Merge branch 'master' into legislation-module-stable

config/initializers/ckeditor.rb

@@ -1,4 +1,4 @@
 Ckeditor.setup do |config|
-  config.assets_languages = I18n.available_locales.map(&:to_s)
+  config.assets_languages = Rails.application.config.i18n.available_locales.map{|l| l.to_s.downcase}
   config.assets_plugins = []
 end

config/locales/budgets.en.yml

@@ -64,6 +64,9 @@ en:
           not_logged_in: "To create a new budget investment you must %{sign_in} or %{sign_up}."
           sign_in: "sign in"
           sign_up: "sign up"
+          by_feasibility: By feasibility
+          feasible: Feasible projects
+          unfeasible: Unfeasible projects
         orders:
           random: random
           confidence_score: highest rated
@@ -77,6 +80,8 @@ en:
         organization_name_html: 'Organization: <strong>%{name}</strong>'
         share: Share
         title: Investment project
+        supports: Supports
+        votes: Votes
       wrong_price_format: Only integer numbers
       investment:
         title: Investment project
@@ -84,6 +89,7 @@ en:
         already_added: You have already added this investment project
         already_supported: You have already supported this. Share it!
         support_title: Support this project
+        confirm_group: "You can only support investments in one district. If you continue you cannot change your decision. Are you sure?"
         supports:
           one: 1 support
           other: "%{count} supports"

config/locales/budgets.es.yml

@@ -64,6 +64,9 @@ es:
           not_logged_in: "Para crear una nueva propuesta de inversión debes %{sign_in} o %{sign_up}."
           sign_in: "iniciar sesión"
           sign_up: "registrarte"
+          by_feasibility: Por viabilidad
+          feasible: Ver los proyectos viables
+          unfeasible: Ver los proyectos inviables
         orders:
           random: Aleatorias
           confidence_score: Mejor valoradas
@@ -77,6 +80,8 @@ es:
         organization_name_html: 'Organización: <strong>%{name}</strong>'
         share: Compartir
         title: Propuesta de inversión
+        supports: Apoyos
+        votes: Votos
       wrong_price_format: Solo puede incluir caracteres numéricos
       investment:
         title: Propuesta de inversión
@@ -84,6 +89,7 @@ es:
         already_added: "Ya has añadido esta propuesta de inversión"
         already_supported: Ya has apoyado esta propuesta. ¡Compártelo!
         support_title: Apoyar esta propuesta
+        confirm_group: "Sólo puedes apoyar propuestas en un distrito. Si sigues adelante no podrás cambiar esta decisión. ¿Estás seguro?"
         supports:
           one: 1 apoyo
           other: "%{count} apoyos"

config/locales/en.yml

@@ -522,11 +522,6 @@ en:
     advanced_search:
       author_type: 'By author category'
       author_type_blank: 'Select a category'
-      author_type_1: 'Public employee'
-      author_type_2: 'Municipal Organization'
-      author_type_3: 'General director'
-      author_type_4: 'City councillor'
-      author_type_5: 'Mayoress'
       date: 'By date'
       date_placeholder: 'DD/MM/YYYY'
       date_range_blank: 'Choose a date'
@@ -708,6 +703,13 @@ en:
       organization: Organizations are not permitted to vote
       unfeasible: Unfeasible investment projects can not be supported
       not_voting_allowed: Voting phase is closed
+    budget_investments:
+      not_logged_in: You must %{signin} or %{signup} to continue.
+      not_verified: Only verified users can vote on proposals; %{verify_account}.
+      organization: Organizations are not permitted to vote
+      unfeasible: Unfeasible investment projects can not be supported
+      not_voting_allowed: Voting phase is closed
+      different_heading_assigned: You can only support proposals in one district
   welcome:
     debates:
       description: For meeting, discussing and sharing the things that matter to us in our city.

config/locales/es.yml

@@ -522,11 +522,6 @@ es:
     advanced_search:
       author_type: 'Por categoría de autor'
       author_type_blank: 'Elige una categoría'
-      author_type_1: 'Empleado público'
-      author_type_2: 'Organización Municipal'
-      author_type_3: 'Director general'
-      author_type_4: 'Concejal'
-      author_type_5: 'Alcaldesa'
       date: 'Por fecha'
       date_placeholder: 'DD/MM/AAAA'
       date_range_blank: 'Elige una fecha'
@@ -708,6 +703,13 @@ es:
       organization: Las organizaciones no pueden votar.
       unfeasible: No se pueden votar propuestas inviables.
       not_voting_allowed: El periodo de votación está cerrado.
+    budget_investments:
+      not_logged_in: Necesitas %{signin} o %{signup} para continuar.
+      not_verified: Las propuestas de inversión sólo pueden ser apoyadas por usuarios verificados, %{verify_account}.
+      organization: Las organizaciones no pueden votar.
+      unfeasible: No se pueden votar propuestas inviables.
+      not_voting_allowed: El periodo de votación está cerrado.
+      different_heading_assigned: Sólo puedes apoyar propuestas en un distrito
   welcome:
     debates:
       description: Encontrarnos, debatir y compartir lo que nos parece importante en nuestra ciudad.

config/locales/fr.yml

@@ -1361,11 +1361,6 @@ fr:
   shared:
     advanced_search:
       author_type: Par catégorie d'auteur
-      author_type_1: Fonctionnaire
-      author_type_2: Organisation municipale
-      author_type_3: Directeur général
-      author_type_4: Conseiller municipal
-      author_type_5: Maire
       author_type_blank: Sélectionner une catégorie
       date: Par date
       date_1: Dernières 24 heures

config/locales/mailers.en.yml

@@ -31,6 +31,16 @@ en:
       sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation."
       subject: "Your investment project '%{code}' has been marked as unfeasible"
       unfeasible_html: "From the City Council we want to thank you for your participation in the <strong>participatory budgets</strong>. We regret to inform you that your proposal <strong>'%{title}'</strong> will be excluded from this participatory process for the following reason:"
+    budget_investment_unfeasible:
+      hi: "Dear user,"
+      new_html: "For all these, we invite you to elaborate a <strong>new proposal</strong> that ajusts to the conditions of this process. You can do it following this link: %{url}."
+      new_href: "new investment project"
+      reconsider_html: "If you believe that the rejected proposal meets the requirements to be an investment proposal, you can communicate this, within 48 hours, responding to the email address examples@consul.es. Including the code %{code} in the subject of the email."
+      sincerely: "Sincerely"
+      signatory: "DEPARTMENT OF PUBLIC PARTICIPATION"
+      sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation."
+      subject: "Your investment project '%{code}' has been marked as unfeasible"
+      unfeasible_html: "From the City Council we want to thank you for your participation in the <strong>participatory budgets</strong>. We regret to inform you that your proposal <strong>'%{title}'</strong> will be excluded from this participatory process for the following reason:"
     proposal_notification_digest:
       info: "Here are the new notifications that have been published by authors of the proposals that you have supported in %{org_name}."
       title: "Proposal notifications in %{org_name}"
@@ -52,4 +62,24 @@ en:
       thanks: "Thank you very much."
       title: "Welcome to %{org}"
       button: Complete registration
-      subject: "Invitation to %{org_name}"
+      subject: "Invitation to %{org_name}"
+    budget_investment_created:
+      subject: "Thank you for creating an investment!"
+      title: "Thank you for creating an investment!"
+      intro_html: "Hi <strong>%{author}</strong>,"
+      text_html: "Thank you for creating your investment <strong>%{investment}</strong> for Participatory Budgets <strong>%{budget}</strong>."
+      follow_html: "We will inform you about how the process progresses, which you can also follow on <strong>%{link}</strong>."
+      follow_link: "Participatory Budgets"
+      sincerely: "Sincerely,"
+      signatory: "DEPARTMENT OF PUBLIC PARTICIPATION"
+      share: "Comparte tu proyecto"
+    budget_investment_unfeasible:
+      hi: "Dear user,"
+      new_html: "For all these, we invite you to elaborate a <strong>new investment</strong> that ajusts to the conditions of this process. You can do it following this link: %{url}."
+      new_href: "new investment project"
+      reconsider_html: "If you believe that the rejected investment meets the requirements to be an investment project, you can communicate this, within 48 hours, responding to the email address examples@consul.es. Including the code %{code} in the subject of the email."
+      sincerely: "Sincerely"
+      signatory: "DEPARTMENT OF PUBLIC PARTICIPATION"
+      sorry: "Sorry for the inconvenience and we again thank you for your invaluable participation."
+      subject: "Your investment project '%{code}' has been marked as unfeasible"
+      unfeasible_html: "From the City Council we want to thank you for your participation in the <strong>participatory budgets</strong>. We regret to inform you that your investment <strong>'%{title}'</strong> will be excluded from this participatory process for the following reason:"

config/locales/mailers.es.yml

@@ -52,4 +52,24 @@ es:
       thanks: "Muchas gracias."
       title: "Bienvenido a %{org}"
       button: Completar registro
-      subject: "Invitación a %{org_name}"
+      subject: "Invitación a %{org_name}"
+    budget_investment_created:
+      subject: "¡Gracias por crear un proyecto!"
+      title: "¡Gracias por crear un proyecto!"
+      intro_html: "Hola <strong>%{author}</strong>,"
+      text_html: "Muchas gracias por crear tu proyecto <strong>%{investment}</strong> para los Presupuestos Participativos <strong>%{budget}</strong>."
+      follow_html: "Te informaremos de cómo avanza el proceso, que también puedes seguir en la página de <strong>%{link}</strong>."
+      follow_link: "Presupuestos participativos"
+      sincerely: "Atentamente,"
+      signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA"
+      share: "Comparte tu proyecto"
+    budget_investment_unfeasible:
+      hi: "Estimado usuario,"
+      new_html: "Por todo ello, te invitamos a que elabores un <strong>nuevo proyecto de gasto</strong> que se ajuste a las condiciones de este proceso. Esto lo puedes hacer en este enlace: %{url}."
+      new_href: "nueva propuesta de inversión"
+      reconsider_html: "Si consideras que el proyecto rechazado cumple los requisitos para mantenerlo como proyecto de gasto, podrás comunicarlo, en el plazo de 48 horas, al correo example@consul.es, indicando necesariamente para su tramitación el código %{code} como asunto del correo, correspondiente a tu proyecto."
+      sincerely: "Atentamente"
+      signatory: "DIRECCIÓN GENERAL DE PARTICIPACIÓN CIUDADANA"
+      sorry: "Sentimos las molestias ocasionadas y volvemos a darte las gracias por tu inestimable participación."
+      subject: "Tu propuesta de inversión '%{code}' ha sido marcada como inviable"
+      unfeasible_html: "Desde el Ayuntamiento queremos agradecer tu participación en los <strong>Presupuestos Participativos</strong>. Lamentamos informarte de que tu proyecto <strong>'%{title}'</strong> quedará excluido de este proceso participativo por el siguiente motivo:"

config/locales/pt-BR.yml

@@ -1383,11 +1383,6 @@ pt-BR:
   shared:
     advanced_search:
       author_type: Por categoria de autor
-      author_type_1: Servidor público
-      author_type_2: Organização municipal
-      author_type_3: Diretor geral
-      author_type_4: Conselheiro municipal
-      author_type_5: Prefeita
       author_type_blank: Selecione um categoria
       date: Por data
       date_1: "Últimas 24 horas"