Merge remote-tracking branch 'upstream/master'

Former-commit-id: 4f6ce2f34f558bcdfd5f7542ca32133f7a4fb4f9

2 files changed, 6 insertions, 1 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index bd699971..df92729e 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -33,6 +33,10 @@ angular.module('zmApp.controllers')
             {
                 text: 'Italian',
                 value: 'it'
+            },
+            {
+                text: 'Portugese',
+                value: 'pt'
             }
         ];
 
diff --git a/www/js/app.js b/www/js/app.js
index ef8c1990..b6afba53 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1311,7 +1311,7 @@ angular.module('zmApp', [
     //$translateProvider.useLocalStorage();
     
     
-    $translateProvider.registerAvailableLanguageKeys(['en', 'de','es', 'fr', 'it', 'ja', 'ko', 'zh', 'zh_CN', 'zh_TW'], {
+    $translateProvider.registerAvailableLanguageKeys(['en', 'de','es', 'fr', 'it', 'ja', 'ko', 'zh', 'zh_CN', 'zh_TW', 'pt'], {
              'en_*': 'en',
              'de_*': 'de',
              'es_*': 'es',
@@ -1319,6 +1319,7 @@ angular.module('zmApp', [
              'it_*': 'it',
              'ja_*': 'ja',
              'ko_*': 'ko',
+             'pt_*': 'pt',
                '*': 'en' // must be last
          });