Merge branch 'master' into legislation-module-stable

This commit is contained in:
Amaia Castro
2016-12-15 11:26:22 +01:00
16 changed files with 355 additions and 2 deletions

View File

@@ -148,6 +148,7 @@ en:
admin: Admin menu
banner: Manage banners
debate_topics: Debate topics
geozones: Manage geozones
hidden_comments: Hidden comments
hidden_debates: Hidden debates
hidden_proposals: Hidden proposals
@@ -319,6 +320,33 @@ en:
in_evaluation_count: In evaluation
total_count: Total
cost_for_geozone: Cost
geozones:
index:
title: Geozone
create: Create geozone
edit: Edit
delete: Delete
geozone:
name: Name
external_code: External code
census_code: Census code
coordinates: Coordinates
errors:
form:
error:
one: "prevented this geozone from being saved"
other: 'prevented this geozone from being saved'
edit:
form:
submit_button: Save changes
editing: Editing geozone
back: Go back
new:
back: Go back
creating: Create district
delete:
success: Geozone successfully deleted
error: This geozone can't be deleted since there are elements attached to it
stats:
show:
stats_title: Stats

View File

@@ -146,6 +146,7 @@ es:
admin: Menú de administración
banner: Gestionar banners
debate_topics: Temas de debate
geozones: Gestionar distritos
hidden_comments: Comentarios ocultos
hidden_debates: Debates ocultos
hidden_proposals: Propuestas ocultas
@@ -317,6 +318,33 @@ es:
in_evaluation_count: En evaluación
total_count: Total
cost_for_geozone: Coste total
geozones:
index:
title: Distritos
create: Crear un distrito
edit: Editar
delete: Borrar
geozone:
name: Nombre
external_code: Código externo
census_code: Código del censo
coordinates: Coordenadas
errors:
form:
error:
one: "error impidió guardar el distrito"
other: "errores impidieron guardar el distrito."
edit:
form:
submit_button: Guardar cambios
editing: Editando distrito
back: Volver
new:
back: Volver
creating: Crear distrito
delete:
success: Distrito borrado correctamente
error: No se puede borrar el distrito porque ya tiene elementos asociados
stats:
show:
stats_title: Estadísticas

View File

@@ -198,6 +198,8 @@ Rails.application.routes.draw do
namespace :api do
resource :stats, only: :show
end
resources :geozones, only: [:index, :new, :create, :edit, :update, :destroy]
end
namespace :moderation do