consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into user-recomendations

Browse Source
This commit is contained in:
Raimond Garcia
2017-09-05 17:15:42 +02:00
committed by GitHub
parent 5ddeff217a c6f675ecf2
commit 2519f232ab
101 changed files with 2326 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/i18n-tasks.yml
View File

@@ -37,6 +37,7 @@ data:
- config/locales/%{locale}/officing.yml
- config/locales/%{locale}/budgets.yml
- config/locales/%{locale}/legislation.yml
- config/locales/%{locale}/community.yml
- config/locales/%{locale}/documents.yml
# Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:

29
config/locales/en/admin.yml
View File

@@ -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

57
config/locales/en/community.yml Normal file
View File

@@ -0,0 +1,57 @@
en:
community:
sidebar:
title: Community
description:
proposal: Participate in the user community of this proposal.
investment: Participate in the user community of this investment.
button_to_access: Access the community
show:
title:
proposal: Proposal community
investment: Budget Investment community
description:
proposal: Participate in the community of this proposal. An active community can help to improve the content of the proposal and boost its dissemination to get more support.
investment: Participate in the community of this budget investment. An active community can help to improve the content of the budget investment and boost its dissemination to get more support.
create_first_community_topic:
first_theme_not_logged_in: No issue yet available, participate creating the first one. Click on the create new topic button.
first_theme: Create the first community topic
sub_first_theme: To create a theme you have to %{link}
sign_link: "access %{org_name}"
tab:
participants: Participants
sidebar:
participate: Participate
new_topic: Create topic
disabled_info_title: You need to be logged to create a new topic
topic:
edit_button: Edit
comments:
one: 1 comment
other: "%{count} comments"
zero: No comments
topic:
create: Create a topic
edit: Edit Topic
form:
topic_title: Topic Title
topic_description: Description
new:
submit_button: Create topic
edit:
submit_button: Edit topic
create:
submit_button: Create topic
update:
submit_button: Update topic
show:
tab:
comments_tab: Comments
sidebar:
recommendations_title: Recommendations to create a topic
recommendation_one: Do not write the topic title or whole sentences in capital letters. On the internet that is considered shouting. And no one likes to be yelled at.
recommendation_two: Any topic or comment that implies an illegal action will be eliminated, also those that intend to sabotage the spaces of the subject, everything else is allowed.
recommendation_three: Enjoy this space, the voices that fill it, it's yours too.
topics:
show:
login_to_comment: You must %{signin} or %{signup} to leave a comment.

2
config/locales/en/general.yml
View File

@@ -64,6 +64,7 @@ en:
most_voted: Most voted
newest: Newest first
oldest: Oldest first
most_commented: Most commented
select_order: Sort by
show:
return_to_commentable: 'Go back to '
@@ -182,6 +183,7 @@ en:
verification/sms: phone
signature_sheet: Signature sheet
document: Document
topic: Topic
geozones:
none: All city
all: All scopes

1
config/locales/en/legislation.yml
View File

@@ -53,7 +53,6 @@ en:
empty_questions: There aren't any questions
participate: Participate in the debate
header_full:
title: Participate
description: Description
more_info: More information and context
index:

2
config/locales/en/responders.yml
View File

@@ -13,6 +13,7 @@ en:
spending_proposal: "Spending proposal created successfully. You can access it from %{activity}"
budget_investment: "Budget Investment created successfully."
signature_sheet: "Signature sheet created successfully"
topic: "Topic created successfully."
save_changes:
notice: Changes saved
update:
@@ -23,6 +24,7 @@ en:
proposal: "Proposal updated successfully."
spending_proposal: "Investment project updated succesfully."
budget_investment: "Investment project updated succesfully."
topic: "Topic updated successfully."
destroy:
spending_proposal: "Spending proposal deleted succesfully."
budget_investment: "Investment project deleted succesfully."

1
config/locales/en/settings.yml
View File

@@ -41,6 +41,7 @@ en:
legislation: Legislation
user:
recommendations: Recommendeds
community: Community on proposals and investments
mailer_from_name: Origin email name
mailer_from_address: Origin email address
meta_description: "Site description (SEO)"

29
config/locales/es/admin.yml
View File

@@ -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'

57
config/locales/es/community.yml Normal file
View File

@@ -0,0 +1,57 @@
es:
community:
sidebar:
title: Comunidad
description:
proposal: Participa en la comunidad de usuarios de esta propuesta.
investment: Participa en la comunidad de usuarios de este proyecto de inversión.
button_to_access: Acceder a la comunidad
show:
title:
proposal: Comunidad de la propuesta
investment: Comunidad del presupuesto participativo
description:
proposal: Participa en la comunidad de esta propuesta. Una comunidad activa puede ayudar a mejorar el contenido de la propuesta así como a dinamizar su difusión para conseguir más apoyos.
investment: Participa en la comunidad de este proyecto de inversión. Una comunidad activa puede ayudar a mejorar el contenido del proyecto de inversión así como a dinamizar su difusión para conseguir más apoyos.
create_first_community_topic:
first_theme_not_logged_in: Aún no hay ningun tema disponible, participa creando el primero. Haz click en el botón crear nuevo tema.
first_theme: Crea el primer tema de la comunidad
sub_first_theme: Para crear un tema tienes que %{link}
sign_link: "acceder a %{org_name}"
tab:
participants: Participantes
sidebar:
participate: Participa
new_topic: Crea un tema
disabled_info_title: Necesitas estar logueado para crear un nuevo tema
topic:
edit_button: Editar
comments:
one: 1 Comentario
other: "%{count} Comentarios"
zero: Sin comentarios
topic:
create: Crear un tema
edit: Editar tema
form:
topic_title: Titulo del tema
topic_description: Descripción
new:
submit_button: Crear tema
edit:
submit_button: Guardar cambios
create:
submit_button: Crear tema
update:
submit_button: Actualizar tema
show:
tab:
comments_tab: Comentarios
sidebar:
recommendations_title: Recomendaciones para crear un tema
recommendation_one: No escribas el título del tema o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten.
recommendation_two: Cualquier tema o comentario que implique una acción ilegal será eliminada, también las que tengan la intención de sabotear los espacios del tema, todo lo demás está permitido.
recommendation_three: Disfruta de este espacio, de las voces que lo llenan, también es tuyo
topics:
show:
login_to_comment: Necesitas %{signin} o %{signup} para comentar.

2
config/locales/es/general.yml
View File

@@ -64,6 +64,7 @@ es:
most_voted: Más votados
newest: Más nuevos primero
oldest: Más antiguos primero
most_commented: Más comentados
select_order: Ordenar por
show:
return_to_commentable: 'Volver a '
@@ -182,6 +183,7 @@ es:
verification/sms: el teléfono
signature_sheet: la hoja de firmas
document: el documento
topic: Tema
geozones:
none: Toda la ciudad
all: Todos los ámbitos de actuación

1
config/locales/es/legislation.yml
View File

@@ -53,7 +53,6 @@ es:
empty_questions: No hay preguntas
participate: Realiza tus aportaciones al debate previo participando en los siguientes temas.
header_full:
title: Colabora en la elaboración de la normativa sobre
description: En qué consiste
more_info: Más información y contexto
index:

2
config/locales/es/responders.yml
View File

@@ -13,6 +13,7 @@ es:
spending_proposal: "Propuesta de inversión creada correctamente. Puedes acceder a ella desde %{activity}"
budget_investment: "Propuesta de inversión creada correctamente."
signature_sheet: "Hoja de firmas creada correctamente"
topic: "Tema creado correctamente."
save_changes:
notice: Cambios guardados
update:
@@ -23,6 +24,7 @@ es:
poll_booth: "Urna actualizada correctamente."
spending_proposal: "Propuesta de inversión actualizada correctamente."
budget_investment: "Propuesta de inversión actualizada correctamente"
topic: "Tema actualizado correctamente."
destroy:
spending_proposal: "Propuesta de inversión eliminada."
budget_investment: "Propuesta de inversión eliminada."

1
config/locales/es/settings.yml
View File

@@ -41,6 +41,7 @@ es:
legislation: Legislación
user:
recommendations: Recomendaciones
community: Comunidad en propuestas y proyectos de inversión
mailer_from_name: Nombre email remitente
mailer_from_address: Dirección email remitente
meta_description: "Descripción del sitio (SEO)"

10
config/routes.rb
View File

@@ -156,6 +156,10 @@ Rails.application.routes.draw do
resource :verification, controller: "verification", only: [:show]
resources :communities, only: [:show] do
resources :topics
end
scope module: :verification do
resource :residence, controller: "residence", only: [:new, :create]
resource :sms, controller: "sms", only: [:new, :create, :edit, :update]
@@ -164,6 +168,7 @@ Rails.application.routes.draw do
resource :letter, controller: "letter", only: [:new, :create, :show, :edit, :update]
end
namespace :admin do
root to: "dashboard#index"
resources :organizations, only: :index do
@@ -281,7 +286,10 @@ Rails.application.routes.draw do
get :search, on: :collection
end
resources :booths
resources :booths do
resources :shifts
end
resources :questions
end