Merge branch 'master' into 1954-remove_question_show_and_description

config/locales/en/activerecord.yml

@@ -152,6 +152,8 @@ en:
         starts_at: "Start Date"
         ends_at: "Closing Date"
         geozone_restricted: "Restricted by geozone"
+        summary: "Summary"
+        description: "Description"
       poll/question:
         title: "Question"
         valid_answers: "Posibles answers"

config/locales/en/admin.yml

@@ -489,15 +489,11 @@ en:
         no_officers: "There are no officers assigned to this poll."
         table_name: "Name"
         table_email: "Email"
-        add_officer_assignments: "Add shifts as officer"
-        edit_officer_assignments: "Edit officing shifts"
       by_officer:
         date: "Date"
         booth: "Booth"
         assignments: "Officing shifts in this poll"
         no_assignments: "This user has no officing shifts in this poll."
-        total_recounts: "Total recounts"
-        total_recount: "Total recount (by officer)"
     poll_shifts:
       new:
         add_shift: "Add shift"
@@ -570,16 +566,10 @@ en:
         results_tab: Results
         no_questions: "There are no questions assigned to this poll."
         questions_title: "List of questions"
-        remove_question: "Remove question from poll"
-        add_question: "Include question"
         table_title: "Title"
-        table_assignment: "Assignment"
-        table_name: "Name"
       flash:
         question_added: "Question added to this poll"
         error_on_question_added: "Question could not be assigned to this poll"
-        question_removed: "Question removed from this poll"
-        error_on_question_removed: "Question could not be removed from this poll"
     questions:
       index:
         title: "Questions"
@@ -606,7 +596,6 @@ en:
         description: Description
         video_url: External video
         documents: Documents (1)
-        preview: View on website
     recounts:
       index:
         title: "Recounts"

config/locales/en/general.yml

@@ -494,7 +494,7 @@ en:
     create_question: "Create question"
     default_valid_answers: "Yes, No"
     show:
-      answer_this_question: "Answer this question"
+      answer_this_question: "Go to voting page"
       original_proposal: "Original proposal"
       author: "Created by"
       dates_title: "Participation dates"

config/locales/en/images.yml

@@ -9,6 +9,9 @@ en:
       delete_button: Remove image
       note: "You can upload one image of following content types: %{accepted_content_types}, up to %{max_file_size} MB."
       add_new_image: Add image
+      title_placeholder: Add a descriptive title for the image
+      admin_title: "Main image of the poll"
+      admin_alt_text: "Alternative text for the image"
 
     actions:
       destroy:

config/locales/es/activerecord.yml

@@ -146,6 +146,8 @@ es:
         starts_at: "Fecha de apertura"
         ends_at: "Fecha de cierre"
         geozone_restricted: "Restringida por zonas"
+        summary: "Resumen"
+        description: "Descripción"
       poll/question:
         title: "Pregunta"
         valid_answers: "Posibles respuestas"

config/locales/es/admin.yml

@@ -489,15 +489,11 @@ es:
         no_officers: "No hay presidentes de mesa asignados a esta votación."
         table_name: "Nombre"
         table_email: "Email"
-        add_officer_assignments: "Añadir turnos como presidente de mesa"
-        edit_officer_assignments: "Editar turnos"
       by_officer:
         date: "Fecha"
         booth: "Urna"
         assignments: "Turnos como presidente de mesa en esta votación"
         no_assignments: "No tiene turnos como presidente de mesa en esta votación."
-        total_recounts: "Recuentos totales"
-        total_recount: "Recuento total (presidente de mesa)"
     poll_shifts:
       new:
         add_shift: "Añadir turno"
@@ -570,16 +566,10 @@ es:
         results_tab: Resultados
         no_questions: "No hay preguntas asignadas a esta votación."
         questions_title: "Listado de preguntas asignadas"
-        remove_question: "Desasignar pregunta"
-        add_question: "Incluir pregunta"
         table_title: "Título"
-        table_assignment: "Asignación"
-        table_name: "Nombre"
       flash:
         question_added: "Pregunta añadida a esta votación"
         error_on_question_added: "No se pudo asignar la pregunta"
-        question_removed: "Pregunta eliminada de esta votación"
-        error_on_question_removed: "No se pudo quitar la pregunta"
     questions:
       index:
         title: "Preguntas ciudadanas"
@@ -606,7 +596,6 @@ es:
         description: Descripción
         video_url: Video externo
         documents: Documentos (1)
-        preview: Ver en la web
     recounts:
       index:
         title: "Recuentos"

config/locales/es/images.yml

@@ -9,6 +9,8 @@ es:
       note: "Puedes subir una imagen en los formatos: %{accepted_content_types}, y de hasta %{max_file_size} MB por archivo."
       add_new_image: Añadir imagen
       title_placeholder: Añade un título descriptivo para la imagen
+      admin_title: "Imagen principal de la votación"
+      admin_alt_text: "Texto alternativo para la imagen"
 
     actions:
       destroy:

config/routes.rb

@@ -273,9 +273,7 @@ Rails.application.routes.draw do
 
     scope module: :poll do
       resources :polls do
-        get :search_questions, on: :member
         patch :add_question, on: :member
-        patch :remove_question, on: :member
 
         resources :booth_assignments, only: [:index, :show, :create, :destroy] do
           get :search_booths, on: :collection