Bug 559819 - Change the string id for the isindex prompt. r=l10n.
authorHenri Sivonen <hsivonen@iki.fi>
Tue, 20 Apr 2010 17:19:30 +0300
changeset 41064 665c0d6f3be9a1a2e09c2ecb55eba4454525c690
parent 41063 95ec012e2e221416d9f6dc142250ad8e9268c064
child 41065 cdc8bf25220e5611fbf9b764f0308e5553f79a6d
push id12908
push userhsivonen@iki.fi
push dateWed, 21 Apr 2010 08:43:19 +0000
treeherdermozilla-central@665c0d6f3be9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 559819 - Change the string id for the isindex prompt. r=l10n.
--- a/dom/locales/en-US/chrome/layout/HtmlForm.properties
+++ b/dom/locales/en-US/chrome/layout/HtmlForm.properties
@@ -33,13 +33,17 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 # ***** END LICENSE BLOCK *****
 Submit=Submit Query
 FileUpload=File Upload
-IsIndexPrompt=This is a searchable index. Enter search keywords:\u0020
+# LOCALIZATION NOTE (IsIndexPromptWithSpace): The last character of the string 
+# should be a space (U+0020) in most locales. The prompt is followed by an 
+# input field. The space needs be escaped in the property file to avoid 
+# trimming.
+IsIndexPromptWithSpace=This is a searchable index. Enter search keywords:\u0020
 ForgotPostWarning=Form contains enctype=%S, but does not contain method=post.  Submitting normally with method=GET and no enctype instead.
 ForgotFileEnctypeWarning=Form contains a file input, but is missing method=POST and enctype=multipart/form-data on the form.  The file will not be sent.
 # LOCALIZATION NOTE (DefaultFormSubject): %S will be replaced with brandShortName
 DefaultFormSubject=Form Post from %S
--- a/layout/forms/nsIsIndexFrame.cpp
+++ b/layout/forms/nsIsIndexFrame.cpp
@@ -130,17 +130,17 @@ nsIsIndexFrame::UpdatePromptLabel(PRBool
   if (prompt.IsEmpty()) {
     // Generate localized label.
     // We can't make any assumption as to what the default would be
     // because the value is localized for non-english platforms, thus
     // it might not be the string "This is a searchable index. Enter search keywords: "
     result =
-                                         "IsIndexPrompt", prompt);
+                                         "IsIndexPromptWithSpace", prompt);
   mTextContent->SetText(prompt, aNotify);
   return NS_OK;
--- a/parser/html/nsHtml5Portability.cpp
+++ b/parser/html/nsHtml5Portability.cpp
@@ -181,17 +181,17 @@ nsHtml5Portability::literalEqualsString(
   nsXPIDLString prompt;
   nsresult rv =
-                                         "IsIndexPrompt", prompt);
+                                         "IsIndexPromptWithSpace", prompt);
   PRUint32 len = prompt.Length();
   if (NS_FAILED(rv) || !len) {
     // jArray doesn't support dynamically-allocated zero-length arrays
     // and this method has no way to signal an error. Let's return
     // the REPLACEMENT CHARACTER to avoid crashing on null pointer.
     jArray<PRUnichar,PRInt32> arr = jArray<PRUnichar,PRInt32>(1);
     arr[0] = 0xFFFD;
     return arr;