diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-06-23 09:33:42 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-06-23 09:33:42 +0100 |
| commit | db1a388f0a7b37cc0ceb3ca07b995b34dabdba58 (patch) | |
| tree | e34df5ae0dacdbf6c3b77542b22f2d9e3799d322 /lib/languages.rb | |
| parent | a7cc84b9b2b430644fe23e6328d7ab289e7abf0a (diff) | |
| parent | 7d0fea4b38c214a67b2fc4b56aa670e02a3cda61 (diff) | |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop
Conflicts:
Gemfile.lock
script/handle-mail-replies
script/handle-mail-replies.rb
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'lib/languages.rb')
| -rw-r--r-- | lib/languages.rb | 5 |
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 |