From ebdb26538836af279360ab05bcc5b9300a076c34 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 11 May 2017 13:36:29 +0200 Subject: [PATCH 1/3] changes add button text to vote --- config/locales/budgets.en.yml | 2 +- config/locales/budgets.es.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index 399ab432c..14f07a23c 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -91,7 +91,7 @@ en: wrong_price_format: Only integer numbers investment: title: Investment project - add: Add + add: Vote already_added: You have already added this investment project already_supported: You have already supported this. Share it! support_title: Support this project diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index b036d1aa4..2f8b7e3ad 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -91,7 +91,7 @@ es: wrong_price_format: Solo puede incluir caracteres numéricos investment: title: Propuesta de inversión - add: Añadir + add: Votar already_added: "Ya has añadido esta propuesta de inversión" already_supported: Ya has apoyado esta propuesta. ¡Compártelo! support_title: Apoyar esta propuesta From 36078ab604098393685be5d4ca26b395cbe90ff4 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 11 May 2017 17:24:05 +0200 Subject: [PATCH 2/3] adds link and move to top sidebar message --- app/views/budgets/investments/_sidebar.html.erb | 12 ++++++++---- config/locales/budgets.en.yml | 3 ++- config/locales/budgets.es.yml | 3 ++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/views/budgets/investments/_sidebar.html.erb b/app/views/budgets/investments/_sidebar.html.erb index 830b60634..2776a823f 100644 --- a/app/views/budgets/investments/_sidebar.html.erb +++ b/app/views/budgets/investments/_sidebar.html.erb @@ -13,6 +13,14 @@ <% end %> <% end %> +<% if @heading && can?(:show, @ballot) %> +

+ <%= t("budgets.investments.index.sidebar.voted_info", + link: link_to(t("budgets.investments.index.sidebar.voted_info_link"), + budget_ballot_path(@budget))).html_safe %> +

+<% end %> + <%= render "shared/tag_cloud", taggable: 'budget/investment' %> <%= render 'budgets/investments/categories' %> @@ -45,8 +53,4 @@ <% end %> <% end %> - -

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

<% end %> diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index 14f07a23c..66d4d2715 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -61,7 +61,8 @@ en: voted_html: one: "You voted one proposal with a cost of %{amount_spent}" other: "You voted %{count} proposals with a cost of %{amount_spent}" - voted_info: You can change your vote at any time until the close of this phase. No need to spend all the money available. + 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. 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 2f8b7e3ad..7391f12cb 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -61,7 +61,8 @@ es: voted_html: one: "Has votado una propuesta por un valor de %{amount_spent}" other: "Has votado %{count} propuestas por un valor de %{amount_spent}" - voted_info: Puedes cambiar tus votos en cualquier momento hasta el cierre de esta fase. No hace falta que gastes todo el dinero disponible. + 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." verified_only: "Para crear una nueva propuesta de inversión %{verify}." verify_account: "verifica tu cuenta" From cd4d37470bbd183ac62d67d97e71565966f7b129 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 11 May 2017 17:24:39 +0200 Subject: [PATCH 3/3] removes bold on links and make consistent text --- app/views/budgets/ballot/_ballot.html.erb | 12 ++++-------- config/locales/budgets.en.yml | 2 +- config/locales/budgets.es.yml | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/views/budgets/ballot/_ballot.html.erb b/app/views/budgets/ballot/_ballot.html.erb index da30591f8..51f2750e9 100644 --- a/app/views/budgets/ballot/_ballot.html.erb +++ b/app/views/budgets/ballot/_ballot.html.erb @@ -27,11 +27,9 @@

<%= group.name %> - <%= @ballot.heading_for_group(group).name %>

- - <%= link_to t("budgets.ballots.show.remaining", - amount: @ballot.formatted_amount_available(@ballot.heading_for_group(group))).html_safe, - budget_group_path(@budget, group) %> - + <%= link_to t("budgets.ballots.show.remaining", + amount: @ballot.formatted_amount_available(@ballot.heading_for_group(group))).html_safe, + budget_group_path(@budget, group) %> <% if @ballot.has_lines_in_group?(group) %>

@@ -62,9 +60,7 @@

<%= group.name %>

- - <%= link_to t("budgets.ballots.show.no_balloted_group_yet"), budget_group_path(@budget, group) %> - + <%= link_to t("budgets.ballots.show.no_balloted_group_yet"), budget_group_path(@budget, group) %> diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index 66d4d2715..41f6fbe8f 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -10,7 +10,7 @@ en: voted_html: one: "You have voted one investment." other: "You have voted %{count} investments." - voted_info_html: "You can change your vote at any time until the close of this phase.
No need to invest all the money available." + voted_info_html: "You can change your vote at any time until the close of this phase.
No need to spend all the money available." zero: You have not voted any investment project. reasons_for_not_balloting: not_logged_in: You must %{signin} or %{signup} to continue. diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index 7391f12cb..e5fc416e9 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -10,7 +10,7 @@ es: voted_html: one: "Has votado una propuesta." other: "Has votado %{count} propuestas." - voted_info_html: "Puedes cambiar tus votos en cualquier momento hasta el cierre de esta fase.
No hace falta que inviertas todo el dinero disponible." + voted_info_html: "Puedes cambiar tus votos en cualquier momento hasta el cierre de esta fase.
No hace falta que gastes todo el dinero disponible." zero: "Todavía no has votado ninguna propuesta de inversión." reasons_for_not_balloting: not_logged_in: Necesitas %{signin} o %{signup} para continuar.