From af960555b4b5a41ca0f3d5ca67af1b35520e4fce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Thu, 8 Dec 2016 16:00:03 -0300 Subject: [PATCH] adding language detection and language preferences --- src/js/controllers/preferencesLanguage.js | 6 +++--- src/js/controllers/translators.js | 4 ++-- src/js/services/uxLanguage.js | 3 --- www/views/preferencesAbout.html | 4 ++-- www/views/preferencesLanguage.html | 20 ++++++++++++-------- www/views/tab-settings.html | 22 ++++++++++------------ www/views/translators.html | 20 +++++++++++--------- 7 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js index 4a4ca07f7..81db570a2 100644 --- a/src/js/controllers/preferencesLanguage.js +++ b/src/js/controllers/preferencesLanguage.js @@ -5,8 +5,8 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController $scope.availableLanguages = uxLanguage.getLanguages(); - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; $scope.save = function(newLang) { @@ -30,7 +30,7 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController }); }; - $scope.$on("$ionicView.enter", function(event, data){ + $scope.$on("$ionicView.enter", function(event, data) { $scope.currentLanguage = uxLanguage.getCurrentLanguage(); }); }); diff --git a/src/js/controllers/translators.js b/src/js/controllers/translators.js index 7f09f58d5..c763d7079 100644 --- a/src/js/controllers/translators.js +++ b/src/js/controllers/translators.js @@ -2,7 +2,7 @@ angular.module('copayApp.controllers').controller('translatorsController', function($scope, externalLinkService) { - $scope.openExternalLink = function(url, target) { - externalLinkService.open(url, target); + $scope.openExternalLink = function(url, optIn, title, message, okText, cancelText) { + externalLinkService.open(url, optIn, title, message, okText, cancelText); }; }); diff --git a/src/js/services/uxLanguage.js b/src/js/services/uxLanguage.js index 2f9e76043..7adf07cbe 100644 --- a/src/js/services/uxLanguage.js +++ b/src/js/services/uxLanguage.js @@ -41,9 +41,6 @@ angular.module('copayApp.services') root._detect = function(cb) { - - return cb('en'); //disable auto detection for release; - var userLang, androidLang; if (navigator && navigator.globalization) { diff --git a/www/views/preferencesAbout.html b/www/views/preferencesAbout.html index 3f26d93b6..8d30b1864 100644 --- a/www/views/preferencesAbout.html +++ b/www/views/preferencesAbout.html @@ -30,11 +30,11 @@ Terms of Use - + Session log diff --git a/www/views/preferencesLanguage.html b/www/views/preferencesLanguage.html index 2c01d7d61..737091fa0 100644 --- a/www/views/preferencesLanguage.html +++ b/www/views/preferencesLanguage.html @@ -12,14 +12,18 @@ ng-click="save(lang.isoCode)">{{lang.name}} -
- We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin. - - - Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. - +
+
+ We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin. +
+
+
+ Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. +
+
+
+ Contribute Translations +
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index f4a5fc3ab..ab01bf9b7 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -53,18 +53,16 @@ Notifications - - - - - - - - - - - - + + + + + Language + + {{currentLanguageName|translate}} + + + diff --git a/www/views/translators.html b/www/views/translators.html index e2a97d9cb..4ca1c4d6e 100644 --- a/www/views/translators.html +++ b/www/views/translators.html @@ -19,16 +19,18 @@
Pirx1618Polish
mareksipCzech
-
-

- We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin. - -

- +
+
+ We’re always looking for translation contributions! You can make corrections or help to make this app available in your native language by joining our community on Crowdin. +
+
+
+
Don't see your language on Crowdin? Contact the Owner on Crowdin! We'd love to support your language. - +
+
+
+ Contribute Translations