Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

i18n simple_form move of deliveries

Browse source
This commit is contained in:
wvengen 2013-10-09 23:19:40 +02:00
parent c3d22e883d
commit 6ba971fe15
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/deliveries/index.html.haml
View file

@ -3,9 +3,9 @@
%table.table.table-striped %table.table.table-striped
%thead %thead
%tr %tr
%th= t 'simple_form.labels.delivery.delivered_on' %th= heading_helper Delivery, :delivered_on
%th.numeric= t 'deliveries.invoice_amount' %th.numeric= t 'deliveries.invoice_amount'
%th= t 'simple_form.labels.defaults.note' %th= heading_helper Delivery, :note
%tbody %tbody
- for delivery in @deliveries - for delivery in @deliveries
%tr %tr

6
app/views/deliveries/show.html.haml
View file

@ -1,16 +1,16 @@
- title t('.title') - title t('.title')
%dl %dl
%dt= t 'simple_form.labels.delivery.supplier' %dt= heading_helper Delivery, :supplier
%dd= @delivery.supplier.name %dd= @delivery.supplier.name
%dt= t 'simple_form.labels.delivery.delivered_on' %dt= heading_helper Delivery, :delivered_on
%dd= @delivery.delivered_on %dd= @delivery.delivered_on
%dt= t 'deliveries.invoice_amount' %dt= t 'deliveries.invoice_amount'
%dd= link_to_invoice(@delivery) %dd= link_to_invoice(@delivery)
- if @delivery.invoice - if @delivery.invoice
%dt= t 'deliveries.invoice_net_amount' %dt= t 'deliveries.invoice_net_amount'
%dd= number_to_currency @delivery.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 %dd= simple_format @delivery.note
%h2= t '.title_articles' %h2= t '.title_articles'

7
config/locales/de.yml
View file

@ -46,6 +46,10 @@ de:
tax: MwSt tax: MwSt
unit: Einheit unit: Einheit
unit_quantity: Gebindegröße unit_quantity: Gebindegröße
delivery:
delivered_on: Lieferdatum
note: Notiz
supplier: Lieferantin
financial_transaction: financial_transaction:
amount: Betrag amount: Betrag
note: Notiz note: Notiz
@ -1612,9 +1616,6 @@ de:
title: Titel title: Titel
unit_quantity: Gebindegröße unit_quantity: Gebindegröße
user_tokens: Mitglieder user_tokens: Mitglieder
delivery:
delivered_on: Lieferdatum
supplier: Lieferantin
group_order_article: group_order_article:
ordergroup_id: Bestellgruppe ordergroup_id: Bestellgruppe
result: Menge result: Menge

6
config/locales/en.yml
View file

@ -57,6 +57,9 @@ en:
article_category: article_category:
description: Description description: Description
name: Name name: Name
delivery:
delivered_on: Delivery date
supplier: Supplier
financial_transaction: financial_transaction:
amount: amount amount: amount
note: note note: note
@ -1622,9 +1625,6 @@ en:
title: Title title: Title
unit_quantity: Unit quantity unit_quantity: Unit quantity
user_tokens: Members user_tokens: Members
delivery:
delivered_on: Delivery date
supplier: Supplier
group_order_article: group_order_article:
ordergroup_id: Ordergroup ordergroup_id: Ordergroup
result: Amount result: Amount