Removes content pending to backport

This commit is contained in:
decabeza
2018-06-08 19:46:07 +02:00
parent 85efdfbf47
commit 56ee33d947
4 changed files with 2 additions and 12 deletions

View File

@@ -76,7 +76,7 @@
<li class="section-title" <%= "class=is-active" if messages_menu_active %>> <li class="section-title" <%= "class=is-active" if messages_menu_active %>>
<a href="#"> <a href="#">
<span class="icon-zip"></span> <span class="icon-zip"></span>
<strong><%= t("admin.menu.messaging_users") %></strong> <strong><%= t("admin.menu.emails") %></strong>
</a> </a>
<ul <%= "class=is-active" if messages_menu_active %>> <ul <%= "class=is-active" if messages_menu_active %>>
<li <%= "class=is-active" if controller_name == "newsletters" %>> <li <%= "class=is-active" if controller_name == "newsletters" %>>

View File

@@ -965,11 +965,6 @@ en:
description: Description description: Description
image: Image image: Image
show_image: Show image show_image: Show image
view: View
proposal: Proposal
author: Author
content: Content
created_at: Created at
moderated_content: "Check the content moderated by the moderators, and confirm if the moderation has been done correctly." moderated_content: "Check the content moderated by the moderators, and confirm if the moderation has been done correctly."
spending_proposals: spending_proposals:
index: index:

View File

@@ -965,11 +965,6 @@ es:
description: Descripción description: Descripción
image: Imagen image: Imagen
show_image: Mostrar imagen show_image: Mostrar imagen
view: Ver
proposal: Propuesta
author: Autor
content: Contenido
created_at: Fecha de creación
moderated_content: "Revisa el contenido moderado por los moderadores, y confirma si la moderación se ha realizado correctamente." moderated_content: "Revisa el contenido moderado por los moderadores, y confirma si la moderación se ha realizado correctamente."
spending_proposals: spending_proposals:
index: index:

View File

@@ -22,7 +22,7 @@ feature 'Budgets' do
expect(page).to have_content(budget.name) expect(page).to have_content(budget.name)
expect(page).to have_content(budget.description) expect(page).to have_content(budget.description)
expect(page).to have_content('Actual phase') expect(page).to have_content('Actual phase')
expect(page).to have_content('Informing') expect(page).to have_content('Information')
expect(page).to have_link('Help with participatory budgets') expect(page).to have_link('Help with participatory budgets')
expect(page).to have_link('See all phases') expect(page).to have_link('See all phases')
end end