small i18n and translation updates
This commit is contained in:
parent
b7f71f5859
commit
3d1847fabb
3 changed files with 15 additions and 13 deletions
|
@ -15,7 +15,7 @@
|
||||||
%tr{:class => cycle("even","odd", :name => "order")}
|
%tr{:class => cycle("even","odd", :name => "order")}
|
||||||
%td= link_to truncate(order.name), new_finance_order_path(order_id: order.id)
|
%td= link_to truncate(order.name), new_finance_order_path(order_id: order.id)
|
||||||
%td=h format_time(order.ends) unless order.ends.nil?
|
%td=h format_time(order.ends) unless order.ends.nil?
|
||||||
%td= order.closed? ? t('.cleared', amount: number_to_currency(order.foodcoop_result)) : "beendet"
|
%td= order.closed? ? t('.cleared', amount: number_to_currency(order.foodcoop_result)) : t('.ended')
|
||||||
%td= order.updated_by.nil? ? '??' : order.updated_by.nick
|
%td= order.updated_by.nil? ? '??' : order.updated_by.nick
|
||||||
%td
|
%td
|
||||||
- unless order.closed?
|
- unless order.closed?
|
||||||
|
@ -23,4 +23,4 @@
|
||||||
= link_to t('.close'), close_direct_finance_order_path(order),
|
= link_to t('.close'), close_direct_finance_order_path(order),
|
||||||
:confirm => t('.confirm'), :method => :put, class: 'btn btn-mini'
|
:confirm => t('.confirm'), :method => :put, class: 'btn btn-mini'
|
||||||
- else
|
- else
|
||||||
%i= t('.no_closed_orders')
|
%i= t('.no_closed_orders')
|
||||||
|
|
|
@ -598,10 +598,11 @@ de:
|
||||||
close: direkt schließen
|
close: direkt schließen
|
||||||
confirm: Wirklich die Bestellung schließen setzen?
|
confirm: Wirklich die Bestellung schließen setzen?
|
||||||
end: Ende
|
end: Ende
|
||||||
last_edited_by: zuletzt bearbeitet von
|
last_edited_by: Zuletzt bearbeitet von
|
||||||
name: Name
|
name: Name
|
||||||
no_closed_orders: derzeit gibt es keine beendeten Bestellungen
|
no_closed_orders: derzeit gibt es keine beendeten Bestellungen
|
||||||
state: Status
|
state: Status
|
||||||
|
ended: beendet
|
||||||
summary:
|
summary:
|
||||||
changed: Daten wurden verändert!
|
changed: Daten wurden verändert!
|
||||||
duration: von %{starts} bis %{ends}
|
duration: von %{starts} bis %{ends}
|
||||||
|
|
|
@ -158,9 +158,9 @@ en:
|
||||||
edit:
|
edit:
|
||||||
title: Edit user
|
title: Edit user
|
||||||
index:
|
index:
|
||||||
first_paragraph: Here you can edit users %{url}, bearbeiten and also delete them.
|
first_paragraph: Here you can %{url} users, edit and also delete them.
|
||||||
new_user: Create new user
|
new_user: Create new user
|
||||||
new_users: Create new user
|
new_users: create new
|
||||||
title: Admin/users
|
title: Admin/users
|
||||||
new:
|
new:
|
||||||
title: Create new user
|
title: Create new user
|
||||||
|
@ -223,7 +223,7 @@ en:
|
||||||
articles:
|
articles:
|
||||||
article:
|
article:
|
||||||
confirm_delete: Are you sure?
|
confirm_delete: Are you sure?
|
||||||
last_update: ! 'last updated: %{last_update} | Gross: %{gross_price}'
|
last_update: ! 'last updated: %{last_update} | gross: %{gross_price}'
|
||||||
articles:
|
articles:
|
||||||
confirm_delete: Do you really want to delete all selected articles?
|
confirm_delete: Do you really want to delete all selected articles?
|
||||||
option_available: Articles are available
|
option_available: Articles are available
|
||||||
|
@ -578,7 +578,7 @@ en:
|
||||||
new:
|
new:
|
||||||
alert: Attention, order was already accounted
|
alert: Attention, order was already accounted
|
||||||
articles_overview: Overview of articles
|
articles_overview: Overview of articles
|
||||||
comment_on_transaction: Here you can add a comment with your accounting
|
comment_on_transaction: Here you can add a comment to your accounting.
|
||||||
comments: Comments
|
comments: Comments
|
||||||
confirm_order: Close order
|
confirm_order: Close order
|
||||||
create_invoice: Create invoice
|
create_invoice: Create invoice
|
||||||
|
@ -596,12 +596,13 @@ en:
|
||||||
clear: Accounting
|
clear: Accounting
|
||||||
cleared: Accounted (%{amount})
|
cleared: Accounted (%{amount})
|
||||||
close: Close directly
|
close: Close directly
|
||||||
confirm: Really want to put the order on closed?
|
confirm: Do you really want to fully close the order?
|
||||||
end: End
|
end: End
|
||||||
last_edited_by: Last edited by
|
last_edited_by: Last edited by
|
||||||
name: Name
|
name: Name
|
||||||
no_closed_orders: At the moment there are not closed orders
|
no_closed_orders: At the moment there are no ended orders.
|
||||||
state: State
|
state: State
|
||||||
|
ended: ended
|
||||||
summary:
|
summary:
|
||||||
changed: Data was changed!
|
changed: Data was changed!
|
||||||
duration: From %{starts} till %{ends}
|
duration: From %{starts} till %{ends}
|
||||||
|
@ -611,8 +612,8 @@ en:
|
||||||
groups_amount: ! 'Group amounts:'
|
groups_amount: ! 'Group amounts:'
|
||||||
net_amount: ! 'Net amount:'
|
net_amount: ! 'Net amount:'
|
||||||
reload: Reload summary
|
reload: Reload summary
|
||||||
with_extra_charge: ! 'With extra charge:'
|
with_extra_charge: ! 'with extra charge:'
|
||||||
without_extra_charge: ! 'Without extra charge:'
|
without_extra_charge: ! 'without extra charge:'
|
||||||
create:
|
create:
|
||||||
notice: Invoice was created
|
notice: Invoice was created
|
||||||
financial_transactions:
|
financial_transactions:
|
||||||
|
@ -623,12 +624,12 @@ en:
|
||||||
notice: All Transactions were saved.
|
notice: All Transactions were saved.
|
||||||
index:
|
index:
|
||||||
balance: ! 'Balance of account: %{balance}'
|
balance: ! 'Balance of account: %{balance}'
|
||||||
last_updated_at: (last updated at %{when})
|
last_updated_at: (last updated %{when} ago)
|
||||||
new_transaction: Create new transaction
|
new_transaction: Create new transaction
|
||||||
search_placeholder: Search ..
|
search_placeholder: Search ..
|
||||||
title: Account statement for %{name}
|
title: Account statement for %{name}
|
||||||
new:
|
new:
|
||||||
paragraph: Here you can credit/deduct the order group <b>%{name}</b> money.
|
paragraph: Here you can credit and debit money for the order group <b>%{name}</b>.
|
||||||
title: New transaction
|
title: New transaction
|
||||||
new_collection:
|
new_collection:
|
||||||
amount: Amount
|
amount: Amount
|
||||||
|
|
Loading…
Reference in a new issue