From c3d22e883df4243f53161161a21ab301e93621c8 Mon Sep 17 00:00:00 2001 From: wvengen Date: Wed, 9 Oct 2013 23:12:26 +0200 Subject: [PATCH] i18n simple_form move of suppliers --- app/views/suppliers/index.haml | 6 ++--- app/views/suppliers/shared_suppliers.haml | 10 ++++---- app/views/suppliers/show.haml | 28 ++++++++++---------- config/locales/de.yml | 31 ++++++++++++----------- config/locales/en.yml | 30 +++++++++++----------- 5 files changed, 53 insertions(+), 52 deletions(-) diff --git a/app/views/suppliers/index.haml b/app/views/suppliers/index.haml index 2ea9ad27..e49c8f83 100644 --- a/app/views/suppliers/index.haml +++ b/app/views/suppliers/index.haml @@ -6,9 +6,9 @@ %table.table.table-striped %thead %tr - %th= t 'simple_form.labels.supplier.name' - %th= t 'simple_form.labels.supplier.phone' - %th= t 'simple_form.labels.supplier.customer_number' + %th= heading_helper Supplier, :name + %th= heading_helper Supplier, :phone + %th= heading_helper Supplier, :customer_number, short: true %th %th %th diff --git a/app/views/suppliers/shared_suppliers.haml b/app/views/suppliers/shared_suppliers.haml index 22cf67da..8e9c3eef 100644 --- a/app/views/suppliers/shared_suppliers.haml +++ b/app/views/suppliers/shared_suppliers.haml @@ -4,11 +4,11 @@ %table.table.table-striped %thead %tr - %th= t 'simple_form.labels.supplier.name' - %th= t 'simple_form.labels.supplier.address' - %th= t 'simple_form.labels.supplier.note' - %th= t 'simple_form.labels.supplier.delivery_days' - %th= t 'simple_form.labels.supplier.is_subscribed' + %th= heading_helper Supplier, :name + %th= heading_helper Supplier, :address + %th= heading_helper Supplier, :note + %th= heading_helper Supplier, :delivery_days + %th= heading_helper Supplier, :is_subscribed %tbody - for shared_supplier in @shared_suppliers %tr diff --git a/app/views/suppliers/show.haml b/app/views/suppliers/show.haml index 0a9417fe..1b239775 100644 --- a/app/views/suppliers/show.haml +++ b/app/views/suppliers/show.haml @@ -7,29 +7,29 @@ = t 'suppliers.shared_supplier_note' %dl.dl-horizontal - %dt= t('simple_form.labels.supplier.address') + ':' + %dt= heading_helper(Supplier, :address) + ':' %dd= @supplier.address - %dt= t('simple_form.labels.supplier.phone') + ':' + %dt= heading_helper(Supplier, :phone) + ':' %dd= @supplier.phone - %dt= t('simple_form.labels.supplier.phone2') + ':' + %dt= heading_helper(Supplier, :phone2) + ':' %dd= @supplier.phone2 - %dt= t('simple_form.labels.supplier.fax') + ':' + %dt= heading_helper(Supplier, :fax) + ':' %dd= @supplier.fax - %dt= t('simple_form.labels.supplier.email') + ':' + %dt= heading_helper(Supplier, :email) + ':' %dd= @supplier.email - %dt= t('simple_form.labels.supplier.url') + ':' + %dt= heading_helper(Supplier, :url) + ':' %dd= link_to @supplier.url, @supplier.url - %dt= t('simple_form.labels.supplier.contact_person') + ':' + %dt= heading_helper(Supplier, :contact_person) + ':' %dd= @supplier.contact_person - %dt= t('simple_form.labels.supplier.customer_number') + ':' + %dt= heading_helper(Supplier, :customer_number) + ':' %dd= @supplier.customer_number - %dt= t('simple_form.labels.supplier.delivery_days') + ':' + %dt= heading_helper(Supplier, :delivery_days) + ':' %dd= @supplier.delivery_days - %dt= t('simple_form.labels.supplier.order_howto') + ':' + %dt= heading_helper(Supplier, :order_howto) + ':' %dd= @supplier.order_howto - %dt= t('simple_form.labels.supplier.note') + ':' + %dt= heading_helper(Supplier, :note) + ':' %dd= @supplier.note - %dt= t('simple_form.labels.supplier.min_order_quantity') + ':' + %dt= heading_helper(Supplier, :min_order_quantity) + ':' %dd= @supplier.min_order_quantity .clearfix @@ -43,8 +43,8 @@ %table.table.table-horizontal %thead %tr - %th= t 'simple_form.labels.defaults.date' - %th= t 'simple_form.labels.defaults.amount' + %th= heading_helper Delivery, :date + %th= heading_helper Delivery, :amount %tbody - for delivery in @deliveries %tr diff --git a/config/locales/de.yml b/config/locales/de.yml index 98fdcca6..b2f0f149 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -51,6 +51,22 @@ de: note: Notiz stock_article: price: Nettopreis + supplier: + address: Adresse + contact_person: Ansprechparter_in + customer_number: Kundennummer + customer_number_short: Kundennr. + delivery_days: Liefertage + email: Email + fax: FAX + is_subscribed: abonniert? + min_order_quantity: Mindestbestellmenge + name: Name + note: Notiz + order_howto: Howto Bestellen + phone: Telefon + phone2: Telefon 2 + url: Homepage user: email: Email first_name: Vorname @@ -1654,21 +1670,6 @@ de: privacy: Privatsphäre stock_article: supplier: Lieferant - supplier: - address: Adresse - contact_person: Ansprechparter_in - customer_number: Kundennummer - delivery_days: Liefertage - email: Email - fax: FAX - is_subscribed: abonniert? - min_order_quantity: Mindestbestellmenge - name: Name - note: Notiz - order_howto: Howto Bestellen - phone: Telefon - phone2: Telefon 2 - url: Homepage task: done: Erledigt? due_date: Wann erledigen? diff --git a/config/locales/en.yml b/config/locales/en.yml index 54581e6a..65b84388 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -62,6 +62,21 @@ en: note: note stock_article: price: Price + supplier: + address: Address + contact_person: Contact person + customer_number: Customer number + delivery_days: Delivery days + email: Email + fax: Fax + is_subscribed: subscribed? + min_order_quantity: Minimum order quantity + name: Name + note: Note + order_howto: How to order + phone: Phone + phone2: Phone 2 + url: Homepage task: done: Done? due_date: Due date @@ -1665,21 +1680,6 @@ en: privacy: Privacy stock_article: supplier: Supplier - supplier: - address: Address - contact_person: Contact person - customer_number: Customer number - delivery_days: Delivery days - email: Email - fax: Fax - is_subscribed: subscribed? - min_order_quantity: Minimum order quantity - name: Name - note: Note - order_howto: How to order - phone: Phone - phone2: Phone 2 - url: Homepage workgroup: next_weekly_tasks_number: For how many weeks in advance would you like to define tasks? role_admin: Administration