Merge branch 'master' into aperez-edit-poll-question-answers

config/locales/en/admin.yml

@@ -608,6 +608,10 @@ en:
           video_list: Video list (%{count})
           images: Images
           images_list: Images list
+          documents: Documents
+          documents_list: Documents list
+          document_title: Title
+          document_actions: Actions
     answers:
       new:
         title: New answer

config/locales/es/admin.yml

@@ -601,7 +601,6 @@ es:
         valid_answers: Respuestas válidas
         add_answer: Añadir respuesta
         video_url: Video externo
-        preview: Ver en la web
         answers:
           title: Respuesta
           description: Descripción
@@ -609,6 +608,10 @@ es:
           video_list: Lista de vídeos (%{count})
           images: Imágenes
           images_list: Lista de imágenes
+          documents: Documentos
+          documents_list: Lista de documentos
+          document_title: Título
+          document_actions: Acciones
     answers:
       new:
         title: Nueva respuesta

config/routes.rb

@@ -301,9 +301,10 @@ Rails.application.routes.draw do
       end
 
       resources :questions, shallow: true do
-        resources :answers, except: [:index, :destroy, :delete], controller: 'questions/answers', shallow: true do
+        resources :answers, except: [:index, :destroy], controller: 'questions/answers', shallow: true do
           resources :images, controller: 'questions/answers/images'
           resources :videos, controller: 'questions/answers/videos'
+          get :documents, to: 'questions/answers#documents'
         end
       end
     end