From cdca989154d270a6553c1c8e2df0122b521b49eb Mon Sep 17 00:00:00 2001 From: "mmenke@chromium.org" Date: Fri, 20 May 2011 14:58:31 +0000 Subject: Add error text and resolution instructions to network error pages for ERR_CONNECTION_TIMED_OUT, ERR_CONNECTION_RESET, and ERR_CONNECTION_REFUSED. Also update resolution suggestion text, and replace "web page" in the entire file with "webpage", per UX guidelines. BUG=74592, 74593, 80422 TEST=none Review URL: http://codereview.chromium.org/6991013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86080 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/generated_resources.grd | 112 ++++++++++++++++++++++--------------- chrome/renderer/localized_error.cc | 52 +++++++++-------- 2 files changed, 97 insertions(+), 67 deletions(-) diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index a598dfe..24bc3e4 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4097,7 +4097,7 @@ Keep your key file in a safe place. You will need it to create new versions of y CRX-less Web Apps - Enables support for installing Chrome apps that are deployed using a manifest file on a web page, rather than by packaging the manifest and icons into a crx file. + Enables support for installing Chrome apps that are deployed using a manifest file on a webpage, rather than by packaging the manifest and icons into a crx file. Check for known conflicts with 3rd party modules. @@ -4109,7 +4109,7 @@ Keep your key file in a safe place. You will need it to create new versions of y GPU Accelerated Compositing - Enables 3D CSS and higher performance compositing of web pages using Graphics Processor Unit (GPU) hardware. + Enables 3D CSS and higher performance compositing of webpages using Graphics Processor Unit (GPU) hardware. Composited render layer borders @@ -4299,7 +4299,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Enable Instant for faster searching and browsing? - With Instant enabled, most web pages begin loading as soon as you type a URL in the omnibox, before you hit Enter. In addition, if supported by your default search engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search.\n\nBecause search results are requested even while you're typing your query, your default search engine may be logging these as search queries.\n + With Instant enabled, most webpages begin loading as soon as you type a URL in the omnibox, before you hit Enter. In addition, if supported by your default search engine, search results appear instantly as you type queries in the omnibox, and in-line predictions help guide your search.\n\nBecause search results are requested even while you're typing your query, your default search engine may be logging these as search queries.\n Enable Instant for faster searching and browsing @@ -4506,17 +4506,17 @@ Keep your key file in a safe place. You will need it to create new versions of y - + Javascript Alert - + Javascript - + The page at $1http://www.google.com says: - + The page at $1http://www.google.com says: @@ -5885,7 +5885,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Copy URL - + Open browser window @@ -5896,7 +5896,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Copy URL - + Open Browser Window @@ -6007,13 +6007,13 @@ Keep your key file in a safe place. You will need it to create new versions of y - <a jsvalues="href:reloadUrl">Reload</a> this web page later. + <a jsvalues="href:reloadUrl">Reload</a> this webpage later. Go to the home page of the site: - Check your Internet connection. Reboot any routers, modems, or other + Check your Internet connection. Restart any router, modem, or other network devices you may be using. @@ -6024,7 +6024,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Try disabling network prediction by following these steps: Go to <strong> - Wrench menu > + the wrench menu > <span jscontent="settingsTitle"></span>Settings > <span jscontent="advancedTitle"></span>Under the Hood @@ -6033,19 +6033,18 @@ Keep your key file in a safe place. You will need it to create new versions of y If this does not resolve the issue, we recommend selecting this option again for improved performance. - - Try adding + + Add <span jscontent="productName"></span>Google Chrome - as a permitted program in your firewall or antivirus software's settings. If it is + as a permitted program in your firewall's or antivirus software's settings. If it is already a permitted program, try deleting it from the list of permitted programs and adding it again. - - If you use a proxy server, check your proxy settings or check with your network administrator - to make sure the proxy server is working. - - - If you don't believe you should be using a proxy server, try the following steps: + + If you use a proxy server, check your proxy settings or contact your + network administrator to make sure the proxy server is working. If you + don't believe you should be using a proxy server, adjust your proxy + settings: $1Goto the wrench menu and choose Fix It @@ -6057,35 +6056,38 @@ Keep your key file in a safe place. You will need it to create new versions of y and deselect any proxies that have been selected. - - - Go to - <strong> - Wrench menu > Settings > Under the Hood > Change proxy settings - </strong> - and make sure your configuration is set to "no proxy" or "direct." - - - - + + Go to <strong> - Wrench menu > Preferences > Under the Hood > Change proxy settings + the wrench menu > + <span jscontent="settingsTitle"></span>Settings + > + <span jscontent="advancedTitle"></span>Under the Hood + > + <span jscontent="proxyTitle"></span>Change proxy settings... </strong> and make sure your configuration is set to "no proxy" or "direct." - + Go to <strong> - Wrench menu > Options > Under the Hood > Change proxy settings > LAN Settings + the wrench menu > + <span jscontent="settingsTitle"></span>Settings + > + <span jscontent="advancedTitle"></span>Under the Hood + > + <span jscontent="proxyTitle"></span>Change proxy settings... + > + LAN Settings </strong> - and deselect "Use a proxy server for your LAN." + and deselect the "Use a proxy server for your LAN" checkbox. - + <a jsvalues="href:learnMoreUrl">Learn more</a> about this problem. @@ -6140,8 +6142,28 @@ Keep your key file in a safe place. You will need it to create new versions of y The webpage at <strong jscontent="failedUrl"></strong> might be temporarily down or it may have moved permanently to a new web address. + + <span jscontent="productName"></span>Google Chrome + could not load the webpage because + <strong jscontent="hostName"></strong>www.whatever.com + took too long to respond. The website may be down, or you may be + experiencing issues with your Internet connection. + + + The connection to + <strong jscontent="hostName"></strong>www.whatever.com + was interrupted. + + + <span jscontent="productName"></span>Google Chrome's + connection attempt to + <strong jscontent="hostName"></strong>www.whatever.com + was rejected. The website may be down, or your network may not be + properly configured. + - The server at <strong jscontent="hostName"></strong> + The server at + <strong jscontent="hostName"></strong>www.whatever.com can't be found, because the DNS lookup failed. DNS is the web service that translates a website's name to its Internet address. This error is most often caused by having no connection to the Internet or a @@ -6307,10 +6329,10 @@ Keep your key file in a safe place. You will need it to create new versions of y The connection was reset. - + The server refused the connection. - + The attempt to connect to the server failed. @@ -6452,7 +6474,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - This web page requires data that you entered earlier in order to be properly displayed. You can send this data again, but by doing so you will repeat any action this page previously performed. Press Reload to resend that data and display this page. + This webpage requires data that you entered earlier in order to be properly displayed. You can send this data again, but by doing so you will repeat any action this page previously performed. Press Reload to resend that data and display this page. @@ -7542,7 +7564,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - + Predict network actions to improve page load performance @@ -8176,7 +8198,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - + Web Page, HTML Only @@ -8246,7 +8268,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Pressing Tab on a webpage highlights links, as well as form fields - + Change the default font and language for webpages. @@ -9796,7 +9818,7 @@ Keep your key file in a safe place. You will need it to create new versions of y Image burning has been terminated - + Create OS Recovery Media diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index bdf5938..ac63d49 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -56,16 +56,18 @@ const LocalizedErrorMap net_error_options[] = { {net::ERR_TIMED_OUT, IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, - IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE, + IDS_ERRORPAGES_SUMMARY_TIMED_OUT, IDS_ERRORPAGES_DETAILS_TIMED_OUT, - SUGGEST_RELOAD, + SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | + SUGGEST_PROXY_CONFIG, }, {net::ERR_CONNECTION_TIMED_OUT, IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, - IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE, + IDS_ERRORPAGES_SUMMARY_TIMED_OUT, IDS_ERRORPAGES_DETAILS_TIMED_OUT, - SUGGEST_RELOAD, + SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | + SUGGEST_PROXY_CONFIG, }, {net::ERR_CONNECTION_CLOSED, IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, @@ -77,16 +79,18 @@ const LocalizedErrorMap net_error_options[] = { {net::ERR_CONNECTION_RESET, IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, - IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE, + IDS_ERRORPAGES_SUMMARY_CONNECTION_RESET, IDS_ERRORPAGES_DETAILS_CONNECTION_RESET, - SUGGEST_RELOAD, + SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | + SUGGEST_PROXY_CONFIG, }, {net::ERR_CONNECTION_REFUSED, IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, - IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE, + IDS_ERRORPAGES_SUMMARY_CONNECTION_REFUSED, IDS_ERRORPAGES_DETAILS_CONNECTION_REFUSED, - SUGGEST_RELOAD, + SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | + SUGGEST_PROXY_CONFIG, }, {net::ERR_CONNECTION_FAILED, IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, @@ -101,7 +105,7 @@ const LocalizedErrorMap net_error_options[] = { IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED, IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED, SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_DNS_CONFIG | - SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG, + SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG, }, {net::ERR_ADDRESS_UNREACHABLE, IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, @@ -360,6 +364,17 @@ bool LocaleIsRTL() { #endif } +// Returns a dictionary containing the strings for the settings menu under the +// wrench, and the advanced settings button. +DictionaryValue* GetStandardMenuItemsText() { + DictionaryValue* standard_menu_items_text = new DictionaryValue(); + standard_menu_items_text->SetString("settingsTitle", + l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE)); + standard_menu_items_text->SetString("advancedTitle", + l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_TAB_LABEL)); + return standard_menu_items_text; +} + } // namespace const char LocalizedError::kHttpErrorDomain[] = "http"; @@ -488,14 +503,10 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error, l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG)); error_strings->Set("suggestionsDNSConfig", suggest_dns_config); - DictionaryValue* suggest_network_prediction = new DictionaryValue; + DictionaryValue* suggest_network_prediction = GetStandardMenuItemsText(); suggest_network_prediction->SetString("msg", l10n_util::GetStringUTF16( IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION)); - suggest_network_prediction->SetString("settingsTitle", - l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE)); - suggest_network_prediction->SetString("advancedTitle", - l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_TAB_LABEL)); suggest_network_prediction->SetString( "noNetworkPredictionTitle", l10n_util::GetStringUTF16( @@ -514,17 +525,14 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error, } if (options.suggestions & SUGGEST_PROXY_CONFIG) { - DictionaryValue* suggest_proxy_config = new DictionaryValue; + DictionaryValue* suggest_proxy_config = GetStandardMenuItemsText(); suggest_proxy_config->SetString("msg", - l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG)); - error_strings->Set("suggestionsProxyConfig", suggest_proxy_config); - - DictionaryValue* suggest_proxy_disable = new DictionaryValue; - suggest_proxy_disable->SetString("msg", - l10n_util::GetStringFUTF16(IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE, + l10n_util::GetStringFUTF16(IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG, l10n_util::GetStringUTF16( IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM))); - error_strings->Set("suggestionsProxyDisable", suggest_proxy_disable); + suggest_proxy_config->SetString("proxyTitle", + l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)); + error_strings->Set("suggestionsProxyConfig", suggest_proxy_config); } if (options.suggestions & SUGGEST_LEARNMORE) { -- cgit v1.1