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

Merge branch 'master' into backport-2588-fix_supports_filter

Browse Source
This commit is contained in:
Alberto
2018-07-26 13:44:20 +02:00
committed by GitHub
parent e9d73eb687 273781430c
commit d17b628426
53 changed files with 1354 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/locales/en/activerecord.yml
View File

@@ -283,6 +283,10 @@ en:
attributes:
segment_recipient:
invalid: "The user recipients segment is invalid"
admin_notification:
attributes:
segment_recipient:
invalid: "The user recipients segment is invalid"
map_location:
attributes:
map:

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

@@ -186,18 +186,20 @@ en:
undecided: "Undecided"
selected: "Selected"
select: "Select"
table_id: "ID"
table_title: "Title"
table_supports: "Supports"
table_admin: "Administrator"
table_valuator: "Valuator"
table_valuation_group: "Valuation Group"
table_geozone: "Scope of operation"
table_feasibility: "Feasibility"
table_valuation_finished: "Val. Fin."
table_selection: "Selected"
table_evaluation: "Show to valuators"
table_incompatible: "Incompatible"
list:
id: ID
title: Title
supports: Supports
admin: Administrator
valuator: Valuator
valuation_group: Valuation Group
geozone: Scope of operation
feasibility: Feasibility
valuation_finished: Val. Fin.
selected: Selected
visible_to_valuators: Show to valuators
author_username: Author username
incompatible: Incompatible
cannot_calculate_winners: The budget has to stay on phase "Balloting projects", "Reviewing Ballots" or "Finished budget" in order to calculate winners projects
see_results: "See results"
show:
@@ -516,8 +518,10 @@ en:
administrators: Administrators
managers: Managers
moderators: Moderators
emails: Sending of emails
messaging_users: Messages to users
newsletters: Newsletters
admin_notifications: Notifications
system_emails: System Emails
emails_download: Emails download
valuators: Valuators
poll_officers: Poll officers
@@ -611,6 +615,50 @@ en:
body: Email content
body_help_text: This is how the users will see the email
send_alert: Are you sure you want to send this newsletter to %{n} users?
admin_notifications:
create_success: Notification created successfully
update_success: Notification updated successfully
send_success: Notification sent successfully
delete_success: Notification deleted successfully
index:
section_title: Notifications
new_notification: New notification
title: Title
segment_recipient: Recipients
sent: Sent
actions: Actions
draft: Draft
edit: Edit
delete: Delete
preview: Preview
view: View
empty_notifications: There are no notifications to show
new:
section_title: New notification
edit:
section_title: Edit notification
show:
section_title: Notification preview
send: Send
will_get_notified: (%{n} users will be notified)
got_notified: (%{n} users got notified)
sent_at: Sent at
title: Title
body: Text
link: Link
segment_recipient: Recipients
preview_guide: "This is how the users will see the notification:"
sent_guide: "This is how the users see the notification:"
send_alert: Are you sure you want to send this notification to %{n} users?
system_emails:
preview_pending:
action: Preview Pending
preview_of: Preview of %{name}
pending_to_be_sent: This is the content pending to be sent
proposal_notification_digest:
title: Proposal Notification Digest
description: Gathers all proposal notifications for an user in a single message, to avoid too much emails.
preview_detail: Users will only recieve notifications from the proposals they are following
emails_download:
index:
title: Emails download
@@ -1007,6 +1055,11 @@ en:
image: Image
show_image: Show image
moderated_content: "Check the content moderated by the moderators, and confirm if the moderation has been done correctly."
view: View
proposal: Proposal
author: Author
content: Content
created_at: Created at
spending_proposals:
index:
geozone_filter_all: All zones

4
config/locales/es/activerecord.yml
View File

@@ -283,6 +283,10 @@ es:
attributes:
segment_recipient:
invalid: "El segmento de usuarios es inválido"
admin_notification:
attributes:
segment_recipient:
invalid: "El segmento de usuarios es inválido"
map_location:
attributes:
map:

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

@@ -187,18 +187,20 @@ es:
undecided: "Sin decidir"
selected: "Seleccionada"
select: "Seleccionar"
table_id: "ID"
table_title: "Título"
table_supports: "Apoyos"
table_admin: "Administrador"
table_valuator: "Evaluador"
table_valuation_group: "Grupos evaluadores"
table_geozone: "Ámbito de actuación"
table_feasibility: "Viabilidad"
table_valuation_finished: "Ev. Fin."
table_selection: "Seleccionado"
table_evaluation: "Mostrar a evaluadores"
table_incompatible: "Incompatible"
list:
id: ID
title: Título
supports: Apoyos
admin: Administrador
valuator: Evaluador
valuation_group: Grupos evaluadores
geozone: Ámbito de actuación
feasibility: Viabilidad
valuation_finished: Ev. Fin.
selected: Seleccionado
visible_to_valuators: Mostrar a evaluadores
author_username: Usuario autor
incompatible: Incompatible
cannot_calculate_winners: El presupuesto debe estar en las fases "Votación final", "Votación finalizada" o "Resultados" para poder calcular las propuestas ganadoras
see_results: "Ver resultados"
show:
@@ -517,8 +519,10 @@ es:
administrators: Administradores
managers: Gestores
moderators: Moderadores
emails: Envío de emails
messaging_users: Mensajes a usuarios
newsletters: Newsletters
admin_notifications: Notificaciones
system_emails: Emails del sistema
emails_download: Descarga de emails
valuators: Evaluadores
poll_officers: Presidentes de mesa
@@ -612,6 +616,50 @@ es:
body: Contenido del email
body_help_text: Así es como verán el email los usuarios
send_alert: ¿Estás seguro/a de que quieres enviar esta newsletter a %{n} usuarios?
admin_notifications:
create_success: Notificación creada correctamente
update_success: Notificación actualizada correctamente
send_success: Notificación enviada correctamente
delete_success: Notificación borrada correctamente
index:
section_title: Envío de notificaciones
new_notification: Crear notificación
title: Título
segment_recipient: Destinatarios
sent: Enviado
actions: Acciones
draft: Borrador
edit: Editar
delete: Borrar
preview: Previsualizar
view: Visualizar
empty_notifications: No hay notificaciones para mostrar
new:
section_title: Nueva notificación
edit:
section_title: Editar notificación
show:
section_title: Vista previa de notificación
send: Enviar
will_get_notified: (%{n} usuarios serán notificados)
got_notified: (%{n} usuarios fueron notificados)
sent_at: Enviado
title: Título
body: Texto
link: Enlace
segment_recipient: Destinatarios
preview_guide: "Así es como los usuarios verán la notificación:"
sent_guide: "Así es como los usuarios ven la notificación:"
send_alert: ¿Estás seguro/a de que quieres enviar esta notificación a %{n} usuarios?
system_emails:
preview_pending:
action: Previsualizar Pendientes
preview_of: Vista previa de %{name}
pending_to_be_sent: Este es todo el contenido pendiente de enviar
proposal_notification_digest:
title: Resumen de Notificationes de Propuestas
description: Reune todas las notificaciones de propuestas en un único mensaje, para evitar demasiados emails.
preview_detail: Los usuarios sólo recibirán las notificaciones de aquellas propuestas que siguen.
emails_download:
index:
title: Descarga de emails
@@ -1008,6 +1056,11 @@ es:
image: Imagen
show_image: Mostrar imagen
moderated_content: "Revisa el contenido moderado por los moderadores, y confirma si la moderación se ha realizado correctamente."
view: Ver
proposal: Propuesta
author: Autor
content: Contenido
created_at: Fecha de creación
spending_proposals:
index:
geozone_filter_all: Todos los ámbitos de actuación