Merge branch 'feature/language_zh-cn' of https://github.com/leopku/mastodon into leopku-feature/language_zh-cn

2017-03-26 13:10:04 +02:00 · 2017-03-26 13:10:04 +02:00 · dddb2eb84f
commit dddb2eb84f
parent 6ec6fe259a d5d5afff9c
5 changed files with 261 additions and 1 deletions
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@ -9,6 +9,7 @@ module SettingsHelper
    fr: 'Français',
    hu: 'Magyar',
    uk: 'Українська',
+    'zh-CN': '简体中文'
  }.freeze

  def human_locale(locale)