Merge branch 'master' into community

config/locales/en/admin.yml

@@ -403,6 +403,7 @@ en:
       poll_officers: Poll officers
       polls: Polls
       poll_booths: Booths location
+      poll_shifts: Manage shifts
       officials: Officials
       organizations: Organisations
       settings: Configuration settings
@@ -481,11 +482,6 @@ en:
         search: Search
         user_not_found: User not found
     poll_officer_assignments:
-      flash:
-        destroy: "Officing shift removed"
-        create: "Officing shift added"
-        error_destroy: "An error ocurred when removing officer assignment"
-        error_create: "An error ocurred when adding officer assignment"
       index:
         officers_title: "List of officers"
         no_officers: "There are no officers assigned to this poll."
@@ -494,18 +490,27 @@ en:
         add_officer_assignments: "Add shifts as officer"
         edit_officer_assignments: "Edit officing shifts"
       by_officer:
-        new_assignment: "New shift"
         date: "Date"
         booth: "Booth"
-        assignment: "Assignment"
-        select_date: "Select day"
-        select_booth: "Select booth"
-        add_assignment: "Add shift"
-        remove_assignment: "Remove"
         assignments: "Officing shifts in this poll"
         no_assignments: "This user has no officing shifts in this poll."
         final_recounts: "Final recounts"
         final_recount: "Final recount (by officer)"
+    poll_shifts:
+      new:
+        new_assignment: "New shift"
+        date: "Date"
+        officer: "Officer"
+        assignment: "Assignment"
+        select_date: "Select day"
+        select_officer: "Select officer"
+        add_assignment: "Add shift"
+        remove_assignment: "Remove"
+        assignments: "Shifts in this booth"
+        no_assignments: "This booth has no shifts"
+      flash:
+        create: "Shift added"
+        destroy: "Shift removed"
     poll_booth_assignments:
       flash:
         destroy: "Booth not assigned anymore"
@@ -618,6 +623,8 @@ en:
         submit_button: "Update booth"
       show:
         location: "Location"
+      booth:
+        shifts: "Manage shifts"
     officials:
       edit:
         destroy: Remove 'Official' status

config/locales/es/admin.yml

@@ -414,6 +414,7 @@ es:
       poll_officers: Presidentes de mesa
       polls: Votaciones
       poll_booths: Ubicación de urnas
+      poll_shifts: Asignar turnos
       officials: Cargos públicos
       organizations: Organizaciones
       settings: Configuración global
@@ -481,11 +482,6 @@ es:
         search: Buscar
         user_not_found: Usuario no encontrado
     poll_officer_assignments:
-      flash:
-        destroy: "Eliminado turno de presidente de mesa"
-        create: "Añadido turno de presidente de mesa"
-        error_destroy: "Se ha producido un error al eliminar el turno"
-        error_create: "Se ha producido un error al intentar crear el turno"
       index:
         officers_title: "Listado de presidentes de mesa asignados"
         no_officers: "No hay presidentes de mesa asignados a esta votación."
@@ -494,18 +490,27 @@ es:
         add_officer_assignments: "Añadir turnos como presidente de mesa"
         edit_officer_assignments: "Editar turnos"
       by_officer:
-        new_assignment: "Nuevo turno"
         date: "Fecha"
         booth: "Urna"
-        assignment: "Asignación"
-        select_date: "Seleccionar día"
-        select_booth: "Seleccionar urna"
-        add_assignment: "Añadir turno"
-        remove_assignment: "Eliminar turno"
         assignments: "Turnos como presidente de mesa en esta votación"
         no_assignments: "No tiene turnos como presidente de mesa en esta votación."
         final_recounts: "Recuentos finales"
         final_recount: "Recuento final (presidente de mesa)"
+    poll_shifts:
+      new:
+        new_assignment: "Nuevo turno"
+        date: "Fecha"
+        officer: "Presidente de mesa"
+        assignment: "Asignación"
+        select_date: "Seleccionar día"
+        select_officer: "Seleccionar presidente de mesa"
+        add_assignment: "Añadir turno"
+        remove_assignment: "Eliminar turno"
+        assignments: "Turnos en esta urna"
+        no_assignments: "Esta urna no tiene turnos asignados"
+      flash:
+        create: "Añadido turno de presidente de mesa"   
+        destroy: "Eliminado turno de presidente de mesa"
     poll_booth_assignments:
       flash:
         destroy: "Urna desasignada"
@@ -618,6 +623,8 @@ es:
         submit_button: "Actualizar urna"
       show:
         location: "Ubicación"
+      booth:
+        shifts: "Asignar turnos"
     officials:
       edit:
         destroy: Eliminar condición de 'Cargo Público'

config/routes.rb

@@ -286,7 +286,10 @@ Rails.application.routes.draw do
         get :search, on: :collection
       end
 
-      resources :booths
+      resources :booths do
+        resources :shifts
+      end
+
       resources :questions
     end