Merge branch 'master' into legislation-module-stable

config/deploy.rb

@@ -38,7 +38,7 @@ set(:config_files, %w(
   unicorn.rb
 ))
 
-set :whenever_roles, -> { :cron }
+set :whenever_roles, -> { :app }
 
 namespace :deploy do
   before :starting, 'rvm1:install:rvm'  # install/update RVM

config/locales/en.yml

@@ -185,6 +185,7 @@ en:
       transparency_url: https://transparency.consul
     header:
       administration: Administration
+      available_locales: Available languages
       debates: Debates
       external_link_blog: Blog
       external_link_opendata: Open data
@@ -426,6 +427,7 @@ en:
     check_none: None
     collective: Collective
     flag: Flag as inappropriate
+    hide: Hide
     print:
       print_button: Print this info
     show: Show

config/locales/es.yml

@@ -185,6 +185,7 @@ es:
       transparency_url: https://transparency.consul
     header:
       administration: Administrar
+      available_locales: Idiomas disponibles
       debates: Debates
       external_link_blog: Blog
       external_link_opendata: Datos abiertos
@@ -426,6 +427,7 @@ es:
     check_none: Ninguno
     collective: Colectivo
     flag: Denunciar como inapropiado
+    hide: Ocultar
     print:
       print_button: Imprimir esta información
     show: Mostrar