Skip to content

Commit d059895

Browse files
committed
Fix #34: Add region support for Android
1 parent ec953a6 commit d059895

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

demo/app/i18n/fr-CA.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"hello": {
3+
"world": "Bonjour le monde ! Hello world !"
4+
}
5+
}

hooks/converter.android.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class ConverterAndroid extends ConverterCommon {
2020
protected cleanObsoleteResourcesFiles(resourcesDirectory: string, languages: Languages): this {
2121
fs.readdirSync(resourcesDirectory).filter(fileName => {
2222
const match = /^values-(.+)$/.exec(fileName);
23-
return match && !languages.has(match[1]);
23+
return match && !languages.has(match[1].replace(/^(.+?)-r(.+?)$/, "$1-$2"));
2424
}).map(fileName => {
2525
return path.join(resourcesDirectory, fileName);
2626
}).filter(filePath => {
@@ -42,7 +42,7 @@ export class ConverterAndroid extends ConverterCommon {
4242
): this {
4343
const languageResourcesDir = path.join(
4444
this.appResourcesDirectoryPath,
45-
`values${isDefaultLanguage ? "" : `-${language}`}`
45+
`values${isDefaultLanguage ? "" : `-${language.replace(/^(.+?)-(.+?)$/, "$1-r$2")}`}`
4646
);
4747
this.createDirectoryIfNeeded(languageResourcesDir);
4848
let strings = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n";

0 commit comments

Comments
 (0)