decidim-core 0.0.1.alpha7 → 0.0.1.alpha8

data/app/views/devise/mailer/organization_admin_invitation_instructions.text.erb

@@ -5,7 +5,7 @@
 <%= accept_invitation_url(@resource, invitation_token: @token, invite_redirect: decidim_admin.root_path, host: @resource.organization.host) %>
 
 <% if @resource.invitation_due_at %>
-  <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :'devise.mailer.invitation_instructions.accept_until_format')) %>
+  <%= t("devise.mailer.invitation_instructions.accept_until", due_date: l(@resource.invitation_due_at, format: :long)) %>
 <% end %>
 
 <%= strip_tags t("devise.mailer.invitation_instructions.ignore") %>

data/app/views/layouts/decidim/_footer.html.erb

@@ -4,9 +4,9 @@
         <div class="row">
           <div class="medium-8 large-6 large-offset-3 column main__footer__nav">
             <ul class="footer-nav">
-              <li><a href="#"><%= t('.about') %></a></li>
-              <li><a href="#"><%= t('.terms_of_use') %></a></li>
-              <li><a href="#"><%= t('.accessibility') %></a></li>
+              <li><%= link_to t('.about'), page_path("about") %></a></li>
+              <li><%= link_to t('.terms_of_use'), page_path("terms") %></a></li>
+              <li><%= link_to t('.accessibility'), page_path("accessibility") %></a></li>
             </ul>
           </div>
         </div>

data/app/views/layouts/decidim/_header.html.erb

@@ -46,7 +46,7 @@
               <div class="topbar__dropmenu topbar__user__logged">
                 <ul class="dropdown menu" data-dropdown-menu>
                   <li class="is-dropdown-submenu-parent show-for-medium">
-                    <%= link_to current_user.name, root_path %>
+                    <%= link_to current_user.name, account_path %>
                     <ul class="menu is-dropdown-subeenu js-append usermenu-off-canvas">
                       <li><%= link_to t('.sign_out'), destroy_user_session_path, method: :delete, class: "sign-out-link" %></li>
                     </ul>
@@ -74,7 +74,10 @@
             <div class="row">
               <ul class="main-nav">
                 <li>
-                  <%= active_link_to t("menu.home", scope: "decidim"), root_path, active: :exact, class: "main-nav__link", active_class: "main-nav__link-active" %>
+                  <%= active_link_to t("menu.home", scope: "decidim"), root_path, active: :exact, class: "main-nav__link", class_active: "main-nav__link-active" %>
+                </li>
+                <li>
+                  <%= active_link_to t("menu.processes", scope: "decidim"), participatory_processes_path, active: :inclusive, class: "main-nav__link", class_active: "main-nav__link--active" %>
                 </li>
               </ul>
             </div>

data/app/views/pages/404.html.erb

@@ -0,0 +1,13 @@
+<main class="wrapper">
+  <div class="row">
+    <div class="large-8 large-centered">
+      <div class="static__message">
+        <h1 class="heading1 page-title"><%= t(".title") %></h1>
+        <p><%= t(".content_doesnt_exist") %></p>
+        <div class="static__message__cta">
+          <%= link_to t(".back_home"), root_path, class: "button" %>
+        </div>
+      </div>
+  </div>
+</div>
+</main>

data/app/views/pages/500.html.erb

@@ -0,0 +1,10 @@
+<main class="wrapper">
+  <div class="row">
+    <div class="large-8 large-centered">
+    <div class="static__message">
+      <h1 class="heading1 page-title"><%= t(".title") %></h1>
+      <p><%= t(".try_later") %></p>
+    </div>
+  </div>
+</div>
+</main>

data/app/views/pages/terms.ca.html.erb

@@ -0,0 +1,4 @@
+<center>
+  <h1>Substitueix aquest text pels termes i condicions.</h1>
+  <pre>Pots fer-ho creant un arxiu a app/pages/terms.ca.html.erb</pre>
+</center>

data/app/views/pages/terms.en.html.erb

@@ -0,0 +1,4 @@
+<center>
+  <h1>Replace this text by the terms and conditions.</h1>
+  <pre>You can do this by creating a file in app/pages/terms.en.html.erb</pre>
+</center>

data/app/views/pages/terms.es.html.erb

@@ -0,0 +1,4 @@
+<center>
+  <h1>Sustituye este texto por los términos y condiciones.</h1>
+  <pre>Puedes hacerlo creando un archivo app/pages/terms.es.html.erb</pre>
+</center>

data/config/i18n-tasks.yml

@@ -90,6 +90,9 @@ ignore_missing:
 ignore_unused:
   - '{time.formats}.*'
   - devise.mailer.password_change.subject
+  - activerecord.attributes.decidim/user.*
+  - activerecord.models.decidim/user
+  - booleans.*
 # - 'activerecord.attributes.*'
 # - '{devise,kaminari,will_paginate}.*'
 # - 'simple_form.{yes,no}'

data/config/initializers/devise.rb

@@ -14,7 +14,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
+  config.mailer_sender = Decidim.config.mailer_sender
 
   # Configure the class responsible to send e-mails.
   config.mailer = "Decidim::DecidimDeviseMailer"

data/config/locales/ca.yml

@@ -1,12 +1,65 @@
 ---
 ca:
+  activerecord:
+    attributes:
+      decidim/user:
+        current_password: Contrasenya actual
+        email: Correu electrònic
+        name: Nom d'usuari
+        password: Contrasenya
+        password_confirmation: Confirmar contrasenya
+        remember_me: Recordar-me
+        tos_agreement: Termes i condicions d'ús
+    models:
+      decidim/user: Usuari
+  booleans:
+    'false': 'No'
+    'true': Sí
   decidim:
-    home:
+    account:
+      authorizations:
+        authorization_confirm_destroy: Segur que vols suprimir aquesta autorització?
       show:
-        register: Registra't
-        welcome: Benvingut/da a %{organization}!
+        authorizations: Autoritzacions
+        title: El meu compte
+    authorization_handlers:
+      decidim/dummy_authorization_handler: Autorització d'exemple
+    authorizations:
+      create:
+        error: S'ha produït un error al crear l'autorització.
+        success: Has estat autoritzat/da correctament.
+      current_participatory_processes: fer una ullada als processos actuals
+      destroy:
+        success: Autorització destruïda correctament.
+      index:
+        actions:
+          decidim/dummy_authorization_handler: Verificar-me amb l'exemple
+        title: Verificar la teva identitat
+        verify_with_these_options: 'Aquestes són les opcions disponibles per verificar la teva identitat:'
+      new:
+        authorize: Enviar
+        authorize_with: Verificar-me amb %{authorizer}
+      skip_verification: Pots saltar-te aquest pas per ara i %{link}
+    core:
+      actions:
+        unauthorized: No tens permís per realitzar aquesta acció.
+    devise:
+      registrations:
+        new:
+          already_have_an_account?: Ja tens un compte?
+          sign_in: Entra
+          sign_up: Registra't
+          subtitle: Crea un compte per poder participar en els debats i donar suport a les propostes.
+          terms: els termes i condicions d'ús
+          tos_agreement: En registrar-te acceptes %{link}.
+          username_help: Nom públic que apareixerà en les teves publicacions. Amb l'objectiu de garantitzar l'anonimat pot ser qualsevol nom.
+      sessions:
+        new:
+          are_you_new?: Ets nou a la plataforma?
+          register: Crea't un compte
     menu:
       home: Inici
+      processes: Processos
   devise:
     mailer:
       invitation_instructions:
@@ -28,7 +81,7 @@ ca:
       footer:
         about: Quant a Decidim
         accessibility: Accessibilitat
-        made_with_open_source: Aquesta web està feta amb <a target="_blank" href="https://github.com/codegram/decidim">software lliure</a>.
+        made_with_open_source: Aquesta web està feta amb <a target="_blank" href="https://github.com/AjuntamentdeBarcelona/decidim">software lliure</a>.
         terms_of_use: Termes i condicions
       header:
         close_menu: Tancar menú
@@ -36,13 +89,34 @@ ca:
         sign_in: Entra
         sign_out: Surt
         sign_up: Registra't
+      participatory_processes:
+        index:
+          promoted_processes: Processos destacats
+        no_processes_yet:
+          no_processes_yet: Encara no hi ha cap procés participatiu!
+        order_by_processes:
+          processes:
+            one: "%{count} procés"
+            other: "%{count} processos"
+        participatory_process:
+          active_step: 'Fase actual:'
+          take_part: Participa
+        promoted_process:
+          active_step: 'Fase actual:'
+          more_info: Més informació
+          take_part: Participa
   locales:
     ca: Català
     en: English
     es: Castellano
-  time:
-    formats:
-      devise:
-        mailer:
-          invitation_instructions:
-            accept_until_format: "%B %d, %Y %I:%M %p"
+  pages:
+    '404':
+      back_home: Tornar a l'inici
+      content_doesnt_exist: Aquesta adreça és incorrecta o ha estat eliminada.
+      title: No s'ha trobat la pàgina que busques!
+    '500':
+      title: Hi ha hagut un problema amb el nostre servidor
+      try_later: Si us plau, torna-ho a intentar més tard.
+    home:
+      register: Registra't
+      welcome: Benvingut/da a %{organization}!

data/config/locales/en.yml

@@ -1,12 +1,65 @@
 ---
 en:
+  activerecord:
+    attributes:
+      decidim/user:
+        current_password: Current password
+        email: Email
+        name: Username
+        password: Password
+        password_confirmation: Password confirmation
+        remember_me: Remember me
+        tos_agreement: Terms & conditions
+    models:
+      decidim/user: User
+  booleans:
+    'false': 'No'
+    'true': 'Yes'
   decidim:
-    home:
+    account:
+      authorizations:
+        authorization_confirm_destroy: Are you sure you want to delete this authorization?
       show:
-        register: Register
-        welcome: Welcome to %{organization}!
+        authorizations: Authorizations
+        title: My account
+    authorization_handlers:
+      decidim/dummy_authorization_handler: Example authorization
+    authorizations:
+      create:
+        error: There was an error creating the authorization.
+        success: You've been successfully authorized.
+      current_participatory_processes: take a look at the current processes
+      destroy:
+        success: Authorization successfully destroyed
+      index:
+        actions:
+          decidim/dummy_authorization_handler: Verify against the example authorization
+        title: Verify your identity
+        verify_with_these_options: 'These are the available options to verify your identity:'
+      new:
+        authorize: Send
+        authorize_with: Verify with %{authorizer}
+      skip_verification: You can skip this for now and %{link}
+    core:
+      actions:
+        unauthorized: You are not authorized to perform this action
+    devise:
+      registrations:
+        new:
+          already_have_an_account?: Already have an account?
+          sign_in: Log in
+          sign_up: Sign up
+          subtitle: Sign up to participate in discussions and support proposals.
+          terms: the terms and conditions of use
+          tos_agreement: By signing up you agree to %{link}.
+          username_help: Public name that appears on your posts. With the aim of guaranteeing the anonymity, can be any name.
+      sessions:
+        new:
+          are_you_new?: New to the platform?
+          register: Create an account
     menu:
       home: Home
+      processes: Processes
   devise:
     mailer:
       invitation_instructions:
@@ -24,7 +77,7 @@ en:
       footer:
         about: About Decidim
         accessibility: Accessibility
-        made_with_open_source: Website made with <a target="_blank" href="https://github.com/codegram/decidim">open-source software</a>.
+        made_with_open_source: Website made with <a target="_blank" href="https://github.com/AjuntamentdeBarcelona/decidim">open-source software</a>.
         terms_of_use: Terms Of Use
       header:
         close_menu: Close menu
@@ -32,13 +85,34 @@ en:
         sign_in: Sign In
         sign_out: Sign out
         sign_up: Sign Up
+      participatory_processes:
+        index:
+          promoted_processes: Highlighted processes
+        no_processes_yet:
+          no_processes_yet: No participatory processes yet!
+        order_by_processes:
+          processes:
+            one: "%{count} process"
+            other: "%{count} processes"
+        participatory_process:
+          active_step: 'Current step:'
+          take_part: Take part
+        promoted_process:
+          active_step: 'Current step:'
+          more_info: More info
+          take_part: Take part
   locales:
     ca: Català
     en: English
     es: Castellano
-  time:
-    formats:
-      devise:
-        mailer:
-          invitation_instructions:
-            accept_until_format: "%B %d, %Y %I:%M %p"
+  pages:
+    '404':
+      back_home: Back home
+      content_doesnt_exist: This address is incorrect or has been removed.
+      title: The page you're looking for can't be found
+    '500':
+      title: There was a problem with our server
+      try_later: Please try again later.
+    home:
+      register: Register
+      welcome: Welcome to %{organization}!

data/config/locales/es.yml

@@ -1,12 +1,65 @@
 ---
 es:
+  activerecord:
+    attributes:
+      decidim/user:
+        current_password: Contraseña actual
+        email: Correo electrónico
+        name: Nombre de usuario
+        password: Contraseña
+        password_confirmation: Confirmación de la contraseña
+        remember_me: Recordarme
+        tos_agreement: Términos y condiciones de uso
+    models:
+      decidim/user: Usuario
+  booleans:
+    'false': 'No'
+    'true': Sí
   decidim:
-    home:
+    account:
+      authorizations:
+        authorization_confirm_destroy: "¿Seguro que quieres eliminar esta autorización?"
       show:
-        register: Regístrate
-        welcome: Bienvenido/da %{organization}!
+        authorizations: Autorizaciones
+        title: Mi cuenta
+    authorization_handlers:
+      decidim/dummy_authorization_handler: ejemplo de autorización
+    authorizations:
+      create:
+        error: Se ha producido un error al crear la autorización.
+        success: Has sido autorizado/a correctamente.
+      current_participatory_processes: echar un vistazo a los procesos actuales
+      destroy:
+        success: Autorización destruida con éxito
+      index:
+        actions:
+          decidim/dummy_authorization_handler: Verificarme con el ejemplo
+        title: Verifica tu identidad
+        verify_with_these_options: 'Estas son las opciones disponibles para verificar tu identidad:'
+      new:
+        authorize: Enviar
+        authorize_with: Verificarme con %{authorizer}
+      skip_verification: Puede saltarte este paso por ahora y %{link}
+    core:
+      actions:
+        unauthorized: No tienes permiso para realizar esta acción.
+    devise:
+      registrations:
+        new:
+          already_have_an_account?: "¿Ya tienes una cuenta?"
+          sign_in: Entra
+          sign_up: Regístrate
+          subtitle: Crea una cuenta para poder participar en los debates y apoyar las propuestas.
+          terms: los términos y condiciones de uso
+          tos_agreement: Al registrarte aceptas %{link}.
+          username_help: Nombre público que aparecerá en tus publicaciones. Con el objetivo de garantizar el anonimato puede ser cualquier nombre.
+      sessions:
+        new:
+          are_you_new?: "¿Eres nuevo en la plataforma?"
+          register: Créate una cuenta
     menu:
       home: Inicio
+      processes: Procesos
   devise:
     mailer:
       invitation_instructions:
@@ -28,7 +81,7 @@ es:
       footer:
         about: En cuanto a Decidim
         accessibility: Accesibilidad
-        made_with_open_source: Esta web está hecha con <a target="_blank" href="https://github.com/codegram/decidim">software libre</a>.
+        made_with_open_source: Esta web está hecha con <a target="_blank" href="https://github.com/AjuntamentdeBarcelona/decidim">software libre</a>.
         terms_of_use: Términos y condiciones
       header:
         close_menu: Cerrar menú
@@ -36,13 +89,34 @@ es:
         sign_in: Entra
         sign_out: Sale
         sign_up: Regístrate
+      participatory_processes:
+        index:
+          promoted_processes: Procesos destacados
+        no_processes_yet:
+          no_processes_yet: No hay procesos participativos todavía!
+        order_by_processes:
+          processes:
+            one: "%{count} proceso"
+            other: "%{count} procesos"
+        participatory_process:
+          active_step: 'Fase actual:'
+          take_part: Participa
+        promoted_process:
+          active_step: 'Fase actual:'
+          more_info: Más información
+          take_part: Participa
   locales:
     ca: Català
     en: English
     es: Castellano
-  time:
-    formats:
-      devise:
-        mailer:
-          invitation_instructions:
-            accept_until_format: "% B% d,% Y% I:% M% p"
+  pages:
+    '404':
+      back_home: Volver al inicio
+      content_doesnt_exist: Esta dirección es incorrecta o ha sido eliminada.
+      title: "¡No se ha encontrado la página que buscas!"
+    '500':
+      title: Ha habido un problema con nuestro servidor
+      try_later: Por favor, vuelve a intentarlo más tarde.
+    home:
+      register: Regístrate
+      welcome: Bienvenido/da %{organization}!