From cb537bc11cef44250bc2cd94f74d05e88417a67d Mon Sep 17 00:00:00 2001 From: wvengen Date: Sat, 9 Mar 2013 00:40:07 +0100 Subject: [PATCH] start articles i18n --- app/views/articles/_article.html.haml | 10 +++---- app/views/articles/_articles.html.haml | 26 +++++++++---------- .../articles/_destroy_active_article.haml | 6 +---- app/views/articles/_form.html.haml | 6 ++--- app/views/articles/edit_all.html.haml | 11 ++++---- config/locales/de/de.articles.yml | 26 +++++++++++++++++++ config/locales/de/de.simple_form.yml | 1 + 7 files changed, 54 insertions(+), 32 deletions(-) create mode 100644 config/locales/de/de.articles.yml diff --git a/app/views/articles/_article.html.haml b/app/views/articles/_article.html.haml index ac2679e1..ccfc3b66 100644 --- a/app/views/articles/_article.html.haml +++ b/app/views/articles/_article.html.haml @@ -7,13 +7,13 @@ %td= truncate(article.note, :length => 11) %td= article.unit_quantity %td{:class => "currency"} - %acronym{:title => "zuletzt geändert: #{format_date(article.updated_at)} | Brutto: #{number_to_currency(article.gross_price)}"} + %acronym{:title => t('.last_update', last_update: format_date(article.updated_at), gross_price: number_to_currency(article.gross_price))} = number_to_currency(article.price) %td= number_to_percentage(article.tax) if article.tax != 0 %td= number_to_currency(article.deposit) if article.deposit != 0 - %td= link_to "Bearbeiten", edit_supplier_article_path(@supplier, article), + %td= link_to t('ui.edit'), edit_supplier_article_path(@supplier, article), :remote => true, class: 'btn btn-mini' - %td= link_to "Löschen", [@supplier, article], - :method => :delete, :confirm => 'Bist du sicher?', :remote => true, class: 'btn btn-mini btn-danger' + %td= link_to t('ui.delete'), [@supplier, article], + :method => :delete, :confirm => t('.confirm_delete'), :remote => true, class: 'btn btn-mini btn-danger' - \ No newline at end of file + diff --git a/app/views/articles/_articles.html.haml b/app/views/articles/_articles.html.haml index 0a0f6c17..443fef4f 100644 --- a/app/views/articles/_articles.html.haml +++ b/app/views/articles/_articles.html.haml @@ -6,15 +6,15 @@ %thead %tr %th - %th= sort_link_helper "Name", "name" + %th= sort_link_helper t('simple_form.labels.article.name'), "name" %th - %th= sort_link_helper "Kategorie", "category" - %th= sort_link_helper "Einheit", "unit" - %th= sort_link_helper "Notiz", "note" - %th{:style => "width: 4em;"} Gebgr. - %th{:style => "width: 5em;"} Preis - %th{:style => "width: 3.5em;"} MwSt - %th{:style => "width: 4em;"} Pfand + %th= sort_link_helper t('simple_form.labels.article.article_category'), "category" + %th= sort_link_helper t('simple_form.labels.article.unit'), "unit" + %th= sort_link_helper t('simple_form.labels.article.note'), "note" + %th{:style => "width: 4em;"}= t '.unit_quantity' + %th{:style => "width: 5em;"}= t '.price_netto' + %th{:style => "width: 3.5em;"}= t 'simple_form.labels.defaults.tax' + %th{:style => "width: 4em;"}= t 'simple_form.labels.defaults.deposit' %th{:style => "width: 3em;"} %tbody#listbody @@ -27,10 +27,10 @@ %td{:colspan => '11'} = check_box_tag :checkall, 1, false, 'data-check-all' => '#articlesInListForm', 'data-ignore-onchange' => true %select{:name => "selected_action", 'data-submit-onchange' => true} - %option{:value => '', :selected => 'selected'} Aktion wählen ... - %option{:value => "destroy", 'data-confirm' => 'Willst Du wirklich alle gewählten Artikel löschen?'} Artikel löschen - %option{:value => "setNotAvailable"} Artikel sind nicht mehr verfügbar - %option{:value => "setAvailable"} Artikel sind verfügbar + %option{:value => '', :selected => 'selected'}= t '.option_select' + %option{:value => "destroy", 'data-confirm' => t('.confirm_delete')}= t '.option_delete' + %option{:value => "setNotAvailable"}= t '.option_not_available' + %option{:value => "setAvailable"}= t '.option_available' = hidden_field_tag 'supplier_id', @supplier.id -= pagination_links_remote @articles \ No newline at end of file += pagination_links_remote @articles diff --git a/app/views/articles/_destroy_active_article.haml b/app/views/articles/_destroy_active_article.haml index ea742199..73c59e1c 100644 --- a/app/views/articles/_destroy_active_article.haml +++ b/app/views/articles/_destroy_active_article.haml @@ -1,7 +1,3 @@ %tr.edit_inline{:id=> "edit_"+@article.id.to_s} %td{:colspan=>"10"} - =h @article.name - wird in laufenden Bestellungen verwendet und kann nicht gelöscht werden. - Bitte zuerst den Artikel aus den Bestellungen - = link_to "entfernen", :controller => 'orders', :action => 'edit', :id => @order - \ No newline at end of file + = t('.note', article: h(@article.name), drop_link: link_to(t('.drop'), :controller => 'orders', :action => 'edit', :id => @order)).html_safe diff --git a/app/views/articles/_form.html.haml b/app/views/articles/_form.html.haml index d87cbf79..c92e4901 100644 --- a/app/views/articles/_form.html.haml +++ b/app/views/articles/_form.html.haml @@ -2,8 +2,8 @@ = f.hidden_field :shared_updated_on = f.hidden_field :supplier_id .modal-header - = button_tag "x", class: 'close', data: {dismiss: 'modal'} - %h3 Neuen Artikel einfügen + = button_tag t('ui.marks.close'), class: 'close', data: {dismiss: 'modal'} + %h3= t '.title' .modal-body = f.input :availability = f.input :name @@ -19,6 +19,6 @@ = f.input :tax = f.input :deposit .modal-footer - = button_tag "Schließen", class: 'btn', data: {dismiss: 'modal'} + = button_tag t('ui.close'), class: 'btn', data: {dismiss: 'modal'} = f.submit class: 'btn btn-primary' diff --git a/app/views/articles/edit_all.html.haml b/app/views/articles/edit_all.html.haml index a9668218..0d5a85c3 100644 --- a/app/views/articles/edit_all.html.haml +++ b/app/views/articles/edit_all.html.haml @@ -1,11 +1,10 @@ -- title "Alle Artikel von #{@supplier.name} bearbeiten" | +- title t('.title', supplier: @supplier.name) %p - %i - Pflichtfelder sind: Name, Einheit, (netto) Preis und Bestellnummer. + %i= t '.note' = form_tag(update_all_supplier_articles_path(@supplier)) do = render 'edit_all_table' %br/ - %i Achtung, alle Artikel werden aktualisiert! + %i= t '.warning' .form-actions - = submit_tag 'Alle Artikel aktualisieren', class: 'btn btn-primary' - = link_to 'oder abbrechen', supplier_articles_path(@supplier) + = submit_tag t('.submit'), class: 'btn btn-primary' + = link_to t('.or_cancel'), supplier_articles_path(@supplier) diff --git a/config/locales/de/de.articles.yml b/config/locales/de/de.articles.yml new file mode 100644 index 00000000..fe4a7184 --- /dev/null +++ b/config/locales/de/de.articles.yml @@ -0,0 +1,26 @@ +de: + articles: + article: + last_update: 'zuletzt geändert: %{last_update} | Brutto: %{gross_price}' + confirm_delete: 'Bist du sicher?' + articles: + unit_quantity: 'Gebgr.' + price_netto: 'Preis' + option_select: 'Aktion wählen ...' + option_delete: 'Artikel löschen' + confirm_delete: 'Willst Du wirklich alle gewählten Artikel löschen?' + option_not_available: 'Artikel sind nicht mehr verfügbar' + option_available: 'Artikel sind verfügbar' + destroy_active_article: + note: > + %{article} wird in laufenden Bestellungen verwendet und kann nicht gelöscht werden. + Bitte zuerst den Artikel aus den Bestellungen %{drop_link}. + drop: 'entfernen' + edit_all: + title: 'Alle Artikel von %{supplier} bearbeiten' + note: 'Pflichtfelder sind: Name, Einheit, (netto) Preis und Bestellnummer.' + warning: 'Achtung, alle Artikel werden aktualisiert!' + submit: 'Alle Artikel aktualisieren' + or_cancel: 'oder abbrechen' + form: + title: 'Neuen Artikel einfügen' diff --git a/config/locales/de/de.simple_form.yml b/config/locales/de/de.simple_form.yml index 1b48ad87..af1f5815 100644 --- a/config/locales/de/de.simple_form.yml +++ b/config/locales/de/de.simple_form.yml @@ -81,6 +81,7 @@ de: min_order_quantity: 'Mindestbestellmenge' is_subscribed: 'abonniert?' article: + name: 'Name' availability: 'Artikel ist verfügbar?' origin: 'Herkunft' manufacturer: 'Produzent'