Improve i18n and more

foodcoops · Sep 14, 2015 · 9c7d16b · 9c7d16b
1 parent 7bfd230
commit 9c7d16b
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 170 deletions.
diff --git a/app/views/finance/balancing/_orders.html.haml b/app/views/finance/balancing/_orders.html.haml
@@ -7,7 +7,7 @@
       %tr
         %th= t('.name')
         %th= t('.end')
-        %th= t('.state')
+        %th= heading_helper Order, :state
         %th= heading_helper Order, :updated_by
         %th
     %tbody

diff --git a/app/views/orders/_orders.html.haml b/app/views/orders/_orders.html.haml
@@ -5,13 +5,13 @@
       %th= sort_link_helper heading_helper(Order, :supplier), "supplier"
       %th= heading_helper Order, :starts
       %th= sort_link_helper heading_helper(Order, :ends), "ends"
-      %th= heading_helper Order, :status
+      %th= heading_helper Order, :state
       %th{:colspan => "2"}
   %tbody
     - @orders.each do |order|
       %tr
         %td= order.name
         %td= format_time(order.starts)
         %td= format_time(order.ends)
-        %td= t(order.state, scope: 'orders.state')
+        %td= order.aasm.human_state
         %td= link_to t('ui.show'), order, class: 'btn btn-small'
diff --git a/app/views/suppliers/show.html.haml b/app/views/suppliers/show.html.haml
@@ -69,7 +69,7 @@
           %tr
             %th= heading_helper Order, :starts
             %th= heading_helper Order, :ends
-            %th= heading_helper Order, :status
+            %th= heading_helper Order, :state
             %th= heading_helper Order, :updated_by
         %tbody
           - for order in @orders

diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -77,7 +77,10 @@ de:
         name: Lieferant
         note: Notiz
         starts: Läuft vom
-        status: Status
+        state: Status
+        state/closed: beendet
+        state/finished: abgerechnet
+        state/open: laufend
         supplier: Lieferant
         updated_by: Zuletzt geändert von
       order_article:
@@ -1314,16 +1317,12 @@ de:
       sort_group: Sortiert nach Gruppen
       title: 'Bestellung: %{name}'
       warn_not_closed: Achtung, Bestellung wurde noch nicht abgerechnet.
-    state:
-      closed: beendet
-      finished: abgerechnet
-      open: laufend
     update:
       notice: Die Bestellung wurde aktualisiert.
     update_order_amounts:
       msg1: "%{count} Artikel (%{units} Einheiten) aktualisiert"
       msg2: "%{count} (%{units}) Toleranzmenge"
-      msg3: 
+      msg3:
       msg4: "%{count} (%{units}) übrig"
   pages:
     all:

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -76,8 +76,11 @@ en:
         ends: Ends at
         name: Supplier
         note: Note
+        state: State
+        state/closed: closed
+        state/finished: settled
+        state/open: open
         starts: Starts at
-        status: Status
         supplier: Supplier
         updated_by: Last edited by
       order_article:
@@ -1328,10 +1331,6 @@ en:
       sort_group: Sorted in groups
       title: 'Order: %{name}'
       warn_not_closed: Warning, order is not yet settled.
-    state:
-      closed: closed
-      finished: settled
-      open: open
     update:
       notice: The order was updated.
     update_order_amounts: