diff --git a/app/views/group_orders/_form.html.haml b/app/views/group_orders/_form.html.haml index 50ec8312..f6039456 100644 --- a/app/views/group_orders/_form.html.haml +++ b/app/views/group_orders/_form.html.haml @@ -134,6 +134,6 @@ € #order-button = submit_tag( t('.action_save'), id: 'submit_button', class: 'btn btn-primary' ) - oder #{link_to t('.cancel'), group_orders_path} + #{link_to t('.cancel'), group_orders_path} %input#total_balance{name: "total_balance", type: "hidden", value: @ordergroup.account_balance - @group_order.price}/ %input{name: "version", type: "hidden", value: @version}/ diff --git a/config/locales/de/de.group_orders.yml b/config/locales/de/de.group_orders.yml index 2e63edab..0951032b 100644 --- a/config/locales/de/de.group_orders.yml +++ b/config/locales/de/de.group_orders.yml @@ -32,7 +32,7 @@ de: available_funds: 'Verfügbares Guthaben' new_funds: 'Neuer Kontostand' action_save: 'Bestellung speichern' - cancel: 'abbrechen' + cancel: 'oder abbrechen' index: title: 'Bestellüberblick' funds: diff --git a/config/locales/en/en.grouporders.yml b/config/locales/en/en.group_orders.yml similarity index 96% rename from config/locales/en/en.grouporders.yml rename to config/locales/en/en.group_orders.yml index a74d7c23..f887324e 100644 --- a/config/locales/en/en.grouporders.yml +++ b/config/locales/en/en.group_orders.yml @@ -12,7 +12,7 @@ en: created_by: 'Created by' ending: 'End' min_quantity: 'Minimum quantity' - sum_amount: 'Quantity until now:' + sum_amount: 'Current amount' last_update: 'Last ordered' funds: 'Credit' name: 'Mame' @@ -31,8 +31,8 @@ en: total_sum_amount: 'Total amount' available_funds: 'Available credits' new_funds: 'New account balance' - action_save: 'Order saved' - cancel: 'Cancel' + action_save: 'Save order' + cancel: 'or cancel' index: title: 'Orders overview' funds: