More i18n in activities

app/views/activities/edit.html.erb

@@ -1,6 +1,8 @@
-<h1>Editing Activity</h1>
+<h1>
+  <%= t 'activity.editing' %>
+</h1>
 
 <%= render 'form', activity: @activity %>
 
-<%= link_to 'Show', group_activity_path(@group, @activity) %> |
-<%= link_to 'Back', group_activities_path(@group) %>
+<%= link_to t(:cancel), group_activity_path(@group, @activity) %> |
+<%= link_to t(:back), group_activities_path(@group) %>

app/views/activities/index.html.erb

@@ -10,9 +10,9 @@
   <tbody>
     <% @activities.each do |activity| %>
       <tr>
-        <td><%= link_to 'Show', group_activity_path(@group, activity) %></td>
-        <td><%= link_to 'Edit', edit_group_activity_path(@group, activity) %></td>
-        <td><%= link_to 'Destroy', group_activity_path(@group, activity), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to t(:show), group_activity_path(@group, activity) %></td>
+        <td><%= link_to t(:edit), edit_group_activity_path(@group, activity) %></td>
+        <td><%= link_to t(:destroy), group_activity_path(@group, activity), method: :delete, data: { confirm: t(:areyousure) } %></td>
       </tr>
     <% end %>
   </tbody>
@@ -20,4 +20,4 @@
 
 <br>
 
-<%= link_to 'New Activity', new_group_activity_path(@group) %>
+<%= link_to t('activities.new'), new_group_activity_path(@group) %>

app/views/activities/new.html.erb

@@ -1,5 +1,5 @@
-<h1>New Activity</h1>
+<h1><%= t('activities.new') %></h1>
 
 <%= render 'form', activity: @activity %>
 
-<%= link_to 'Back', group_activities_path(@group) %>
+<%= link_to t(:back), group_activities_path(@group) %>

app/views/activities/show.html.haml

@@ -11,24 +11,24 @@
       %table.table
         %tr
           %td
-            Organizers:
+            = t 'activities.attrs.organizers'
           %td
             = @organizers
         %tr
           %td
-            Description:
+            = t 'activities.attrs.description'
           %td
             = @activity.description
 
         %tr
           %td
-            Location:
+            = t 'activities.attrs.location'
           %td
             = @activity.location
 
         %tr
           %td
-            When:
+            = t 'activities.attrs.when'
 
           %td
             = @activity.start
@@ -37,7 +37,7 @@
 
         %tr
           %td
-            Deadline:
+            = t 'activities.attrs.deadline'
 
           %td
             = @activity.deadline
@@ -46,30 +46,21 @@
     .col-md-3
       .panel.panel-default
         .panel-heading
-          Your response
+          = t 'activities.participant.yourresponse'
         .panel-body
           = render partial: "activities/wide_presence_buttons", locals: {activity: @activity, person: @ownparticipant.person, state: @ownparticipant.attending}
 
-          -#.btn-group.btn-group-justified
-            -#.btn-group
-              -#%button.btn.btn-success
-                -#Present
-
-            -#.btn-group
-              -#%button.btn.btn-danger
-                -#Absent
-
           = editable @ownparticipant,
             :notes,
             url: presence_group_activity_path(@activity.group, @activity, person_id: @ownparticipant.person_id),
-            title: "Notes",
+            title: t('activities.participant.notes'),
             value: "",
-            emptytext: "Add notes..."
+            emptytext: t('activities.participant.add_notes')
 
 .hidden-xs
   %h2
     = @num_participants
-    participants
+    = t 'activities.participant.plural'
     = render partial: "state_counts", locals: {counts: @counts}
 
   %table.table.table-bordered
@@ -81,7 +72,7 @@
             %i.fa.fa-star-o
 
         %td
-          = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: "Notes", value: p.notes, emptytext: "--"
+          = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activities.participant.notes'), value: p.notes, emptytext: "--"
 
         %td
           = render partial: "activities/presence_buttons", locals: {activity: @activity, person: p.person, state: p.attending}
@@ -89,9 +80,6 @@
 .hidden-sm.hidden-md.hidden-lg
   .panel.panel-default.panel-success
     .panel-heading
-      -#%button.btn.btn-default.btn-sm{data: {toggle: 'collapse', target: '#present-collapse'}}
-        -#%i.fa.fa-arrows-v
-
       %a{role: 'button', href: '#present-collapse', data: {toggle: 'collapse'}, 'aria-expanded': 'false'}
 
         %span.sv-show-collapsed
@@ -100,7 +88,7 @@
         %span.sv-show-expanded
           %i.fa.fa-angle-up
 
-        Present
+        = t 'activities.state.present'
         %span.badge
           = @counts[true]
 
@@ -118,7 +106,7 @@
 
           %tr{data: {person_id: p.person_id, activity_id: @activity.id}}
             %td{colspan: "2"}
-              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: "Notes", value: p.notes, emptytext: "--"
+              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activities.participant.notes'), value: p.notes, emptytext: "--"
 
 
   .panel.panel-default
@@ -130,7 +118,9 @@
 
         %span.sv-show-expanded
           %i.fa.fa-angle-up
-        No reaction
+
+        = t 'activities.state.need_response'
+
         %span.badge
           = @counts[nil]
 
@@ -148,7 +138,7 @@
 
           %tr{data: {person_id: p.person_id, activity_id: @activity.id}}
             %td{colspan: "2"}
-              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: "Notes", value: p.notes, emptytext: "--"
+              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activitites.participant.notes'), value: p.notes, emptytext: "--"
 
   .panel.panel-default.panel-danger
     .panel-heading
@@ -159,7 +149,9 @@
 
         %span.sv-show-expanded
           %i.fa.fa-angle-up
-        Absent
+
+        = t 'activities.state.absent'
+
         %span.badge
           = @counts[false]
 
@@ -177,4 +169,4 @@
 
           %tr{data: {person_id: p.person_id, activity_id: @activity.id}}
             %td{colspan: "2"}
-              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: "Notes", value: p.notes, emptytext: "--"
+              = editable p, :notes, url: presence_group_activity_path(@activity.group, @activity, person_id: p.person_id), title: t('activitites.participant.notes'), value: p.notes, emptytext: "--"

config/locales/activities/en.yml

@@ -3,9 +3,14 @@ en:
     singular: Activity
     plural: Activities
 
+    new: Nieuwe activiteit
+
     participant:
+      singular: participant
+      plural: participants
       notes: Notes
       add_notes: Add notes
+      yourresponse: Your response
 
     state:
       need_response: Need response
@@ -19,3 +24,6 @@ en:
       when: When
       where: Where
       actions: Actions
+      organizers: Organizers
+      description: Description
+      deadline: Deadline

config/locales/activities/nl.yml

@@ -3,9 +3,14 @@ nl:
     singular: Activiteit
     plural: Activiteiten
 
+    new: New activity
+
     participant:
+      singular: deelnemer
+      plural: deelnemers
       notes: Opmerkingen
       add_notes: Opmerkingen toevoegen
+      yourresponse: Jouw antwoord
 
     state:
       need_response: Niet gereageerd
@@ -19,3 +24,6 @@ nl:
       when: Wanneer
       where: Waar
       actions: Acties
+      organizers: Organisatoren
+      description: Omschrijving
+      deadline: Deadline

config/locales/en.yml

@@ -26,3 +26,11 @@ en:
 
   log_out: Log out
   log_in: Log in
+
+  cancel: Cancel
+  back: Back
+  show: Show
+  edit: Edit
+  destroy: Delete
+
+  areyousure: Are you sure?

config/locales/nl.yml

@@ -1,6 +1,15 @@
 nl:
   hello: "Hallo wereld"
+
   collapse: "Inklappen"
 
   log_out: Uitloggen
   log_in: Inloggen
+
+  cancel: Annuleren
+  back: Terug
+  show: Weergeven
+  edit: Bewerken
+  destroy: Verwijderen
+
+  areyousure: Weet je het zeker?