Merge remote-tracking branch 'origin/translations' into translations

coletivoEITA · May 9, 2017 · 41f49cc · 41f49cc
2 parents bc87ba0 + a874307
commit 41f49cc
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 34 deletions.
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
@@ -23,7 +23,7 @@ const fs = require('fs');
 const rimraf = require('rimraf');
 
 // cleanup language files before copying them.
-rimraf("webapp/i18n/", function () { console.log('cleanup language files'); });
+//rimraf("webapp/", function () { console.log('cleanup language files'); });
 
 //From http://stackoverflow.com/a/20525865/4929236
 function generateFileArray(dir, files_) {
@@ -131,8 +131,6 @@ function next(i, err) {
     }
 }
 
-next(0);
-
 // Generate Language List
 
 const testFolder = 'src/i18n/';
@@ -145,17 +143,25 @@ if (!fs.existsSync('webapp')){
 if (!fs.existsSync('webapp/i18n/')){
   fs.mkdirSync('webapp/i18n/');
 }
-fs.readdir(testFolder, (err, files) => {
-  files.forEach(file => {
-    if (file == 'pt_BR.json') {
-      languages['pt_br'] = file;
-    } else if (file.indexOf("-") > -1) {
+
+if (!fs.existsSync('webapp/i18n/languages.json')){
+  rimraf("webapp/i18n/languages.json", function () { console.log('cleanup languages.json file'); });
+}
+
+fs.readdir(testFolder, function(err, files) {
+  if (err) {
+    throw err;
+  }
+  files.forEach(function(file) {
+    if (file.indexOf("-") > -1) {
       languages[file.split('-')[0]] = file;
     } else if (file.indexOf("_") > -1) {
       languages[file.split('_')[0]] = file;
     } else {
       languages[file.split('.json')[0]] = file;
     }
   });
-  fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4), 'utf8');
+  fs.writeFile('webapp/i18n/languages.json', JSON.stringify(languages, null, 4));
 })
+
+next(0);
diff --git a/src/vector/index.js b/src/vector/index.js
@@ -317,9 +317,6 @@ function onAction(payload) {
             if (language.indexOf("-") > -1) {
               counterpart.setLocale(language.split('-')[0]);
               setLocalSetting('language', language.split('-')[0]);
-            } else if (language == 'pt-br') {
-              counterpart.setLocale('pt-br');
-              setLocalSetting('language', 'pt-br');
             } else {
               counterpart.setLocale(language);
               setLocalSetting('language', language);
@@ -427,30 +424,34 @@ async function loadApp() {
     }
 }
 
-const _localSettings = getLocalSettings();
-dis.register(onAction);
-if (!_localSettings.hasOwnProperty('language')) {
-  const language = navigator.languages[0] || navigator.language || navigator.userLanguage;
-  if (language.indexOf("-") > -1) {
-    dis.dispatch({
-        action: 'set_language',
-        value: language.split('-')[0],
-    });
-    counterpart.setLocale(language.split('-')[0]);
-    setLocalSetting('language', language.split('-')[0]);
-  } else {
-    dis.dispatch({
+function loadLanguage(callback) {
+  const _localSettings = getLocalSettings();
+  dis.register(onAction);
+  if (!_localSettings.hasOwnProperty('language')) {
+    const language = navigator.languages[0] || navigator.language || navigator.userLanguage;
+    if (language.indexOf("-") > -1) {
+      onAction({
+          action: 'set_language',
+          value: language.split('-')[0],
+      });
+      sdk.setLanguage(language.split('-')[0]);
+      setLocalSetting('language', language.split('-')[0]);
+    } else {
+      onAction({
+          action: 'set_language',
+          value: language,
+      });
+      sdk.setLanguage(language);
+      setLocalSetting('language', language);
+    }
+  }else {
+    sdk.setLanguage(_localSettings.language);
+    onAction({
         action: 'set_language',
-        value: language,
+        value: _localSettings.language,
     });
-    counterpart.setLocale(language);
-    setLocalSetting('language', language);
   }
-}else {
-  dis.dispatch({
-      action: 'set_language',
-      value: _localSettings.language,
-  });
+  callback();
 }
 
-loadApp();
+loadLanguage(loadApp);