Do not encode simple keys

Author: lfabreges

src/hooks/converter.android.ts

@@ -46,18 +46,26 @@ export class ConverterAndroid extends ConverterCommon {
  );
  this.createDirectoryIfNeeded(languageResourcesDir);
  let strings = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n";
- i18nEntries.forEach((value, key) => {
- const encodedKey = encodeKey(key);
- const encodedValue = encodeValue(value);
+ this.encodeI18nEntries(i18nEntries).forEach((encodedValue, encodedKey) => {
  strings += ` <string name="${encodedKey}">${encodedValue}</string>\n`;
- if (key === "app.name") {
- strings += ` <string name="app_name">${encodedValue}</string>\n`;
- strings += ` <string name="title_activity_kimera">${encodedValue}</string>\n`;
- }
  });
  strings += "</resources>\n";
  const resourceFilePath = path.join(languageResourcesDir, "strings.xml");
  this.writeFileSyncIfNeeded(resourceFilePath, strings);
  return this;
  }
+
+ private encodeI18nEntries(i18nEntries: I18nEntries): I18nEntries {
+ const encodedI18nEntries: I18nEntries = new Map();
+ i18nEntries.forEach((value, key) => {
+ const encodedKey = encodeKey(key);
+ const encodedValue = encodeValue(value);
+ encodedI18nEntries.set(encodedKey, encodedValue);
+ if (key === "app.name") {
+ encodedI18nEntries.set("app_name", encodedValue);
+ encodedI18nEntries.set("title_activity_kimera", encodedValue);
+ }
+ });
+ return encodedI18nEntries;
+ }
 }

src/hooks/converter.common.ts

@@ -24,7 +24,6 @@ export abstract class ConverterCommon {
  .platformProjectService
  .getAppResourcesDestinationDirectoryPath(projectData)
  ;
-
  this.i18nDirectoryPath = path.join(projectData.appDirectoryPath, "i18n");
  }
 
@@ -42,7 +41,9 @@ export abstract class ConverterCommon {
  public run(): this {
  this.dataProvider.getLanguages().forEach((languageI18nEntries, language) => {
  this.createLanguageResourcesFiles(
- language, language === this.dataProvider.getDefaultLanguage(), languageI18nEntries
+ language,
+ language === this.dataProvider.getDefaultLanguage(),
+ languageI18nEntries
  );
  });
  if (fs.existsSync(this.appResourcesDirectoryPath) && fs.statSync(this.appResourcesDirectoryPath).isDirectory()) {

src/hooks/converter.ios.ts

@@ -42,8 +42,8 @@ export class ConverterIOS extends ConverterCommon {
  const languageResourcesDir = path.join(this.appResourcesDirectoryPath, `${language}.lproj`);
  this
  .createDirectoryIfNeeded(languageResourcesDir)
- .writeStrings(languageResourcesDir, "Localizable.strings", i18nEntries, true)
- .writeStrings(languageResourcesDir, "InfoPlist.strings", infoPlistStrings, false)
+ .writeStrings(languageResourcesDir, "Localizable.strings", i18nEntries)
+ .writeStrings(languageResourcesDir, "InfoPlist.strings", infoPlistStrings)
  ;
  if (isDefaultLanguage) {
  infoPlistStrings.set("CFBundleDevelopmentRegion", language);
@@ -52,15 +52,24 @@ export class ConverterIOS extends ConverterCommon {
  return this;
  }
 
+ private encodeI18nEntries(i18nEntries: I18nEntries): I18nEntries {
+ const encodedI18nEntries: I18nEntries = new Map();
+ i18nEntries.forEach((value, key) => {
+ const encodedKey = encodeKey(key);
+ const encodedValue = encodeValue(value);
+ encodedI18nEntries.set(encodedKey, encodedValue);
+ });
+ return encodedI18nEntries;
+ }
+
  private writeStrings(
  languageResourcesDir: string,
  resourceFileName: string,
- strings: I18nEntries,
- encodeKeys: boolean
+ i18nEntries: I18nEntries,
  ): this {
  let content = "";
- strings.forEach((value, key) => {
- content += `"${encodeKeys ? encodeKey(key) : key}" = "${encodeValue(value)}";\n`;
+ this.encodeI18nEntries(i18nEntries).forEach((encodedValue, encodedKey) => {
+ content += `"${encodedKey}" = "${encodedValue}";\n`;
  });
  const resourceFilePath = path.join(languageResourcesDir, resourceFileName);
  this.writeFileSyncIfNeeded(resourceFilePath, content);

src/resource.common.ts

@@ -1,7 +1,7 @@
 import * as shorthash from "shorthash";
 
 export function encodeKey(key: string): string {
- return `_${key.replace(/[^\w]/g, "_")}_${shorthash.unique(key)}`;
+ return key.match(/^[_a-zA-Z]\w*$/) ? key : `_${key.replace(/[^\w]/g, "_")}_${shorthash.unique(key)}`;
 }
 
 export function replace(find: string[], replace: string[], subject: string): string {