Merge branch 'legislation-module-stable' into 107-social-share-for-annotations

2017-02-14 18:14:00 +01:00
parent af52fb5670 9478ca3b60
commit 2efa72ddd5
25 changed files with 328 additions and 108 deletions
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -193,6 +193,7 @@ en:
          form:
            error: Error
        form:
+          active: Active
          process: Process
          debate_phase: Debate phase
          allegations_phase: Allegations phase
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -193,6 +193,7 @@ es:
          form:
            error: Error
        form:
+          active: Activa
          process: Proceso
          debate_phase: Fase previa
          allegations_phase: Fase de alegaciones
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -102,6 +102,7 @@ Rails.application.routes.draw do

  namespace :legislation do
    resources :processes, only: [:index, :show] do
+      get :debate
      get :draft_publication
      get :allegations
      get :final_version_publication