From d30d2b0dd8e68072907698e1fe619682d9330f14 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Wed, 24 Jan 2018 10:07:50 -0400 Subject: [PATCH] Arrange Admin::BudgetInvestments I18n for buttons under same namespace --- app/views/admin/budget_investments/_advanced_filters.html.erb | 2 +- app/views/admin/budget_investments/_search_form.html.erb | 4 ++-- app/views/admin/budget_investments/index.html.erb | 2 +- config/locales/en/admin.yml | 2 +- config/locales/es/admin.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/admin/budget_investments/_advanced_filters.html.erb b/app/views/admin/budget_investments/_advanced_filters.html.erb index 7f6e7fe6a..ed2dd885f 100644 --- a/app/views/admin/budget_investments/_advanced_filters.html.erb +++ b/app/views/admin/budget_investments/_advanced_filters.html.erb @@ -38,7 +38,7 @@
- <%= submit_tag t("#{i18n_namespace}.filters.button"), class: "button expanded" %> + <%= submit_tag t("admin.budget_investments.index.buttons.filter"), class: "button expanded" %>
<% end %> diff --git a/app/views/admin/budget_investments/_search_form.html.erb b/app/views/admin/budget_investments/_search_form.html.erb index d11e80dc2..df73f123a 100644 --- a/app/views/admin/budget_investments/_search_form.html.erb +++ b/app/views/admin/budget_investments/_search_form.html.erb @@ -3,9 +3,9 @@ method: :get, remote: true) do |f| %>
- <%= text_field_tag :project_title, "", placeholder: t("#{i18n_namespace}.placeholder") %> + <%= text_field_tag :project_title, "", placeholder: t("admin.budget_investments.index.placeholder") %>
- <%= f.submit t("#{i18n_namespace}.buttons.search"), class: "button" %> + <%= f.submit t("admin.budget_investments.index.buttons.search"), class: "button" %>
<% end %> diff --git a/app/views/admin/budget_investments/index.html.erb b/app/views/admin/budget_investments/index.html.erb index c295b033d..522382939 100644 --- a/app/views/admin/budget_investments/index.html.erb +++ b/app/views/admin/budget_investments/index.html.erb @@ -1,6 +1,6 @@

<%= @budget.name %> - <%= t("admin.budget_investments.index.title") %>

-<%= render 'search_form', i18n_namespace: "admin.budget_investments.index" %> +<%= render "search_form" %> <%= form_tag(admin_budget_budget_investments_path(budget: @budget), method: :get, enforce_utf8: false) do %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 92afd7ec9..d979bcf17 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -151,11 +151,11 @@ en: unfeasible: Unfeasible max_per_heading: Max. supports per heading winners: Winners - button: Filter one_filter_html: "Current applied filter: %{filter}" two_filters_html: "Current applied filters: %{filter}, %{second_filter}" buttons: search: Search + filter: Filter download_current_selection: "Download current selection" no_budget_investments: "There are no investment projects." title: Investment projects diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 1d311074d..d13c2cc42 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -151,11 +151,11 @@ es: unfeasible: Inviables max_per_heading: Corte por partida winners: Ganadores - button: Filtrar one_filter_html: "Filtro en uso: %{filter}" two_filters_html: "Filtros en uso: %{filter}, %{second_filter}" buttons: search: Buscar + filter: Filtrar download_current_selection: "Descargar selección actual" no_budget_investments: "No hay proyectos de gasto." title: Proyectos de gasto