From 29da91a0828ec5ebc569f6bcb47b42961ef9ec69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 23 Jun 2019 15:48:27 +0200 Subject: [PATCH] Fix untranslated texts I've also renamed the key for the settings title so the `

` gets the `title` key, as done in other sections in the admin. --- app/views/admin/settings/_configuration_settings_tab.html.erb | 2 +- app/views/admin/settings/_filter_subnav.html.erb | 2 +- app/views/admin/settings/index.html.erb | 2 +- app/views/admin/shared/_columns_selector.html.erb | 4 ++-- app/views/layouts/mailer.html.erb | 2 +- config/locales/en/admin.yml | 4 +++- config/locales/en/mailers.yml | 1 + config/locales/es/admin.yml | 2 ++ config/locales/es/mailers.yml | 1 + 9 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/views/admin/settings/_configuration_settings_tab.html.erb b/app/views/admin/settings/_configuration_settings_tab.html.erb index 84f21559b..b33fa9371 100644 --- a/app/views/admin/settings/_configuration_settings_tab.html.erb +++ b/app/views/admin/settings/_configuration_settings_tab.html.erb @@ -1,3 +1,3 @@ -

<%= t("admin.settings.index.title") %>

+

<%= t("admin.settings.index.general") %>

<%= render "settings_table", settings: @configuration_settings, setting_name: "setting", tab: "#tab-configuration" %> diff --git a/app/views/admin/settings/_filter_subnav.html.erb b/app/views/admin/settings/_filter_subnav.html.erb index 09d2d240b..cdd095d0d 100644 --- a/app/views/admin/settings/_filter_subnav.html.erb +++ b/app/views/admin/settings/_filter_subnav.html.erb @@ -7,7 +7,7 @@ data-tabs>
  • <%= link_to "#tab-configuration" do %> - <%= t("admin.settings.index.title") %> + <%= t("admin.settings.index.general") %> <% end %>
    • diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb index 56d727887..9e417dc0e 100644 --- a/app/views/admin/settings/index.html.erb +++ b/app/views/admin/settings/index.html.erb @@ -1,4 +1,4 @@ -

    Settings

    +

    <%= t("admin.settings.index.title") %>

    <%= render "filter_subnav" %> diff --git a/app/views/admin/shared/_columns_selector.html.erb b/app/views/admin/shared/_columns_selector.html.erb index a48a17f3f..dfae1d808 100644 --- a/app/views/admin/shared/_columns_selector.html.erb +++ b/app/views/admin/shared/_columns_selector.html.erb @@ -1,11 +1,11 @@ "> - Columns + <%= t("admin.budget_investments.index.columns") %> diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb index 9431845dd..b11d38a3a 100644 --- a/app/views/layouts/mailer.html.erb +++ b/app/views/layouts/mailer.html.erb @@ -1,7 +1,7 @@ - Gobierno abierto + <%= t("mailers.title") %> diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 967186cf1..8ce3dab12 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -224,6 +224,7 @@ en: download_current_selection: "Download current selection" no_budget_investments: "There are no investment projects." title: Investment projects + columns: Columns assigned_admin: Assigned administrator no_admin_assigned: No admin assigned no_valuators_assigned: No valuators assigned @@ -1291,7 +1292,8 @@ en: flash: updated: Value updated index: - title: Configuration settings + title: Settings + general: Configuration settings update_setting: Update participation_processes: "Participation processes" images_and_documents: "Images and documents" diff --git a/config/locales/en/mailers.yml b/config/locales/en/mailers.yml index a1151d57d..6434b8951 100644 --- a/config/locales/en/mailers.yml +++ b/config/locales/en/mailers.yml @@ -1,5 +1,6 @@ en: mailers: + title: "Open Government" no_reply: "This message was sent from an email address that does not accept replies." comment: hi: Hi diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index bdf7eaffb..a87554c0d 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -224,6 +224,7 @@ es: download_current_selection: "Descargar selección actual" no_budget_investments: "No hay proyectos de gasto." title: Proyectos de gasto + columns: Columnas assigned_admin: Administrador asignado no_admin_assigned: Sin admin asignado no_valuators_assigned: Sin evaluador @@ -1293,6 +1294,7 @@ es: updated: Valor actualizado index: title: Configuración global + general: Configuración global update_setting: Actualizar participation_processes: "Procesos de participación" images_and_documents: "Imágenes y documentos" diff --git a/config/locales/es/mailers.yml b/config/locales/es/mailers.yml index 92a810b39..fa37c399a 100644 --- a/config/locales/es/mailers.yml +++ b/config/locales/es/mailers.yml @@ -1,5 +1,6 @@ es: mailers: + title: "Gobierno abierto" no_reply: "Este mensaje se ha enviado desde una dirección de correo electrónico que no admite respuestas." comment: hi: Hola