merges master and fixes conflicts

config/deploy-secrets.yml.example

@@ -3,18 +3,23 @@ staging:
   ssh_port: 21
   server: staging.participacion.madrid.es
   user: xxxxx
+  full_app_name: participacion
   server_name: staging.participacion.madrid.es
   db_server: postgre.participacion.madrid.es
 
 preproduction:
   deploy_to: "/var/www/participacion"
   ssh_port: 2222
-  server: xxx.xxx.xxx.xxx
+  server1: xxx.xxx.xxx.xxx
+  server2: xxx.xxx.xxx.xxx
   user: xxxxx
+  full_app_name: participacion
+  db_server: xxx.xxx.xxx.xxx
 
 production:
   deploy_to: "/var/www/participacion"
   ssh_port: 2222
   server: xxx.xxx.xxx.xxx
   user: xxxxx
+  full_app_name: participacion
 

config/deploy.rb

@@ -6,11 +6,14 @@ def deploysecret(key)
   @deploy_secrets_yml[key.to_s]
 end
 
+
 set :rails_env, fetch(:stage)
 set :rvm_ruby_version, '2.2.2'
 set :rvm_type, :user
 
 set :application, 'participacion'
+set :full_app_name, deploysecret(:full_app_name)
+
 set :server_name, deploysecret(:server_name)
 #set :repo_url, 'git@github.com:AyuntamientoMadrid/participacion.git'
 # If ssh access is restricted, probably you need to use https access
@@ -45,9 +48,9 @@ set(:config_files, %w(
 
 namespace :deploy do
   # Check right version of deploy branch
-  before :deploy, "deploy:check_revision"
+  # before :deploy, "deploy:check_revision"
   # Run test aund continue only if passed
-  before :deploy, "deploy:run_tests"
+  # before :deploy, "deploy:run_tests"
   # Compile assets locally and then rsync
   after 'deploy:symlink:shared', 'deploy:compile_assets_locally'
   after :finishing, 'deploy:cleanup'

config/deploy/preproduction.rb

@@ -6,4 +6,5 @@ set :ssh_options, port: deploysecret(:ssh_port)
 set :stage, :production
 set :rails_env, :production
 
-server deploysecret(:server), user: deploysecret(:user), roles: %w(web app db importer)
+server deploysecret(:server1), user: deploysecret(:user), roles: %w(web app db importer)
+server deploysecret(:server2), user: deploysecret(:user), roles: %w(web app db importer)

config/deploy/shared/secrets.yml.erb

@@ -2,3 +2,4 @@
   recaptcha_public_key: <%= ENV["MADRID_RECAPTCHA_PUBLIC_KEY"] %>
   recaptcha_private_key: <%= ENV["MADRID_RECAPTCHA_PRIVATE_KEY"] %>
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+  server_name: <%= fetch(:server_name) %>

config/environments/production.rb

@@ -62,7 +62,8 @@ Rails.application.configure do
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.default_url_options = { host: Rails.application.secrets.server_name }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).

config/environments/staging.rb

@@ -62,7 +62,8 @@ Rails.application.configure do
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.default_url_options = { host: Rails.application.secrets.server_name }
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).

config/i18n-tasks.yml

@@ -24,6 +24,7 @@ data:
     - config/locales/%{locale}.yml
     - config/locales/admin.%{locale}.yml
     - config/locales/moderation.%{locale}.yml
+    - config/locales/mailers.%{locale}.yml
     - config/locales/devise_views.%{locale}.yml
     - config/locales/responders.%{locale}.yml
     - config/locales/kaminari.%{locale}.yml

config/locales/activerecord.en.yml

@@ -18,9 +18,7 @@ en:
         title: Title
       user:
         email: Email
-        first_name: "First name"
-        last_name: "Last name"
-        nickname: Nickname
+        username: Username
         password: Password
         phone_number: Phone number
         official_position: Official position

config/locales/activerecord.es.yml

@@ -18,9 +18,7 @@ es:
         title: Título
       user:
         email: Correo electrónico
-        first_name: Nombre
-        last_name: Apellidos
-        nickname: Pseudónimo
+        username: Nombre de usuario
         password: Contraseña
         phone_number: Teléfono
         official_position: Cargo público

config/locales/admin.en.yml

@@ -25,6 +25,7 @@ en:
         verified: Verified
         rejected: Rejected
         filter: Filter
+        edit: Edit
         filters:
           all: All
           pending: Pending
@@ -35,26 +36,38 @@ en:
       hide_author: Ban author
       restore: Restore
       confirm: 'Are you sure?'
+      archive: Archive
     tags:
       index:
         title: 'Debate topics'
         add_tag: 'Add a new debate topic'
-      mark_as_featured: 'Mark as featured'
+      mark_as_featured: 'Propose topic to create debate'
       name:
         placeholder: 'Write a topic'
       destroy: Delete Tag
     comments:
       index:
         title: Hidden comments
+        show_debate: Show debate
+        filter: Filter
       restore:
         success: The comment has been restored
+      filters:
+        all: All
+        pending: Pending
+        archived: Archived
     debates:
       index:
         title: Hidden debates
+        filter: Filter
       show:
         back: Back
       restore:
         success: The debate has been restored
+      filters:
+        all: All
+        pending: Pending
+        archived: Archived
     users:
       index:
         title: Banned users

config/locales/admin.es.yml

@@ -25,6 +25,7 @@ es:
         verified: Verificada
         rejected: Rechazada
         filter: Filtro
+        edit: Editar
         filters:
           all: Todas
           pending: Pendientes
@@ -33,28 +34,40 @@ es:
     actions:
       hide: Ocultar
       hide_author: Bloquear al autor
-      restore: Permitir
+      restore: Volver a mostrar
       confirm: '¿Estás seguro?'
+      archive: Archivar
     tags:
       index:
         title: 'Temas de debate'
         add_tag: 'Añade un nuevo tema de debate'
-      mark_as_featured: 'Marcar como destacado'
+      mark_as_featured: 'Proponer tema al crear debate'
       name:
         placeholder: 'Escribe el nombre del tema'
       destroy: Elimina la etiqueta
     comments:
       index:
         title: Comentarios ocultos
+        show_debate: Ver debate
+        filter: Filtro
       restore:
         success: El comentario ha sido permitido
+      filters:
+        all: Todos
+        pending: Pendientes
+        archived: Archivados
     debates:
       index:
         title: Debates ocultos
+        filter: Filtro
       show:
         back: Volver
       restore:
         success: El debate ha sido permitido
+      filters:
+        all: Todos
+        pending: Pendientes
+        archived: Archivados
     users:
       index:
         title: Usuarios bloqueados

config/locales/devise_views.en.yml

@@ -50,19 +50,16 @@ en:
           back_link: "Back"
         new:
           title: "Sign up"
-          first_name_label: "First name"
-          last_name_label: "Last name"
-          nickname_label: "Nickname"
-          use_nickname_label: "Use nickname"
+          username_label: "Username to use publicly"
           email_label: "Email"
-          phone_number_label: "Phone number"
           password_label: "Password"
           password_confirmation_label: "Confirm password"
           submit: "Sign up"
+          organization_signup: "Do you represent an organization / group?"
     organizations:
       registrations:
         new:
-          title: "Sign up as organization"
+          title: "Sign up as organization / collective"
           organization_name_label: "Organization name"
           email_label: "Email"
           password_label: "Password"
@@ -86,7 +83,7 @@ en:
         login: "Log in"
         signup: "Sign up"
         signin_with_provider: "Sign in with %{provider}"
-        organization_signup: "Sign up as an organization"
+        organization_signup: "Sign up as an organization / collective"
         new_password: "Forgot your password?"
         new_confirmation: "Didn't receive confirmation instructions?"
         new_unlock: "Didn't receive unlock instructions?"

config/locales/devise_views.es.yml

@@ -50,19 +50,16 @@ es:
           back_link: "Atrás"
         new:
           title: "Registrarse"
-          first_name_label: "Nombre"
-          last_name_label: "Apellidos"
-          nickname_label: "Pseudónimo"
-          use_nickname_label: "Usar pseudónimo"
+          username_label: "Nombre a utilizar públicamente"
           email_label: "Email"
-          phone_number_label: "Teléfono"
           password_label: "Contraseña"
           password_confirmation_label: "Confirmar contraseña"
           submit: "Registrarse"
+          organization_signup: "¿Representas a una organización / colectivo?"
     organizations:
       registrations:
         new:
-          title: "Registrarse como organización"
+          title: "Registrarse como organización / colectivo"
           organization_name_label: "Nombre de la organización"
           email_label: "Email"
           password_label: "Contraseña"
@@ -85,7 +82,7 @@ es:
       links:
         login: "Entrar"
         signup: "Registrarse"
-        organization_signup: "Registro para organizaciones"
+        organization_signup: "Registro para organizaciones / colectivos"
         signin_with_provider: "Entrar con %{provider}"
         new_password: "¿Olvidaste tu contraseña?"
         new_confirmation: "¿No has recibido instrucciones para confirmar tu cuenta?"

config/locales/en.yml

@@ -13,11 +13,11 @@ en:
       open_city_slogan: So the citizens can decide what kind of city they want.
       see_all_debates: See all debates
       my_account_link: My account
-      language: Site language
+      locale: "Site language:"
       administration: Administration
       moderation: Moderation
       welcome: Welcome
-      news: News
+      how_it_works: How it works
       debates: Debates
       initiatives: Initiatives
     footer:
@@ -32,14 +32,11 @@ en:
   debates:
     index:
       create_debate: Create a debate
-      showing: You are seeing
-      tag: with the topic
-      filter_debates: debates
-      filter_initiatives: initiatives
-      filter_debates_and_initiatives: debates and initiatives
+      showing: You are seeing debates
       filter_news: the newest
       filter_votes: the most voted
       filter_rated: the best rated
+      filter_topic: "You are seeing %{number} debates with the topic '%{topic}'"
     debate:
       debate: Debate
       comments:
@@ -81,8 +78,7 @@ en:
         zero: No comments
         one: 1 Comment
         other: "%{count} Comments"
-      leave_comment: Write a comment
-      login_to_comment: Log in to participate
+      login_to_comment: "You need to %{signin} or %{signup} to comment."
       edit_debate_link: Edit
       share: Share
     edit:
@@ -120,12 +116,9 @@ en:
       change_credentials_link: "Change my credentials"
       avatar: "Avatar"
       personal: "Personal data"
-      first_name_label: "First Name"
-      last_name_label: "Last Name"
+      username_label: "Username"
       phone_number_label: "Phone number"
       organization_name_label: "Organization name"
-      use_nickname_label: "Use nickname"
-      nickname_label: "Nickname"
       notifications: Notifications
   simple_captcha:
     placeholder: "Enter the image value"
@@ -137,9 +130,9 @@ en:
   shared:
     tags_cloud:
       tags: Topics
-    organization: Organization
     flag_as_inappropiate: Flag as inappropiate
     undo_flag_as_inappropiate: Undo flag as inappropiate
+    collective: Collective
   mailer:
     comment:
       subject: Someone has commented on your debate
@@ -150,4 +143,4 @@ en:
     manage:
       all: "You are not authorized to %{action} %{subject}."
   welcome:
-    featured_debates: Features debates
+    last_debates: Last debates

config/locales/es.yml

@@ -1,5 +1,5 @@
 es:
-  locale: 'Español'
+  locale: "Español"
   layouts:
     header:
       external_link_transparency: Transparencia
@@ -13,11 +13,11 @@ es:
       open_city_slogan: Para que todos los madrileños decidamos que ciudad queremos tener.
       see_all_debates: Ver todos los debates
       my_account_link: Mi cuenta
-      language: Idioma de la página
+      locale: "Idioma de la página:"
       administration: Administrar
       moderation: Moderar
       welcome: Portada
-      news: Novedades
+      how_it_works: "Cómo funciona"
       debates: Debates
       initiatives: Iniciativas
     footer:
@@ -32,14 +32,11 @@ es:
   debates:
     index:
       create_debate: Crea un debate
-      showing: "Estás viendo"
-      tag: "con el tema"
-      filter_debates: debates
-      filter_initiatives: iniciativas
-      filter_debates_and_initiatives: debates e iniciativas
+      showing: "Estás viendo los debates"
       filter_news: "más nuevos"
       filter_votes: "más votados"
       filter_rated: mejor valorados
+      filter_topic: "Estás viendo %{number} debates con el tema '%{topic}'"
     debate:
       debate: Debate
       comments:
@@ -81,8 +78,7 @@ es:
         zero: Sin comentarios
         one: 1 Comentario
         other: "%{count} Comentarios"
-      leave_comment: Deja tu comentario
-      login_to_comment: Entra para participar
+      login_to_comment: "Necesitas %{signin} o %{signup} para comentar."
       edit_debate_link: Editar
       share: Compartir
     edit:
@@ -115,17 +111,14 @@ es:
     show:
       title: "Mi cuenta"
       save_changes_submit: "Guardar cambios"
-      change_credentials_link: "Cambiar mis credenciales"
+      change_credentials_link: "Cambiar mis datos de acceso"
       email_on_debate_comment_label: "Recibir un email cuando alguien comenta en mis debates"
       email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
       avatar: "Avatar"
       personal: "Datos personales"
-      first_name_label: "Nombre"
-      last_name_label: "Apellidos"
+      username_label: "Nombre de usuario"
       phone_number_label: "Teléfono"
       organization_name_label: "Nombre de la organización"
-      use_nickname_label: "Usar pseudónimo"
-      nickname_label: "Pseudónimo"
       notifications: Notificaciones
   simple_captcha:
     placeholder: "Introduce el texto de la imagen"
@@ -137,9 +130,9 @@ es:
   shared:
     tags_cloud:
         tags: Temas
-    organization: Organización
     flag_as_inappropiate: Denunciar como inapropiado
     undo_flag_as_inappropiate: Deshacer denunciar como inapropiado
+    collective: Colectivo
   mailer:
     comment:
       subject: Alguien ha comentado en tu debate
@@ -150,4 +143,4 @@ es:
     manage:
       all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
   welcome:
-    featured_debates: Debates destacados
+    last_debates: Úlitmos debates

config/locales/mailers.en.yml

@@ -0,0 +1,8 @@
+en:
+  mailers:
+    comment:
+      hi: "Hello, %{recipient}"
+      new_comment_by: "There'is a new comment by %{commenter}"
+    reply:
+      hi: "Hello, %{recipient}"
+      new_reply_by: "There'is a new reply by %{commenter} to your comment"

config/locales/mailers.es.yml

@@ -0,0 +1,8 @@
+es:
+  mailers:
+    comment:
+      hi: "Hola, %{recipient}"
+      new_comment_by: "Hay un nuevo comentario de %{commenter}"
+    reply:
+      hi: "Hola, %{recipient}"
+      new_reply_by: "Hay una nueva respuesta de %{commenter} a tu comentario"