diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 7fba518a..65dc951b 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -107,9 +107,9 @@ class OrdersController < ApplicationController supplier = order.supplier contact = FoodsoftConfig[:contact].symbolize_keys 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#{Supplier.human_attribute_name(: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.labels.supplier.fax') + ": #{supplier.fax}\n\n" + text += "\n\n#{supplier.name}\n#{supplier.address}\n#{Supplier.human_attribute_name(: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" diff --git a/config/locales/de.yml b/config/locales/de.yml index 8efaf074..802084f1 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1307,7 +1307,6 @@ de: fax: amount: Menge articles: Artikel - customer_number: Kundennummer delivery_day: Liefertag heading: Bestellung für %{name} name: Name diff --git a/config/locales/en.yml b/config/locales/en.yml index ad133361..afd0b49e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1320,7 +1320,6 @@ en: fax: amount: Amount articles: Articles - customer_number: Customer number delivery_day: Delivery day heading: Order for %{name} name: Name @@ -1652,7 +1651,7 @@ en: supplier: address: Address contact_person: Contact person - customer_number: Customer ID + customer_number: Customer number delivery_days: Delivery days email: Email fax: Fax diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 2c176d31..50ae3b5b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1307,7 +1307,6 @@ fr: fax: amount: Quantité articles: Articles - customer_number: Numéro de client de la coop delivery_day: Jour de livraison heading: Commande pour %{name} name: Nom diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 05b3ea5e..50c7ccd6 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1235,7 +1235,6 @@ nl: fax: amount: Aantal articles: Artikelen - customer_number: Klantnummer delivery_day: Bezorgdag heading: Bestelling voor %{name} name: Naam @@ -1575,7 +1574,7 @@ nl: supplier: address: contact_person: - customer_number: + customer_number: Klantnummer delivery_days: Bezorgdagen email: fax: