fixes conflicts with master

config/i18n-tasks.yml

@@ -85,6 +85,8 @@ search:
 # ignore_missing:
 # - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
 # - '{devise,simple_form}.*'
+ignore_missing:
+  - 'unauthorized.*'
 
 ## Consider these keys used:
 ignore_unused:
@@ -93,6 +95,8 @@ ignore_unused:
 # - 'simple_form.{yes,no}'
 # - 'simple_form.{placeholders,hints,labels}.*'
 # - 'simple_form.{error_notification,required}.:'
+ignore_unused:
+  - 'unauthorized.*'
 
 ## Exclude these keys from the `i18n-tasks eq-base' report:
 # ignore_eq_base:

config/locales/en.yml

@@ -14,6 +14,14 @@ en:
       language: Site language
     footer:
       copyright: "Ayuntamiento de Madrid, 2015. All rights reserved"
+  admin:
+    dashboard:
+      index:
+        title: Administration
+  moderation:
+    dashboard:
+      index:
+        title: Moderation
   debates:
     index:
       create_debate: Create a debate
@@ -83,3 +91,7 @@ en:
       subject: Someone has commented on your debate
     reply:
       subject: Someone has replied to your comment
+  unauthorized:
+    default: "You are not authorized to access this page."
+    manage:
+      all: "You are not authorized to %{action} %{subject}."

config/locales/es.yml

@@ -14,6 +14,14 @@ es:
       language: Idioma de la página
     footer:
       copyright: "Ayuntamiento de Madrid, %{year}. Todos los derechos reservados"
+  admin:
+    dashboard:
+      index:
+        title: Administración
+  moderation:
+    dashboard:
+      index:
+        title: Moderación
   debates:
     index:
       create_debate: Crea un debate
@@ -83,3 +91,21 @@ es:
       subject: Alguien ha comentado en tu debate
     reply:
       subject: Alguien ha respondido a tu comentario
+  unauthorized:
+    default: "No tienes permiso para acceder a esta página."
+    index:
+      all: "No tienes permiso para listar %{subject}"
+    show:
+      all: "No tienes permiso para ver %{subject}"
+    edit:
+      all: "No tienes permiso para editar %{subject}"
+    update:
+      all: "No tienes permiso para modificar %{subject}"
+    create:
+      all: "No tienes permiso para crear %{subject}"
+    delete:
+      all: "No tienes permiso para borrar %{subject}"
+    manage:
+      all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
+
+

config/routes.rb

@@ -17,11 +17,18 @@ Rails.application.routes.draw do
         post :vote
       end
     end
-
   end
 
   resource :account, controller: "account", only: [:show, :update]
 
+  namespace :admin do
+    root to: "dashboard#index"
+  end
+
+  namespace :moderation do
+    root to: "dashboard#index"
+  end
+
   # Example of regular route:
   #   get 'products/:id' => 'catalog#view'