From 6ba971fe15f5e2774680141423b5d7f56450a031 Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Wed, 9 Oct 2013 23:19:40 +0200
Subject: [PATCH] i18n simple_form move of deliveries

---
 app/views/deliveries/index.html.haml | 4 ++--
 app/views/deliveries/show.html.haml  | 6 +++---
 config/locales/de.yml                | 7 ++++---
 config/locales/en.yml                | 6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/views/deliveries/index.html.haml b/app/views/deliveries/index.html.haml
index 16b0388b..423332b1 100644
--- a/app/views/deliveries/index.html.haml
+++ b/app/views/deliveries/index.html.haml
@@ -3,9 +3,9 @@
 %table.table.table-striped
   %thead
     %tr
-      %th= t 'simple_form.labels.delivery.delivered_on'
+      %th= heading_helper Delivery, :delivered_on
       %th.numeric= t 'deliveries.invoice_amount'
-      %th= t 'simple_form.labels.defaults.note'
+      %th= heading_helper Delivery, :note
   %tbody
     - for delivery in @deliveries
       %tr
diff --git a/app/views/deliveries/show.html.haml b/app/views/deliveries/show.html.haml
index 05a39db6..d5df7fd5 100644
--- a/app/views/deliveries/show.html.haml
+++ b/app/views/deliveries/show.html.haml
@@ -1,16 +1,16 @@
 - title t('.title')
 
 %dl
-  %dt= t 'simple_form.labels.delivery.supplier'
+  %dt= heading_helper Delivery, :supplier
   %dd= @delivery.supplier.name
-  %dt= t 'simple_form.labels.delivery.delivered_on'
+  %dt= heading_helper Delivery, :delivered_on
   %dd= @delivery.delivered_on
   %dt= t 'deliveries.invoice_amount'
   %dd= link_to_invoice(@delivery)
   - if @delivery.invoice
     %dt= t 'deliveries.invoice_net_amount'
     %dd= number_to_currency @delivery.invoice.net_amount
-  %dt= t 'simple_form.labels.defaults.note'
+  %dt= heading_helper Delivery, :note
   %dd= simple_format @delivery.note
 
 %h2= t '.title_articles'
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b2f0f149..0145c947 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -46,6 +46,10 @@ de:
         tax: MwSt
         unit: Einheit
         unit_quantity: Gebindegröße
+      delivery:
+        delivered_on: Lieferdatum
+        note: Notiz
+        supplier: Lieferantin
       financial_transaction:
         amount: Betrag
         note: Notiz
@@ -1612,9 +1616,6 @@ de:
         title: Titel
         unit_quantity: Gebindegröße
         user_tokens: Mitglieder
-      delivery:
-        delivered_on: Lieferdatum
-        supplier: Lieferantin
       group_order_article:
         ordergroup_id: Bestellgruppe
         result: Menge
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65b84388..fb322d84 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -57,6 +57,9 @@ en:
       article_category:
         description: Description
         name: Name
+      delivery:
+        delivered_on: Delivery date
+        supplier: Supplier
       financial_transaction:
         amount: amount
         note: note
@@ -1622,9 +1625,6 @@ en:
         title: Title
         unit_quantity: Unit quantity
         user_tokens: Members
-      delivery:
-        delivered_on: Delivery date
-        supplier: Supplier
       group_order_article:
         ordergroup_id: Ordergroup
         result: Amount