6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 00545997
Changed files
common/assets/translations/intl_da.arb | 29 +++- common/assets/translations/intl_en.arb | 29 +++- common/lib/.generated/l10n/app_localizations.dart | 162 +++++++++++++++++++++ .../lib/.generated/l10n/app_localizations_da.dart | 84 +++++++++++ .../lib/.generated/l10n/app_localizations_en.dart | 84 +++++++++++ .../confirm_order/confirm_order_screen.dart | 7 +- .../widgets/confirm_order_action_bar.dart | 3 +- .../widgets/select_payment_method.dart | 9 +- .../hotel_overview_page_screen.dart | 3 +- .../hotel_overview_page/widgets/cart_app_bar.dart | 5 +- .../widgets/product_details_app_bar.dart | 3 +- .../provide_location/provide_location_screen.dart | 11 +- .../widgets/provide_location_action_bar.dart | 3 +- .../screens/receipt/receipt_screen.dart | 3 +- .../receipt/widgets/receipt_action_bar.dart | 3 +- .../screens/receipt/widgets/receipt_card.dart | 11 +- .../screens/review_order/review_order_screen.dart | 5 +- .../review_order/widget/delivery_time_picker.dart | 3 +- 18 files changed, 427 insertions(+), 30 deletions(-)
Diff
diff --git a/common/assets/translations/intl_da.arb b/common/assets/translations/intl_da.arb
index 34bc485f..fa661b85 100644
--- a/common/assets/translations/intl_da.arb
+++ b/common/assets/translations/intl_da.arb
@@ -423,5 +423,32 @@
"check_in_page_payment_payment_title": "Betal og check ind",
"pickup": "Afhentning",
"delivery": "Levering",
- "order_overview": "Ordreoversigt"
+ "order_overview": "Ordreoversigt",
+ "confirm_order": "Bekræft ordre",
+ "comment_to_order": "Kommentar til ordre",
+ "charge_to_room": "Skriv på værelset og få point",
+ "you_will_pay_at_checkout": "Du betaler ved udtjekning",
+ "pay_now": "Betal din ordre nu",
+ "select_payment_method_next_step": "Vælg betalingsmetode i næste trin",
+ "there_are_no_products_in_this_area": "Der er ingen varer på til dette område",
+ "my_order": "Min Bestilling",
+ "products": "varer",
+ "product": "vare",
+ "update_order": "Opdater bestilling",
+ "add_to_order": "Tilføj til bestilling",
+ "provide_location": "Angiv lokation",
+ "deliver_to_room": "Levering til værelset",
+ "room": "Værelse",
+ "deliver_to_area": "Levering til lokation",
+ "provide_location_code": "Angiv 4-cifret lokationsnummer",
+ "contact_comwell_for_changes": "Kontakt Comwells personale for ændringer på tlf. nr. 42 43 44 45",
+ "go_to_front_page": "Gå til forsiden",
+ "order_to_room": "Bestilling til værelse",
+ "order_status": "Status på bestilling",
+ "your_order_is_being_delivered": "Din bestilling leveres",
+ "your_order_is_ready": "Bestilling klar",
+ "your_order": "Din bestilling",
+ "asap": "Hurtigst muligt",
+ "no_products_in_cart": "Du har ingen varer i kurven",
+ "confirm_location": "Bekræft lokation"
}
\ No newline at end of file
diff --git a/common/assets/translations/intl_en.arb b/common/assets/translations/intl_en.arb
index 608e8a93..c7a421c0 100644
--- a/common/assets/translations/intl_en.arb
+++ b/common/assets/translations/intl_en.arb
@@ -423,5 +423,32 @@
"check_in_page_payment_payment_title": "Pay and check in",
"pickup": "Pick up",
"delivery": "Delivery",
- "order_overview": "Order overview"
+ "order_overview": "Order overview",
+ "confirm_order": "Confirm order",
+ "comment_to_order": "Comment to order",
+ "charge_to_room": "Charge to room and earn points",
+ "you_will_pay_at_checkout": "You will pay at checkout",
+ "pay_now": "Pay now",
+ "select_payment_method_next_step": "Select payment method in the next step",
+ "there_are_no_products_in_this_area": "There are no products in this area",
+ "my_order": "My order",
+ "products": "products",
+ "product": "product",
+ "update_order": "Update order",
+ "add_to_order": "Add to order",
+ "provide_location": "Provide location",
+ "deliver_to_room": "Deliver to room",
+ "room": "Room",
+ "deliver_to_area": "Deliver to location",
+ "provide_location_code": "Provide location code",
+ "contact_comwell_for_changes": "Call Comwell for changes at 42 43 44 45",
+ "go_to_front_page": "Go to front page",
+ "order_to_room": "Order to room",
+ "order_status": "Order status",
+ "your_order_is_being_delivered": "Your order is being delivered",
+ "your_order_is_ready": "Your order is ready",
+ "your_order": "Your order",
+ "asap": "As soon as possible",
+ "no_products_in_cart": "You have no products in your cart",
+ "confirm_location": "Confirm location"
}
\ No newline at end of file
diff --git a/common/lib/.generated/l10n/app_localizations.dart b/common/lib/.generated/l10n/app_localizations.dart
index f7955f41..aa682831 100644
--- a/common/lib/.generated/l10n/app_localizations.dart
+++ b/common/lib/.generated/l10n/app_localizations.dart
@@ -2644,6 +2644,168 @@ abstract class AppLocalizations {
/// In en, this message translates to:
/// **'Order overview'**
String get order_overview;
+
+ /// No description provided for @confirm_order.
+ ///
+ /// In en, this message translates to:
+ /// **'Confirm order'**
+ String get confirm_order;
+
+ /// No description provided for @comment_to_order.
+ ///
+ /// In en, this message translates to:
+ /// **'Comment to order'**
+ String get comment_to_order;
+
+ /// No description provided for @charge_to_room.
+ ///
+ /// In en, this message translates to:
+ /// **'Charge to room and earn points'**
+ String get charge_to_room;
+
+ /// No description provided for @you_will_pay_at_checkout.
+ ///
+ /// In en, this message translates to:
+ /// **'You will pay at checkout'**
+ String get you_will_pay_at_checkout;
+
+ /// No description provided for @pay_now.
+ ///
+ /// In en, this message translates to:
+ /// **'Pay now'**
+ String get pay_now;
+
+ /// No description provided for @select_payment_method_next_step.
+ ///
+ /// In en, this message translates to:
+ /// **'Select payment method in the next step'**
+ String get select_payment_method_next_step;
+
+ /// No description provided for @there_are_no_products_in_this_area.
+ ///
+ /// In en, this message translates to:
+ /// **'There are no products in this area'**
+ String get there_are_no_products_in_this_area;
+
+ /// No description provided for @my_order.
+ ///
+ /// In en, this message translates to:
+ /// **'My order'**
+ String get my_order;
+
+ /// No description provided for @products.
+ ///
+ /// In en, this message translates to:
+ /// **'products'**
+ String get products;
+
+ /// No description provided for @product.
+ ///
+ /// In en, this message translates to:
+ /// **'product'**
+ String get product;
+
+ /// No description provided for @update_order.
+ ///
+ /// In en, this message translates to:
+ /// **'Update order'**
+ String get update_order;
+
+ /// No description provided for @add_to_order.
+ ///
+ /// In en, this message translates to:
+ /// **'Add to order'**
+ String get add_to_order;
+
+ /// No description provided for @provide_location.
+ ///
+ /// In en, this message translates to:
+ /// **'Provide location'**
+ String get provide_location;
+
+ /// No description provided for @deliver_to_room.
+ ///
+ /// In en, this message translates to:
+ /// **'Deliver to room'**
+ String get deliver_to_room;
+
+ /// No description provided for @room.
+ ///
+ /// In en, this message translates to:
+ /// **'Room'**
+ String get room;
+
+ /// No description provided for @deliver_to_area.
+ ///
+ /// In en, this message translates to:
+ /// **'Deliver to location'**
+ String get deliver_to_area;
+
+ /// No description provided for @provide_location_code.
+ ///
+ /// In en, this message translates to:
+ /// **'Provide location code'**
+ String get provide_location_code;
+
+ /// No description provided for @contact_comwell_for_changes.
+ ///
+ /// In en, this message translates to:
+ /// **'Call Comwell for changes at 42 43 44 45'**
+ String get contact_comwell_for_changes;
+
+ /// No description provided for @go_to_front_page.
+ ///
+ /// In en, this message translates to:
+ /// **'Go to front page'**
+ String get go_to_front_page;
+
+ /// No description provided for @order_to_room.
+ ///
+ /// In en, this message translates to:
+ /// **'Order to room'**
+ String get order_to_room;
+
+ /// No description provided for @order_status.
+ ///
+ /// In en, this message translates to:
+ /// **'Order status'**
+ String get order_status;
+
+ /// No description provided for @your_order_is_being_delivered.
+ ///
+ /// In en, this message translates to:
+ /// **'Your order is being delivered'**
+ String get your_order_is_being_delivered;
+
+ /// No description provided for @your_order_is_ready.
+ ///
+ /// In en, this message translates to:
+ /// **'Your order is ready'**
+ String get your_order_is_ready;
+
+ /// No description provided for @your_order.
+ ///
+ /// In en, this message translates to:
+ /// **'Your order'**
+ String get your_order;
+
+ /// No description provided for @asap.
+ ///
+ /// In en, this message translates to:
+ /// **'As soon as possible'**
+ String get asap;
+
+ /// No description provided for @no_products_in_cart.
+ ///
+ /// In en, this message translates to:
+ /// **'You have no products in your cart'**
+ String get no_products_in_cart;
+
+ /// No description provided for @confirm_location.
+ ///
+ /// In en, this message translates to:
+ /// **'Confirm location'**
+ String get confirm_location;
}
class _AppLocalizationsDelegate
diff --git a/common/lib/.generated/l10n/app_localizations_da.dart b/common/lib/.generated/l10n/app_localizations_da.dart
index 94715d7d..9a5fd497 100644
--- a/common/lib/.generated/l10n/app_localizations_da.dart
+++ b/common/lib/.generated/l10n/app_localizations_da.dart
@@ -1419,4 +1419,88 @@ class AppLocalizationsDa extends AppLocalizations {
@override
String get order_overview => 'Ordreoversigt';
+
+ @override
+ String get confirm_order => 'Bekræft ordre';
+
+ @override
+ String get comment_to_order => 'Kommentar til ordre';
+
+ @override
+ String get charge_to_room => 'Skriv på værelset og få point';
+
+ @override
+ String get you_will_pay_at_checkout => 'Du betaler ved udtjekning';
+
+ @override
+ String get pay_now => 'Betal din ordre nu';
+
+ @override
+ String get select_payment_method_next_step =>
+ 'Vælg betalingsmetode i næste trin';
+
+ @override
+ String get there_are_no_products_in_this_area =>
+ 'Der er ingen varer på til dette område';
+
+ @override
+ String get my_order => 'Min Bestilling';
+
+ @override
+ String get products => 'varer';
+
+ @override
+ String get product => 'vare';
+
+ @override
+ String get update_order => 'Opdater bestilling';
+
+ @override
+ String get add_to_order => 'Tilføj til bestilling';
+
+ @override
+ String get provide_location => 'Angiv lokation';
+
+ @override
+ String get deliver_to_room => 'Levering til værelset';
+
+ @override
+ String get room => 'Værelse';
+
+ @override
+ String get deliver_to_area => 'Levering til lokation';
+
+ @override
+ String get provide_location_code => 'Angiv 4-cifret lokationsnummer';
+
+ @override
+ String get contact_comwell_for_changes =>
+ 'Kontakt Comwells personale for ændringer på tlf. nr. 42 43 44 45';
+
+ @override
+ String get go_to_front_page => 'Gå til forsiden';
+
+ @override
+ String get order_to_room => 'Bestilling til værelse';
+
+ @override
+ String get order_status => 'Status på bestilling';
+
+ @override
+ String get your_order_is_being_delivered => 'Din bestilling leveres';
+
+ @override
+ String get your_order_is_ready => 'Bestilling klar';
+
+ @override
+ String get your_order => 'Din bestilling';
+
+ @override
+ String get asap => 'Hurtigst muligt';
+
+ @override
+ String get no_products_in_cart => 'Du har ingen varer i kurven';
+
+ @override
+ String get confirm_location => 'Bekræft lokation';
}
diff --git a/common/lib/.generated/l10n/app_localizations_en.dart b/common/lib/.generated/l10n/app_localizations_en.dart
index 764f2ed2..d8bebd09 100644
--- a/common/lib/.generated/l10n/app_localizations_en.dart
+++ b/common/lib/.generated/l10n/app_localizations_en.dart
@@ -1416,4 +1416,88 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get order_overview => 'Order overview';
+
+ @override
+ String get confirm_order => 'Confirm order';
+
+ @override
+ String get comment_to_order => 'Comment to order';
+
+ @override
+ String get charge_to_room => 'Charge to room and earn points';
+
+ @override
+ String get you_will_pay_at_checkout => 'You will pay at checkout';
+
+ @override
+ String get pay_now => 'Pay now';
+
+ @override
+ String get select_payment_method_next_step =>
+ 'Select payment method in the next step';
+
+ @override
+ String get there_are_no_products_in_this_area =>
+ 'There are no products in this area';
+
+ @override
+ String get my_order => 'My order';
+
+ @override
+ String get products => 'products';
+
+ @override
+ String get product => 'product';
+
+ @override
+ String get update_order => 'Update order';
+
+ @override
+ String get add_to_order => 'Add to order';
+
+ @override
+ String get provide_location => 'Provide location';
+
+ @override
+ String get deliver_to_room => 'Deliver to room';
+
+ @override
+ String get room => 'Room';
+
+ @override
+ String get deliver_to_area => 'Deliver to location';
+
+ @override
+ String get provide_location_code => 'Provide location code';
+
+ @override
+ String get contact_comwell_for_changes =>
+ 'Call Comwell for changes at 42 43 44 45';
+
+ @override
+ String get go_to_front_page => 'Go to front page';
+
+ @override
+ String get order_to_room => 'Order to room';
+
+ @override
+ String get order_status => 'Order status';
+
+ @override
+ String get your_order_is_being_delivered => 'Your order is being delivered';
+
+ @override
+ String get your_order_is_ready => 'Your order is ready';
+
+ @override
+ String get your_order => 'Your order';
+
+ @override
+ String get asap => 'As soon as possible';
+
+ @override
+ String get no_products_in_cart => 'You have no products in your cart';
+
+ @override
+ String get confirm_location => 'Confirm location';
}
diff --git a/concierge/lib/presentation/screens/confirm_order/confirm_order_screen.dart b/concierge/lib/presentation/screens/confirm_order/confirm_order_screen.dart
index 94632586..b7ddc537 100644
--- a/concierge/lib/presentation/screens/confirm_order/confirm_order_screen.dart
+++ b/concierge/lib/presentation/screens/confirm_order/confirm_order_screen.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
import 'package:concierge/presentation/screens/confirm_order/widgets/confirm_order_action_bar.dart';
import 'package:concierge/presentation/screens/confirm_order/widgets/confirm_order_product_list_tile.dart';
@@ -36,13 +37,13 @@ class ConfirmOrderScreen extends StatelessWidget {
children: [
const Gap(100),
const Gap(36),
- Text("Ordreoversigt", style: TextStyle(fontSize: 20)),
+ Text(context.strings.order_overview, style: TextStyle(fontSize: 20)),
const Gap(36),
...buildOrderOverview(context),
const Gap(16),
...buildCommentField(context),
const Gap(36),
- Text("Betaling", style: TextStyle(fontSize: 20)),
+ Text(context.strings.payment, style: TextStyle(fontSize: 20)),
const Gap(16),
SelectPaymentMethod(),
const Gap(40),
@@ -72,7 +73,7 @@ class ConfirmOrderScreen extends StatelessWidget {
}
yield Row(
children: [
- Text("I alt", style: TextStyle(fontSize: 20)),
+ Text(context.strings.total, style: TextStyle(fontSize: 20)),
Expanded(child: Spacer()),
Text("${cartCubit.totalPrice} kr.", style: TextStyle(fontSize: 20)),
],
diff --git a/concierge/lib/presentation/screens/confirm_order/widgets/confirm_order_action_bar.dart b/concierge/lib/presentation/screens/confirm_order/widgets/confirm_order_action_bar.dart
index ae7b80f0..611ffa0d 100644
--- a/concierge/lib/presentation/screens/confirm_order/widgets/confirm_order_action_bar.dart
+++ b/concierge/lib/presentation/screens/confirm_order/widgets/confirm_order_action_bar.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/screens/payment/payment_route.dart';
import 'package:concierge/presentation/theme/app_colors.dart';
import 'package:flutter/material.dart';
@@ -23,7 +24,7 @@ class ConfirmOrderActionBar extends StatelessWidget {
PaymentRoute().push(context);
},
child: Text(
- "Bekræft ordre",
+ context.strings.confirm_order,
style: TextStyle(color: Colors.white),
),
),
diff --git a/concierge/lib/presentation/screens/confirm_order/widgets/select_payment_method.dart b/concierge/lib/presentation/screens/confirm_order/widgets/select_payment_method.dart
index 997ad6db..dc6b0958 100644
--- a/concierge/lib/presentation/screens/confirm_order/widgets/select_payment_method.dart
+++ b/concierge/lib/presentation/screens/confirm_order/widgets/select_payment_method.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
import 'package:concierge/presentation/widgets/toggle_list_item.dart';
import 'package:flutter/material.dart';
@@ -17,8 +18,8 @@ class SelectPaymentMethod extends StatelessWidget {
buildPaymentOption(
context,
icon: Icons.bed_outlined,
- title: "Skriv på værelset og få point",
- subtitle: "Du betaler ved udtjekning",
+ title: context.strings.charge_to_room,
+ subtitle: context.strings.you_will_pay_at_checkout,
isSelected: cartCubit.state.chargeToRoom,
isChargeToRoom: true,
),
@@ -26,8 +27,8 @@ class SelectPaymentMethod extends StatelessWidget {
buildPaymentOption(
context,
icon: Icons.credit_card,
- title: "Betal din ordre nu",
- subtitle: "Vælg betalingsmetode i næste step",
+ title: context.strings.you_will_pay_at_checkout,
+ subtitle: context.strings.select_payment_method_next_step,
isSelected: !cartCubit.state.chargeToRoom,
isChargeToRoom: false,
),
diff --git a/concierge/lib/presentation/screens/hotel_overview_page/hotel_overview_page_screen.dart b/concierge/lib/presentation/screens/hotel_overview_page/hotel_overview_page_screen.dart
index 8046c91e..607f819c 100644
--- a/concierge/lib/presentation/screens/hotel_overview_page/hotel_overview_page_screen.dart
+++ b/concierge/lib/presentation/screens/hotel_overview_page/hotel_overview_page_screen.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/data/remote/models/area_category.dart';
import 'package:concierge/data/remote/models/area_details.dart';
import 'package:concierge/data/remote/models/area_sub_category.dart';
@@ -47,7 +48,7 @@ class HotelOverviewPageScreen extends StatelessWidget {
}
final areaDetails = (areaState as Success<AreaDetails>).data;
if (areaDetails.categories.isEmpty) {
- return Center(child: Text("Der er ingen varer på til dette område"));
+ return Center(child: Text(context.strings.there_are_no_products_in_this_area));
}
final widgets = buildCategories(context, areaDetails.categories).toList();
return ListView.builder(
diff --git a/concierge/lib/presentation/screens/hotel_overview_page/widgets/cart_app_bar.dart b/concierge/lib/presentation/screens/hotel_overview_page/widgets/cart_app_bar.dart
index 983f5f8a..0b4a6e7a 100644
--- a/concierge/lib/presentation/screens/hotel_overview_page/widgets/cart_app_bar.dart
+++ b/concierge/lib/presentation/screens/hotel_overview_page/widgets/cart_app_bar.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
import 'package:concierge/presentation/screens/review_order/review_order_route.dart';
import 'package:concierge/presentation/theme/app_colors.dart';
@@ -29,11 +30,11 @@ class CartAppBar extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
- "Min Bestilling",
+ context.strings.my_order,
style: TextStyle(color: Colors.white),
),
Text(
- "${cartCubit.totalItems} varer",
+ "${cartCubit.totalItems} ${context.strings.products}",
style: TextStyle(color: Colors.white, fontSize: 12),
),
],
diff --git a/concierge/lib/presentation/screens/product_details/widgets/product_details_app_bar.dart b/concierge/lib/presentation/screens/product_details/widgets/product_details_app_bar.dart
index 7c16f673..387858ac 100644
--- a/concierge/lib/presentation/screens/product_details/widgets/product_details_app_bar.dart
+++ b/concierge/lib/presentation/screens/product_details/widgets/product_details_app_bar.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/screens/product_details/bloc/product_details_cubit.dart';
import 'package:concierge/presentation/theme/app_colors.dart';
import 'package:flutter/material.dart';
@@ -58,7 +59,7 @@ class ProductDetailsAppBar extends StatelessWidget {
context.pop();
},
child: Text(
- productDetailsCubit.isEdit ? "Opdater bestilling" : "Add to order",
+ productDetailsCubit.isEdit ? context.strings.update_order : context.strings.add_to_order,
style: TextStyle(color: Colors.white),
),
),
diff --git a/concierge/lib/presentation/screens/provide_location/provide_location_screen.dart b/concierge/lib/presentation/screens/provide_location/provide_location_screen.dart
index a2de090d..a44217cc 100644
--- a/concierge/lib/presentation/screens/provide_location/provide_location_screen.dart
+++ b/concierge/lib/presentation/screens/provide_location/provide_location_screen.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/domain/models/delivery_location.dart';
import 'package:concierge/presentation/screens/provide_location/widgets/provide_location_action_bar.dart';
import 'package:concierge/presentation/theme/app_colors.dart';
@@ -29,14 +30,14 @@ class ProvideLocationScreen extends StatelessWidget {
Gap(100),
Gap(32),
Text(
- "Angiv Lokation",
+ context.strings.provide_location,
style: TextStyle(fontSize: 20),
),
Gap(48),
ToggleListItem(
icon: Icons.bed_outlined,
- title: "Levering til værelset",
- subtitle: "Værelse 345",
+ title: context.strings.deliver_to_room,
+ subtitle: "${context.strings.room} 345",
isSelected: cubit.state.deliveryLocation is Room,
onClick: (_) {
cubit.updateLocation(DeliveryLocation.room);
@@ -45,8 +46,8 @@ class ProvideLocationScreen extends StatelessWidget {
Gap(12),
ToggleListItem(
icon: Icons.bed_outlined,
- title: "Levering til lokation",
- subtitle: "Angiv 4-cifret lokationsnummer",
+ title: context.strings.deliver_to_area,
+ subtitle: context.strings.provide_location_code,
isSelected: cubit.state.deliveryLocation is Area,
onClick: (_) {
cubit.updateLocation(DeliveryLocation.area);
diff --git a/concierge/lib/presentation/screens/provide_location/widgets/provide_location_action_bar.dart b/concierge/lib/presentation/screens/provide_location/widgets/provide_location_action_bar.dart
index b62b948e..dbffc3c9 100644
--- a/concierge/lib/presentation/screens/provide_location/widgets/provide_location_action_bar.dart
+++ b/concierge/lib/presentation/screens/provide_location/widgets/provide_location_action_bar.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
import 'package:concierge/presentation/screens/provide_location/bloc/provide_location_cubit.dart';
import 'package:concierge/presentation/theme/app_colors.dart';
@@ -33,7 +34,7 @@ class ProvideLocationActionBar extends StatelessWidget {
context.pop();
},
child: Text(
- "Bekræft lokation",
+ context.strings.confirm_location,
style: TextStyle(color: Colors.white),
),
),
diff --git a/concierge/lib/presentation/screens/receipt/receipt_screen.dart b/concierge/lib/presentation/screens/receipt/receipt_screen.dart
index a12731b6..c2601dc7 100644
--- a/concierge/lib/presentation/screens/receipt/receipt_screen.dart
+++ b/concierge/lib/presentation/screens/receipt/receipt_screen.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/screens/receipt/widgets/receipt_action_bar.dart';
import 'package:concierge/presentation/screens/receipt/widgets/receipt_card.dart';
import 'package:concierge/presentation/theme/app_colors.dart';
@@ -48,7 +49,7 @@ class ReceiptScreen extends StatelessWidget {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 100),
child: Text(
- "Kontakt Comwells personale for ændringer på tlf. nr. 42 43 44 45",
+ context.strings.contact_comwell_for_changes,
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 12,
diff --git a/concierge/lib/presentation/screens/receipt/widgets/receipt_action_bar.dart b/concierge/lib/presentation/screens/receipt/widgets/receipt_action_bar.dart
index e1367ecd..b7ec6a66 100644
--- a/concierge/lib/presentation/screens/receipt/widgets/receipt_action_bar.dart
+++ b/concierge/lib/presentation/screens/receipt/widgets/receipt_action_bar.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:flutter/material.dart';
class ReceiptActionBar extends StatelessWidget {
@@ -15,7 +16,7 @@ class ReceiptActionBar extends StatelessWidget {
backgroundColor: WidgetStatePropertyAll(Colors.white),
),
child: Text(
- "Gå til forsiden",
+ context.strings.go_to_front_page,
style: TextStyle(color: Colors.black),
),
),
diff --git a/concierge/lib/presentation/screens/receipt/widgets/receipt_card.dart b/concierge/lib/presentation/screens/receipt/widgets/receipt_card.dart
index 7e681229..7f566fa8 100644
--- a/concierge/lib/presentation/screens/receipt/widgets/receipt_card.dart
+++ b/concierge/lib/presentation/screens/receipt/widgets/receipt_card.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
import 'package:concierge/presentation/screens/confirm_order/widgets/confirm_order_product_list_tile.dart';
import 'package:concierge/presentation/widgets/padded_column.dart';
@@ -31,7 +32,7 @@ class ReceiptCard extends StatelessWidget {
Padding(
padding: EdgeInsets.all(12),
child: Text(
- "Bestilling til værelse 108",
+ "${context.strings.order_to_room} 108",
style: TextStyle(fontSize: 20, color: Colors.white),
),
),
@@ -43,14 +44,14 @@ class ReceiptCard extends StatelessWidget {
children: [
const Gap(16),
Text(
- "Status på bestilling",
+ context.strings.order_status,
style: TextStyle(fontSize: 14, color: Colors.grey),
),
const Gap(8),
- Text("Din bestilling leveres"),
+ Text(context.strings.your_order_is_being_delivered),
const Gap(16),
Text(
- "Bestilling klar",
+ context.strings.your_order_is_ready,
style: TextStyle(fontSize: 14, color: Colors.grey),
),
const Gap(4),
@@ -65,7 +66,7 @@ class ReceiptCard extends StatelessWidget {
),
Gap(4),
Text(
- "Din bestilling",
+ context.strings.your_order,
style: TextStyle(fontSize: 14, color: Colors.grey),
),
],
diff --git a/concierge/lib/presentation/screens/review_order/review_order_screen.dart b/concierge/lib/presentation/screens/review_order/review_order_screen.dart
index f66f453d..30f13807 100644
--- a/concierge/lib/presentation/screens/review_order/review_order_screen.dart
+++ b/concierge/lib/presentation/screens/review_order/review_order_screen.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/data/remote/models/product.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
import 'package:concierge/presentation/widgets/comment_field.dart';
@@ -63,7 +64,7 @@ class ReviewOrderScreen extends StatelessWidget {
yield* [
Gap(100), // app bar offset
Gap(48),
- Text("Din Bestilling", style: TextStyle(fontSize: 20)),
+ Text(context.strings.your_order, style: TextStyle(fontSize: 20)),
Gap(48),
if (cartCubit.products.isNotEmpty) ...buildDeliveryMethod(context),
...buildProducts(context, cartCubit.products),
@@ -84,7 +85,7 @@ class ReviewOrderScreen extends StatelessWidget {
if (products.isEmpty) {
yield Gap(36);
yield Center(
- child: Text("Du har ingen varer i kurven."),
+ child: Text(context.strings.no_products_in_cart),
);
} else {
yield Divider(color: Colors.grey.shade300);
diff --git a/concierge/lib/presentation/screens/review_order/widget/delivery_time_picker.dart b/concierge/lib/presentation/screens/review_order/widget/delivery_time_picker.dart
index c719570c..2d52ba05 100644
--- a/concierge/lib/presentation/screens/review_order/widget/delivery_time_picker.dart
+++ b/concierge/lib/presentation/screens/review_order/widget/delivery_time_picker.dart
@@ -1,3 +1,4 @@
+import 'package:common/localization/l10n_utils.dart';
import 'package:concierge/presentation/app/cart_cubit.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -28,7 +29,7 @@ class DeliveryTimePicker extends StatelessWidget {
cartCubit.updateReadyTime(time);
},
child: Text(
- time.isEmpty ? "Hurtigst muligt" : time,
+ time.isEmpty ? context.strings.asap : time,
style: TextStyle(
color: cartCubit.state.readyTime == time ? Colors.black : Colors.grey,
),