0

extended_updates: Finalize UI strings

Update the UI with finalized strings.

Screenshots:
 About page: https://screenshot.googleplex.com/BBeht3EXjDmQdrY
 QuickSettings: https://screenshot.googleplex.com/7hmV5yQJFZMgBjW
 Dialog: https://screenshot.googleplex.com/5992YMq5fnugGh8
 Dialog popup: https://screenshot.googleplex.com/5992YMq5fnugGh8
 Notification: https://screenshot.googleplex.com/5BEYELypFnPCnJn

BUG=b:324297162
TEST=manual visual testing

Change-Id: I8316f25f061f628c8963219f2bfce13e48b6e4e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5488983
Auto-Submit: Artyom Chen <artyomchen@google.com>
Reviewed-by: Addison Luh <aluh@chromium.org>
Commit-Queue: Alex Newcomer <newcomer@chromium.org>
Reviewed-by: Wes Okuhara <wesokuhara@google.com>
Commit-Queue: Artyom Chen <artyomchen@google.com>
Reviewed-by: Alex Newcomer <newcomer@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1292732}
This commit is contained in:
Artyom Chen
2024-04-25 22:10:30 +00:00
committed by Chromium LUCI CQ
parent 1ddf4f6263
commit 231fbb6f80
27 changed files with 57 additions and 43 deletions
ash
chrome

@ -350,9 +350,8 @@ Style notes:
<message name="IDS_ASH_QUICK_SETTINGS_BUBBLE_EOL_NOTICE_SHORT" desc="A short message shown to the user in the quick settings bubble when their device reaches end of life, and stops receiving software updates."> <message name="IDS_ASH_QUICK_SETTINGS_BUBBLE_EOL_NOTICE_SHORT" desc="A short message shown to the user in the quick settings bubble when their device reaches end of life, and stops receiving software updates.">
Updates ended Updates ended
</message> </message>
<!-- TODO(b/324297162): Finalize and translate --> <message name="IDS_ASH_QUICK_SETTINGS_BUBBLE_EXTENDED_UPDATES_NOTICE" desc="Message shown to the user in the quick settings bubble when their device is eligible to receive extended updates support.">
<message name="IDS_ASH_QUICK_SETTINGS_BUBBLE_EXTENDED_UPDATES_NOTICE" desc="Message shown to the user in the quick settings bubble when their device is eligible to receive extended updates support." translateable="false"> Extended security updates available
Security updates paused. Review options.
</message> </message>
<message name="IDS_ASH_STATUS_TRAY_AUTOZOOM_BUTTON_LABEL" desc="The shorter label used for the button in the status tray to toggle the Autozoom feature (which controls if camera auto zoom to faces) on or off. [CHAR_LIMIT=14]"> <message name="IDS_ASH_STATUS_TRAY_AUTOZOOM_BUTTON_LABEL" desc="The shorter label used for the button in the status tray to toggle the Autozoom feature (which controls if camera auto zoom to faces) on or off. [CHAR_LIMIT=14]">
Camera framing Camera framing

@ -0,0 +1 @@
d3afcc1feb8f11c44c91af74ecf0bc8fb86d95ba

@ -17,7 +17,7 @@ using ExtendedUpdatesNoticeQuickSettingsViewPixelTest =
TEST_F(ExtendedUpdatesNoticeQuickSettingsViewPixelTest, Basics) { TEST_F(ExtendedUpdatesNoticeQuickSettingsViewPixelTest, Basics) {
AddChildView(std::make_unique<ExtendedUpdatesNoticeQuickSettingsView>()); AddChildView(std::make_unique<ExtendedUpdatesNoticeQuickSettingsView>());
DiffView(/*revision_number=*/0); DiffView(/*revision_number=*/1);
} }
} // namespace ash } // namespace ash

@ -7499,59 +7499,57 @@ Your <ph name="DEVICE_TYPE">{0}<ex>Chromebook</ex></ph> will be locked now.
</message> </message>
<!-- Extended Updates Dialog --> <!-- Extended Updates Dialog -->
<!-- TODO(b/324297162): Finalize strings and translate --> <message name="IDS_EXTENDED_UPDATES_DIALOG_DIALOG_HEADING" desc="Dialog heading of the Extended Updates Dialog">
<message name="IDS_EXTENDED_UPDATES_DIALOG_DIALOG_HEADING" desc="Dialog heading of the Extended Updates Dialog" translateable="false"> Turn on extended security updates
Turn on extended updates
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_DIALOG_DESCRIPTION_P1" desc="Dialog description paragraph 1 of the Extended Updates Dialog" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_DIALOG_DESCRIPTION_P1" desc="Dialog description paragraph 1 of the Extended Updates Dialog">
Automatic security and software updates have been paused. You can extended automatic updates on your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> to receive continued security, performance, and stability. This device is no longer receiving automatic software and security updates, but you can turn on extended security updates.
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_DIALOG_DESCRIPTION_P2" desc="Dialog description paragraph 2 of the Extended Updates Dialog" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_DIALOG_DESCRIPTION_P2" desc="Dialog description paragraph 2 of the Extended Updates Dialog">
If you turn on extended updates, this change can't be reversed. Extended updates apply to all users of this device. <ph name="LINK_START">&lt;a href="$1" target="_blank"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph> This change is permanent and can't be reversed. Extended updates apply to all users of this device. <ph name="LINK_START">&lt;a href="$1" target="_blank"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_CANCEL_BUTTON" desc="Cancel button label of the Extended Updates Dialog" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_CANCEL_BUTTON" desc="Cancel button label of the Extended Updates Dialog">
Cancel Cancel
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_ENABLE_BUTTON" desc="Enable button label of the Extended Updates Dialog" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_ENABLE_BUTTON" desc="Enable button label of the Extended Updates Dialog">
Turn on Turn on
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_ANDROID_DESCRIPTION" desc="Description of the loss of Android Apps" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_ANDROID_DESCRIPTION" desc="Description of the loss of Android Apps">
You wont be able to use Android apps or the Google Play Store You wont be able to use Android apps or the Google Play Store
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_ANDROID_APPS_LIST_DESCRIPTION_SINGULAR" desc="Description of the list of Android Apps for one app" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_ANDROID_APPS_LIST_DESCRIPTION_SINGULAR" desc="Description of the list of Android Apps for one app">
1 installed app will be removed 1 installed app will be removed
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_ANDROID_APPS_LIST_DESCRIPTION_PLURAL" desc="Description of the list of Android Apps for multiple apps" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_ANDROID_APPS_LIST_DESCRIPTION_PLURAL" desc="Description of the list of Android Apps for multiple apps">
<ph name="NUM_OF_APPS">$1<ex>5</ex></ph> installed apps will be removed <ph name="NUM_OF_APPS">$1<ex>5</ex></ph> installed apps will be removed
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_ANDROID_APPS_LIST_NOTE" desc="Note of the loss of Android Apps" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_ANDROID_APPS_LIST_NOTE" desc="Note of the loss of Android Apps">
Tip: Many Android apps are available on the web. Check the app or developer website for availability. Tip: Many Android apps are available on the web. Check the app or developer website for availability.
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_SECURITY_DESCRIPTION" desc="Description of the extended security updates" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_SECURITY_DESCRIPTION" desc="Description of the extended security updates">
Youll get security updates and the latest features for 2 more years Your device gets the latest security, stability, and performance
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_POPUP_TITLE" desc="Title of the confirmation popup in the Extended Updates Dialog" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_POPUP_TITLE" desc="Title of the confirmation popup in the Extended Updates Dialog">
Turn on extended updates? Confirm extended security updates?
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_POPUP_DESCRIPTION" desc="Description of the confirmation popup in the Extended Updates Dialog" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_POPUP_DESCRIPTION" desc="Description of the confirmation popup in the Extended Updates Dialog">
This change can't be reversed and applies to all users of this device This change will take effect when you receive the next update and restart your Chromebook. This change cant be reversed and applies to all users of this device.
</message> </message>
<message name="IDS_EXTENDED_UPDATES_DIALOG_POPUP_CONFIRM_BUTTON" desc="Confirm button label of the confirmation popup in the Extended Updates Dialog" translateable="false"> <message name="IDS_EXTENDED_UPDATES_DIALOG_POPUP_CONFIRM_BUTTON" desc="Confirm button label of the confirmation popup in the Extended Updates Dialog">
Confirm &amp; turn on Confirm &amp; turn on
</message> </message>
<!-- Extended Updates Notification --> <!-- Extended Updates Notification -->
<!-- TODO(b/324297162): Finalize strings and translate --> <message name="IDS_EXTENDED_UPDATES_NOTIFICATION_TITLE" desc="Notification title that informs users about availability of extended updates.">
<message name="IDS_EXTENDED_UPDATES_NOTIFICATION_TITLE" desc="Notification title that informs users about availability of extended updates." translateable="false"> Extended security updates available
Your <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> is eligible for extended updates
</message> </message>
<message name="IDS_EXTENDED_UPDATES_NOTIFICATION_MESSAGE" desc="Notification message that informs users about availability of extended updates." translateable="false"> <message name="IDS_EXTENDED_UPDATES_NOTIFICATION_MESSAGE" desc="Notification message that informs users about availability of extended updates.">
Automatic security and software updates have been paused. You can extend updates for 2 years, but some functionality will be limited. This device is no longer receiving automatic software updates, but you can get continued security, stability, and performance. Some functionality will be limited.
</message> </message>
<message name="IDS_EXTENDED_UPDATES_NOTIFICATION_SETUP_BUTTON" desc="Setup button in the notification message that informs users about availability of extended updates." translateable="false"> <message name="IDS_EXTENDED_UPDATES_NOTIFICATION_SETUP_BUTTON" desc="Setup button in the notification message that informs users about availability of extended updates.">
Set up Set up
</message> </message>
<message name="IDS_EXTENDED_UPDATES_NOTIFICATION_LEARN_MORE_BUTTON" desc="Learn more button in the notification message that informs users about availability of extended updates." translateable="false"> <message name="IDS_EXTENDED_UPDATES_NOTIFICATION_LEARN_MORE_BUTTON" desc="Learn more button in the notification message that informs users about availability of extended updates.">
Learn more Learn more
</message> </message>

@ -0,0 +1 @@
a5df0981f4890815659a8185b45f4cb2f5f0fdc4

@ -0,0 +1 @@
a5df0981f4890815659a8185b45f4cb2f5f0fdc4

@ -0,0 +1 @@
a5df0981f4890815659a8185b45f4cb2f5f0fdc4

@ -0,0 +1 @@
a5df0981f4890815659a8185b45f4cb2f5f0fdc4

@ -0,0 +1 @@
a5df0981f4890815659a8185b45f4cb2f5f0fdc4

@ -0,0 +1 @@
a5df0981f4890815659a8185b45f4cb2f5f0fdc4

@ -0,0 +1 @@
a5df0981f4890815659a8185b45f4cb2f5f0fdc4

@ -0,0 +1 @@
6765430ca88a6e6529758a9df6f4606867f510bc

@ -0,0 +1 @@
6765430ca88a6e6529758a9df6f4606867f510bc

@ -0,0 +1 @@
6765430ca88a6e6529758a9df6f4606867f510bc

@ -0,0 +1 @@
a5df0981f4890815659a8185b45f4cb2f5f0fdc4

@ -0,0 +1 @@
f6d5a23f6e2ab41d0f8ac8856f68292d51ab3bab

@ -0,0 +1 @@
f6d5a23f6e2ab41d0f8ac8856f68292d51ab3bab

@ -0,0 +1 @@
f6d5a23f6e2ab41d0f8ac8856f68292d51ab3bab

@ -0,0 +1 @@
f6d5a23f6e2ab41d0f8ac8856f68292d51ab3bab

@ -295,15 +295,14 @@
<message name="IDS_SETTINGS_ABOUT_PAGE_CONSUMER_AUTO_UPDATE_TOGGLE_KEEP_UPDATES_BUTTON" desc="Text of the auto update toggle feature dialog keep update button."> <message name="IDS_SETTINGS_ABOUT_PAGE_CONSUMER_AUTO_UPDATE_TOGGLE_KEEP_UPDATES_BUTTON" desc="Text of the auto update toggle feature dialog keep update button.">
Keep updates Keep updates
</message> </message>
<!-- TODO(b/324297162): Finalize and enable translation --> <message name="IDS_SETTINGS_ABOUT_PAGE_EXTENDED_UPDATES_BUTTON" desc="Text of the extended updates button.">
<message name="IDS_SETTINGS_ABOUT_PAGE_EXTENDED_UPDATES_BUTTON" desc="Text of the extended updates button." translateable="false">
Set up Set up
</message> </message>
<message name="IDS_SETTINGS_ABOUT_PAGE_EXTENDED_UPDATES_MAIN_MESSAGE" desc="Text of the main extended updates message." translateable="false"> <message name="IDS_SETTINGS_ABOUT_PAGE_EXTENDED_UPDATES_MAIN_MESSAGE" desc="Text of the main extended updates message.">
Opt into extended updates to keep your device up to date Extended security updates available
</message> </message>
<message name="IDS_SETTINGS_ABOUT_PAGE_EXTENDED_UPDATES_SECONDARY_MESSAGE" desc="Text of the supplemental explanation about extended updates." translateable="false"> <message name="IDS_SETTINGS_ABOUT_PAGE_EXTENDED_UPDATES_SECONDARY_MESSAGE" desc="Text of the supplemental explanation about extended updates.">
Automatic security and software updates have been paused. You can extend updates for 2 more years, but some functionality will be limited. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph> This device is no longer receiving automatic software updates. Turn on extended security updates for continued security, stability, and performance. Some functionality will be limited. <ph name="LINK_BEGIN">&lt;a target="_blank" href="$1<ex>https://google.com/</ex>"&gt;</ph>Learn more<ph name="LINK_END">&lt;/a&gt;</ph>
</message> </message>
<!-- ChromeOS End Of Life Incentive --> <!-- ChromeOS End Of Life Incentive -->

@ -0,0 +1 @@
5ef5d53ae82ee1c960be2a09433f7754d924b94a

@ -0,0 +1 @@
5ef5d53ae82ee1c960be2a09433f7754d924b94a

@ -0,0 +1 @@
5ef5d53ae82ee1c960be2a09433f7754d924b94a

@ -67,8 +67,7 @@ void ExtendedUpdatesNotification::Show() {
SystemNotificationBuilder builder; SystemNotificationBuilder builder;
builder.SetId(std::string(kNotificationId)) builder.SetId(std::string(kNotificationId))
.SetCatalogName(NotificationCatalogName::kExtendedUpdatesAvailable) .SetCatalogName(NotificationCatalogName::kExtendedUpdatesAvailable)
.SetTitle(l10n_util::GetStringFUTF16( .SetTitleId(IDS_EXTENDED_UPDATES_NOTIFICATION_TITLE)
IDS_EXTENDED_UPDATES_NOTIFICATION_TITLE, ui::GetChromeOSDeviceName()))
.SetMessageId(IDS_EXTENDED_UPDATES_NOTIFICATION_MESSAGE) .SetMessageId(IDS_EXTENDED_UPDATES_NOTIFICATION_MESSAGE)
.SetOptionalFields(data) .SetOptionalFields(data)
.SetDelegate( .SetDelegate(

@ -39,6 +39,8 @@ ExtendedUpdatesUI::ExtendedUpdatesUI(content::WebUI* web_ui)
static constexpr webui::LocalizedString kLocalizedStrings[] = { static constexpr webui::LocalizedString kLocalizedStrings[] = {
{"dialogHeading", IDS_EXTENDED_UPDATES_DIALOG_DIALOG_HEADING}, {"dialogHeading", IDS_EXTENDED_UPDATES_DIALOG_DIALOG_HEADING},
{"dialogDescriptionP1",
IDS_EXTENDED_UPDATES_DIALOG_DIALOG_DESCRIPTION_P1},
{"cancelButton", IDS_EXTENDED_UPDATES_DIALOG_CANCEL_BUTTON}, {"cancelButton", IDS_EXTENDED_UPDATES_DIALOG_CANCEL_BUTTON},
{"enableButton", IDS_EXTENDED_UPDATES_DIALOG_ENABLE_BUTTON}, {"enableButton", IDS_EXTENDED_UPDATES_DIALOG_ENABLE_BUTTON},
{"androidDescription", IDS_EXTENDED_UPDATES_DIALOG_ANDROID_DESCRIPTION}, {"androidDescription", IDS_EXTENDED_UPDATES_DIALOG_ANDROID_DESCRIPTION},
@ -55,10 +57,6 @@ ExtendedUpdatesUI::ExtendedUpdatesUI(content::WebUI* web_ui)
}; };
source->AddLocalizedStrings(kLocalizedStrings); source->AddLocalizedStrings(kLocalizedStrings);
source->AddString("dialogDescriptionP1",
l10n_util::GetStringFUTF16(
IDS_EXTENDED_UPDATES_DIALOG_DIALOG_DESCRIPTION_P1,
ui::GetChromeOSDeviceName()));
source->AddString("dialogDescriptionP2", source->AddString("dialogDescriptionP2",
l10n_util::GetStringFUTF16( l10n_util::GetStringFUTF16(
IDS_EXTENDED_UPDATES_DIALOG_DIALOG_DESCRIPTION_P2, IDS_EXTENDED_UPDATES_DIALOG_DIALOG_DESCRIPTION_P2,