fix(sync): use first locale in config as default locale

Author: Anton Savoskin

src/commands/sync.ts

@@ -62,11 +62,13 @@ export default class Extract extends Base {
     const {
       flags: { langs, provider, projectId, token, version, namespace },
     } = this.parse(Extract);
+    const locales = langs.split(',');
+    const defaultLocale = locales[0];
 
     const getProvider = () => {
       const providers: { [key: string]: any } = {
-        lokalise: () => new Lokalise(projectId, token),
-        locize: () => new Locize(projectId, token, version, namespace),
+        lokalise: () => new Lokalise(defaultLocale, projectId, token),
+        locize: () => new Locize(defaultLocale, projectId, token, version, namespace),
       };
       return providers[provider]();
     };
@@ -77,7 +79,6 @@ export default class Extract extends Base {
       return;
     }
 
-    const locales = langs.split(',');
     locales.forEach(locale => {
       this.messages[locale] = {};
     });
@@ -92,7 +93,7 @@ export default class Extract extends Base {
           this.provider!.uploadMessages(newMessages.map(id => this.messages[locale][id]).filter(Boolean), locale),
         );
       } else {
-        await this.provider.uploadMessages(newMessages.map(id => this.messages[locales[0]][id]), 'en');
+        await this.provider.uploadMessages(newMessages.map(id => this.messages[locales[0]][id]), defaultLocale);
       }
     }
   }

src/providers/locize.ts

@@ -11,6 +11,7 @@ export class Locize implements Provider {
   locizeKeys: { [locale: string]: LocizeKeys } = {};
   newMessages: string[] = [];
   constructor(
+    private defaultLocale?: string,
     private projectId?: string,
     private apiKey?: string,
     private version?: string,
@@ -37,7 +38,7 @@ export class Locize implements Provider {
     if (key) {
       return this.locizeKeys[locale][key];
     }
-    if (locale === 'en') {
+    if (locale === this.defaultLocale) {
       this.newMessages.push(id);
     }
     return '';
@@ -48,7 +49,7 @@ export class Locize implements Provider {
     const body = messages.reduce(
       (acc, { id, message, defaultMessage, description }) => {
         acc[id] = {
-          value: locale === 'en' ? message || defaultMessage : message || '',
+          value: locale === this.defaultLocale ? message || defaultMessage : message || '',
           context: { text: description || '' },
         };
         return acc;
@@ -59,9 +60,9 @@ export class Locize implements Provider {
       const response = await request<string>({
         headers,
         body,
-        url: `${BASE_URL}/${locale === 'en' ? 'missing' : 'update'}/${this.projectId}/${this.version}/${locale}/${
-          this.namespace
-        }`,
+        url: `${BASE_URL}/${locale === this.defaultLocale ? 'missing' : 'update'}/${this.projectId}/${
+          this.version
+        }/${locale}/${this.namespace}`,
         method: 'POST',
       });
       showInfo(`Response from locize: ${JSON.stringify(response, null, 2)}`);

src/providers/lokalise.ts

@@ -56,7 +56,7 @@ type LocalizeResponse = {
 export class Lokalise implements Provider {
   lokaliseKeys: LokaliseKey[] = [];
   newMessages: string[] = [];
-  constructor(private projectId?: string, private token?: string) {}
+  constructor(private defaultLocale?: string, private projectId?: string, private token?: string) {}
 
   async getKeys() {
     const headers = { 'x-api-token': this.token, 'content-type': 'application/json' };
@@ -79,7 +79,7 @@ export class Lokalise implements Provider {
     if (lokaliseString) {
       return lokaliseString.translation;
     }
-    if (locale === 'en') {
+    if (locale === this.defaultLocale) {
       this.newMessages.push(id);
     }
     return '';
@@ -92,7 +92,7 @@ export class Lokalise implements Provider {
         key_name: message.id,
         description: message ? message.description : '',
         platforms: ['ios', 'android', 'web', 'other'],
-        translations: [{ language_iso: 'en', translation: message ? message.defaultMessage : '' }],
+        translations: [{ language_iso: this.defaultLocale, translation: message ? message.defaultMessage : '' }],
       })),
     };
     try {