From 0eca4d5d48f5fb0df5b40ba0ba2ef5fad52c24e1 Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Tue, 8 Mar 2016 16:26:02 +0100
Subject: [PATCH] fixes specs

---
 .../admin/spending_proposals/show.html.erb    |  3 +-
 .../_written_by_valuators.html.erb            | 31 ++++++++++++-------
 config/locales/admin.en.yml                   | 16 ----------
 config/locales/admin.es.yml                   | 16 ----------
 4 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/app/views/admin/spending_proposals/show.html.erb b/app/views/admin/spending_proposals/show.html.erb
index 3a7595017..8584c34ec 100644
--- a/app/views/admin/spending_proposals/show.html.erb
+++ b/app/views/admin/spending_proposals/show.html.erb
@@ -31,4 +31,5 @@
 
 <hr>
 
-<%= render 'valuation/spending_proposals/written_by_valuators' %>
+<h2><%= t("admin.spending_proposals.show.dossier") %></h2>
+<%= render 'valuation/spending_proposals/written_by_valuators' %>
\ No newline at end of file
diff --git a/app/views/valuation/spending_proposals/_written_by_valuators.html.erb b/app/views/valuation/spending_proposals/_written_by_valuators.html.erb
index 1361a5dc1..8b704950e 100644
--- a/app/views/valuation/spending_proposals/_written_by_valuators.html.erb
+++ b/app/views/valuation/spending_proposals/_written_by_valuators.html.erb
@@ -1,46 +1,53 @@
-<h2><%= t("admin.spending_proposals.show.dossier") %></h2>
-
 <p id="price">
   <strong>
-    <%= t("admin.spending_proposals.show.price") %>
-   (<%= t("admin.spending_proposals.show.currency") %>):
+    <%= t("valuation.spending_proposals.show.price") %>
+   (<%= t("valuation.spending_proposals.show.currency") %>):
   </strong>
   <% if @spending_proposal.price.present? %>
     <%= @spending_proposal.price %>
   <% else %>
-   <%= t("admin.spending_proposals.show.undefined") %>
+   <%= t("valuation.spending_proposals.show.undefined") %>
   <% end %>
 </p>
 
 <p id="price_first_year">
   <strong>
-    <%= t("admin.spending_proposals.show.price_first_year") %>
-    (<%= t("admin.spending_proposals.show.currency") %>):
+    <%= t("valuation.spending_proposals.show.price_first_year") %>
+    (<%= t("valuation.spending_proposals.show.currency") %>):
   </strong>
 
   <% if @spending_proposal.price_first_year.present? %>
     <%= @spending_proposal.price_first_year %>
   <% else %>
-   <%= t("admin.spending_proposals.show.undefined") %>
+   <%= t("valuation.spending_proposals.show.undefined") %>
   <% end %>
 </p>
 
 <%= explanation_field @spending_proposal.price_explanation %>
 
+<p id="time_scope">
+  <strong><%= t("valuation.spending_proposals.show.time_scope") %>:</strong>
+  <% if @spending_proposal.time_scope.present? %>
+    <%= @spending_proposal.time_scope %>
+  <% else %>
+    <%= t("valuation.spending_proposals.show.undefined") %>
+  <% end %>
+</p>
+
 <p id="feasibility">
-  <strong><%= t("admin.spending_proposals.show.feasibility") %>:</strong>
-  <%= t("admin.spending_proposals.show.#{@spending_proposal.feasibility}") %>
+  <strong><%= t("valuation.spending_proposals.show.feasibility") %>:</strong>
+  <%= t("valuation.spending_proposals.show.#{@spending_proposal.feasibility}") %>
 </p>
 
 <%= explanation_field @spending_proposal.feasible_explanation %>
 
 <% if @spending_proposal.valuation_finished %>
   <p id="valuation">
-    <strong><%= t("admin.spending_proposals.show.valuation_finished") %></strong>
+    <strong><%= t("valuation.spending_proposals.show.valuation_finished") %></strong>
   </p>
 <% end %>
 
 <% if @spending_proposal.internal_comments.present? %>
-  <h2><%= t("admin.spending_proposals.show.internal_comments") %></h2>
+  <h2><%= t("valuation.spending_proposals.show.internal_comments") %></h2>
   <%= explanation_field @spending_proposal.internal_comments %>
 <% end %>
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml
index b86c01a23..1ee1f72a4 100755
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -173,22 +173,6 @@ en:
         sent: Sent
         geozone: Scope
         dossier: Dossier
-        price: Price
-        price_first_year: Cost during the first year
-        currency: "€"
-        feasibility: Feasibility
-        feasible: Feasible
-        not_feasible: Not feasible
-        undefined: Undefined
-        valuation_finished: Valuation finished
-        internal_comments: Internal comments
-        classification: Clasificación
-        assigned_admin: Assigned admin
-        assigned_valuators: Assigned valuators
-        assign_valuators: Assign valuators
-        no_valuators: There is not any valuator user
-        assign: Assign
-        tags: Tags
       edit:
         classification: Clasification
         assigned_valuators: Valuators
diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml
index a0ce036e4..993a3269a 100644
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -173,22 +173,6 @@ es:
         sent: Fecha
         geozone: Ámbito
         dossier: Informe
-        price: Coste
-        price_first_year: Coste en el primer año
-        currency: "€"
-        feasibility: Viabilidad
-        feasible: Viable
-        not_feasible: No viable
-        undefined: Sin definir
-        valuation_finished: Informe finalizado
-        internal_comments: Commentarios internos
-        classification: Clasificación
-        assigned_admin: Administrador asignado
-        assigned_valuators: Evaluadores asignados
-        assign_valuators: Asignar evaluadores
-        no_valuators: No hay ningún usuario evaluador
-        assign: Asignar
-        tags: Etiquetas
       edit:
         classification: Clasificación
         assigned_valuators: Evaluadores