@transifex/native 2.0.1 → 2.2.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@transifex/native",
-  "version": "2.0.1",
+  "version": "2.2.0-alpha.0",
   "description": "Transifex Native for Javascript",
   "keywords": [
     "transifex",

package/src/TxNative.js

@@ -68,6 +68,8 @@ export default class TxNative {
         that[value] = params[value];
       }
     });
+
+    this.fetchedTags = {}; // {langCode: [tag1, tag2, ...], ...}
   }
 
   /**
@@ -159,23 +161,37 @@ export default class TxNative {
    * @returns {Promise}
    */
   async fetchTranslations(localeCode, params = {}) {
+    const filterTags = params.filterTags || this.filterTags;
+
     if (!params.refresh
-      && this.cache.hasTranslations(localeCode)
       && !this.cache.isStale(localeCode)
-    ) {
+      && (
+        (!filterTags && this.cache.hasTranslations(localeCode))
+        || (filterTags
+          && (this.fetchedTags[localeCode] || []).indexOf(filterTags) !== -1)
+      )) {
       return;
     }
 
+    if (filterTags) {
+      if (!(localeCode in this.fetchedTags)) {
+        this.fetchedTags[localeCode] = [];
+      }
+      if (this.fetchedTags[localeCode].indexOf(filterTags) === -1) {
+        this.fetchedTags[localeCode].push(filterTags);
+      }
+    }
+
     // contact CDS
     try {
-      sendEvent(FETCHING_TRANSLATIONS, localeCode, this);
+      sendEvent(FETCHING_TRANSLATIONS, { localeCode, filterTags }, this);
       let response;
       let lastResponseStatus = 202;
       while (lastResponseStatus === 202) {
         /* eslint-disable no-await-in-loop */
         let url = `${this.cdsHost}/content/${localeCode}`;
-        if (this.filterTags) {
-          url = `${url}?filter[tags]=${this.filterTags}`;
+        if (filterTags) {
+          url = `${url}?filter[tags]=${filterTags}`;
         }
         response = await axios.get(url, {
           headers: {
@@ -197,13 +213,13 @@ export default class TxNative {
           }
         });
         this.cache.update(localeCode, hashmap);
-        sendEvent(TRANSLATIONS_FETCHED, localeCode, this);
+        sendEvent(TRANSLATIONS_FETCHED, { localeCode, filterTags }, this);
       } else {
-        sendEvent(TRANSLATIONS_FETCH_FAILED, localeCode, this);
+        sendEvent(TRANSLATIONS_FETCH_FAILED, { localeCode, filterTags }, this);
         throw new Error('Could not fetch translations');
       }
     } catch (err) {
-      sendEvent(TRANSLATIONS_FETCH_FAILED, localeCode, this);
+      sendEvent(TRANSLATIONS_FETCH_FAILED, { localeCode, filterTags }, this);
       throw err;
     }
   }

package/src/cache/MemoryCache.js

@@ -11,7 +11,10 @@ export default class MemoryCache {
    * @param {String} translations[key] - Translation string
    */
   update(localeCode, translations) {
-    this.translationsByLocale[localeCode] = translations;
+    if (!this.translationsByLocale[localeCode]) {
+      this.translationsByLocale[localeCode] = {};
+    }
+    Object.assign(this.translationsByLocale[localeCode], translations);
   }
 
   /**

package/src/renderers/MessageFormatRenderer.js

@@ -1,7 +1,9 @@
 /* eslint-disable class-methods-use-this */
 import MessageFormat from '@messageformat/core';
 
-const MF = new MessageFormat();
+// object to cache MessageFormat classes related to
+// specific locales
+const MF = {};
 
 /**
  * MessageFormat renderer
@@ -11,7 +13,17 @@ const MF = new MessageFormat();
  */
 export default class MessageFormatRenderer {
   render(sourceString, localeCode, params) {
-    const msg = MF.compile(sourceString);
+    // construct a MessageFormat class based on locale
+    // to make dates and other content localizable
+    const locale = ((localeCode || '').split('_'))[0];
+    if (!MF[locale]) {
+      try {
+        MF[locale] = new MessageFormat(locale);
+      } catch (err) {
+        MF[locale] = new MessageFormat();
+      }
+    }
+    const msg = MF[locale].compile(sourceString);
     return msg(params);
   }
 }