Skip to content

GitLab

T
tangled
Commit 50ed7c91 authored by kochi@chromium.org's avatar kochi@chromium.org
Browse files
Options

Unify ChromeOS/non-ChromeOS strings into one label on sync_ui_util 

BUG=none
TEST=build with chromeos=0/1 use_titlecase=0/1


Review URL: http://codereview.chromium.org/10167025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133606 0039d316-1c4b-4281-b951-d872f2087c98
parent 5a2a9834
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 45 deletions
chrome/app/generated_resources.grd
View file @ 50ed7c91
......@@ -11090,11 +11090,13 @@ Some features may be unavailable. Please check that the profile exists and you
<message name="IDS_SYNC_SERVER_IS_UNREACHABLE" desc="The message to display in the New Tab Page sync section when the server is unreachable.">
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data because it could not connect to the sync server. Retrying...
</message>
<message name="IDS_SYNC_RELOGIN_LINK_LABEL" desc="The text to display on in the hyperlink when the user needs to sign in again to use sync.">
Sign in again
</message>
<if expr="not pp_ifdef('chromeos')">
<message name="IDS_SYNC_RELOGIN_LINK_LABEL" desc="The text to display on in the hyperlink when the user needs to sign in again to use sync.">
Sign in again
</message>
</if>
<if expr="pp_ifdef('chromeos')">
<message name="IDS_SYNC_RELOGIN_LINK_LABEL_CHROMEOS" desc="The text to display on in the hyperlink when the user needs to sign in again to use sync.">
<message name="IDS_SYNC_RELOGIN_LINK_LABEL" desc="The text to display on in the hyperlink when the user needs to sign out and sign in again to use sync on Chrome OS.">
Sign out then sign in again
</message>
</if>
......@@ -11502,52 +11504,57 @@ Some features may be unavailable. Please check that the profile exists and you
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> could not sync your data due to an error signing in.
</message>
<if expr="not pp_ifdef('use_titlecase')">
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
Sign in again...
</message>
<message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to update the passphrase.">
Update...
</message>
<message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when sync is not available for their domain.">
OK...
</message>
<message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign in again.">
Sync Error: Sign in again...
</message>
<message name="IDS_SYNC_PASSPHRASE_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to update the passphrase.">
Sync Error: Update Sync passphrase...
</message>
</if>
<if expr="not pp_ifdef('use_titlecase') and not pp_ifdef('chromeos')">
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
Sign in again...
</message>
<message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign in again.">
Sync Error: Sign in again...
</message>
</if>
<if expr="not pp_ifdef('use_titlecase') and pp_ifdef('chromeos')">
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT_CHROMEOS" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign out and sign in again to Chrome OS.">
Sign out then sign in again...
</message>
<message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM_CHROMEOS" desc="The sync error wrench menu item when the user needs to sign in again to CrOS.">
<message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign out and sign in again to Chrome OS.">
Sync Error: Sign out then sign in again...
</message>
</if>
<if expr="pp_ifdef('use_titlecase')">
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
Sign in Again...
</message>
<message name="IDS_SYNC_PASSPHRASE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to update the passphrase.">
Update...
</message>
<message name="IDS_SYNC_UNAVAILABLE_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when sync is not available for their domain.">
OK...
</message>
<message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign in again.">
Sync Error: Sign in Again...
</message>
<message name="IDS_SYNC_PASSPHRASE_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to update the passphrase.">
Sync Error: Update Sync Passphrase...
</message>
</if>
<if expr="pp_ifdef('use_titlecase') and not pp_ifdef('chromeos')">
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
Sign in Again...
</message>
<message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign in again.">
Sync Error: Sign in Again...
</message>
</if>
<if expr="pp_ifdef('use_titlecase') and pp_ifdef('chromeos')">
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT_CHROMEOS" desc="The accept button in the sync error bubble view when the user needs to sign in again.">
<message name="IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT" desc="The accept button in the sync error bubble view when the user needs to sign out and sign in again on Chrome OS.">
Sign out then Sign in Again...
</message>
<message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM_CHROMEOS" desc="The sync error wrench menu item when the user needs to sign in again to CrOS.">
<message name="IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM" desc="The sync error wrench menu item when the user needs to sign out and sign in again to Chrome OS.">
Sync Error: Sign out then Sign in Again...
</message>
</if>
......
chrome/browser/sync/sync_ui_util.cc
View file @ 50ed7c91
......@@ -52,17 +52,8 @@ void GetStatusLabelsForAuthError(const AuthError& auth_error,
string16 username = UTF8ToUTF16(service.profile()->GetPrefs()->GetString(
prefs::kGoogleServicesUsername));
string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
// TODO(altimofeev): get rid of "if def" construction: use the same IDS
// names. The reason the suffix was used is that strings were submitted
// before the actual change.
#if defined(OS_CHROMEOS)
if (link_label)
link_label->assign(
l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL_CHROMEOS));
#else
if (link_label)
link_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL));
#endif
switch (auth_error.state()) {
case AuthError::INVALID_GAIA_CREDENTIALS:
......@@ -81,32 +72,16 @@ void GetStatusLabelsForAuthError(const AuthError& auth_error,
l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE));
}
if (global_error_menu_label) {
// TODO(altimofeev): get rid of "if def" construction: use the same
// IDS names. The reason the suffix was used is that strings were
// submitted before the actual change.
#if defined(OS_CHROMEOS)
global_error_menu_label->assign(l10n_util::GetStringUTF16(
IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM_CHROMEOS));
#else
global_error_menu_label->assign(l10n_util::GetStringUTF16(
IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM));
#endif
}
if (global_error_bubble_message) {
global_error_bubble_message->assign(l10n_util::GetStringFUTF16(
IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE, product_name));
}
if (global_error_bubble_accept_label) {
// TODO(altimofeev): get rid of "if def" construction: use the same
// IDS names. The reason the suffix was used is that strings were
// submitted before the actual change.
#if defined(OS_CHROMEOS)
global_error_bubble_accept_label->assign(l10n_util::GetStringUTF16(
IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT_CHROMEOS));
#else
global_error_bubble_accept_label->assign(l10n_util::GetStringUTF16(
IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT));
#endif
}
}
break;
......
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