Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks

Conflicts:
	config/locales/de.yml

app/views/tasks/_archive_tasks.html.haml

@@ -5,13 +5,13 @@
 %table.table.table-striped
   %thead
     %tr
-      %th Fälligkeitsdatum
-      %th Betreff
-      %th Verantwortliche Menschen
+      %th= t '.due_date'
+      %th= t '.task'
+      %th= t '.who'
       %th
   %tbody
     - @tasks.each do |task|
       %tr
         %td= task.due_date unless task.due_date.nil?
-        %td= link_to "#{task.name} (#{task.duration}h)", :controller => "tasks", :action => "show", :id => task
-        %td= task_assignments task
+        %td= link_to t('.task_format', name: task.name, duration: task.duration), :controller => "tasks", :action => "show", :id => task
+        %td= task_assignments task

app/views/tasks/_form.html.haml

@@ -4,9 +4,9 @@
       $("#task_user_list").tokenInput("#{users_path(:format => :json)}", {
         crossDomain: false,
         prePopulate: $("#task_user_list").data("pre"),
-        hintText: 'Nach Nutzerin suchen',
-        noResultText: 'Keine Nutzerin gefunden',
-        searchingText: 'Suche ...',
+        hintText: '#{escape_javascript(t('.search.hint'))}',
+        noResultText: '#{escape_javascript(t('.search.noresult'))}',
+        searchingText: '#{escape_javascript(t('.search.placeholder'))}',
         theme: 'facebook'
       });
     });
@@ -27,4 +27,4 @@
   = f.input :done
   .form-actions
     = f.submit class: 'btn'
-    = link_to 'oder abbrechen', :back
+    = link_to t('ui.or_cancel'), :back

app/views/tasks/_list.haml

@@ -1,29 +1,27 @@
 %table.table.table-striped
   %thead
     %tr
-      %th Fälligkeit
-      %th Betreff
+      %th= t '.due_date'
+      %th= t '.task'
       %th{:colspan => '2'}
-        Wer machts?
-        %small (Wie viele werden noch benötigt?)
+        = t '.who'
+        %small= t '.who_hint'
   %tbody
     - tasks.each do |task|
       - done = task.done ? " done" : ""
       %tr{:class => done }
         %td= format_date(task.due_date) unless task.due_date.nil?
-        %td= link_to "#{task.name} (#{task.duration}h)", task_path(task)
+        %td= link_to t('.task_format', name: task.name, duration: task.duration), task_path(task)
         %td
           = task_assignments task
           = highlighted_required_users task
         %td
           - if !task.is_accepted?(current_user)
-            = link_to "Aufgabe übernehmen", accept_task_path(task), method: :post, class: 'btn btn-small'
-            = link_to "Aufgabe ablehnen", reject_task_path(task), method: :post, class: 'btn btn-small' if task.is_assigned?(current_user)
+            = link_to t('.accept_task'), accept_task_path(task), method: :post, class: 'btn btn-small'
+            = link_to t('.reject_task'), reject_task_path(task), method: :post, class: 'btn btn-small' if task.is_assigned?(current_user)
           - elsif !task.done
             = link_to set_done_task_path(task), method: :post, class: 'btn btn-small',
-              title: 'Aufgabe als erledigt markieren' do
-              %i.icon-ok
-              Erledigt?
+              title: t('.mark_done') do
+              %i.icon-ok= t '.done_q'
           - else
-            %i.icon-ok
-            Erledigt
+            %i.icon-ok= t '.done'

app/views/tasks/_nav.haml

@@ -1,13 +1,13 @@
 - content_for :actionbar do
-  = link_to "Neue Aufgabe erstellen", new_task_path, class: 'btn btn-primary'
+  = link_to t('.new_task'), new_task_path, class: 'btn btn-primary'
 
 - content_for :sidebar do
   .well.well-small
     %ul.nav.nav-list
       %li.nav-header Seiten
-      %li= link_to "Meine Aufgaben", user_tasks_path
-      %li= link_to "Alle Aufgaben", tasks_path
-      %li= link_to "Erledigte Aufgaben (Archiv)", archive_tasks_path
-      %li.nav-header Gruppenaufgaben
+      %li= link_to t('.my_tasks'), user_tasks_path
+      %li= link_to t('.all_tasks'), tasks_path
+      %li= link_to t('.archive'), archive_tasks_path
+      %li.nav-header= t '.group_tasks'
       - for group in Workgroup.all
-        %li= link_to group.name, workgroup_tasks_path(workgroup_id: group.id)
+        %li= link_to group.name, workgroup_tasks_path(workgroup_id: group.id)

app/views/tasks/archive.haml

@@ -1,4 +1,4 @@
-- title "Aufgabenarchiv"
+- title t('.title')
 = render 'nav'
 
 #tasks= render 'archive_tasks'

app/views/tasks/edit.haml

@@ -1,3 +1,3 @@
-- title "Aufgabe bearbeiten"
+- title t('.title')
 
-= render 'form'
+= render 'form'

app/views/tasks/index.haml

@@ -1,9 +1,9 @@
-- title "Aufgaben"
+- title t('.title')
 = render 'nav'
 
 - unless @non_group_tasks.empty?
   %section
-    %h3 Aufgaben für alle!
+    %h3= t '.title_non_group'
     = render 'list', tasks: @non_group_tasks
 
 
@@ -13,6 +13,6 @@
     %section
       %h3
         = group.name
-        %small= link_to "Gruppenaufgaben anzeigen", workgroup_tasks_path(group)
+        %small= link_to t('.show_group_tasks'), workgroup_tasks_path(group)
       = render 'list', tasks: tasks
-      = link_to_top
+      = link_to_top

app/views/tasks/new.haml

@@ -1,3 +1,3 @@
-- title "Neue Aufgabe erstellen"
+- title t('.title')
 
 = render 'form'

app/views/tasks/show.haml

@@ -1,31 +1,31 @@
-- title "Aufgabe anzeigen"
+- title t('.title')
 = render 'nav'
 
 %section
   %dl.dl-horizontal
-    %dt Name
+    %dt= t 'simple_form.labels.task.name'
     %dd= @task.name
     - if @task.description.present?
-      %dt Beschreibung
+      %dt= t 'simple_form.labels.defaults.description'
       %dd= simple_format(@task.description)
     - if @task.due_date.present?
-      %dt Fälligkeitsdatum
+      %dt= t '.due_date'
       %dd= format_date(@task.due_date)
-    %dt Dauer in Stunden
-    %dd= @task.duration
-    %dt Verantwortliche Menschen
+    %dt= t 'simple_form.labels.task.duration'
+    %dd= t('.hours', count: @task.duration)
+    %dt= t 'simple_form.labels.task.user_list'
     %dd= task_assignments(@task)
-    %dt Arbeitsgruppe
+    %dt= t 'simple_form.labels.task.workgroup'
     %dd
       - if @task.workgroup
         = link_to @task.workgroup.name, workgroup_tasks_path(workgroup_id: @task.workgroup_id)
 %p
   - if !@task.is_accepted?(current_user)
-    = link_to "Aufgabe übernehmen", accept_task_path(@task), method: :post, class: 'btn btn-success'
+    = link_to t('.accept_task'), accept_task_path(@task), method: :post, class: 'btn btn-success'
     - if @task.is_assigned?(current_user)
-      = link_to "Aufgabe ablehnen", reject_task_path(@task), method: :post, class: 'btn'
+      = link_to t('.reject_task'), reject_task_path(@task), method: :post, class: 'btn'
   - unless @task.done?
-    = link_to 'Als erledigt markieren', set_done_task_path(@task), method: :post, class: 'btn'
-  = link_to "Bearbeiten", edit_task_path(@task), class: 'btn'
-  = link_to "Löschen", task_path(@task), :method => :delete, :confirm => "Die Aufgabe wirklich löschen?",
+    = link_to t('.mark_done'), set_done_task_path(@task), method: :post, class: 'btn'
+  = link_to t('ui.edit'), edit_task_path(@task), class: 'btn'
+  = link_to t('ui.delete'), task_path(@task), :method => :delete, :confirm => "Die Aufgabe wirklich löschen?",
     class: 'btn btn-danger'

app/views/tasks/user.html.haml

@@ -3,17 +3,15 @@
 
 - unless @unaccepted_tasks.empty?
   %section
-    %h3 Offene Aufgaben
+    %h3= t '.title_open'
     = render 'list', tasks: @unaccepted_tasks
 
 %section
-  %h3 Anstehende Aufgaben
+  %h3= t '.title_accepted'
   - unless @accepted_tasks.empty?
     = render 'list', tasks: @accepted_tasks
   - else
-    Nichts zu tun?
-    = link_to "Hier", tasks_path
-    gibt es bestimmt Arbeit.
+    = t('.more', tasks_link: link_to(t('.tasks_link'), tasks_path)).html_safe
   %br/
   = link_to_top
 

app/views/tasks/workgroup.haml

@@ -1,21 +1,20 @@
-- title "Aufgaben für #{@group.name}"
+- title t('.title', workgroup: @group.name)
 = render 'nav'
 
 %section.well
-  %h3 Wöchentliche Aufgaben
+  %h3= t '.weekly.title'
   - if @group.weekly_task
-    %p Jeden <b>#{weekday(@group.weekday)}</b> hat diese Arbeitsgruppe folgenden Job: <b>#{@group.task_name}</b>
-    %p Die Wochenaufgaben werden von der Foodsoft automatisch erstellt. Eintragen müsst Ihr Euch aber selber.
+    = t('.weekly.desc', weekday: weekday(@group.weekday), task: @group.task_name).html_safe
   - else
-    Noch keine Wochenaufgaben angelegt.
+    = t('.weekly.empty').html_safe
 
   - if @current_user.member_of?(@group) or @current_user.role_admin?
-    = link_to "Wöchentliche Aufgaben anpassen", edit_foodcoop_workgroup_path(@group), class: 'btn'
+    = link_to t('.weekly.edit'), edit_foodcoop_workgroup_path(@group), class: 'btn'
 
 %section
-  %h3 Alle Aufgaben der Gruppe
+  %h3= t '.title_all'
   = render 'list', tasks: @group.open_tasks
   %br/
   = link_to_top
 
-  
+