Merge branch 'master' into legislation-module-stable

2016-12-28 17:51:15 +01:00
parent 573e281a8f c1a6f7d445
commit 525ad3ebd1
10 changed files with 130 additions and 120 deletions
--- a/config/initializers/delayed_job_config.rb
+++ b/config/initializers/delayed_job_config.rb
@@ -6,7 +6,7 @@ end
 Delayed::Worker.destroy_failed_jobs = false
 Delayed::Worker.sleep_delay = 2
 Delayed::Worker.max_attempts = 3
-Delayed::Worker.max_run_time = 30.seconds
+Delayed::Worker.max_run_time = 30.minutes
 Delayed::Worker.read_ahead = 10
 Delayed::Worker.default_queue_name = 'default'
 Delayed::Worker.raise_signal_exceptions = :term
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -389,6 +389,7 @@ en:
        created_at: Created
        author: Author
        documents: Documents
+        document_count: "Number of documents:"
        verified:
          one: "There is %{count} valid signature"
          other: "There are %{count} valid signatures"
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -387,6 +387,7 @@ es:
        created_at: Creado
        author: Autor
        documents: Documentos
+        document_count: "Número de documentos:"
        verified:
          one: "Hay %{count} firma válida"
          other: "Hay %{count} firmas válidas"