consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Locales helper improvement

Browse Source 
Added a rescue block in `name_for_locale()` to ensure the application doesn't crash in case it receives an invalid locale.
This commit is contained in:
María Checa
2017-07-03 12:55:22 +02:00
parent da2b55942a
commit 3e2cbabc9c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/locales_helper.rb
View File

@@ -3,6 +3,8 @@ module LocalesHelper
def name_for_locale(locale) def name_for_locale(locale)
default = I18n.t("locale", locale: locale) default = I18n.t("locale", locale: locale)
I18n.backend.translate(locale, "i18n.language.name", default: default) I18n.backend.translate(locale, "i18n.language.name", default: default)
rescue
nil
end end
end end

2
app/views/admin/site_customization/pages/index.html.erb
View File

@@ -28,7 +28,7 @@
<td><%= I18n.l page.created_at, format: :short %></td> <td><%= I18n.l page.created_at, format: :short %></td>
<td><%= I18n.l page.created_at, format: :short %></td> <td><%= I18n.l page.created_at, format: :short %></td>
<td><%= t("admin.site_customization.pages.page.status_#{page.status}") %></td> <td><%= t("admin.site_customization.pages.page.status_#{page.status}") %></td>
<td><%= name_for_locale(page.locale) rescue nil %></td> <td><%= name_for_locale(page.locale) %></td>
<td class="small"> <td class="small">
<span class="icon-eye"></span> <span class="icon-eye"></span>
<% if page.status == "published" %> <% if page.status == "published" %>