From 56ee33d947293fc6773d6c53ea5c9bfee7e3f1f6 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 8 Jun 2018 19:46:07 +0200
Subject: [PATCH] Removes content pending to backport

---
 app/views/admin/_menu.html.erb        | 2 +-
 config/locales/en/admin.yml           | 5 -----
 config/locales/es/admin.yml           | 5 -----
 spec/features/budgets/budgets_spec.rb | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index d9d54f7a0..499f9a54c 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -76,7 +76,7 @@
     <li class="section-title" <%= "class=is-active" if messages_menu_active %>>
       <a href="#">
         <span class="icon-zip"></span>
-        <strong><%= t("admin.menu.messaging_users") %></strong>
+        <strong><%= t("admin.menu.emails") %></strong>
       </a>
       <ul <%= "class=is-active" if messages_menu_active %>>
         <li <%= "class=is-active" if controller_name == "newsletters" %>>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index e9b188efe..5e70d609f 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -965,11 +965,6 @@ en:
       description: Description
       image: 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."
     spending_proposals:
       index:
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 2d2ea7f7e..48a2ee30c 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -965,11 +965,6 @@ es:
       description: Descripción
       image: 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."
     spending_proposals:
       index:
diff --git a/spec/features/budgets/budgets_spec.rb b/spec/features/budgets/budgets_spec.rb
index dc50f5d8b..2400a8c6a 100644
--- a/spec/features/budgets/budgets_spec.rb
+++ b/spec/features/budgets/budgets_spec.rb
@@ -22,7 +22,7 @@ feature 'Budgets' do
         expect(page).to have_content(budget.name)
         expect(page).to have_content(budget.description)
         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('See all phases')
       end