small invoice i18n cleanup/refactoring

This commit is contained in:
wvengen 2013-06-21 14:24:05 +02:00
parent c5c4b1f93f
commit cab6ada8b8
5 changed files with 19 additions and 22 deletions

View file

@ -3,9 +3,9 @@
= f.hidden_field :order_id = f.hidden_field :order_id
- if @invoice.delivery - if @invoice.delivery
%p= t('.linked', what_link: link_to(t('.delivery'), [@invoice.supplier,@invoice.delivery])).html_safe %p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_delivery'), [@invoice.supplier,@invoice.delivery])).html_safe
- if @invoice.order - if @invoice.order
%p= t('.linked', what_link: link_to(t('.order'), @invoice.order)).html_safe %p= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), @invoice.order)).html_safe
= f.association :supplier, hint: false = f.association :supplier, hint: false
= f.input :number = f.input :number

View file

@ -1,12 +1,18 @@
- title t('.title', number: @invoice.number) - title t('.title', number: @invoice.number)
%p %p
%b= t 'simple_form.labels.invoice.supplier' %b= t('simple_form.labels.invoice.supplier') + ':'
= @invoice.supplier.name = @invoice.supplier.name
- if @invoice.delivery - if @invoice.delivery
%p %p
%b= t('simple_form.labels.invoice.delivery') + ':' %b= t('simple_form.labels.invoice.delivery') + ':'
= t('.linked', what_link: link_to(t('.delivery'), [@invoice.supplier,@invoice.delivery])).html_safe = 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') + ':'
= t('finance.invoices.linked', what_link: link_to(t('finance.invoices.linked_order'), @invoice.order)).html_safe
%p %p
%b= t('simple_form.labels.invoice.number') + ':' %b= t('simple_form.labels.invoice.number') + ':'
= @invoice.number = @invoice.number

View file

@ -668,23 +668,20 @@ de:
invoices: invoices:
edit: edit:
title: Rechnung bearbeiten title: Rechnung bearbeiten
form:
delivery: Lieferung
linked: Diese Rechnung ist mit einer %{what_link} verknüpft.
order: Bestellung
index: index:
action_new: Neue Rechnung anlegen action_new: Neue Rechnung anlegen
title: Rechnungen title: Rechnungen
invoices: invoices:
confirm_delete: Bist Du sicher? confirm_delete: Bist Du sicher?
delivery: Lieferung delivery: Lieferung
linked: Diese Rechnung ist mit %{what_link} verknüpft.
linked_delivery: einer Lieferung
linked_order: einer Bestellung
new: new:
back: Züruck back: Züruck
title: Neue Rechnung anlegen title: Neue Rechnung anlegen
show: show:
back: Züruck back: Züruck
delivery: Lieferung
linked: Diese Rechnung ist mit einer %{what_link} verknüpft.
title: Rechnung %{number} title: Rechnung %{number}
order_articles: order_articles:
edit: edit:

View file

@ -670,23 +670,20 @@ en:
invoices: invoices:
edit: edit:
title: Edit invoice title: Edit invoice
form:
delivery: delivery
linked: This invoice is linked to a %{what_link}.
order: order
index: index:
action_new: Create new invoice action_new: Create new invoice
title: Invoices title: Invoices
invoices: invoices:
confirm_delete: Are you sure? confirm_delete: Are you sure?
delivery: Delivery delivery: Delivery
linked: This invoice is linked to %{what_link}.
linked_delivery: a delivery
linked_order: an order
new: new:
back: Back back: Back
title: Create new invoice title: Create new invoice
show: show:
back: Back back: Back
delivery: delivery
linked: This invoice is linked to a %{what_link}.
title: Invoice %{number} title: Invoice %{number}
order_articles: order_articles:
edit: edit:

View file

@ -646,23 +646,20 @@ nl:
invoices: invoices:
edit: edit:
title: Factuur bewerken title: Factuur bewerken
form:
delivery: levering
linked: Deze factuur is met aan %{what_link} gekoppeld.
order: bestelling
index: index:
action_new: Nieuwe factuur toevoegen action_new: Nieuwe factuur toevoegen
title: Facturen title: Facturen
invoices: invoices:
confirm_delete: Weet je het zeker? confirm_delete: Weet je het zeker?
delivery: Levering delivery: Levering
linked: Deze factuur is aan %{what_link} gekoppeld.
linked_delivery: een levering
linked_order: een bestelling
new: new:
back: Terug back: Terug
title: Nieuwe factuur toevoegen title: Nieuwe factuur toevoegen
show: show:
back: Terug back: Terug
delivery: levering
linked: Deze factuur is aan een %{what_link} gekoppeld.
title: Factuur %{number} title: Factuur %{number}
order_articles: order_articles:
edit: edit: