i18n update

app/controllers/orders_controller.rb

@@ -9,7 +9,7 @@ class OrdersController < ApplicationController
   # List orders
   def index
     @open_orders = Order.open.includes(:supplier)
-    @orders_in_progress = Order.finished_not_closed.includes(:supplier)
+    @finished_orders = Order.finished_not_closed.includes(:supplier)
     @per_page = 15
     if params['sort']
       sort = case params['sort']

app/views/orders/index.html.haml

@@ -11,12 +11,12 @@
 
 .well
   - if not @open_orders.empty?
-    %h2= t '.open_orders'
-  - elsif not @orders_in_progress.empty?
-    %h2= t '.orders_in_progress'
+    %h2= t '.orders_open'
+  - elsif not @finished_orders.empty?
+    %h2= t '.orders_finished'
   - else
-    = t '.no_open_orders'
-  - unless @open_orders.empty? and @orders_in_progress.empty?
+    = t '.no_open_or_finished_orders'
+  - unless @open_orders.empty? and @finished_orders.empty?
     %table.table.table-striped
       %thead
         %tr
@@ -42,12 +42,12 @@
                 = link_to t('ui.delete'), order, confirm: t('.confirm_delete'), method: :delete,
                   class: 'btn btn-small btn-danger'
 
-        - unless @orders_in_progress.empty?
+        - unless @finished_orders.empty?
           - unless @open_orders.empty?
             %tr
               %td{colspan: 6}
-                %h2= t '.orders_in_progress'
-          - for order in @orders_in_progress
+                %h2= t '.orders_finished'
+          - for order in @finished_orders
             %tr
               %td= order.name
               %td= format_time(order.ends)
@@ -62,10 +62,7 @@
                 = link_to t('ui.show'), order, class: 'btn btn-small'
                 = link_to t('ui.delete'), order, confirm: t('.confirm_delete'), method: :delete,
                   class: 'btn btn-small btn-danger'
-        - else
-          %tr
-            %td{colspan: 6}= t '.no_orders_in_progress'
 
-%h2= t '.closed_orders'
+%h2= t '.orders_settled'
 #orders_table
   = render partial: 'orders'

config/locales/de.yml

@@ -1130,13 +1130,13 @@ de:
     index:
       action_end: Beenden
       action_receive: In Empfang nehmen
-      closed_orders: Abgerechnete Bestellungen
       confirm_delete: Willst Du wirklich die Bestellung löschen?
       confirm_end: Willst Du wirklich die Bestellung %{order} beenden? Es gibt kein zurück.
       new_order: Neue Bestellung anlegen
-      no_open_orders: Derzeit gibt es keine laufende Bestellungen.
-      open_orders: Laufende Bestellungen
-      orders_in_progress: In Bearbeitung
+      no_open_or_finished_orders: Derzeit gibt es keine laufende oder beendete Bestellungen.
+      orders_finished: Beendet
+      orders_open: Laufend
+      orders_settled: Abgerechnet
       title: Bestellungen verwalten
     model:
       error_closed: Bestellung wurde schon abgerechnet

config/locales/en.yml

@@ -1130,13 +1130,13 @@ en:
     index:
       action_end: Close
       action_receive: Receive
-      closed_orders: Settled orders
       confirm_delete: Do you really want to delete the order?
       confirm_end: Do you really want to close the order %{order}? There is no going back.
       new_order: Create new order
-      no_open_orders: There are currently no open orders.
-      open_orders: Current orders
-      orders_in_progress: In process
+      no_open_or_finished_orders: There are currently no open or closed orders.
+      orders_finished: Closed
+      orders_open: Open
+      orders_settled: Settled
       title: Manage orders
     model:
       error_closed: Order was already settled

config/locales/fr.yml

@@ -1126,10 +1126,11 @@ fr:
       action_end: Terminer
       confirm_delete: Vraiment supprimer la commande?
       confirm_end: Veux tu vraiment mettre fin à la commande %{order}? Attention, il n'y aura pas d'annulation possible.
-      ended_orders: Commandes closes
       new_order: Définir une nouvelle commande
-      no_open_orders: Il n'y a aucune commande en cours en ce moment.
-      open_orders: Commandes en cours
+      no_open_or_finished_orders: Il n'y a aucune commande en cours en ce moment.
+      orders_finished: Close
+      orders_open: En cours
+      orders_settled: Décomptée
       title: Gestion des commandes
     model:
       error_closed: Cette commande a déjà été décomptée

config/locales/nl.yml

@@ -1101,10 +1101,11 @@ nl:
       action_end: Sluiten
       confirm_delete: Wil je de bestelling werkelijk verwijderen?
       confirm_end: Wil je de bestelling %{order} werkelijk sluiten? Dit kun je niet ongedaan maken.
-      ended_orders: Gesloten bestellingen
       new_order: Nieuwe bestelling openen
-      no_open_orders: Er zijn momenteel geen lopende bestellingen.
-      open_orders: Lopende bestellingen
+      no_open_or_finished_orders: Er zijn momenteel geen open of gesloten bestellingen.
+      orders_finished: Gesloten
+      orders_open: Open
+      orders_settled: Afgerekend
       title: Bestellingen beheren
     model:
       error_closed: Bestelling was al afgerekend