Skip to content

GitLab

T
tangled
Commit 544debc5 authored by Yunke Zhou's avatar Yunke Zhou Committed by Commit Bot
Browse files
Options

Oobe: update strings in screens for child setup 

Bug: 1133679
Change-Id: Ifad8d8ae4a3bf23372b274eaa5ed776d18a64ca1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445171Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Yunke Zhou <yunkez@google.com>
Cr-Commit-Position: refs/heads/master@{#813251}
parent 5ba78465
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 19 deletions
chrome/app/chromeos_strings.grdp
View file @ 544debc5
......@@ -772,22 +772,34 @@
Set up this device for work or personal use
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_BUTTON_LABEL" desc="The label of the button that leads to set up device for child.">
Your child
A child
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_BUTTON_DESCRIPTION" desc="The description of the button that leads to set up device for child.">
Set digital ground rules to help your child learn, play, and explore
Set digital ground rules to help children play, explore and do schoolwork at home
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_SIGNIN_TITLE" desc="Title of the screen which allows users to choose signin method for child.">
Set up this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> for your child
Set up this <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> for a child
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_SIGNIN_SUBTITLE" desc="Subtitle of the screen which allows users to choose signin method for child.">
To set up parental controls, your child must have a Google Account that you'll help manage. You can set screen time limits, approve or block websites, and more with the Family Link app.
To set up parental controls, a child must have a Google Account managed by a parent. <ph name="DEVICE_TYPE_PLURAL">$1<ex>Chromebooks</ex></ph> allow parents to set up screen limits, approve or block websites, and do more with the Family Link app. If the child needs to do schoolwork on sites like Google Classroom, a school account can be added later.
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_SIGNIN_LEARN_MORE" desc="Learn more link text in child account creation screen.">
Learn more
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_ACCOUNT_CREATION_BUTTON_LABEL" desc="The label of the button that leads to child account creation.">
Create a Google Account for your child
Create a Google Account for a child
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_BUTTON_LABEL" desc="The label of the button that leads to child sign in using existing account.">
Sign in with your child's Google Account
Sign in with a child's Google Account
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_PARENT_NOTIFICATION_TEXT" desc="Text displayed to parent on child account creation screen.">
Parents, the next few steps are for you. You can hand the <ph name="DEVICE_TYPE">$1<ex>Chromebook</ex></ph> back to the child after account setup.
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_LEARN_MORE_DIALOG_TITLE" desc="Title of the learn more dialog on child account creation screen.">
Add a school account later
</message>
<message name="IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_LEARN_MORE_DIALOG_TEXT" desc="Text of the learn more dialog on child account creation screen.">
Parental controls are not supported for school accounts. To add a school account to access Google Classroom and other websites for schoolwork at home, sign in with the child's personal account first. You can add the school account later in setup.
</message>
<!-- Strings for the OOBE demo setup flow -->
......
chrome/app/chromeos_strings_grdp/IDS_OOBE_USER_CREATION_CHILD_ACCOUNT_CREATION_BUTTON_LABEL.png.sha1
View file @ 544debc5
5ffb83e470ed2730c5dde3e26d0c08268feaa581
\ No newline at end of file
0b55f6ae17cad345a391ee81b3f4cd38e6a6c36f
\ No newline at end of file
chrome/app/chromeos_strings_grdp/IDS_OOBE_USER_CREATION_CHILD_BUTTON_DESCRIPTION.png.sha1
View file @ 544debc5
985a43c1a7f9a552c75335cffa17b010cf08d8fa
\ No newline at end of file
021929a55123d89ba678c6fd4fd8a2508a438c20
\ No newline at end of file
chrome/app/chromeos_strings_grdp/IDS_OOBE_USER_CREATION_CHILD_BUTTON_LABEL.png.sha1
View file @ 544debc5
985a43c1a7f9a552c75335cffa17b010cf08d8fa
\ No newline at end of file
021929a55123d89ba678c6fd4fd8a2508a438c20
\ No newline at end of file
chrome/app/chromeos_strings_grdp/IDS_OOBE_USER_CREATION_CHILD_SIGNIN_LEARN_MORE.png.sha1 0 → 100644
View file @ 544debc5
0b55f6ae17cad345a391ee81b3f4cd38e6a6c36f
\ No newline at end of file
chrome/app/chromeos_strings_grdp/IDS_OOBE_USER_CREATION_CHILD_SIGNIN_SUBTITLE.png.sha1
View file @ 544debc5
5ffb83e470ed2730c5dde3e26d0c08268feaa581
\ No newline at end of file
0b55f6ae17cad345a391ee81b3f4cd38e6a6c36f
\ No newline at end of file
chrome/app/chromeos_strings_grdp/IDS_OOBE_USER_CREATION_CHILD_SIGNIN_TITLE.png.sha1
View file @ 544debc5
5ffb83e470ed2730c5dde3e26d0c08268feaa581
\ No newline at end of file
0b55f6ae17cad345a391ee81b3f4cd38e6a6c36f
\ No newline at end of file
chrome/app/chromeos_strings_grdp/IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_BUTTON_LABEL.png.sha1
View file @ 544debc5
5ffb83e470ed2730c5dde3e26d0c08268feaa581
\ No newline at end of file
0b55f6ae17cad345a391ee81b3f4cd38e6a6c36f
\ No newline at end of file
chrome/browser/resources/chromeos/login/user_creation.html
View file @ 544debc5
......@@ -44,8 +44,8 @@ found in the LICENSE file. -->
font-size: 16px;
font-weight: 500;
line-height: 24px;
padding-inline-end: 20px;
padding-inline-start: 20px;
padding-inline-end: 32px;
padding-inline-start: 32px;
padding-top: 16px;
}
......@@ -53,6 +53,10 @@ found in the LICENSE file. -->
color: var(--oobe-text-color);
line-height: 20px;
}
.help-text {
color: var(--oobe-subheader-text-color);
}
</style>
<oobe-dialog id="userCreationDialog" role="dialog" has-buttons
title-key="[[titleKey_]]" subtitle-key="[[subtitleKey_]]"
......@@ -104,12 +108,19 @@ found in the LICENSE file. -->
</div>
</oobe-dialog>
<oobe-dialog id="childSignInDialog" role="dialog" has-buttons
title-key="childSignInTitle" subtitle-key="childSignInSubtitle"
aria-label$="[[i18nDynamic(locale, 'childSignInTitle')]]"
for-step="child">
title-key="childSignInTitle" for-step="child"
aria-label$="[[i18nDynamic(locale, 'childSignInTitle')]]">
<hd-iron-icon icon1x="oobe-32:family" icon2x="oobe-64:family"
slot="oobe-icon">
</hd-iron-icon>
<div slot="subtitle">
<div>
[[i18nDynamic(locale, 'childSignInSubtitle')]]
<a href="#" class="oobe-local-link" on-tap="onLearnMoreClicked_">
[[i18nDynamic(locale, 'childSignInLearnMore')]]
</a>
</div>
</div>
<div slot="footer" class="footer-container flex layout vertical
center-justified">
<cr-radio-group id="childSignInMethod" class="layout horizontal"
......@@ -137,6 +148,9 @@ found in the LICENSE file. -->
</div>
</cr-card-radio-button>
</cr-radio-group>
<div class="help-text">
[[i18nDynamic(locale, 'childSignInParentNotificationText')]]
</div>
</div>
<div slot="bottom-buttons" class="layout horizontal justified">
<oobe-back-button id="childBackButton" on-tap="onBackClicked_">
......@@ -146,5 +160,11 @@ found in the LICENSE file. -->
</oobe-next-button>
</div>
</oobe-dialog>
<oobe-help-dialog id="learnMoreDialog"
title-key="childSignInLearnMoreDialogTitle">
<div slot="content" class="card-text">
[[i18nDynamic(locale, 'childSignInLearnMoreDialogText')]]
</div>
</oobe-help-dialog>
</template>
</dom-module>
chrome/browser/resources/chromeos/login/user_creation.js
View file @ 544debc5
......@@ -149,5 +149,9 @@ Polymer({
}
},
onLearnMoreClicked_() {
this.$.learnMoreDialog.showDialog();
}
});
})();
chrome/browser/ui/webui/chromeos/login/user_creation_screen_handler.cc
View file @ 544debc5
......@@ -47,12 +47,22 @@ void UserCreationScreenHandler::DeclareLocalizedValues(
IDS_OOBE_USER_CREATION_CHILD_BUTTON_DESCRIPTION);
builder->AddF("childSignInTitle", IDS_OOBE_USER_CREATION_CHILD_SIGNIN_TITLE,
ui::GetChromeOSDeviceName());
builder->Add("childSignInSubtitle",
IDS_OOBE_USER_CREATION_CHILD_SIGNIN_SUBTITLE);
builder->AddF("childSignInSubtitle",
IDS_OOBE_USER_CREATION_CHILD_SIGNIN_SUBTITLE,
ui::GetChromeOSDeviceNameInPlural());
builder->Add("createAccountForChildLabel",
IDS_OOBE_USER_CREATION_CHILD_ACCOUNT_CREATION_BUTTON_LABEL);
builder->Add("signInForChildLabel",
IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_BUTTON_LABEL);
builder->AddF("childSignInParentNotificationText",
IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_PARENT_NOTIFICATION_TEXT,
ui::GetChromeOSDeviceName());
builder->Add("childSignInLearnMore",
IDS_OOBE_USER_CREATION_CHILD_SIGNIN_LEARN_MORE);
builder->Add("childSignInLearnMoreDialogTitle",
IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_LEARN_MORE_DIALOG_TITLE);
builder->Add("childSignInLearnMoreDialogText",
IDS_OOBE_USER_CREATION_CHILD_SIGN_IN_LEARN_MORE_DIALOG_TEXT);
}
void UserCreationScreenHandler::Initialize() {}
......
ui/chromeos/devicetype_utils.cc
View file @ 544debc5
......@@ -37,4 +37,26 @@ int GetChromeOSDeviceTypeResourceId() {
return IDS_GENERIC_CHROMEOS_DEVICE_NAME;
}
base::string16 GetChromeOSDeviceNameInPlural() {
return l10n_util::GetStringUTF16(GetChromeOSDeviceTypeInPluralResourceId());
}
int GetChromeOSDeviceTypeInPluralResourceId() {
switch (chromeos::GetDeviceType()) {
case chromeos::DeviceType::kChromebase:
return IDS_CHROMEBASE_DEVICE_NAME_IN_PLURAL;
case chromeos::DeviceType::kChromebook:
return IDS_CHROMEBOOK_DEVICE_NAME_IN_PLURAL;
case chromeos::DeviceType::kChromebox:
return IDS_CHROMEBOX_DEVICE_NAME_IN_PLURAL;
case chromeos::DeviceType::kChromebit:
return IDS_CHROMEBIT_DEVICE_NAME_IN_PLURAL;
case chromeos::DeviceType::kUnknown:
return IDS_GENERIC_CHROMEOS_DEVICE_NAME_IN_PLURAL;
}
NOTREACHED();
return IDS_GENERIC_CHROMEOS_DEVICE_NAME_IN_PLURAL;
}
} // namespace ui
ui/chromeos/devicetype_utils.h
View file @ 544debc5
......@@ -21,6 +21,14 @@ UI_CHROMEOS_EXPORT base::string16 GetChromeOSDeviceName();
// Chromebox).
UI_CHROMEOS_EXPORT int GetChromeOSDeviceTypeResourceId();
// Returns the name (plural forms) of the Chrome device type (e.g. Chromebooks,
// Chromeboxes).
UI_CHROMEOS_EXPORT base::string16 GetChromeOSDeviceNameInPlural();
// Returns the resource ID for the current Chrome device type in plural forms
// (e.g. Chromebooks, Chromeboxes).
UI_CHROMEOS_EXPORT int GetChromeOSDeviceTypeInPluralResourceId();
} // namespace ui
#endif // UI_CHROMEOS_DEVICETYPE_UTILS_H_
ui/chromeos/ui_chromeos_strings.grd
View file @ 544debc5
......@@ -495,6 +495,23 @@
Chrome device
</message>
<!-- Generic device type names (plural forms) -->
<message name="IDS_CHROMEBASE_DEVICE_NAME_IN_PLURAL" desc="The device name (plural) for Chromebase (versus say Chromeboxes)">
Chromebases
</message>
<message name="IDS_CHROMEBIT_DEVICE_NAME_IN_PLURAL" desc="The device name (plural) for Chromebit (versus say Chromeboxes)">
Chromebits
</message>
<message name="IDS_CHROMEBOOK_DEVICE_NAME_IN_PLURAL" desc="The device name (plural) for Chromebook (versus say Chromeboxes)">
Chromebooks
</message>
<message name="IDS_CHROMEBOX_DEVICE_NAME_IN_PLURAL" desc="The device name (plural) for Chromebox (versus say Chromebooks)">
Chromeboxes
</message>
<message name="IDS_GENERIC_CHROMEOS_DEVICE_NAME_IN_PLURAL" desc="The device name (plural) for generic Chrome device">
Chrome devices
</message>
<!-- Input method strings. -->
<message name="IDS_CHROMEOS_IME_INFOLIST_WINDOW_TITLE" desc="The title of the infolist window where the meanings and the usages of words are displayed.">
Information
......
ui/chromeos/ui_chromeos_strings_grd/IDS_CHROMEBASE_DEVICE_NAME_IN_PLURAL.png.sha1 0 → 100644
View file @ 544debc5
496b50523f5a12ee0b285bc94e679440468de151
\ No newline at end of file
ui/chromeos/ui_chromeos_strings_grd/IDS_CHROMEBIT_DEVICE_NAME_IN_PLURAL.png.sha1 0 → 100644
View file @ 544debc5
7fb35f15d65c7ed356b828911db9a585e365fefd
\ No newline at end of file
ui/chromeos/ui_chromeos_strings_grd/IDS_CHROMEBOOK_DEVICE_NAME_IN_PLURAL.png.sha1 0 → 100644
View file @ 544debc5
462caed499a6ade1f7af785e838a9ec96048c6db
\ No newline at end of file
ui/chromeos/ui_chromeos_strings_grd/IDS_CHROMEBOX_DEVICE_NAME_IN_PLURAL.png.sha1 0 → 100644
View file @ 544debc5
7b6f877e15c171b0894f6ed9eb9fb23900d1ccb9
\ No newline at end of file
ui/chromeos/ui_chromeos_strings_grd/IDS_GENERIC_CHROMEOS_DEVICE_NAME_IN_PLURAL.png.sha1 0 → 100644
View file @ 544debc5
dd44779a1d8150e023675353876b16bb65a06f54
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment