From 552af7925d6ecf865962f638093c5bc77af8be1b Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Wed, 9 Oct 2013 22:41:23 +0200
Subject: [PATCH] i18n simple_form move of tasks

---
 app/views/tasks/show.haml | 12 ++++++------
 config/locales/en.yml     | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/tasks/show.haml b/app/views/tasks/show.haml
index 644151fa..86de92bf 100644
--- a/app/views/tasks/show.haml
+++ b/app/views/tasks/show.haml
@@ -3,22 +3,22 @@
 
 %section
   %dl.dl-horizontal
-    %dt= t 'simple_form.labels.task.name'
+    %dt= Task.human_attribute_name(:name)
     %dd= @task.name
     - if @task.description.present?
-      %dt= t 'simple_form.labels.defaults.description'
+      %dt= Task.human_attribute_name(:description)
       %dd= simple_format(@task.description)
     - if @task.due_date.present?
-      %dt= t '.due_date'
+      %dt= Task.human_attribute_name(:due_date)
       %dd 
         = format_date(@task.due_date)
         - if @task.periodic?
           %i.icon-repeat{title: t('tasks.repeated')}
-    %dt= t 'simple_form.labels.task.duration'
+    %dt= Task.human_attribute_name(:duration)
     %dd= t('.hours', count: @task.duration)
-    %dt= t 'simple_form.labels.task.user_list'
+    %dt= Task.human_attribute_name(:user_list)
     %dd= task_assignments(@task)
-    %dt= t 'simple_form.labels.task.workgroup'
+    %dt= Task.human_attribute_name(:workgroup)
     %dd
       - if @task.workgroup
         = link_to @task.workgroup.name, workgroup_tasks_path(workgroup_id: @task.workgroup_id)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index afd0b49e..4d46865d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -62,6 +62,14 @@ en:
         note: note
       stock_article:
         price: Price
+      task:
+        done: Done?
+        due_date: Due date
+        duration: Duration
+        name: Name
+        required_users: People required
+        user_list: Responsible user
+        workgroup: Workgroup
       user:
         first_name: First name
         password: Password
@@ -1663,14 +1671,6 @@ en:
         phone: Phone
         phone2: Phone 2
         url: Homepage
-      task:
-        done: Done?
-        due_date: Due date
-        duration: Duration
-        name: Name
-        required_users: People required
-        user_list: Responsible user
-        workgroup: Workgroup
       user:
         email: Email
         last_name: Last name
@@ -1869,9 +1869,9 @@ en:
       notice: The state of the task has been updated
     show:
       accept_task: Accept task
+      confirm_delete_single: Are you sure you want to delete the task?
       confirm_delete_group: Really delete this and all subsequent tasks?
       delete_group: Delete task and subsequent
-      due_date: Due date
       hours: ! '%{count}h'
       mark_done: Mark task as done
       reject_task: Reject task