Merge pull request #3 from imartinez/feature/lang-region-support

Feature/lang region support

Author: Daniel Gallego

README.md

@@ -56,7 +56,8 @@ Just run the new ```importPoEditorStrings``` task via Android Studio or command
 This task will:
 - download all strings files (every available lang) from PoEditor given the api token and project id.
 - process the incoming strings to fix some PoEditor incompatibilities with Android strings system. 
-- create and save strings.xml files to ```/values-<lang>``` (or ```/values``` in case of the default lang)
+- create and save strings.xml files to ```/values-<lang>``` (or ```/values``` in case of the default lang). It supports
+region specific languages by creating the proper folders (i.e. ```/values-es-rMX```).
 
 Handle Tablet specific strings
 --------
@@ -120,7 +121,6 @@ will become, in values-es/strings.xml
 
 To-Do
 -------
-* Manage language specializations: i.e. values-es-rMX for Mexican.
 * Change placeholder system to avoid using ordinals by taking into account the placeholder value instead.
 
 License

src/main/groovy/com/bq/gradle/ImportPoEditorStringsTask.groovy

@@ -110,15 +110,15 @@ class ImportPoEditorStringsTask extends DefaultTask {
             // If language folders doesn't exist, create it (both for smartphones and tablets)
             // TODO investigate if we can infer the res folder path instead of passing it using poEditorPlugin.res_dir_path
 
-            // TODO manage langauge specializations: values-es-rMX for Mexican
-            def valuesFolder = it != defaultLang ? "values-${it}" : "values"
+            def valuesModifier = createValuesModifierFromLangCode(it)
+            def valuesFolder = valuesModifier != defaultLang ? "values-${valuesModifier}" : "values"
             File stringsFolder = new File("${resDirPath}/${valuesFolder}")
             if (!stringsFolder.exists()) {
                 println 'Creating strings folder for new language'
                 def folderCreated = stringsFolder.mkdir()
                 println "Folder created: ${folderCreated}"
             }
-            def tabletValuesFolder = it != defaultLang ? "values-${it}-sw600dp" : "values-sw600dp"
+            def tabletValuesFolder = valuesModifier != defaultLang ? "values-${valuesModifier}-sw600dp" : "values-sw600dp"
             File tabletStringsFolder = new File("${resDirPath}/${tabletValuesFolder}")
             if (!tabletStringsFolder.exists()) {
                 println 'Creating tablet strings folder for new language'
@@ -140,6 +140,20 @@ class ImportPoEditorStringsTask extends DefaultTask {
         }
     }
 
+    /**
+     * Creates values file modifier taking into account specializations (i.e values-es-rMX for Mexican)
+     * @param langCode
+     * @return proper values file modifier (i.e. es-rMX)
+     */
+    String createValuesModifierFromLangCode(String langCode) {
+        if (!langCode.contains("-")) {
+            return langCode
+        } else {
+            String[] langParts = langCode.split("-")
+            return langParts[0] + "-" + "r" + langParts[1].toUpperCase()
+        }
+    }
+
     String postProcessIncomingXMLString(String incomingXMLString) {
         // Post process the downloaded XML
         return incomingXMLString

src/test/groovy/org/gradle/ImportPoEditorStringsTaskTest.groovy

@@ -141,4 +141,22 @@ class ImportPoEditorStringsTaskTest {
                 '  </string>\n' +
                 ' </resources>'))
     }
+
+    @Test
+    public void testCreateValuesModifierFromLangCodeWithNormalLangCode() throws Exception {
+        Project project = ProjectBuilder.builder().build()
+        def task = project.task('importPoEditorStrings', type: ImportPoEditorStringsTask)
+
+        assertEquals('es',
+                ((ImportPoEditorStringsTask)task).createValuesModifierFromLangCode('es'))
+    }
+
+    @Test
+    public void testCreateValuesModifierFromLangCodeWithSpecializedLangCode() throws Exception {
+        Project project = ProjectBuilder.builder().build()
+        def task = project.task('importPoEditorStrings', type: ImportPoEditorStringsTask)
+
+        assertEquals('es-rMX',
+                ((ImportPoEditorStringsTask)task).createValuesModifierFromLangCode('es-mx'))
+    }
 }