Merge pull request #86 from IBM-Cloud/85-truncate-srcSuffix

truncate source suffix in target resource files

Author: yumaoka

gp-maven-plugin/src/it/t4-basic-download-success/src/main/resources/com/bundle2/BundleWithSuffix_en.json

@@ -0,0 +1,5 @@
+{
+	"upload.desc":"description",
+	"upload.comment":"comment",
+	"upload.submit":"upload"
+}

gp-maven-plugin/src/it/t4-basic-download-success/verify.groovy

@@ -25,6 +25,7 @@ try {
     println "verifying that download happened successfully"
     String location = bldDir + "/it/t4-basic-download-success"
     String targetLocation = location + "/target/classes/com/bundle1"
+    String targetLocation2 = location + "/target/classes/com/bundle2"
     def dir = new File(targetLocation)
     int filecount = 0
     int keycount = 5 // including opening and closing braces which take 1 line each
@@ -40,6 +41,13 @@ try {
     	}
     }
     assert filecount == 20
+
+    def dir2 = new File(targetLocation2)
+    dir2.traverse { file ->
+        if (!file.directory) {
+            assert !file.name.contains("_en_")
+        }
+    }
 } catch( Throwable t ) {
     t.printStackTrace()
     return false

gp-maven-plugin/src/main/java/com/ibm/g11n/pipeline/maven/GPDownloadMojo.java

@@ -132,7 +132,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 if (outputSrcLang) {
                     if (bdlLangs.contains(srcLang)) {
                         exportLanguageResource(client, bf, srcLang, outDir,
-                                outContentOpt, bundleLayout, langIdStyle, langMap);
+                                outContentOpt, bundleLayout, langIdStyle, langMap, srcLang);
                     } else {
                         getLog().warn("The specified source language (" + srcLang
                                 + ") does not exist in the bundle:" + bundleId);
@@ -142,7 +142,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                 for (String tgtLang: tgtLangs) {
                     if (bdlLangs.contains(tgtLang)) {
                         exportLanguageResource(client, bf, tgtLang, outDir,
-                                outContentOpt, bundleLayout, langIdStyle, langMap);
+                                outContentOpt, bundleLayout, langIdStyle, langMap, srcLang);
                     } else {
                         getLog().warn("The specified target language (" + tgtLang
                                 + ") does not exist in the bundle:" + bundleId);
@@ -154,16 +154,23 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 
     private void exportLanguageResource(ServiceClient client, SourceBundleFile bf, String language,
             File outBaseDir, OutputContentOption outContntOpt, BundleLayout bundleLayout,
-            LanguageIdStyle langIdStyle, Map<String, String> langMap)
+            LanguageIdStyle langIdStyle, Map<String, String> langMap, String srcLang)
             throws MojoFailureException {
         String srcFileName = bf.getFile().getName();
         String relPath = bf.getRelativePath();
-
         File outputFile = null;
 
         switch (bundleLayout) {
         case LANGUAGE_SUFFIX: {
             File dir = (new File(outBaseDir, relPath)).getParentFile();
+            
+            // truncate source suffix from sourceFile name - BEGIN
+            int extensionIndex = srcFileName.lastIndexOf('.');
+            String extension = (extensionIndex > 0) ? srcFileName.substring(extensionIndex) : "";
+            int srcSuffixIndex = srcFileName.lastIndexOf("_" + getLanguageId(srcLang, langIdStyle, langMap));
+            srcFileName = (srcSuffixIndex > 0) ? srcFileName.substring(0,srcSuffixIndex) + extension : srcFileName;
+            // truncate source suffix from sourceFile name - END
+            
             int idx = srcFileName.lastIndexOf('.');
             String tgtName = null;
             if (idx < 0) {