diff options
author | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
commit | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (patch) | |
tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/helpers | |
parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
parent | 90712d42933efd9978e4bbae82f81a4650aa4d84 (diff) |
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/settings_helper.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index af950aa63..369a45680 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -30,6 +30,7 @@ module SettingsHelper th: 'ภาษาไทย', tr: 'Türkçe', uk: 'Українська', + zh: '中文', 'zh-CN': '简体中文', 'zh-HK': '繁體中文(香港)', 'zh-TW': '繁體中文(臺灣)', @@ -39,6 +40,10 @@ module SettingsHelper HUMAN_LOCALES[locale] end + def filterable_languages + I18n.available_locales.map { |locale| locale.to_s.split('-').first.to_sym }.uniq + end + def hash_to_object(hash) HashObject.new(hash) end |