summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordzhioev <dzhioev@chromium.org>2014-09-26 15:30:03 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-26 22:30:34 +0000
commit4c5a4267aaa7fa54da7c00df7bf87de2950bd973 (patch)
tree07bb2909d54359ca0020046197b8ff0e05939b2a
parent367411a84c4e8d2a508b9167f090b0a7edb3ebc3 (diff)
downloadchromium_src-4c5a4267aaa7fa54da7c00df7bf87de2950bd973.zip
chromium_src-4c5a4267aaa7fa54da7c00df7bf87de2950bd973.tar.gz
chromium_src-4c5a4267aaa7fa54da7c00df7bf87de2950bd973.tar.bz2
Added strings needed for the pairing UI.
BUG=375191 TEST=none Review URL: https://codereview.chromium.org/608963002 Cr-Commit-Position: refs/heads/master@{#297057}
-rw-r--r--chrome/app/chromeos_strings.grdp108
-rw-r--r--chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc45
-rw-r--r--chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc23
3 files changed, 175 insertions, 1 deletions
diff --git a/chrome/app/chromeos_strings.grdp b/chrome/app/chromeos_strings.grdp
index cd97582..e00648b 100644
--- a/chrome/app/chromeos_strings.grdp
+++ b/chrome/app/chromeos_strings.grdp
@@ -5489,7 +5489,7 @@ All users must sign out to continue.
Offline
</message>
- <!-- Strings for the new-style OAuth-based enterprise enrollment page -->
+ <!-- Strings for the "Chromebox for meeting" OOBE UI. -->
<message name="IDS_ENTERPRISE_DEVICE_REQUISITION_PROMPT_CANCEL" desc="Cancel button text in the device requisition poup.">
Cancel
</message>
@@ -5505,7 +5505,113 @@ All users must sign out to continue.
<message name="IDS_ENTERPRISE_DEVICE_REQUISITION_SHARK_PROMPT_TEXT" desc="Prompt shown in the device requisition shark prompt popup.">
Are you sure you want to set up this device as a "Shark"?
</message>
+ <message name="IDS_PAIRING_CONTROLLER_WELCOME" desc="Message shown on 'Chromebox for meetings' controller in the beginning of the setup process.">
+ Welcome to Chromebox for meeting
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_SEARCHING" desc="Message shown on 'Chromebox for meetings' controller when it is searching for host devices.">
+ Searching for nearby Chromeboxes...
+ </message>
+ <message name="IDS_PAIRING_NEED_HELP" desc="Text on the button launching help article about the 'Chromebox for meetings' setup process.">
+ Need help?
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_TROUBLE_CONNECTING" desc="Title of the the dialog giving an advice on how to improve a connection between a host and a controller during the 'Chromebox for meeting' setup process.">
+ Trouble connecting?
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONNECTING_ADVICE" desc="Text in the dialog giving an advice on how to improve a connection between a host and a controller during the 'Chromebox for meeting' setup process.">
+ Please make sure that your Hotrod device is turned on and connected to a TV.
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_ADVICE_GOT_IT" desc="Text on the confirmation button of the dialog giving an advice on how to improve a connection between a host and a controller during the 'Chromebox for meeting' setup process.">
+ OK, got it
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_SELECT_TITLE" desc="Title of the list of nearby 'Chromebox for meeting' devices, that is shown on a controller device during a setup process.">
+ Select a Chromebox to connect to
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONNECT" desc="Text on the button initiating a connection to the choosen device. After a user pressed the button, text changes to 'Connecting...'.">
+ Connect
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONNECTING" desc="Text on the button initiating a connection to the choosen device, after a user pressed it. The initial text is 'Connect'.">
+ Connecting...
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONFIRMATION_TITLE" desc="Title of the page showing the confirmation code on a controller's screen during the 'Chromebox for meeting' setup process.">
+ Pair with Chromebox
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONFIRMATION_QUESTION" desc="Text that is shown near 6-digit confirmation code on a controller's screen during the 'Chromebox for meeting' setup process.">
+ Does this code appear on your Chromebox screen?
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_REJECT_CODE" desc="Text on button, pressing which user reports that he doesn't see confirmation code on host screen.">
+ No, I don't see it
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_ACCEPT_CODE" desc="Text on button, pressing which user reports that he sees confirmation code on host screen and code is correct.">
+ Yes, I see it
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_UPDATE_TITLE" desc="Title of the controller's update page of the 'Chromebox for meeting' setup process.">
+ Updating Chromebox
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_UPDATE_TEXT" desc="Text on the controller's update page of the 'Chromebox for meeting' setup process.">
+ In order to bring you the latest features, your Chromebox needs to update.
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TITLE" desc="Title of the controller page which says that connection with host was lost during the 'Chromebox for meeting' setup process.">
+ Connection to Chromebox lost
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TEXT" desc="Text on the controller page which says that connection with host was lost during the 'Chromebox for meeting' setup process.">
+ Lost connection to your Chromebox. Please move closer, or check your device while we try to reconnect.
+ </message>
+ <message name="IDS_PAIRING_ENROLL_TITLE" desc="Title of the enroll page of the 'Chromebox for meeting' setup process.">
+ Enroll in your organization
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_ENROLL_TEXT_1" desc="First paragraph of text shown on the controller's enroll page of the 'Chromebox for meeting' setup process. Second paragraph is: 'This will only happen once, and your credentials will not be stored.'">
+ Chromebox for meetings needs to know what domain it belongs to. This will require you to sign in to your account.
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_ENROLL_TEXT_2" desc="Second paragraph of text shown on the controller's enroll page of the 'Chromebox for meeting' setup process. First paragraph is: 'Chromebox for meetings needs to know what domain it belongs to. This will require you to sign in to your account.'">
+ This will only happen once, and your credentials will not be stored.
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONTINUE" desc="Text on buttons leading to the next step of the 'Chromebox for meeting' setup process.">
+ Continue
+ </message>
+ <message name="IDS_PAIRING_ENROLLMENT_IN_PROGRESS" desc="Message shown on enroll screens of the 'Chromebox for meeting' setup process.">
+ Enrolling in <ph name="BEGIN_BOLD">&lt;strong&gt;</ph><ph name="DOMAIN_NAME">$1<ex>example.com</ex></ph><ph name="END_BOLD">&lt;/strong&gt;</ph>...
+ </message>
+ <message name="IDS_PAIRING_ENROLLMENT_ERROR_TITLE" desc="Title of the page shown when enrollment attempt is failed during the 'Chromebox for meeting' setup process.">
+ Unable to enroll
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_ENROLLMENT_ERROR_HOST_RESTARTS" desc="Text on the controller's page shown when enrollment attempt is failed during the 'Chromebox for meeting' setup process.">
+ Please wait while your Chromebox restarts...
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_SUCCESS_TITLE" desc="Title of the final controller's page shown when the 'Chromebox for meeting' setup process is finished.">
+ Success!
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_SUCCESS_TEXT" desc="Text on the final controller's page shown when the 'Chromebox for meeting' setup process is finished.">
+ <ph name="DEVICE_NAME">$1<ex>Chromebox-01</ex></ph> will now appear in the Admin Console
+ </message>
+ <message name="IDS_PAIRING_CONTROLLER_CONTINUE_TO_HANGOUTS" desc="Text on the button, shown on the final controller's page, displayed when the 'Chromebox for meeting' setup process is finished.">
+ Continue to Hangouts
+ </message>
+ <message name="IDS_PAIRING_HOST_WELCOME_TITLE" desc="Title of the host's welcome page of the 'Chromebox for meeting' setup process.">
+ Welcome to Chromebox for meetings!
+ </message>
+ <message name="IDS_PAIRING_HOST_WELCOME_TEXT" desc="Text on the host's welcome page of the 'Chromebox for meeting' setup process.">
+ Turn on your touch controller to set me up
+ </message>
+ <message name="IDS_PAIRING_HOST_CONFIRMATION_TITLE" desc="Title of the host's confirmation page of the 'Chromebox for meeting' setup process. 6-digit confirmation code is displayed below.">
+ Pair with a controller
+ </message>
+ <message name="IDS_PAIRING_HOST_UPDATING_TITLE" desc="Title of the host's update page of the 'Chromebox for meeting' setup process.">
+ Updating Chromebox...
+ </message>
+ <message name="IDS_PAIRING_HOST_UPDATING_TEXT" desc="Update progress shown on the host's update page of the 'Chromebox for meeting' setup process.">
+ <ph name="DOWNLOADED_AMOUNT_MB">$1<ex>13.7</ex></ph> MB / <ph name="TOTAL_AMOUNT_MB">$2<ex>23</ex></ph> MB downloaded
+ </message>
+ <message name="IDS_PAIRING_HOST_DONE_TITLE" desc="Title of the final host's page shown when the 'Chromebox for meeting' setup process is finished.">
+ Congratulations
+ </message>
+ <message name="IDS_PAIRING_HOST_DONE_TEXT" desc="Title of the final host's page shown when the 'Chromebox for meeting' setup process is finished.">
+ You're all set to continue on to Hangouts
+ </message>
+ <message name="IDS_PAIRING_HOST_EROLLMENT_ERROR_NEEDS_RESTART" desc="Text on the host's page of the 'Chromebox for meeting' setup process shown when enrollment attempt is failed.">
+ Chromebox needs to restart...
+ </message>
+ <!-- Strings for the le OAuth-based enterprise enrollment page -->
<message name="IDS_ENTERPRISE_ENROLLMENT_STATUS_REGISTRATION_FAILED" desc="Error message shown on the enrollment screen upon failed device registration.">
Error when registering the device with the server: <ph name="CLIENT_ERROR">$1<ex>Failed to connect to the server</ex></ph>.
</message>
diff --git a/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc
index 7283710..f00cec2 100644
--- a/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.cc
@@ -4,8 +4,10 @@
#include "chrome/browser/ui/webui/chromeos/login/controller_pairing_screen_handler.h"
+#include "base/strings/string_util.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
#include "content/public/browser/web_contents.h"
+#include "grit/generated_resources.h"
namespace chromeos {
@@ -55,6 +57,49 @@ void ControllerPairingScreenHandler::Initialize() {
void ControllerPairingScreenHandler::DeclareLocalizedValues(
LocalizedValuesBuilder* builder) {
+ // TODO(dzhioev): Move the prefix logic to the base screen handler after
+ // migration.
+ std::string prefix;
+ base::ReplaceChars(kJsScreenPath, ".", "_", &prefix);
+ prefix += "_";
+
+ builder->Add(prefix + "welcome", IDS_PAIRING_CONTROLLER_WELCOME);
+ builder->Add(prefix + "searching", IDS_PAIRING_CONTROLLER_SEARCHING);
+ builder->Add(prefix + "needHelp", IDS_PAIRING_NEED_HELP);
+ builder->Add(prefix + "troubleConnecting",
+ IDS_PAIRING_CONTROLLER_TROUBLE_CONNECTING);
+ builder->Add(prefix + "connectingAdvice",
+ IDS_PAIRING_CONTROLLER_CONNECTING_ADVICE);
+ builder->Add(prefix + "adviceGotIt", IDS_PAIRING_CONTROLLER_ADVICE_GOT_IT);
+ builder->Add(prefix + "selectTitle", IDS_PAIRING_CONTROLLER_SELECT_TITLE);
+ builder->Add(prefix + "connect", IDS_PAIRING_CONTROLLER_CONNECT);
+ builder->Add(prefix + "connecting", IDS_PAIRING_CONTROLLER_CONNECTING);
+ builder->Add(prefix + "confirmationTitle",
+ IDS_PAIRING_CONTROLLER_CONFIRMATION_TITLE);
+ builder->Add(prefix + "confirmationQuestion",
+ IDS_PAIRING_CONTROLLER_CONFIRMATION_QUESTION);
+ builder->Add(prefix + "rejectCode", IDS_PAIRING_CONTROLLER_REJECT_CODE);
+ builder->Add(prefix + "acceptCode", IDS_PAIRING_CONTROLLER_ACCEPT_CODE);
+ builder->Add(prefix + "updateTitle", IDS_PAIRING_CONTROLLER_UPDATE_TITLE);
+ builder->Add(prefix + "updateText", IDS_PAIRING_CONTROLLER_UPDATE_TEXT);
+ builder->Add(prefix + "connectionLostTitle",
+ IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TITLE);
+ builder->Add(prefix + "connectionLostText",
+ IDS_PAIRING_CONTROLLER_CONNECTION_LOST_TEXT);
+ builder->Add(prefix + "enrollTitle", IDS_PAIRING_ENROLL_TITLE);
+ builder->Add(prefix + "enrollText1", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_1);
+ builder->Add(prefix + "enrollText2", IDS_PAIRING_CONTROLLER_ENROLL_TEXT_2);
+ builder->Add(prefix + "continue", IDS_PAIRING_CONTROLLER_CONTINUE);
+ builder->Add(prefix + "enrollmentInProgress",
+ IDS_PAIRING_ENROLLMENT_IN_PROGRESS);
+ builder->Add(prefix + "enrollmentErrorTitle",
+ IDS_PAIRING_ENROLLMENT_ERROR_TITLE);
+ builder->Add(prefix + "enrollmentErrorHostRestarts",
+ IDS_PAIRING_CONTROLLER_ENROLLMENT_ERROR_HOST_RESTARTS);
+ builder->Add(prefix + "successTitle", IDS_PAIRING_CONTROLLER_SUCCESS_TITLE);
+ builder->Add(prefix + "successText", IDS_PAIRING_CONTROLLER_SUCCESS_TEXT);
+ builder->Add(prefix + "continueToHangouts",
+ IDS_PAIRING_CONTROLLER_CONTINUE_TO_HANGOUTS);
}
void ControllerPairingScreenHandler::RegisterMessages() {
diff --git a/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
index 6a1ffcb..4914bb7 100644
--- a/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.cc
@@ -4,7 +4,9 @@
#include "chrome/browser/ui/webui/chromeos/login/host_pairing_screen_handler.h"
+#include "base/strings/string_util.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "grit/generated_resources.h"
namespace chromeos {
@@ -50,6 +52,27 @@ void HostPairingScreenHandler::Initialize() {
void HostPairingScreenHandler::DeclareLocalizedValues(
LocalizedValuesBuilder* builder) {
+ // TODO(dzhioev): Move the prefix logic to the base screen handler after
+ // migration.
+ std::string prefix;
+ base::ReplaceChars(kJsScreenPath, ".", "_", &prefix);
+ prefix += "_";
+
+ builder->Add(prefix + "welcomeTitle", IDS_PAIRING_HOST_WELCOME_TITLE);
+ builder->Add(prefix + "welcomeText", IDS_PAIRING_HOST_WELCOME_TEXT);
+ builder->Add(prefix + "confirmationTitle",
+ IDS_PAIRING_HOST_CONFIRMATION_TITLE);
+ builder->Add(prefix + "updatingTitle", IDS_PAIRING_HOST_UPDATING_TITLE);
+ builder->Add(prefix + "updatingText", IDS_PAIRING_HOST_UPDATING_TEXT);
+ builder->Add(prefix + "enrollTitle", IDS_PAIRING_ENROLL_TITLE);
+ builder->Add(prefix + "enrollingTitle",
+ IDS_PAIRING_ENROLLMENT_IN_PROGRESS);
+ builder->Add(prefix + "doneTitle", IDS_PAIRING_HOST_DONE_TITLE);
+ builder->Add(prefix + "doneText", IDS_PAIRING_HOST_DONE_TEXT);
+ builder->Add(prefix + "enrollmentErrorTitle",
+ IDS_PAIRING_ENROLLMENT_ERROR_TITLE);
+ builder->Add(prefix + "errorNeedsRestart",
+ IDS_PAIRING_HOST_EROLLMENT_ERROR_NEEDS_RESTART);
}
void HostPairingScreenHandler::RegisterMessages() {