Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

display language name in user locale selector - make it consistent with admin (#5424)

This commit is contained in:
Maja Komel 2017-12-13 22:17:36 +01:00 committed by Sam
parent 1b4483c942
commit 0f4ed2e070
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
View File

@ -33,7 +33,7 @@ export default Ember.Controller.extend(PreferencesTabController, {
@computed() @computed()
availableLocales() { availableLocales() {
return this.siteSettings.available_locales.split('|').map(s => ({ name: s, value: s })); return JSON.parse(this.siteSettings.available_locales);
}, },
@computed() @computed()

2
app/models/site_setting.rb
View File

@ -30,7 +30,7 @@ class SiteSetting < ActiveRecord::Base
client_settings << :available_locales client_settings << :available_locales
def self.available_locales def self.available_locales
LocaleSiteSetting.values.map { |e| e[:value] }.join('|') LocaleSiteSetting.values.to_json
end end
def self.topic_title_length def self.topic_title_length