From 4fca07172cdd3f7582130ee5c5a7db1e8936791e Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 11 May 2018 17:31:14 +0200
Subject: [PATCH] Reorders and improve i18n for legislation processes form

---
 .../legislation/processes/_form.html.erb      | 66 +++++++++----------
 config/locales/en/activerecord.yml            |  1 +
 config/locales/en/admin.yml                   |  4 +-
 config/locales/es/activerecord.yml            |  1 +
 config/locales/es/admin.yml                   |  6 +-
 5 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/app/views/admin/legislation/processes/_form.html.erb b/app/views/admin/legislation/processes/_form.html.erb
index ba055d9f3..5a0aa668d 100644
--- a/app/views/admin/legislation/processes/_form.html.erb
+++ b/app/views/admin/legislation/processes/_form.html.erb
@@ -81,39 +81,6 @@
     </div>
   </div>
 
-  <div class="row">
-    <div class="small-12 medium-4 column">
-      <label><%= t('admin.legislation.processes.form.allegations_phase') %></label>
-    </div>
-    <div class="small-12 medium-1 column legislation-process-start">
-      <%= t('admin.legislation.processes.form.start') %>
-    </div>
-    <div class="small-12 medium-2 column">
-      <%= f.text_field :allegations_start_date,
-                        label: false,
-                        value: format_date_for_calendar_form(@process.allegations_start_date),
-                        class: "js-calendar-full",
-                        id: "allegations_start_date" %>
-    </div>
-    <div class="small-12 medium-1 column legislation-process-end">
-      <%= t('admin.legislation.processes.form.end') %>
-    </div>
-    <div class="small-12 medium-2 column">
-      <%= f.text_field :allegations_end_date,
-                        label: false,
-                        value: format_date_for_calendar_form(@process.allegations_end_date),
-                        class: "js-calendar-full",
-                        id: "allegations_end_date" %>
-    </div>
-    <div class="small-12 medium-2 column">
-      <%= f.check_box :allegations_phase_enabled, checked: @process.allegations_phase.enabled?, label: t('admin.legislation.processes.form.enabled') %>
-    </div>
-
-    <div class="small-12 column">
-      <hr>
-    </div>
-  </div>
-
   <div class="row">
     <div class="small-12 medium-4 column">
       <label><%= t('admin.legislation.processes.form.proposals_phase') %></label>
@@ -147,6 +114,39 @@
     </div>
   </div>
 
+  <div class="row">
+    <div class="small-12 medium-4 column">
+      <label><%= t('admin.legislation.processes.form.allegations_phase') %></label>
+    </div>
+    <div class="small-12 medium-1 column legislation-process-start">
+      <%= t('admin.legislation.processes.form.start') %>
+    </div>
+    <div class="small-12 medium-2 column">
+      <%= f.text_field :allegations_start_date,
+                        label: false,
+                        value: format_date_for_calendar_form(@process.allegations_start_date),
+                        class: "js-calendar-full",
+                        id: "allegations_start_date" %>
+    </div>
+    <div class="small-12 medium-1 column legislation-process-end">
+      <%= t('admin.legislation.processes.form.end') %>
+    </div>
+    <div class="small-12 medium-2 column">
+      <%= f.text_field :allegations_end_date,
+                        label: false,
+                        value: format_date_for_calendar_form(@process.allegations_end_date),
+                        class: "js-calendar-full",
+                        id: "allegations_end_date" %>
+    </div>
+    <div class="small-12 medium-2 column">
+      <%= f.check_box :allegations_phase_enabled, checked: @process.allegations_phase.enabled?, label: t('admin.legislation.processes.form.enabled') %>
+    </div>
+
+    <div class="small-12 column">
+      <hr>
+    </div>
+  </div>
+
   <div class="row">
     <div class="small-12 medium-4 column">
       <%= f.label :draft_publication_date %>
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index 1ca114973..9dce0c25b 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -201,6 +201,7 @@ en:
         body: Body
       legislation/process:
         title: Process Title
+        summary: Summary
         description: Description
         additional_info: Additional info
         start_date: Start date
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 7c8ad7b59..e9b188efe 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -332,7 +332,7 @@ en:
           enabled: Enabled
           process: Process
           debate_phase: Debate phase
-          allegations_phase: Allegations phase
+          allegations_phase: Drafting phase
           proposals_phase: Proposals phase
           start: Start
           end: End
@@ -364,7 +364,7 @@ en:
           status_planned: Planned
         subnav:
           info: Information
-          draft_texts: Text
+          draft_texts: Drafting
           questions: Debate
           proposals: Proposals
       proposals:
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index 56a7ea8b7..c5d8a63bc 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -201,6 +201,7 @@ es:
         body: Contenido
       legislation/process:
         title: Título del proceso
+        summary: Resumen
         description: En qué consiste
         additional_info: Información adicional
         start_date: Fecha de inicio del proceso
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 9cd191095..2d2ea7f7e 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -331,8 +331,8 @@ es:
         form:
           enabled: Habilitado
           process: Proceso
-          debate_phase: Fase previa
-          allegations_phase: Fase de alegaciones
+          debate_phase: Fase de debate
+          allegations_phase: Fase de redacción
           proposals_phase: Fase de propuestas
           start: Inicio
           end: Fin
@@ -364,7 +364,7 @@ es:
           status_planned: Próximamente
         subnav:
           info: Información
-          draft_texts: Texto
+          draft_texts: Redacción
           questions: Debate
           proposals: Propuestas
       proposals: