Merge pull request #11 from transifex/improve-source-extraction

Improve React CLI source extraction
transifex · Jul 29, 2020 · a171fd9 · a171fd9
2 parents 0e4ae23 + 296cc5d
commit a171fd9
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 46 deletions.
diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
diff --git a/packages/cli/src/api/extract.js b/packages/cli/src/api/extract.js
@@ -120,12 +120,15 @@ function extractPhrases(file, relativeFile, globalTags) {
       let string;
       const params = {};
       _.each(elem.attributes, (attr) => {
-        if (attr.name.name === '_str') {
-          string = attr.value.value;
+        const property = attr.name && attr.name.name;
+        const value = attr.value && attr.value.value;
+        if (!property || !value) return;
+        if (property === '_str') {
+          string = value;
           return;
         }
-        if (_.isString(attr.value.value) || _.isNumber(attr.value.value)) {
-          params[attr.name.name] = attr.value.value;
+        if (_.isString(value) || _.isNumber(value)) {
+          params[property] = value;
         }
       });
 

diff --git a/packages/cli/test/fixtures/react.jsx b/packages/cli/test/fixtures/react.jsx
@@ -8,8 +8,8 @@ function foo() {
         _charlimit="10"
         _comment="comment" />
 
-      <T _str="Text 2" />
-      <T _str="Text 3" />
+      <T _str="Text 2" _html/>
+      <T _str="Text 3" _html _inline />
       <T _str="Text 4" />
     </div>
   );

diff --git a/packages/native/dist/browser.native.js b/packages/native/dist/browser.native.js
diff --git a/packages/native/dist/browser.native.js.map b/packages/native/dist/browser.native.js.map
diff --git a/packages/native/dist/node.native.js b/packages/native/dist/node.native.js
diff --git a/packages/native/dist/node.native.js.map b/packages/native/dist/node.native.js.map
diff --git a/packages/native/package-lock.json b/packages/native/package-lock.json
diff --git a/packages/native/package.json b/packages/native/package.json
@@ -43,10 +43,10 @@
     "eslint-plugin-import": "^2.22.0",
     "glob": "^7.1.6",
     "mocha": "^8.0.1",
-    "nock": "^13.0.2",
+    "nock": "^13.0.3",
     "nyc": "^15.1.0",
     "source-map-support": "^0.5.19",
-    "webpack": "^4.43.0",
+    "webpack": "^4.44.0",
     "webpack-cli": "^3.3.12"
   },
   "dependencies": {

diff --git a/packages/native/src/TxNative.js b/packages/native/src/TxNative.js
@@ -7,7 +7,6 @@ import {
   FETCHING_LOCALES, LOCALES_FETCHED, LOCALES_FETCH_FAILED,
   LOCALE_CHANGED,
 } from './events';
-import { normalizeLocale } from './utils';
 
 /**
  * Native instance, combines functionality from
@@ -86,13 +85,10 @@ export default class TxNative {
       return;
     }
 
-    // normalize locale
-    const processedLocaleCode = normalizeLocale(localeCode);
-
     // contact CDS
     try {
-      sendEvent(FETCHING_TRANSLATIONS, processedLocaleCode, this);
-      const response = await axios.get(`${this.core.cdsHost}/content/${processedLocaleCode}`, {
+      sendEvent(FETCHING_TRANSLATIONS, localeCode, this);
+      const response = await axios.get(`${this.core.cdsHost}/content/${localeCode}`, {
         headers: {
           Authorization: `Bearer ${this.core.token}`,
         },
@@ -106,14 +102,14 @@ export default class TxNative {
             hashmap[key] = data.data[key].string;
           }
         });
-        this.core.cache.update(processedLocaleCode, hashmap);
-        sendEvent(TRANSLATIONS_FETCHED, processedLocaleCode, this);
+        this.core.cache.update(localeCode, hashmap);
+        sendEvent(TRANSLATIONS_FETCHED, localeCode, this);
       } else {
-        sendEvent(TRANSLATIONS_FETCH_FAILED, processedLocaleCode, this);
+        sendEvent(TRANSLATIONS_FETCH_FAILED, localeCode, this);
         throw new Error('Could not fetch translations');
       }
     } catch (err) {
-      sendEvent(TRANSLATIONS_FETCH_FAILED, processedLocaleCode, this);
+      sendEvent(TRANSLATIONS_FETCH_FAILED, localeCode, this);
       throw err;
     }
   }