Merge branch 'release/0.6'0.6

Conflicts:
	locale/bs/app.po
	locale/ca/app.po
	locale/cs/app.po
	locale/cy/app.po
	locale/de/app.po
	locale/en_IE/app.po
	locale/es/app.po
	locale/eu/app.po
	locale/fr/app.po
	locale/ga_IE/app.po
	locale/gl/app.po
	locale/hu_HU/app.po
	locale/id/app.po
	locale/pt_BR/app.po
	locale/sq/app.po
	locale/sr@latin/app.po
	spec/fixtures/locale/en/app.po

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