diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-28 09:22:01 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-28 09:22:01 +0100 |
| commit | 00a74de49966373832a63efb0d6f702825b6554d (patch) | |
| tree | 6243ec8756e13e0b5c0b8b072bf2bebe8f8103b3 /lib/languages.rb | |
| parent | fd1c62d447e94503d857b2c3463eef93ab231ca6 (diff) | |
| parent | cfb656ca40cbe4e34a5df795bb8514e427c8c708 (diff) | |
Merge branch 'locale-specific-language-name' into rails-3-develop
Diffstat (limited to 'lib/languages.rb')
| -rw-r--r-- | lib/languages.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/languages.rb b/lib/languages.rb index 7d03bc60a..4f51f9bee 100644 --- a/lib/languages.rb +++ b/lib/languages.rb @@ -32,6 +32,7 @@ class LanguageNames 'ce' => 'нохчийн мотт', 'ny' => 'chiCheŵa', 'zh' => '中文 (Zhōngwén)', + 'zh-HK' => '中文(香港)', 'cv' => 'чӑваш чӗлхи', 'kw' => 'Kernewek', 'co' => 'corsu', @@ -188,6 +189,7 @@ class LanguageNames 'zu' => 'isiZulu' } locale = locale.sub("_", "-") # normalize + return language_names[locale] if language_names[locale] main_part = I18n::Locale::Tag::Simple.tag(locale).subtags[0] return language_names[main_part] end |