summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 16:48:02 +0000
committerjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 16:48:02 +0000
commit7f90c383008605329c4f6dedcba0a7587aa6dfd9 (patch)
tree5a0753787094c7845075345c3e4da2417da12d2f /chrome/app
parent44db7c6b5a0dd41bfbd8145a74cc6948fe2d6c04 (diff)
downloadchromium_src-7f90c383008605329c4f6dedcba0a7587aa6dfd9.zip
chromium_src-7f90c383008605329c4f6dedcba0a7587aa6dfd9.tar.gz
chromium_src-7f90c383008605329c4f6dedcba0a7587aa6dfd9.tar.bz2
Adds support for language detection on the server side.
The CLD can sometimes fail to detect the language of a page, in which case the translate server might be able to. This CL ensures the browser deals with the server side language detection properly. Also added a new factory method to create error translate infobar delegates that does not assert when the language code is incorrect. Also changed the enums in TranslateInfoBarDelegate2 to use the constant name style, as it is the preferred naming for enums according to the style guide. Original review: http://codereview.chromium.org/2859013/show BUG=40857 TEST=Visit http://www.saanconf.org/saanday.htm, use the context menu to translate the page. You should get an error mentioning the page is already in English. Review URL: http://codereview.chromium.org/2860037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 483426a..a1854d7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7042,6 +7042,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_TRANSLATE_INFOBAR_ERROR_CANT_TRANSLATE" desc="Error message to show for translate infobar when translate server is unable to translate page">
The translation failed because of a server error.
</message>
+ <message name="IDS_TRANSLATE_INFOBAR_UNKNOWN_PAGE_LANGUAGE" desc="Error message to show for translate infobar when the page language could not be determined.">
+ The translation failed because the page's language could not be determined.
+ </message>
+ <message name="IDS_TRANSLATE_INFOBAR_ERROR_SAME_LANGUAGE" desc="Error message to show for translate infobar when the original and target languages are identical">
+ The translation failed because the page is already in <ph name="language">$1<ex>English</ex></ph>.
+ </message>
<!-- Desktop notifications -->
<message name="IDS_NOTIFICATION_BALLOON_DISMISS_LABEL" desc="Text on the button which dismisses the balloon.">