Bug 561059 Incorrect Encoding of cmd/command symbol in global search and quick filter search bars. r=asuth,a=blocker
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 22 Apr 2010 18:08:39 +0100
changeset 5512 14b30bd6cec189cd577f9b5683b33294433f65fa
parent 5511 88a03ba7cb78f3051e97a34d298684e11d4bb272
child 5513 801f44cdf8e4343aea8ad2c17b030ea7cd9b7a41
push idunknown
push userunknown
push dateunknown
reviewersasuth, blocker
bugs561059
Bug 561059 Incorrect Encoding of cmd/command symbol in global search and quick filter search bars. r=asuth,a=blocker
mail/base/content/extraCustomizeItems.xul
mail/base/content/quickFilterBar.xul
mail/locales/en-US/chrome/messenger/messenger.dtd
mail/locales/en-US/chrome/messenger/quickFilterBar.dtd
--- a/mail/base/content/extraCustomizeItems.xul
+++ b/mail/base/content/extraCustomizeItems.xul
@@ -71,17 +71,17 @@
                  autocompletesearch="gloda"
                  autocompletepopup="PopupGlodaAutocomplete"
                  autocompletesearchparam="global"
                  enablehistory="false"
                  timeout="200"
                  emptytext=""
                  emptytextbase="&searchAllMessages.label.base;"
                  keyLabelNonMac="&searchAllMessages.keyLabel.nonmac;"
-                 keyLabelMac="&searchAllMessages.keyLabel.mac;"
+                 keyLabelMac="&searchAllMessages.keyLabel1.mac;"
                  >
           <!-- Mimic the search/clear buttons of the standard search textbox,
                but adjust for the reality that clear doesn't make much sense
                since gloda results only show in a tab and the idiom for closing
                tabs is closing the tab.  Our binding does process escape to
                clear the box, if people want to clear it that way...
                -->
           <hbox>
--- a/mail/base/content/quickFilterBar.xul
+++ b/mail/base/content/quickFilterBar.xul
@@ -146,17 +146,17 @@
                somefmtstring="&quickFilterBar.resultsLabel.some.formatString;"
                noresultsstring="&quickFilterBar.resultsLabel.none;"
                />
         <textbox id="qfb-qs-textbox" flex="1"
                  type="search"
                  emptytext=""
                  emptytextbase="&quickFilterBar.textbox.emptyText.base;"
                  keyLabelNonMac="&quickFilterBar.textbox.emptyText.keyLabel.nonmac;"
-                 keyLabelMac="&quickFilterBar.textbox.emptyText.keyLabel.mac;"
+                 keyLabelMac="&quickFilterBar.textbox.emptyText.keyLabel1.mac;"
                  timeout="500"
                  width="320"
                  minwidth="280">
         </textbox>
       </hbox>
       <hbox id="quick-filter-bar-expando">
         <arrowscrollbox id="quick-filter-bar-tab-bar"
                         orient="horizontal"
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -720,17 +720,17 @@ you can use these alternative items. Oth
      -->
 <!ENTITY searchAllMessages.keyLabel.nonmac "&lt;Ctrl+K&gt;">
 <!-- LOCALIZATION NOTE (searchAllMessages.keyLabel.mac):
      The description of the key-binding to get into the box on mac systems.
      We use the keybinding for cmd_find used by the find-in-message mechanism,
      so that's the letter to indicate  if you don't use 'f' for your
      localization.
      -->
-<!ENTITY searchAllMessages.keyLabel.mac "&lt;&#2318;+F&gt;">
+<!ENTITY searchAllMessages.keyLabel1.mac "&lt;&#x2318;F&gt;">
 
 <!-- Message Header Context Menu -->
 <!ENTITY AddToAddressBook.label "Add to Address Book…">
 <!ENTITY AddToAddressBook.accesskey "B">
 <!ENTITY AddDirectlyToAddressBook.label "Add to Address Book">
 <!ENTITY AddDirectlyToAddressBook.accesskey "B">
 <!ENTITY EditContact.label "Edit Contact…">
 <!ENTITY EditContact.accesskey "E">
--- a/mail/locales/en-US/chrome/messenger/quickFilterBar.dtd
+++ b/mail/locales/en-US/chrome/messenger/quickFilterBar.dtd
@@ -160,18 +160,18 @@
          "&lt;Ctrl+F&gt;">
 
 <!-- LOCALIZATION NOTE (quickFilterBar.textbox.emptyText.keyLabel.mac):
      The description of the key-binding to get into the box on mac systems.
      We use the keybinding for cmd_find used by the find-in-message mechanism,
      so that's the letter to indicate  if you don't use 'f' for your
      localization.
      -->
-<!ENTITY quickFilterBar.textbox.emptyText.keyLabel.mac
-         "&lt;&#2318;+F&gt;">
+<!ENTITY quickFilterBar.textbox.emptyText.keyLabel1.mac
+         "&lt;&#x2318;F&gt;">
 
 <!-- LOCALIZATION NOTE (quickFilterBar.textbox.idealWidth):
      The number of pixels for the ideal width of the quick filter box textbox.
      Choose this value so that the emptyText fits nicely with a little bit of
      extra whitespace.
      -->
 <!ENTITY quickFilterBar.textbox.idealWidth
          "320">