Added comments

config/locales/en.yml

@@ -234,7 +234,7 @@ en:
   time:
     am: am
     formats:
-      default: "%a, %d %b %Y %H:%M:%S %z"
+      default: "%a, %d %b %Y %H:%M"
       long: "%l%P, %B %e, %Y"
       short: "%l:%M%P"
     pm: pm
@@ -5542,6 +5542,7 @@ en:
         facilitate: Request to Facilitate ‘%{workshop_title}’
         add_facilitator: Add a facilitator
         needs_facilitators: Looking for help?
+        Comments: Comments
       paragraphs:
         Proposed_Workshops: Would you like to facilitate your own workshop? Simply
           register and visit the workshops page. If you have already registered you
@@ -5657,6 +5658,8 @@ en:
         delete: Delete
         place_guest: Place Guest
         set_host: Set Host
+        add_comment: Add Comment
+        reply: Reply
       aria:
         remove_interest: Click if you are no longer interested in this workshop
         show_interest: Click if you are interested in this workshop
@@ -5806,6 +5809,9 @@ en:
         denied
       workshop_translated: The %{language} translation for %{workshop_title} has been modified
       workshop_original_content_changed: Original content for %{workshop_title} has been modified
+      workshop_comment:
+        comment: '%{user_name} commented on %{workshop_title}'
+        reply: '%{user_name} replied to your comment'
     general:
       paragraph:
         see_you: See you in %{conference_location}!
@@ -5825,6 +5831,9 @@ en:
       paragraph:
         workshop_translated: '%{user_name} has modified the %{language} translation for %{workshop_title}.'
         workshop_original_content_changed: '%{user_name} has modified the original content for %{workshop_title}. Translations may need to be updated.'
+    workshop_comment:
+      paragraph:
+        user_said: '%{user_name} said: '
     workshop:
       paragraph:
         request_approved: You have been added as a facilitator of %{workshop_title}.
@@ -5836,3 +5845,4 @@ en:
         request_message: "%{user_name} has requested to help facilitate %{workshop_title}:"
         request_reply_instructions: You can also reply directly to this email to ask
           follow-up questions.
+        view_workshop: 'View the workshop here: '

config/locales/es.yml

@@ -199,7 +199,7 @@ es:
   time:
     am: am
     formats:
-      default: '%A, %d de %B de %Y %H:%M:%S %z'
+      default: '%A, %d de %B de %Y %H:%M'
       long: '%d de %B de %Y %H:%M'
       short: '%H:%M'
     pm: pm
@@ -838,7 +838,7 @@ es:
       term:
         education: Los talleres tienen un enfoque en la educación, en enseñar a otros
           cómo arreglar bicicletas
-        export_bikes: ''
+        export_bikes: Organizaciones que se incluyen bicicletas para las comunidades de otros países.
         low_cost: Hay organizaciones que envían bicicletas donadas a comunidades en
           otros países
         no_money: Hay organizaciones que reciclan bicicletas y algunas de sus partes
@@ -1068,8 +1068,6 @@ es:
       no_value: Indefinido
       pages: 'Páginas:'
       pluraliztion_same_as_other: Igual que el otro
-      test:
-        one: ''
       Enabled_Locales: Idiomas habilitados
       History: Historia
       Locale_Translation: Traducción en %%{language}

config/routes.rb

@@ -35,6 +35,7 @@ BikeBike::Application.routes.draw do
     match '/conferences/:slug/workshops/:workshop_id/edit' => 'conferences#edit_workshop', :as => :edit_workshop, via: [:get, :post]
     match '/conferences/:slug/workshops/:workshop_id/translate/:locale' => 'conferences#translate_workshop', :as => :translate_workshop, via: [:get, :post]
     match '/conferences/:slug/workshops/:workshop_id/delete' => 'conferences#delete_workshop', :as => :delete_workshop, via: [:get, :post]
+    post  '/conferences/:slug/workshops/:workshop_id/comment' => 'conferences#add_comment', :as => :workshop_comment
     get   '/conferences/:slug/workshops/:workshop_id/facilitate' => 'conferences#facilitate_workshop', :as => :facilitate_workshop
     post  '/conferences/:slug/workshops/:workshop_id/facilitate_request' => 'conferences#facilitate_request', :as => :facilitate_workshop_request
     get   '/conferences/:slug/workshops/:workshop_id/facilitate_request/:user_id/:approve_or_deny' => 'conferences#approve_facilitate_request', :as => :approve_facilitate_workshop_request