Merge pull request #905 from Ana06/languages

Languages

app/views/admin/events/_proposal.html.haml

@@ -98,6 +98,14 @@
                                               off_text: 'No' }
           - if @event.require_registration
             = registered_text(@event)
+
+      -if @program.languages.present?
+        %tr
+          %td
+            %b Language
+          %td
+            = @event.language
+
       - if !@event.room.nil?
         %tr
           %td

app/views/admin/events/index.html.haml

@@ -22,6 +22,9 @@
           %b Submitter
         %th
           %b Speaker
+        -if @program.languages.present?
+          %th
+            %b Language
         %th
           %b Requires Registration
         %th
@@ -83,6 +86,10 @@
             - else
               Unknown speaker
 
+          -if @program.languages.present?
+            %td
+              = event.language
+
           %td.text-center{'data-order' => "#{event.require_registration}"}
             = check_box_tag @conference.short_title, event.id, event.require_registration,
               method: :patch, url: "/admin/conference/#{@conference.short_title}/program/events/#{event.id}?event[require_registration]=",