<%= t("shared.outline.debates") %>
+ <% if @search_terms || @advanced_search_terms || @tag_filter %> +<%= t("shared.search_results") %>
++ <%= page_entries_info @debates %> + <% if !@advanced_search_terms %> + <%= t("debates.index.search_results_html", count: @debates.size, search_term: @search_terms) %> + <% end %> +
+ <% elsif @tag_filter %> +<%= t("shared.search_results") %>
++ <%= page_entries_info @debates %> + <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %> +
+ <% end %> +- <%= page_entries_info @debates %> - <% if !@advanced_search_terms %> - <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %> - <% end %> -
- <% elsif @tag_filter %> -- <%= page_entries_info @debates %> - <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %> -
- <% end %> -<%= page_entries_info @proposals %> - <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %> + <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %>
<% end %><%= link_to proposal.title, namespaced_proposal_path(proposal) %>
@@ -47,8 +45,8 @@
<%= proposal.summary %>
<%= t("poll_questions.banner.featured_title") %>
-<%= t("poll_questions.banner.info") %>
-<%= t("shared.outline.proposals") %>
-
+ <% if @search_terms || @advanced_search_terms || @tag_filter || params[:retired].present? %>
+
+
+
+ <% if @search_terms || @advanced_search_terms %>
+ <%= t("shared.search_results") %>
+
<%= page_entries_info @proposals %>
<% if !@advanced_search_terms %>
- <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %>
+ <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %>
<% end %>
-
- <% elsif @tag_filter %>
-
- <%= page_entries_info @proposals %>
- <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
-
- <% elsif params[:retired].present? %>
- <%= t("proposals.index.retired_proposals") %>
- <% end %>
+
+ <% elsif @tag_filter %>
+
<%= t("shared.search_results") %>
+
+ <%= page_entries_info @proposals %>
+ <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %>
+
+ <% elsif params[:retired].present? %>
+ <%= t("proposals.index.retired_proposals") %>
+ <% end %>
+
+
+ <% end %>
+
+
+
<% if has_banners? %>
<%= render "shared/banner" %>
<% end %>
- <% if @proposal_successful_exists %>
- <%= render "successful_banner" %>
- <% elsif @featured_proposals.present? %>
+ <% if @featured_proposals.present? %>
diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml
index 6fba08534..905ccce7e 100644
--- a/config/locales/budgets.en.yml
+++ b/config/locales/budgets.en.yml
@@ -54,9 +54,9 @@ en:
button: Search
placeholder: Search investment projects...
title: Search
- search_results:
- one: " containing the term '%{search_term}'"
- other: " containing the term '%{search_term}'"
+ search_results_html:
+ one: " containing the term '%{search_term}'"
+ other: " containing the term '%{search_term}'"
sidebar:
my_ballot: My ballot
voted_html:
@@ -95,7 +95,6 @@ en:
price: Price
wrong_price_format: Only integer numbers
investment:
- title: Investment project
add: Vote
already_added: You have already added this investment project
already_supported: You have already supported this. Share it!
diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml
index 1cb308472..38f8601e8 100644
--- a/config/locales/budgets.es.yml
+++ b/config/locales/budgets.es.yml
@@ -54,9 +54,9 @@ es:
button: Buscar
placeholder: Buscar propuestas de inversión...
title: Buscar
- search_results:
- one: " que contiene '%{search_term}'"
- other: " que contienen '%{search_term}'"
+ search_results_html:
+ one: " que contiene '%{search_term}'"
+ other: " que contienen '%{search_term}'"
sidebar:
my_ballot: Mis votos
voted_html:
@@ -95,7 +95,6 @@ es:
price: Coste
wrong_price_format: Solo puede incluir caracteres numéricos
investment:
- title: Propuesta de inversión
add: Votar
already_added: "Ya has añadido esta propuesta de inversión"
already_supported: Ya has apoyado esta propuesta. ¡Compártelo!
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0cba1f141..342aaa455 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -77,7 +77,6 @@ en:
one: 1 comment
other: "%{count} comments"
zero: No comments
- debate: Debate
votes:
one: 1 vote
other: "%{count} votes"
@@ -108,9 +107,9 @@ en:
button: Search
placeholder: Search debates...
title: Search
- search_results:
- one: " containing the term '%{search_term}'"
- other: " containing the term '%{search_term}'"
+ search_results_html:
+ one: " containing the term '%{search_term}'"
+ other: " containing the term '%{search_term}'"
select_order: Order by
start_debate: Start a debate
title: Debates
@@ -337,9 +336,9 @@ en:
button: Search
placeholder: Search proposals...
title: Search
- search_results:
- one: " containing the term '%{search_term}'"
- other: " containing the term '%{search_term}'"
+ search_results_html:
+ one: " containing the term '%{search_term}'"
+ other: " containing the term '%{search_term}'"
select_order: Order by
select_order_long: 'You are viewing proposals according to:'
start_proposal: Create a proposal
@@ -369,7 +368,6 @@ en:
one: 1 comment
other: "%{count} comments"
zero: No comments
- proposal: Proposal
reason_for_supports_necessary: 1% of Census
support: Support
support_title: Support this proposal
@@ -455,9 +453,6 @@ en:
vote_answer: "Vote %{answer}"
voted: "You have voted %{answer}"
poll: "Poll"
- banner:
- featured_title: "#NextVoting"
- info: "New proposals that have reached the voting phase."
proposal_notifications:
new:
title: "Send message"
@@ -477,6 +472,7 @@ en:
login_to_comment: 'You must %{signin} or %{signup} to leave a comment.'
"yes": "Yes"
"no": "No"
+ search_results: "Search results"
advanced_search:
author_type: 'By author category'
author_type_blank: 'Select a category'
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e62e41c21..9ff5d64c6 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -77,7 +77,6 @@ es:
one: 1 Comentario
other: "%{count} Comentarios"
zero: Sin comentarios
- debate: Debate
votes:
one: 1 voto
other: "%{count} votos"
@@ -108,9 +107,9 @@ es:
button: Buscar
placeholder: Buscar debates...
title: Buscar
- search_results:
- one: " que contiene '%{search_term}'"
- other: " que contienen '%{search_term}'"
+ search_results_html:
+ one: " que contiene '%{search_term}'"
+ other: " que contienen '%{search_term}'"
select_order: Ordenar por
start_debate: Empieza un debate
title: Debates
@@ -337,9 +336,9 @@ es:
button: Buscar
placeholder: Buscar propuestas...
title: Buscar
- search_results:
- one: " que contiene '%{search_term}'"
- other: " que contienen '%{search_term}'"
+ search_results_html:
+ one: " que contiene '%{search_term}'"
+ other: " que contienen '%{search_term}'"
select_order: Ordenar por
select_order_long: Estas viendo las propuestas
start_proposal: Crea una propuesta
@@ -369,7 +368,6 @@ es:
one: 1 Comentario
other: "%{count} Comentarios"
zero: Sin comentarios
- proposal: Propuesta
reason_for_supports_necessary: 1% del Censo
support: Apoyar
support_title: Apoyar esta propuesta
@@ -455,9 +453,6 @@ es:
vote_answer: "Votar %{answer}"
voted: "Has votado %{answer}"
poll: "Votación"
- banner:
- featured_title: "#PróximaVotación"
- info: "Nuevas propuestas ciudadanas han llegado a la fase de votación."
proposal_notifications:
new:
title: "Enviar mensaje"
@@ -477,6 +472,7 @@ es:
login_to_comment: 'Necesitas %{signin} o %{signup} para comentar.'
"yes": "Sí"
"no": "No"
+ search_results: "Resultados de búsqueda"
advanced_search:
author_type: 'Por categoría de autor'
author_type_blank: 'Elige una categoría'
diff --git a/config/locales/kaminari.en.yml b/config/locales/kaminari.en.yml
index 35590c1ca..aa04df74c 100755
--- a/config/locales/kaminari.en.yml
+++ b/config/locales/kaminari.en.yml
@@ -7,11 +7,11 @@ en:
other: Entries
zero: Entries
more_pages:
- display_entries: Displaying %{first} - %{last} of %{total} %{entry_name}
+ display_entries: Displaying %{first} - %{last} of %{total} %{entry_name}
one_page:
display_entries:
- one: There is 1 %{entry_name}
- other: There are %{count} %{entry_name}
+ one: There is 1 %{entry_name}
+ other: There are %{count} %{entry_name}
zero: "%{entry_name} cannot be found"
views:
pagination:
diff --git a/config/locales/kaminari.es.yml b/config/locales/kaminari.es.yml
index 7869cea2a..7cf5bf57e 100644
--- a/config/locales/kaminari.es.yml
+++ b/config/locales/kaminari.es.yml
@@ -7,11 +7,11 @@ es:
other: entradas
zero: entradas
more_pages:
- display_entries: Mostrando %{first} - %{last} de un total de %{total} %{entry_name}
+ display_entries: Mostrando %{first} - %{last} de un total de %{total} %{entry_name}
one_page:
display_entries:
- one: Hay 1 %{entry_name}
- other: Hay %{count} %{entry_name}
+ one: Hay 1 %{entry_name}
+ other: Hay %{count} %{entry_name}
zero: No se han encontrado %{entry_name}
views:
pagination:
diff --git a/spec/features/proposal_ballots_spec.rb b/spec/features/proposal_ballots_spec.rb
index 8f5e99eb8..1ec99d3d0 100644
--- a/spec/features/proposal_ballots_spec.rb
+++ b/spec/features/proposal_ballots_spec.rb
@@ -3,21 +3,6 @@ require 'rails_helper'
feature 'Proposal ballots' do
- scenario 'Banner shows in proposal index' do
- create_featured_proposals
-
- visit proposals_path
- expect(page).to_not have_css("#next-voting")
- expect(page).to have_css("#featured-proposals")
-
- create_successful_proposals
-
- visit proposals_path
-
- expect(page).to have_css("#next-voting")
- expect(page).to_not have_css("#featured-proposals")
- end
-
scenario 'Successful proposals do not show support buttons in index' do
successful_proposals = create_successful_proposals
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index f1f4c8ca2..1bef9dc61 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -1432,21 +1432,6 @@ end
feature 'Successful proposals' do
- scenario 'Banner shows in proposal index' do
- create_featured_proposals
-
- visit proposals_path
- expect(page).to_not have_css("#next-voting")
- expect(page).to have_css("#featured-proposals")
-
- create_successful_proposals
-
- visit proposals_path
-
- expect(page).to have_css("#next-voting")
- expect(page).to_not have_css("#featured-proposals")
- end
-
scenario 'Successful proposals do not show support buttons in index' do
successful_proposals = create_successful_proposals
<%= t("shared.search_results") %>
+<%= page_entries_info @proposals %> <% if !@advanced_search_terms %> - <%= t("proposals.index.search_results", count: @proposals.size, search_term: @search_terms) %> + <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %> <% end %> - - <% elsif @tag_filter %> -
- <%= page_entries_info @proposals %> - <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> -
- <% elsif params[:retired].present? %> -<%= t("proposals.index.retired_proposals") %> - <% end %> +
+ <% elsif @tag_filter %> +
<%= t("shared.search_results") %>
++ <%= page_entries_info @proposals %> + <%= t("proposals.index.filter_topic", count: @proposals.size, topic: @tag_filter) %> +
+ <% elsif params[:retired].present? %> +