update en translation
This commit is contained in:
wvengen
parent
ccb116f504
commit
70542c1ad7
3 changed files with 27 additions and 132 deletions
|
|
@ -109,11 +109,11 @@ class OrdersController < ApplicationController
|
|||
text = I18n.t('orders.fax.heading', :name => FoodsoftConfig[:name])
|
||||
text += "\n" + I18n.t('orders.fax.customer_number') + ': #{supplier.customer_number}' unless supplier.customer_number.blank?
|
||||
text += "\n" + I18n.t('orders.fax.delivery_day')
|
||||
text += "\n\n#{supplier.name}\n#{supplier.address}\n" + I18n.t('simple_form.suppliers.labels.fax') + ": #{supplier.fax}\n\n"
|
||||
text += "\n\n#{supplier.name}\n#{supplier.address}\n" + I18n.t('simple_form.labels.supplier.fax') + ": #{supplier.fax}\n\n"
|
||||
text += "****** " + I18n.t('orders.fax.to_address') + "\n\n"
|
||||
text += "#{FoodsoftConfig[:name]}\n#{contact[:street]}\n#{contact[:zip_code]} #{contact[:city]}\n\n"
|
||||
text += "****** " + I18n.t('orders.fax.articles') + "\n\n"
|
||||
text += I18n.t('.nummer') + " " + I18n.t('.amount') + " " + I18n.t('.name') + "\n"
|
||||
text += I18n.t('orders.fax.number') + " " + I18n.t('orders.fax.amount') + " " + I18n.t('orders.fax.name') + "\n"
|
||||
# now display all ordered articles
|
||||
order.order_articles.ordered.all(:include => [:article, :article_price]).each do |oa|
|
||||
number = oa.article.order_number
|
||||
|
|
|
|||
|
|
@ -263,6 +263,26 @@ en:
|
|||
create: 'send message'
|
||||
invite:
|
||||
create: send invitation
|
||||
application:
|
||||
sort_by: 'Sort by %{text}'
|
||||
edit_user: 'Edit user'
|
||||
show_google_maps: 'Show it on Google maps'
|
||||
# long names in simple_form.labels.workgroup
|
||||
role_admin: 'Admin'
|
||||
role_finance: 'Finance'
|
||||
role_suppliers: 'Suppliers'
|
||||
role_article_meta: 'Articles'
|
||||
role_orders: 'Orders'
|
||||
write_message: 'Write message'
|
||||
deliveries:
|
||||
show_invoice: 'Show invoice'
|
||||
new_invoice: 'New invoice'
|
||||
orders:
|
||||
order_pdf: 'Create PDF'
|
||||
option_choose: 'Choose supplier/stock'
|
||||
option_stock: 'Stock'
|
||||
tasks:
|
||||
required_users: '%{count} members are still needed!'
|
||||
|
||||
# general user-interface
|
||||
ui:
|
||||
|
|
@ -274,133 +294,3 @@ en:
|
|||
or_cancel: 'or cancel'
|
||||
marks:
|
||||
close: 'x'
|
||||
|
||||
# Simple form i18n is used to build the forms
|
||||
simple_form:
|
||||
"yes": 'yes'
|
||||
"no": 'no'
|
||||
required:
|
||||
text: 'required'
|
||||
mark: '*'
|
||||
error_notification:
|
||||
default_message: "Errors were found, please review the form."
|
||||
labels:
|
||||
defaults:
|
||||
password: 'password'
|
||||
password_confirmation: 'password confirmation'
|
||||
description: 'description'
|
||||
title: 'title'
|
||||
email: 'email'
|
||||
note: 'note'
|
||||
date: 'date'
|
||||
ordergroup: 'order group'
|
||||
amount: 'amount'
|
||||
phone: "phone"
|
||||
user_tokens: 'members'
|
||||
price: 'price (netto)'
|
||||
unit_quantity: 'unit quantity'
|
||||
order_number: 'order number'
|
||||
tax: 'VAT'
|
||||
deposit: 'deposit'
|
||||
user:
|
||||
nick: "nickname"
|
||||
first_name: "first name"
|
||||
last_name: "last name"
|
||||
workgroup:
|
||||
weekly_task: 'define weekly task?'
|
||||
weekday: 'day of the week'
|
||||
task_name: 'name of task'
|
||||
task_required_users: 'required users'
|
||||
task_duration: 'task duration in hours'
|
||||
task_description: 'task description'
|
||||
next_weekly_tasks_number: "How many weeks in advance should tasks be created?"
|
||||
role_admin: "Administration"
|
||||
role_finance: "Finance"
|
||||
role_suppliers: "Suppliers"
|
||||
role_article_meta: "Product catalogue"
|
||||
role_orders: "Order management"
|
||||
ordergroup:
|
||||
contact_person: "Contact person"
|
||||
contact_phone: "Phone"
|
||||
contact_address: "Address"
|
||||
ignore_apple_restriction: "Ignore order blocking when there are too little apples"
|
||||
task:
|
||||
duration: 'Duration'
|
||||
user_list: 'Responsible persons'
|
||||
required_users: 'number'
|
||||
due_date: 'Due date'
|
||||
workgroup: 'Workgroup'
|
||||
done: Done?
|
||||
message:
|
||||
sent_to_all: 'Send to all members'
|
||||
recipient_tokens: 'recipients'
|
||||
group_id: 'Group'
|
||||
subject: 'Subject'
|
||||
body: 'Body'
|
||||
private: Private
|
||||
page:
|
||||
body: 'Body'
|
||||
parent_id: Top
|
||||
supplier:
|
||||
address: 'Address'
|
||||
phone: 'Phone'
|
||||
phone2: 'Phone 2'
|
||||
fax: 'Fax'
|
||||
url: 'Homepage'
|
||||
contact_person: 'Contact person'
|
||||
customer_number: 'Customer number'
|
||||
delivery_days: 'Delivery days'
|
||||
order_howto: 'How to order'
|
||||
note: 'Note'
|
||||
min_order_quantity: 'Minimum order quantity'
|
||||
article:
|
||||
availability: 'Article is available?'
|
||||
origin: 'Origin'
|
||||
manufacturer: 'Producer'
|
||||
unit: 'Unit'
|
||||
note: 'Note'
|
||||
article_category: 'Article category'
|
||||
stock_article:
|
||||
supplier: 'Supplier'
|
||||
delivery:
|
||||
delivered_on: 'date of delivery'
|
||||
user:
|
||||
nick: "username"
|
||||
last_name: "last name"
|
||||
order_comment:
|
||||
text: comment on this order ...
|
||||
order:
|
||||
starts: "starts from"
|
||||
ends: "ends at"
|
||||
order_article:
|
||||
article_id: select items from the catalogue
|
||||
group_order_article:
|
||||
ordergroup_id: Ordergroup
|
||||
result: quantity
|
||||
invoice:
|
||||
supplier: supplier
|
||||
number: number
|
||||
date: invoice date
|
||||
paid_on: paid on
|
||||
deposit: deposit calculated
|
||||
deposit_credit: deposit credited
|
||||
order_article:
|
||||
units_to_order: quantity
|
||||
update_current_price: global price update
|
||||
|
||||
hints:
|
||||
tax: 'as percentage, standard for food is 7.0'
|
||||
task:
|
||||
duration: 'how long does the task take, 1-3 hours'
|
||||
required_users: 'how many users in total are needed?'
|
||||
supplier:
|
||||
min_order_quantity: 'the minimum order quantity is displayed during the order and must be explanatory'
|
||||
article:
|
||||
unit: 'e.g. kg or 1L or 500g'
|
||||
stock_article:
|
||||
supplier: ''
|
||||
message:
|
||||
private: Message does not appear in the Foodsoft inbox
|
||||
order_article:
|
||||
units_to_order: number of delivered packages
|
||||
update_current_price: also change the price for current orders
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ en:
|
|||
contact_address: 'Address'
|
||||
ignore_apple_restriction: 'Ignore order stop by apple points restriction'
|
||||
task:
|
||||
name: 'Name'
|
||||
duration: 'Duration'
|
||||
user_list: 'Responsible user'
|
||||
required_users: 'People required'
|
||||
|
|
@ -88,9 +89,13 @@ en:
|
|||
unit: 'Unit'
|
||||
note: 'Note'
|
||||
article_category: 'Category'
|
||||
article_category:
|
||||
name: 'Name'
|
||||
description: 'Description'
|
||||
stock_article:
|
||||
supplier: 'Supplier'
|
||||
delivery:
|
||||
supplier: 'Lieferantin'
|
||||
delivered_on: 'Delivery date'
|
||||
user:
|
||||
nick: 'Username'
|
||||
|
|
|
|||
Loading…
Reference in a new issue