Merge pull request #1819 from OpenBazaar/tryingToFixMerge

Trying to fix merge

Author: jjeffryes

.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+
+# We recommend you to keep these unchanged
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

js/languages/en-US.json

@@ -726,6 +726,8 @@
   },
   "langChangeRestartTitle": "Restart needed for language change",
   "langChangeRestartMessage": "In order for your language change to fully take effect, you must restart the app.",
+	"restartNow": "Restart Now",
+	"restartLater": "Restart Later",
   "countries": {
     "AFGHANISTAN": "Afghanistan",
     "ALAND_ISLANDS": "Aland Islands",

js/languages/fr-CA.json

@@ -725,6 +725,8 @@
     },
     "langChangeRestartTitle": "Redémarrage requis pour le changement de langue",
     "langChangeRestartMessage": "Vous devez redémarrer l'application pour que le changement de langue soit pleinement effectif.",
+		"restartNow": "Redémarrer maintenant",
+	  "restartLater": "Redémarrer plus tard",
     "countries": {
         "AFGHANISTAN": "Afghanistan",
         "ALAND_ISLANDS": "Aland Islands",
@@ -1138,4 +1140,4 @@
         "ZMW": "Zambian Kwacha",
         "ZWL": "Zimbabwe Dollar"
     }
-}
+}

js/languages/fr.json

@@ -725,6 +725,8 @@
     },
     "langChangeRestartTitle": "Redémarrage requis pour le changement de langue",
     "langChangeRestartMessage": "Vous devez redémarrer l'application pour que le changement de langue soit pleinement effectif.",
+		"restartNow": "Redémarrer maintenant",
+	  "restartLater": "Redémarrer plus tard",
     "countries": {
         "AFGHANISTAN": "Afghanistan",
         "ALAND_ISLANDS": "Aland Islands",
@@ -1138,4 +1140,4 @@
         "ZMW": "Zambian Kwacha",
         "ZWL": "Zimbabwe Dollar"
     }
-}
+}

js/languages/pt-BR.json

@@ -725,6 +725,8 @@
     },
     "langChangeRestartTitle": "Reinicialização necessária para a mudança de idioma.",
     "langChangeRestartMessage": "Para mudar o seu idioma, você precisa reinicializar o aplicativo.",
+		"restartNow": "Recomece agora",
+	  "restartLater": "Recomeçar depois",
     "countries": {
         "AFGHANISTAN": "Afeganistão",
         "ALAND_ISLANDS": "Ilhas da Åland",
@@ -1138,4 +1140,4 @@
         "ZMW": "Kwacha zambiano",
         "ZWL": "Dólar do Zimbábue"
     }
-}
+}

js/router.js

@@ -454,6 +454,6 @@ module.exports = Backbone.Router.extend({
       bodyID: 'userPage'
     });
 
-    app.appBar.setTitle(window.polyglot.t('Settings'));
+    app.appBar.setTitle(window.polyglot.t('nav.settings'));
   }
 });

js/start.js

@@ -406,7 +406,7 @@ var profileLoaded;
 var loadProfile = function(landingRoute, onboarded) {
   var externalRoute = remote.getGlobal('externalRoute');
 
-  landingRoute = landingRoute && landingRoute != undefined ? landingRoute : '#';
+  landingRoute = landingRoute || '#';
 
   profileLoaded = true;
 
@@ -423,7 +423,7 @@ var loadProfile = function(landingRoute, onboarded) {
             var userLang = model.get('language');
             cCode = model.get('currency_code');
 
-            if (userLang != window.polyglot.currentLocale){
+            if (userLang != window.polyglot.currentLocale) {
               //when switching nodes, the language saved in localStorage can be different than the language in the
               // user model, but the user model does not trigger a change because it hasn't changed
               updatePolyglot(userLang);
@@ -480,10 +480,10 @@ var loadProfile = function(landingRoute, onboarded) {
                   title: window.polyglot.t('langChangeRestartTitle'),
                   message: window.polyglot.t('langChangeRestartMessage'),
                   buttons: [{
-                    text: 'Restart Later',
+                    text: window.polyglot.t('restartLater'),
                     fragment: 'restart-later'
                   }, {
-                    text: 'Restart Now',
+                    text: window.polyglot.t('restartNow'),
                     fragment: 'restart-now'
                   }]
                 }).on('click-restart-later', () => {