Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-07 04:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

62171: "Separate content from UI". Split langenus.xpi into regus.xpi.

Browse Source 
browser: (r=pchen,sr=alecf), mailnews: (r=yamamoto,sr=sspitzer),
editor: (r=cmonske,sr=sfraser), xpinstall (r=ssu,sr=dveditz).
This commit is contained in:
tao%netscape.com 2006-07-27 14:53:22 +00:00
parent 04472a2b72
commit 7cf02c8ce7
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
suite/common/search/search-panel.js
View File

@ -38,11 +38,13 @@ const nsIRDFLiteral = Components.interfaces.nsIRDFLiteral;
const nsIRDFDataSource = Components.interfaces.nsIRDFDataSource;
const nsIRDFRemoteDataSource = Components.interfaces.nsIRDFRemoteDataSource;
const nsIInternetSearchService = Components.interfaces.nsIInternetSearchService;
const STRINGBUNDLE_REGIONAL_URL = "chrome://navigator-region/locale/region.properties";
var rootNode;
var textArc;
var modeArc;
var searchBundle;
var regionalBundle;
var sidebarInitiatedSearch = false;
@ -580,8 +582,10 @@ function OpenSearch(aSearchStr, engineURIs)
var searchEngineURI = nsPreferences.copyUnicharPref("browser.search.defaultengine", null);
var defaultSearchURL = nsPreferences.getLocalizedUnicharPref("browser.search.defaulturl", null);
if (!defaultSearchURL)
defaultSearchURL = searchBundle.getString("defaultSearchURL");
if (!defaultSearchURL) {
regionalBundle = srGetStrBundle( STRINGBUNDLE_REGIONAL_URL );
defaultSearchURL = regionalBundle.GetStringFromName("defaultSearchURL");
}
var searchDS = Components.classes[ISEARCH_CONTRACTID].getService(nsIInternetSearchService);
@ -600,7 +604,7 @@ function OpenSearch(aSearchStr, engineURIs)
}
if (!searchEngineURI)
searchEngineURI = searchBundle.getString("defaultSearchURL");
searchEngineURI = regionalBundle.GetStringFromName("defaultSearchURL");
// look up the correct search URL format for the given engine
try {

1
suite/common/search/search-panel.xul
View File

@ -35,6 +35,7 @@
<script type="text/javascript" src="chrome://global/content/nsUserSettings.js"/>
<script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
<script type="text/javascript" src="chrome://global/content/strres.js"/>
<script type="text/javascript" src="chrome://communicator/content/search/search-panel.js"/>
<script type="text/javascript" src="chrome://communicator/content/search/shared.js"/>

2
suite/locales/en-US/chrome/common/search/search-panel.properties
View File

@ -2,5 +2,3 @@ enterstringandlocation=Enter some text to search for and select at least one loc
enableAdvanced=Enable advanced search options
disableAdvanced=Disable advanced search options
# Localizable URLs
defaultSearchURL=http://search.netscape.com/cgi-bin/search?charset=UTF-8&search=