r=timeless, sr=mscott, a=bsmedberg
Unnecessary requirement that two strings be the same - pull button names from properties only, not DTD and properties
This commit is contained in:
mkaply%us.ibm.com 2005-07-01 04:07:22 +00:00
parent 779f13f5f7
commit 856a435f18
9 changed files with 10 additions and 8 deletions

View File

@ -77,6 +77,8 @@ function searchOnLoad()
initializeSearchWindowWidgets();
gSearchBundle = document.getElementById("bundle_search");
gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForSearchButton"));
gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForSearchButton"));
gAddressBookBundle = document.getElementById("bundle_addressBook");
gSearchSession = Components.classes[searchSessionContractID].createInstance(Components.interfaces.nsIMsgSearchSession);

View File

@ -110,7 +110,7 @@
</menupopup>
</menulist>
<spacer flex="10"/>
<button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);" default="true" accesskey="&searchButton.accesskey;"/>
<button id="search-button" oncommand="onSearchButton(event);" default="true" />
</hbox>
<hbox align="center">
<spacer flex="1"/>

View File

@ -111,7 +111,7 @@
<menupopup class="searchPopup" oncommand="updateSearchFolderPicker(this.getAttribute('uri'));"/>
</menulist>
<spacer flex="10"/>
<button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);" default="true" accesskey="&searchButton.accesskey;"/>
<button id="search-button" oncommand="onSearchButton(event);" default="true"/>
</hbox>

View File

@ -3,8 +3,6 @@
<!ENTITY searchHeading.accesskey "h">
<!ENTITY searchSubfolders.label "Search subfolders">
<!ENTITY searchSubfolders.accesskey "e">
<!ENTITY searchButton.label "Search">
<!ENTITY searchButton.accesskey "S">
<!ENTITY resetButton.label "Clear">
<!ENTITY resetButton.accesskey "C">
<!ENTITY optionsButton.label "Options">

View File

@ -80,6 +80,8 @@ function searchOnLoad()
initializeSearchWindowWidgets();
gSearchBundle = document.getElementById("bundle_search");
gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForSearchButton"));
gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForSearchButton"));
gAddressBookBundle = document.getElementById("bundle_addressBook");
gSearchSession = Components.classes[searchSessionContractID].createInstance(Components.interfaces.nsIMsgSearchSession);

View File

@ -104,7 +104,7 @@
</menupopup>
</menulist>
<spacer flex="10"/>
<button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);" default="true" accesskey="&searchButton.accesskey;"/>
<button id="search-button" oncommand="onSearchButton(event);" default="true"/>
</hbox>
<hbox align="center">
<spacer flex="1"/>

View File

@ -255,6 +255,8 @@ function searchOnLoad()
CreateMessenger();
gSearchBundle = document.getElementById("bundle_search");
gSearchStopButton.setAttribute("label", gSearchBundle.getString("labelForSearchButton"));
gSearchStopButton.setAttribute("accesskey", gSearchBundle.getString("accesskeyForSearchButton"));
gMessengerBundle = document.getElementById("bundle_messenger");
setupDatasource();
setupSearchListener();

View File

@ -107,7 +107,7 @@
<menupopup class="searchPopup" oncommand="updateSearchFolderPicker(this.getAttribute('uri'));"/>
</menulist>
<spacer flex="10"/>
<button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);" default="true" accesskey="&searchButton.accesskey;"/>
<button id="search-button" oncommand="onSearchButton(event);" default="true"/>
</hbox>
<hbox align="center">

View File

@ -4,8 +4,6 @@
<!ENTITY searchHeading.accesskey "h">
<!ENTITY searchSubfolders.label "Search subfolders">
<!ENTITY searchSubfolders.accesskey "e">
<!ENTITY searchButton.label "Search">
<!ENTITY searchButton.accesskey "S">
<!ENTITY resetButton.label "Clear">
<!ENTITY resetButton.accesskey "C">
<!ENTITY helpButton.label "Help">