File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change 1+ {
2+ "hello" : {
3+ "world" : " Bonjour le monde ! Hello world !"
4+ }
5+ }
Original file line number Diff line number Diff 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 = / ^ v a l u e s - ( .+ ) $ / . 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" ;
You can’t perform that action at this time.
0 commit comments