diff --git a/app/views/admin/application/i18n/_inline.html.erb b/app/views/admin/application/i18n/_inline.html.erb index 6c84630f7900a23be68b51bcd67ebc44463ed794..2f6378a7ad390798e833c668ae317f98c61de26e 100644 --- a/app/views/admin/application/i18n/_inline.html.erb +++ b/app/views/admin/application/i18n/_inline.html.erb @@ -1,6 +1,5 @@ <% if about.available_languages.many? %> - <% # TODO i18n %> - <br>en <%= t(about.language.iso_code, scope: :languages) %> + <br> <%= t('admin.i18n.in', lang: language_name(about.language.iso_code).downcase) %> <% route_args = about.is_direct_object? ? [:admin, about.becomes(about.class.base_class)] @@ -9,9 +8,9 @@ <% links = about.available_languages.map { |language| next if language.id == about.language_id - link_to t(language.iso_code, scope: :languages).downcase, + link_to language_name(language.iso_code).downcase, [*route_args, lang: language.iso_code] }.compact %> - <br>(basculer en <%= links.to_sentence.html_safe %>) + <br>(<%= t('admin.i18n.switch_to', choices: links.to_sentence).html_safe %>) <% end %> \ No newline at end of file diff --git a/app/views/admin/communication/websites/pages/show.json.jbuilder b/app/views/admin/communication/websites/pages/show.json.jbuilder index da23eab710ecae6451824f212f477e96cc912ace..743b5633fe369e50e664e08c65010c5f9d4dc2d5 100644 --- a/app/views/admin/communication/websites/pages/show.json.jbuilder +++ b/app/views/admin/communication/websites/pages/show.json.jbuilder @@ -22,7 +22,7 @@ end if @page.featured_image.attached? language = @page.language json.language do json.extract! language, :id, :name, :iso_code, :summernote_locale - json.label t(language.iso_code, scope: :languages) + json.label language_name(language.iso_code) end original = @page.original diff --git a/config/locales/en.yml b/config/locales/en.yml index 6ca4a3f261077e9875e01ed5d32171b228fcba48..321184eb6f438da8519bcd3c52716fc8ecd34ade 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -107,6 +107,9 @@ en: zero: No element one: 1 element other: "%{count} elements" + i18n: + in: in %{lang} + switch_to: switch to %{choices} infos: Informations inheritance: sentence_without_link: Value inherited diff --git a/config/locales/fr.yml b/config/locales/fr.yml index e81511ce4f68d5e8b8076c05338a4ef6296dd6e4..cbb370b1ffb8264584ebb25047f1470ad422ad0d 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -107,6 +107,9 @@ fr: zero: Aucun élément one: 1 élément other: "%{count} éléments" + i18n: + in: en %{lang} + switch_to: basculer en %{choices} infos: Informations inheritance: sentence_without_link: Valeur héritée