aboutsummaryrefslogtreecommitdiffstats
path: root/lib/languages.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2012-06-20 10:59:54 +0100
committerSeb Bacon <seb.bacon@gmail.com>2012-06-20 10:59:54 +0100
commit7d0fea4b38c214a67b2fc4b56aa670e02a3cda61 (patch)
tree85e77cf7ba0656efbacf1497baff2ef96887bd3b /lib/languages.rb
parent6ef57090e436e01bc5de801bc7acb6bfadb5c490 (diff)
parent6c4c822ef7a4491bf821326af779e5be9118c0a1 (diff)
Merge branch 'master' into develop
Diffstat (limited to 'lib/languages.rb')
-rw-r--r--lib/languages.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/languages.rb b/lib/languages.rb
index 474c0e0cb..42231ef56 100644
--- a/lib/languages.rb
+++ b/lib/languages.rb
@@ -187,8 +187,9 @@ class LanguageNames
'za' => 'Saɯ cueŋƅ',
'zu' => 'isiZulu'
}
-
- return language_names[locale]
+ locale = locale.sub("_", "-") # normalize
+ main_part = I18n::Locale::Tag::Simple.tag(locale).subtags[0]
+ return language_names[main_part]
end
end