fixup language menu

OpenCommunityCoin · Apr 30, 2018 · d987afa · d987afa
1 parent f4a1063
commit d987afa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/www/app/controllers/application.js b/www/app/controllers/application.js
@@ -66,17 +66,22 @@ export default Ember.Controller.extend({
     }
   }),
 
-  // FIXME
-  languages: Ember.computed({
+  languages: Ember.computed('model', {
     get() {
-      let intl = this.get('intl');
-      return [ { name: intl.t('lang.korean'), value: 'ko'}, { name: intl.t('lang.english'), value: 'en-us'} ];
+      return this.get('model.languages');
     }
   }),
 
   selectedLanguage: Ember.computed({
     get() {
-      return Ember.$.cookie('lang');
+      var langs = this.get('languages');
+      var lang = Ember.$.cookie('lang');
+      for (var i = 0; i < langs.length; i++) {
+        if (langs[i].value == lang) {
+          return langs[i].name;
+        }
+      }
+      return lang;
     }
   }),
 

diff --git a/www/app/routes/application.js b/www/app/routes/application.js
@@ -28,6 +28,7 @@ function selectLocale(selected) {
 export default Ember.Route.extend({
   intl: Ember.inject.service(),
   selectedLanguage: null,
+  languages: null,
   poolSettings: null,
   poolCharts: null,
   chartTimestamp: 0,
@@ -46,6 +47,12 @@ export default Ember.Route.extend({
       this.set('selectedLanguage', locale);
     }
 
+    let intl = this.get('intl');
+    this.set('languages', [
+      { name: intl.t('lang.korean'), value: 'ko'},
+      { name: intl.t('lang.english'), value: 'en-us'}
+    ]);
+
     let settings = this.get('poolSettings');
     if (!settings) {
       let self = this;
@@ -79,7 +86,13 @@ export default Ember.Route.extend({
       this.get('intl').setLocale(locale);
       this.set('selectedLanguage', locale);
       Ember.$.cookie('lang', locale);
-      Ember.$('#selectedLanguage').html(locale + '<b class="caret"></b>');
+      let languages = this.get('languages');
+      for (var i = 0; i < languages.length; i++) {
+        if (languages[i].value == locale) {
+          Ember.$('#selectedLanguage').html(languages[i].name + '<b class="caret"></b>');
+          break;
+        }
+      }
 
       return true;
     }
@@ -107,6 +120,7 @@ export default Ember.Route.extend({
   setupController: function(controller, model) {
     let settings = this.get('poolSettings');
     model.settings = settings;
+    model.languages = this.get('languages');
     this._super(controller, model);
     Ember.run.later(this, this.refresh, 5000);
   }