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

small i18n and translation updates

This commit is contained in:
wvengen 2013-06-12 22:37:02 +02:00
parent b7f71f5859
commit 3d1847fabb
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/finance/balancing/_orders.html.haml
View File

@ -15,7 +15,7 @@
%tr{:class => cycle("even","odd", :name => "order")}
%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= 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
- unless order.closed?
@ -23,4 +23,4 @@
= link_to t('.close'), close_direct_finance_order_path(order),
:confirm => t('.confirm'), :method => :put, class: 'btn btn-mini'
- else
%i= t('.no_closed_orders')
%i= t('.no_closed_orders')

3
config/locales/de.yml
View File

@ -598,10 +598,11 @@ de:
close: direkt schließen
confirm: Wirklich die Bestellung schließen setzen?
end: Ende
last_edited_by: zuletzt bearbeitet von
last_edited_by: Zuletzt bearbeitet von
name: Name
no_closed_orders: derzeit gibt es keine beendeten Bestellungen
state: Status
ended: beendet
summary:
changed: Daten wurden verändert!
duration: von %{starts} bis %{ends}

21
config/locales/en.yml
View File

@ -158,9 +158,9 @@ en:
edit:
title: Edit user
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_users: Create new user
new_users: create new
title: Admin/users
new:
title: Create new user
@ -223,7 +223,7 @@ en:
articles:
article:
confirm_delete: Are you sure?
last_update: ! 'last updated: %{last_update} | Gross: %{gross_price}'
last_update: ! 'last updated: %{last_update} | gross: %{gross_price}'
articles:
confirm_delete: Do you really want to delete all selected articles?
option_available: Articles are available
@ -578,7 +578,7 @@ en:
new:
alert: Attention, order was already accounted
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
confirm_order: Close order
create_invoice: Create invoice
@ -596,12 +596,13 @@ en:
clear: Accounting
cleared: Accounted (%{amount})
close: Close directly
confirm: Really want to put the order on closed?
confirm: Do you really want to fully close the order?
end: End
last_edited_by: Last edited by
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
ended: ended
summary:
changed: Data was changed!
duration: From %{starts} till %{ends}
@ -611,8 +612,8 @@ en:
groups_amount: ! 'Group amounts:'
net_amount: ! 'Net amount:'
reload: Reload summary
with_extra_charge: ! 'With extra charge:'
without_extra_charge: ! 'Without extra charge:'
with_extra_charge: ! 'with extra charge:'
without_extra_charge: ! 'without extra charge:'
create:
notice: Invoice was created
financial_transactions:
@ -623,12 +624,12 @@ en:
notice: All Transactions were saved.
index:
balance: ! 'Balance of account: %{balance}'
last_updated_at: (last updated at %{when})
last_updated_at: (last updated %{when} ago)
new_transaction: Create new transaction
search_placeholder: Search ..
title: Account statement for %{name}
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
new_collection:
amount: Amount