From fec94f9683cb9419fbdfca0897ee33e796b8fd1a Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Tue, 21 Feb 2023 14:07:02 +0100 Subject: [PATCH] fix switch menu --- app/views/group_orders/_switch_order.html.haml | 6 +++--- config/locales/de.yml | 4 +++- config/locales/en.yml | 2 ++ config/locales/nl.yml | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/views/group_orders/_switch_order.html.haml b/app/views/group_orders/_switch_order.html.haml index 9fbe15ee..ff1524ed 100644 --- a/app/views/group_orders/_switch_order.html.haml +++ b/app/views/group_orders/_switch_order.html.haml @@ -5,6 +5,6 @@ - orders.each do |order| %li( class='#{ order == current_order ? "active" : ""}' data-toggle='tooltip' - data-placement='left' - title='#{t('.remaining', remaining: time_ago_in_words(order.ends))}') - = link_to_ordering(order, 'data-confirm_switch_order' => true){ order.ends ? order.name : order.name } + data-placement='bottom' + title='#{ order.ends ? t('.remaining', remaining: time_ago_in_words(order.ends)) : "" }') + = link_to_ordering(order, 'data-confirm_switch_order' => true) diff --git a/config/locales/de.yml b/config/locales/de.yml index 5a1a5b35..6af67346 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1099,8 +1099,10 @@ de: sum: Summe title: Dein Bestellergebnis für %{order} switch_order: - remaining: "noch %{remaining}" + remaining: "%{remaining} bis Bestellschluss" title: Laufende Bestellungen + order_details: + details: Details anzeigen update: error_general: Die Bestellung konnte nicht aktualisiert werden, da ein Fehler auftrat. error_stale: In der Zwischenzeit hat jemand anderes auch bestellt, daher konnte die Bestellung nicht aktualisiert werden. diff --git a/config/locales/en.yml b/config/locales/en.yml index 53c2cfca..92bb3bb2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1103,6 +1103,8 @@ en: switch_order: remaining: "%{remaining} until order closes" title: Current orders + order_details: + details: Show Details update: error_general: The order couldn’t be updated due to a bug. error_stale: Someone else has ordered in the meantime, couldn't update the order. diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 4c97dda4..9c5c44b8 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1071,8 +1071,10 @@ nl: sum: Som title: Jouw bestelling voor %{order} switch_order: - remaining: "nog %{remaining}" + remaining: "%{remaining} tot bestelling sluit" title: Lopende bestellingen + order_details: + details: Bekijk details update: error_general: Er is een probleem opgetreden, de bestelling kon niet bijgewerkt worden. error_stale: In de tussentijd heeft iemand anders ook bestelt, daarom kon je bestelling niet opgeslagen worden. Sorry!