From 224eb03ca2041fed7c055c84ec43d40e2d294b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Fri, 12 May 2017 12:03:42 +0200 Subject: [PATCH 1/2] shows right message depending on voting status in budget group --- app/views/budgets/investments/_sidebar.html.erb | 6 ++++++ config/locales/budgets.en.yml | 2 +- config/locales/budgets.es.yml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/budgets/investments/_sidebar.html.erb b/app/views/budgets/investments/_sidebar.html.erb index 2776a823f..014272b02 100644 --- a/app/views/budgets/investments/_sidebar.html.erb +++ b/app/views/budgets/investments/_sidebar.html.erb @@ -40,6 +40,12 @@ amount_spent: @ballot.formatted_amount_spent(@heading)) %>

+ <% elsif @assigned_heading.present? %> +

<%= t("budgets.investments.header.different_heading_assigned_html", + heading_link: link_to( + @assigned_heading.name, + budget_investments_path(@budget, heading_id: @assigned_heading.try(:id))) + ) %>

<% else %>

<%= t("budgets.investments.index.sidebar.zero") %>

<% end %> diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index 41f6fbe8f..d7d55b7b8 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -63,7 +63,7 @@ en: other: "You voted %{count} proposals with a cost of %{amount_spent}" voted_info: You can %{link} at any time until the close of this phase. No need to spend all the money available. voted_info_link: change your vote - zero: You have not voted any investment project. + zero: You have not voted any investment project in this group. verified_only: "To create a new budget investment %{verify}." verify_account: "verify your account" create: "Create budget investment" diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index e5fc416e9..5e0c44679 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -63,7 +63,7 @@ es: other: "Has votado %{count} propuestas por un valor de %{amount_spent}" voted_info: Puedes %{link} en cualquier momento hasta el cierre de esta fase. No hace falta que gastes todo el dinero disponible. voted_info_link: cambiar tus votos - zero: "Todavía no has votado ninguna propuesta de inversión." + zero: "Todavía no has votado ninguna propuesta de inversión en este ámbito del presupuesto." verified_only: "Para crear una nueva propuesta de inversión %{verify}." verify_account: "verifica tu cuenta" create: "Crear propuesta de inversión" From 0395970b241ec71d29e6c535a11a1ad25b96119d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baza=CC=81n?= Date: Fri, 12 May 2017 14:06:16 +0200 Subject: [PATCH 2/2] uses proper i18n key --- app/views/budgets/investments/_sidebar.html.erb | 2 +- config/locales/budgets.en.yml | 1 + config/locales/budgets.es.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/budgets/investments/_sidebar.html.erb b/app/views/budgets/investments/_sidebar.html.erb index 014272b02..06d3b9d81 100644 --- a/app/views/budgets/investments/_sidebar.html.erb +++ b/app/views/budgets/investments/_sidebar.html.erb @@ -41,7 +41,7 @@

<% elsif @assigned_heading.present? %> -

<%= t("budgets.investments.header.different_heading_assigned_html", +

<%= t("budgets.investments.index.sidebar.different_heading_assigned_html", heading_link: link_to( @assigned_heading.name, budget_investments_path(@budget, heading_id: @assigned_heading.try(:id))) diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index d7d55b7b8..e7ee15b5a 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -63,6 +63,7 @@ en: other: "You voted %{count} proposals with a cost of %{amount_spent}" voted_info: You can %{link} at any time until the close of this phase. No need to spend all the money available. voted_info_link: change your vote + different_heading_assigned_html: "You have active votes in another heading: %{heading_link}" zero: You have not voted any investment project in this group. verified_only: "To create a new budget investment %{verify}." verify_account: "verify your account" diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index 5e0c44679..1d848d04a 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -63,6 +63,7 @@ es: other: "Has votado %{count} propuestas por un valor de %{amount_spent}" voted_info: Puedes %{link} en cualquier momento hasta el cierre de esta fase. No hace falta que gastes todo el dinero disponible. voted_info_link: cambiar tus votos + different_heading_assigned_html: "Ya apoyaste propuestas de otra sección del presupuesto: %{heading_link}" zero: "Todavía no has votado ninguna propuesta de inversión en este ámbito del presupuesto." verified_only: "Para crear una nueva propuesta de inversión %{verify}." verify_account: "verifica tu cuenta"