From 67e29620f4e957bdd5c5a4a9e88afaff3b5d1810 Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Wed, 9 Oct 2013 23:37:08 +0200
Subject: [PATCH] i18n simple_form move of invoices

---
 .../finance/invoices/_invoices.html.haml      | 16 +++++++-------
 app/views/finance/invoices/show.html.haml     | 20 ++++++++---------
 config/locales/de.yml                         | 22 +++++++++----------
 config/locales/en.yml                         | 22 +++++++++----------
 4 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/app/views/finance/invoices/_invoices.html.haml b/app/views/finance/invoices/_invoices.html.haml
index 1663c609..621a08fe 100644
--- a/app/views/finance/invoices/_invoices.html.haml
+++ b/app/views/finance/invoices/_invoices.html.haml
@@ -5,14 +5,14 @@
 %table.table.table-striped
   %thead
     %tr
-      %th= t 'simple_form.labels.invoice.number'
-      %th= t 'simple_form.labels.invoice.supplier'
-      %th= t 'simple_form.labels.invoice.date'
-      %th= t 'simple_form.labels.invoice.paid_on'
-      %th= t 'simple_form.labels.invoice.amount'
-      %th= t 'simple_form.labels.invoice.delivery'
-      %th= t 'simple_form.labels.invoice.order'
-      %th= t 'simple_form.labels.invoice.note'
+      %th= heading_helper Invoice, :number
+      %th= heading_helper Invoice, :supplier
+      %th= heading_helper Invoice, :date
+      %th= heading_helper Invoice, :paid_on
+      %th= heading_helper Invoice, :amount
+      %th= heading_helper Invoice, :delivery
+      %th= heading_helper Invoice, :order
+      %th= heading_helper Invoice, :note
       %th
       %th
   %tbody
diff --git a/app/views/finance/invoices/show.html.haml b/app/views/finance/invoices/show.html.haml
index 28bb4519..1106aa5c 100644
--- a/app/views/finance/invoices/show.html.haml
+++ b/app/views/finance/invoices/show.html.haml
@@ -1,38 +1,38 @@
 - title t('.title', number: @invoice.number)
 
 %p
-  %b= t('simple_form.labels.invoice.supplier') + ':'
+  %b= heading_helper(Invoice, :supplier) + ':'
   = @invoice.supplier.name
 
 - if @invoice.delivery
   %p
-    %b= t('simple_form.labels.invoice.delivery') + ':'
+    %b= heading_helper(Invoice, :delivery) + ':'
     = t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_delivery'), [@invoice.supplier,@invoice.delivery])).html_safe
 - if @invoice.order
   %p
-    %b= t('simple_form.labels.invoice.order') + ':'
+    %b= heading_helper(Invoice, :order) + ':'
     = t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), @invoice.order)).html_safe
 
 %p
-  %b= t('simple_form.labels.invoice.number') + ':'
+  %b= heading_helper(Invoice, :number) + ':'
   = @invoice.number
 %p
-  %b= t('simple_form.labels.invoice.date') + ':'
+  %b= heading_helper(Invoice, :date) + ':'
   = @invoice.date
 %p
-  %b= t('simple_form.labels.invoice.paid_on') + ':'
+  %b= heading_helper(Invoice, :paid_on) + ':'
   = @invoice.paid_on
 %p
-  %b= t('simple_form.labels.invoice.amount') + ':'
+  %b= heading_helper(Invoice, :amount) + ':'
   = number_to_currency @invoice.amount
 %p
-  %b= t('simple_form.labels.invoice.deposit') + ':'
+  %b= heading_helper(Invoice, :deposit) + ':'
   = number_to_currency @invoice.deposit
 %p
-  %b= t('simple_form.labels.invoice.deposit_credit') + ':'
+  %b= heading_helper(Invoice, :deposit_credit) + ':'
   = number_to_currency @invoice.deposit_credit
 %p
-  %b= t('simple_form.labels.invoice.note') + ':'
+  %b= heading_helper(Invoice, :note) + ':'
   =h @invoice.note
 
 = link_to t('ui.edit'), edit_finance_invoice_path(@invoice)
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0145c947..f016c5c5 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -53,6 +53,17 @@ de:
       financial_transaction:
         amount: Betrag
         note: Notiz
+      invoice:
+        amount: Betrag
+        date: Rechnungsdatum
+        delivery: Lieferung
+        deposit: Pfand berechnet
+        deposit_credit: Pfand gutgeschrieben
+        note: Notiz
+        number: Nummer
+        order: Bestellung
+        paid_on: Bezahlt am
+        supplier: Lieferant
       stock_article:
         price: Nettopreis
       supplier:
@@ -1619,17 +1630,6 @@ de:
       group_order_article:
         ordergroup_id: Bestellgruppe
         result: Menge
-      invoice:
-        amount: Betrag
-        date: Rechnungsdatum
-        delivery: Lieferung
-        deposit: Pfand berechnet
-        deposit_credit: Pfand gutgeschrieben
-        note: Notiz
-        number: Nummer
-        order: Bestellung
-        paid_on: Bezahlt am
-        supplier: Lieferant
       message:
         body: Inhalt
         group_id: Gruppe
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fb322d84..dfdb1475 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -63,6 +63,17 @@ en:
       financial_transaction:
         amount: amount
         note: note
+      invoice:
+        amount: Amount
+        date: Billing date
+        delivery: Delivery
+        deposit: Deposit charged
+        deposit_credit: Deposit returned
+        note: Note
+        number: Number
+        order: Order
+        paid_on: Paid on
+        supplier: Supplier
       stock_article:
         price: Price
       supplier:
@@ -1628,17 +1639,6 @@ en:
       group_order_article:
         ordergroup_id: Ordergroup
         result: Amount
-      invoice:
-        amount: Amount
-        date: Billing date
-        delivery: Delivery
-        deposit: Deposit charged
-        deposit_credit: Deposit returned
-        note: Note
-        number: Number
-        order: Order
-        paid_on: Paid on
-        supplier: Supplier
       message:
         body: Body
         group_id: Group