From d7c771d10a6973ac3166310b0e105b606fbc8831 Mon Sep 17 00:00:00 2001
From: Julius <JuliusRapp@gmx.de>
Date: Mon, 6 Jan 2014 23:48:39 +0100
Subject: [PATCH] Continue I18n of receive screen

---
 app/views/orders/_edit_amounts.html.haml |  9 +++++----
 app/views/orders/receive.html.haml       | 20 +++++++++-----------
 config/locales/de.yml                    |  8 ++++++++
 config/locales/en.yml                    |  9 ++++++---
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/views/orders/_edit_amounts.html.haml b/app/views/orders/_edit_amounts.html.haml
index 590a111f..ea75c1f9 100644
--- a/app/views/orders/_edit_amounts.html.haml
+++ b/app/views/orders/_edit_amounts.html.haml
@@ -41,7 +41,7 @@
     
     function init_add_article(sel) {
       $(sel).removeAttr('disabled').select2({
-        placeholder: '#{j t('orders.add_article.title')}',
+        placeholder: '#{j t('orders.receive.add_article')}',
         formatNoMatches: function(term) { return '#{j t('.no_articles_available')}';}
         // TODO implement adding a new article, like in deliveries
       }).on('change', function(e) {
@@ -66,17 +66,17 @@
       $(this).replaceWith('<i class="icon icon-warning-sign add-on"></i>');
     }
 
-%table#order_articles.ordered-articles.table.table-striped.stupidtable
+%table#order_articles.ordered-articles.table.table-striped.stupidtable{style: 'margin-bottom: 0'}
   %thead
     %tr
       %th.sort{:data => {:sort => 'string'}}= heading_helper Article, :order_number, short: true
       %th.default-sort.sort{:data => {:sort => 'string'}}= heading_helper Article, :name
       %th= heading_helper Article, :unit
       %th= heading_helper Article, :price
-      %th Members
+      %th= t '.members' # TODO: find term for this
       %th Ordered
       -#%th Invoice # TODO implement invoice screen
-      %th Received
+      %th= heading_helper OrderArticle, :units_received
       %th
       %th= t 'ui.actions'
   %tfoot
@@ -85,6 +85,7 @@
         %select#add_article{:style => 'width: 500px;'}
           - new_article_data.each do |option|
             %option{id: "add_article_#{option[:id]}", value: option[:id]}= option[:text]
+
   %tbody#result_table
     - @order_articles.each do |order_article|
       = render :partial => 'edit_amount', :locals => {:order_article => order_article}
diff --git a/app/views/orders/receive.html.haml b/app/views/orders/receive.html.haml
index 2a130614..53105abd 100644
--- a/app/views/orders/receive.html.haml
+++ b/app/views/orders/receive.html.haml
@@ -22,24 +22,22 @@
       });
     });
 
-- title "Receiving #{@order.name}"
+- title t('.title', order: @order.name)
 
 = form_tag(receive_order_path(@order)) do
-  %section#results
+  %fieldset#results
     = render 'edit_amounts'
 
   .form-actions
     .pull-left
-      Surplus to
-      = label_tag :rest_to_tolerance, class: 'inline' do
+      %b.checkbox.inline
+        = t '.surplus_options'
+      = label_tag :rest_to_tolerance, class: 'checkbox inline' do
         = check_box_tag :rest_to_tolerance, 1, true
-        member tolerance,
-      %span{style: 'color: grey'}
-        and
-        = label_tag :rest_to_stock, class: 'inline' do
-          = check_box_tag :rest_to_stock, 1, false, disabled: true
-          stock
-
+        = t '.consider_member_tolerance'
+      = label_tag :rest_to_stock, class: 'checkbox inline' do
+        = check_box_tag :rest_to_stock, 1, false, disabled: true
+        %span{style: 'color: grey'}= t '.rest_to_stock'
     .pull-right
       = submit_tag t('.submit'), class: 'btn btn-primary'
       = link_to t('ui.or_cancel'), order_path(@order)
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1a7a4d81..6453e95c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -81,6 +81,7 @@ de:
         article: Artikel
         missing_units: Fehlende Einheiten
         missing_units_short: Fehlende
+        units_received: Erhalten
         units_to_order: Menge
         update_current_price: Globalen Preis aktualisieren
       order_comment:
@@ -1130,6 +1131,13 @@ de:
       warning_ordered_stock: ! 'Warnung: Die rot markierten Artikel wurden in der laufenden Lagerbestellung bereits bestellt bzw. gekauft. Wenn Du sie hier abwählst, werden alle bestehenden Bestellungen bzw. Käufe dieses Artikels gelöscht und nicht abgerechnet!'
     new:
       title: Neue Bestellung anlegen
+    receive:
+      add_article: Artikel hinzufügen
+      consider_member_tolerance: Toleranz berücksichtigen
+      rest_to_stock: Rest ins Lager
+      submit: Bestellung in Empfang nehmen
+      surplus_options: 'Verteilungsoptionen:'
+      title: »%{order}« in Empfang nehmen
     show:
       action_end: Beenden!
       amounts: ! 'Netto/Bruttosumme:'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 351b19bf..40855c21 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -81,6 +81,7 @@ en:
         article: Article
         missing_units: Missing units
         missing_units_short: Missing
+        units_received: Received
         units_to_order: Amount of units
         update_current_price: Globally update current price
       order_comment:
@@ -1090,9 +1091,6 @@ en:
     new:
       title: Add delivered article to order
   orders:
-    add_article:
-      title: Add article
-      notice: Article "%{name}" was added to the order.
     articles:
       article_count: ! 'Ordered articles:'
       prices: Net/gross price
@@ -1144,7 +1142,12 @@ en:
     new:
       title: Create new order
     receive:
+      add_article: Add article
+      consider_member_tolerance: consider tolerance
+      rest_to_stock: rest to stock
       submit: Receive order
+      surplus_options: 'Distribution options:'
+      title: Receiving %{order}
     show:
       action_end: Close!
       amounts: ! 'Net/gross sum:'