From 8aeb9646cda98730b74b750490998637d0d7df88 Mon Sep 17 00:00:00 2001 From: Carlos Date: Thu, 16 Nov 2023 15:08:36 -0300 Subject: [PATCH 1/2] Replaces placeholder text by real copy Oliver suggested that text during the Engineering Sprint. Ideally that should be clickable. But let's not invest too much now because Elio is overhauling those screens. As a consequence I'll have to rewrite most of the Flutter UI code (the *_page.dart and *_widgets.dart files) The parameterized l10n string, though, will be used in the final screen. --- gui/packages/ubuntupro/lib/l10n/app_en.arb | 9 ++++++++- .../subscription_status/subscription_status_page.dart | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gui/packages/ubuntupro/lib/l10n/app_en.arb b/gui/packages/ubuntupro/lib/l10n/app_en.arb index 9fd8d0581..8013c8ca0 100644 --- a/gui/packages/ubuntupro/lib/l10n/app_en.arb +++ b/gui/packages/ubuntupro/lib/l10n/app_en.arb @@ -35,7 +35,14 @@ "storeManaged": "This subscription is managed through Microsoft Store", "manageSubscription": "Manage your subscription", "orgManaged": "This subscription is owned and managed by your company", - "manuallyManaged": "Lorem ipsum...", + "manuallyManaged": "Visit {proDashboardLink} to manage your subscription.", + "@manuallyManaged": { + "placeholders": { + "proDashboardLink": { + "type": "String" + } + } + }, "detachPro": "Detach Pro", "updatingSubscriptionInfo": "Updating the subscription information.", diff --git a/gui/packages/ubuntupro/lib/pages/subscription_status/subscription_status_page.dart b/gui/packages/ubuntupro/lib/pages/subscription_status/subscription_status_page.dart index 8b347b04b..600b32cff 100644 --- a/gui/packages/ubuntupro/lib/pages/subscription_status/subscription_status_page.dart +++ b/gui/packages/ubuntupro/lib/pages/subscription_status/subscription_status_page.dart @@ -34,7 +34,7 @@ class SubscriptionStatusPage extends StatelessWidget { ), ), UserSubscriptionStatusModel() => SubscriptionStatus( - caption: lang.manuallyManaged, + caption: lang.manuallyManaged('ubuntu.com/pro/dashboard'), actionButton: FilledButton( style: FilledButton.styleFrom( backgroundColor: const Color(0xFFE86581), From 362f0a61a9a1ae9ccc4c89837aefe42a4dbfad9a Mon Sep 17 00:00:00 2001 From: Carlos Date: Thu, 16 Nov 2023 15:30:05 -0300 Subject: [PATCH 2/2] Updates end to end test "script" --- gui/packages/ubuntupro/end_to_end/end_to_end_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/packages/ubuntupro/end_to_end/end_to_end_test.dart b/gui/packages/ubuntupro/end_to_end/end_to_end_test.dart index 9aa5f17d1..9bbfbe9b2 100644 --- a/gui/packages/ubuntupro/end_to_end/end_to_end_test.dart +++ b/gui/packages/ubuntupro/end_to_end/end_to_end_test.dart @@ -86,7 +86,7 @@ Future testManualTokenInput(WidgetTester tester) async { // asserts that we transitioned to the user-managed status page. l10n = tester.l10n(); - expect(find.text(l10n.manuallyManaged), findsOneWidget); + expect(find.text(l10n.detachPro), findsOneWidget); } Future testPurchase(WidgetTester tester) async {