Fix #34: Add region support for Android

EddyVerbruggen · May 7, 2018 · d059895 · d059895
1 parent ec953a6
commit d059895
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/demo/app/i18n/fr-CA.json b/demo/app/i18n/fr-CA.json
@@ -0,0 +1,5 @@
+{
+  "hello": {
+    "world": "Bonjour le monde ! Hello world !"
+  }
+}
diff --git a/hooks/converter.android.ts b/hooks/converter.android.ts
@@ -20,7 +20,7 @@ export class ConverterAndroid extends ConverterCommon {
   protected cleanObsoleteResourcesFiles(resourcesDirectory: string, languages: Languages): this {
     fs.readdirSync(resourcesDirectory).filter(fileName => {
       const match = /^values-(.+)$/.exec(fileName);
-      return match && !languages.has(match[1]);
+      return match && !languages.has(match[1].replace(/^(.+?)-r(.+?)$/, "$1-$2"));
     }).map(fileName => {
       return path.join(resourcesDirectory, fileName);
     }).filter(filePath => {
@@ -42,7 +42,7 @@ export class ConverterAndroid extends ConverterCommon {
   ): this {
     const languageResourcesDir = path.join(
       this.appResourcesDirectoryPath,
-      `values${isDefaultLanguage ? "" : `-${language}`}`
+      `values${isDefaultLanguage ? "" : `-${language.replace(/^(.+?)-(.+?)$/, "$1-r$2")}`}`
     );
     this.createDirectoryIfNeeded(languageResourcesDir);
     let strings = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n";