From 02f04be6e8ab09e77eb8ac763b8be18c2f7c3e9d Mon Sep 17 00:00:00 2001 From: wvengen Date: Wed, 13 Feb 2013 01:18:50 +0100 Subject: [PATCH] finish stock_takings i18n + controller --- app/controllers/stock_takings_controller.rb | 4 +-- .../stock_takings/_stock_takings.html.haml | 10 +++--- app/views/stock_takings/edit.html.haml | 4 +-- app/views/stock_takings/index.html.haml | 4 +-- app/views/stock_takings/new.html.haml | 17 +++------ app/views/stock_takings/show.html.haml | 22 ++++++------ config/locales/de/de.stock_takings.yml | 36 +++++++++++++++++++ config/locales/de/de.stockit.yml | 4 --- config/locales/en/en.stockit.yml | 4 --- 9 files changed, 63 insertions(+), 42 deletions(-) create mode 100644 config/locales/de/de.stock_takings.yml diff --git a/app/controllers/stock_takings_controller.rb b/app/controllers/stock_takings_controller.rb index 6c45852c..0870b681 100644 --- a/app/controllers/stock_takings_controller.rb +++ b/app/controllers/stock_takings_controller.rb @@ -11,11 +11,11 @@ class StockTakingsController < ApplicationController end def create - create!(:notice => I18n.t('stockit.stock_taking_create.notice')) + create!(:notice => I18n.t('stock_takings.create.notice')) end def update - update!(:notice => I18n.t('stockit.stock_taking_update.notice')) + update!(:notice => I18n.t('stock_takings.update.notice')) end def fill_new_stock_article_form diff --git a/app/views/stock_takings/_stock_takings.html.haml b/app/views/stock_takings/_stock_takings.html.haml index 36b939b4..de06413c 100644 --- a/app/views/stock_takings/_stock_takings.html.haml +++ b/app/views/stock_takings/_stock_takings.html.haml @@ -5,8 +5,8 @@ %table.table.table-striped %thead %tr - %th Datum - %th Notiz + %th= t '.date' + %th= t '.note' %th %tbody - for stock_taking in @stock_takings @@ -14,6 +14,6 @@ %td= link_to format_date(stock_taking.date), stock_taking %td= truncate stock_taking.note %td - = link_to 'Bearbeiten', edit_stock_taking_path(stock_taking), class: 'btn btn-mini' - = link_to 'Löschen', stock_taking, :confirm => 'Are you sure?', :method => :delete, - class: 'btn btn-mini btn-danger' \ No newline at end of file + = link_to t('ui.edit'), edit_stock_taking_path(stock_taking), class: 'btn btn-mini' + = link_to t('ui.delete'), stock_taking, :confirm => t('.confirm_delete'), :method => :delete, + class: 'btn btn-mini btn-danger' diff --git a/app/views/stock_takings/edit.html.haml b/app/views/stock_takings/edit.html.haml index dd0e4b19..f6cbc07b 100644 --- a/app/views/stock_takings/edit.html.haml +++ b/app/views/stock_takings/edit.html.haml @@ -1,7 +1,7 @@ -- title "Inventur bearbeiten" +- title t('.title') - simple_form_for(@stock_taking) do |f| = f.input :date = f.input :note = f.submit - = link_to "oder abbrechen", stock_takings_path \ No newline at end of file + = link_to t('.cancel'), stock_takings_path diff --git a/app/views/stock_takings/index.html.haml b/app/views/stock_takings/index.html.haml index f8c23c34..2717e615 100644 --- a/app/views/stock_takings/index.html.haml +++ b/app/views/stock_takings/index.html.haml @@ -1,8 +1,8 @@ -- title "Inventurübersicht" +- title t('.title') .well.well-small .btn-group - = link_to "Neue Inventur anlegen", new_stock_taking_path, class: 'btn' + = link_to t('.new_inventory'), new_stock_taking_path, class: 'btn' #StockTakingsTable= render 'stock_takings' diff --git a/app/views/stock_takings/new.html.haml b/app/views/stock_takings/new.html.haml index 45d29a3b..e1a8d40f 100644 --- a/app/views/stock_takings/new.html.haml +++ b/app/views/stock_takings/new.html.haml @@ -1,24 +1,17 @@ -- title "Neue Inventur anlegen" +- title t('.title') - content_for :sidebar do %p - %i - Bitte trage hier alle gezählten Abweichungen vom - = link_to "vorläufigen Lagerbestand", stock_articles_path - ein. Bei Schwund benutze einfach ein Minus vor der Zahl. - %p - Einen neuen Lagerartikel musst Du vorher - = link_to "anlegen", new_stock_article_path - bevor Du Ihn hier verwenden kannst. - + %i= t('.text_deviations', inv_link: link_to(t('.temp_inventory'), stock_articles_path)).html_safe + %p= t('.text_need_articles', create_link: link_to(t('.create'), new_stock_article_path)).html_safe = simple_form_for(@stock_taking) do |f| = f.input :date, as: :date_picker = f.input :note, :input_html => {:size => "28x7", :value => "#{@current_user.nick}: ..."} - %h2 Lagerartikel + %h2= t '.stock_articles' #stock_changes = render :partial => 'stock_change', :collection => @stock_taking.stock_changes .form-actions = f.submit class: 'btn' - = link_to "oder abbrechen", stock_takings_path \ No newline at end of file + = link_to t('.cancel'), stock_takings_path diff --git a/app/views/stock_takings/show.html.haml b/app/views/stock_takings/show.html.haml index e69ff51d..2756bc14 100644 --- a/app/views/stock_takings/show.html.haml +++ b/app/views/stock_takings/show.html.haml @@ -1,18 +1,18 @@ -- title "Inventur anzeigen" +- title t('.title') .well.well-small %dl.dl-horizontal - %dt Datum + %dt= t '.date' %dd= format_date @stock_taking.date - %dt Notiz + %dt= t '.note' %dd= simple_format @stock_taking.note %table.table.table-striped %tr - %th Artikel - %th Lieferantin - %th Einheit - %th Menge + %th= t '.article' + %th= t '.supplier' + %th= t '.unit' + %th= t '.amount' - for stock_change in @stock_taking.stock_changes.all %tr %td= stock_change.stock_article.name @@ -21,7 +21,7 @@ %td= stock_change.quantity .btn-group - = link_to "Bearbeiten", edit_stock_taking_path(@stock_taking), class: 'btn' - = link_to "Inventurübersicht", stock_takings_path, class: 'btn' - = link_to "Löschen", @stock_taking, :method => :delete, :confirm => "Willst Du wirklich die Inventur löschen?", - class: 'btn btn-danger' \ No newline at end of file + = link_to t('ui.edit'), edit_stock_taking_path(@stock_taking), class: 'btn' + = link_to t('.overview'), stock_takings_path, class: 'btn' + = link_to t('ui.delete'), @stock_taking, :method => :delete, :confirm => t('.confirm_delete'), + class: 'btn btn-danger' diff --git a/config/locales/de/de.stock_takings.yml b/config/locales/de/de.stock_takings.yml new file mode 100644 index 00000000..61740bf7 --- /dev/null +++ b/config/locales/de/de.stock_takings.yml @@ -0,0 +1,36 @@ +de: + stock_takings: + edit: + title: 'Inventur bearbeiten' + cancel: 'or cancel' + index: + title: 'Inventurübersicht' + new_inventory: 'Neue Inventur anlegen' + new: + title: 'Neue Inventur anlegen' + text_deviations: 'Bitte trage hier alle gezählten Abweichungen vom %{inv_link} ein. Bei Schwund benutze einfach ein Minus vor der Zahl.' + temp_inventory: 'vorläufigen Lagerbestand' + text_need_articles: 'Einen neuen Lagerartikel musst Du vorher %{create_link} bevor Du Ihn hier verwenden kannst.' + create: 'anlegen' + stock_articles: 'Lagerartikel' + cancel: 'oder abbrechen' + show: + title: 'Inventur anzeigen' + date: 'Datum' + note: 'Notiz' + article: 'Artikel' + supplier: 'Lieferantin' + unit: 'Einheit' + amount: 'Menge' + overview: 'Inventurübersicht' + confirm_delete: 'Willst Du wirklicht die Inventur löschen?' + stock_takings: + date: 'Datum' + note: 'Notiz' + confirm_delete: 'Bist Du sicher?' + + # used by controller + create: + notice: 'Inventur wurde erfolgreich angelegt.' + update: + notice: 'Inventur wurde aktualisiert.' diff --git a/config/locales/de/de.stockit.yml b/config/locales/de/de.stockit.yml index 6631f946..5fcabc7a 100644 --- a/config/locales/de/de.stockit.yml +++ b/config/locales/de/de.stockit.yml @@ -35,10 +35,6 @@ de: notice: 'Lagerartikel wurde gespeichert.' stock_update: notice: 'Lagerartikel wurde gespeichert.' - stock_taking_create: - notice: 'Inventur wurde erfolgreich angelegt.' - stock_taking_update: - notice: 'Inventur wurde aktualisiert.' # used by model check: diff --git a/config/locales/en/en.stockit.yml b/config/locales/en/en.stockit.yml index e0de610d..7dae63c2 100644 --- a/config/locales/en/en.stockit.yml +++ b/config/locales/en/en.stockit.yml @@ -35,10 +35,6 @@ en: notice: 'Stock article was created.' stock_update: notice: 'Stock article was saved.' - stock_taking_create: - notice: 'Inventory was created successfully.' - stock_taking_update: - notice: 'Inventory was updated.' # used by model check: