about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-03-26 13:10:04 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-03-26 13:10:04 +0200
commitdddb2eb84f946cf52e418cf8bc4789b11e35049c (patch)
tree8f8b3bd31f5ce2facebaf9a2bbd76034ae2f6470 /app
parent6ec6fe259a8c7fadf7fd308f48f6116b2bd0e73b (diff)
parentd5d5afff9c95542138d4d64e8765bd0af4ec8eb9 (diff)
Merge branch 'feature/language_zh-cn' of https://github.com/leopku/mastodon into leopku-feature/language_zh-cn
Diffstat (limited to 'app')
-rw-r--r--app/helpers/settings_helper.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index aed8770c8..ad8c8d467 100644
--- 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)