Merge pull request #2949 from consul/i18n-language-names

Display language name or language key
2018-10-10 11:45:04 +02:00
parent 3e6b87df04 59b35156b1
commit 710e5ae965
22 changed files with 95 additions and 21 deletions
--- a/app/helpers/locales_helper.rb
+++ b/app/helpers/locales_helper.rb
@@ -1,10 +1,7 @@
 module LocalesHelper

  def name_for_locale(locale)
-    default = I18n.t("locale", locale: locale)
-    I18n.backend.translate(locale, "i18n.language.name", default: default)
-  rescue
-    nil
+    I18n.t("i18n.language.name", locale: locale, fallback: false, default: locale.to_s)
  end

 end