From eb93823ff45571548e10531f28654bd8038d16dc Mon Sep 17 00:00:00 2001 From: "tao%netscape.com" Date: Thu, 18 May 2000 22:44:19 +0000 Subject: [PATCH] bug 39634: Sidebar customize has no remote tabl r= slamm. git-svn-id: svn://10.0.0.236/trunk@70484 18797224-902f-48f8-a5cc-f745e15eee43 --- .../sidebar/resources/sidebarOverlay.js | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js index 22f6ef897b9..70e3626c4d4 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js +++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js @@ -164,26 +164,33 @@ function get_remote_datasource_url() { prefs = prefs.QueryInterface(Components.interfaces.nsIPref); } if (prefs) { + var locale; try { url = prefs.CopyCharPref("sidebar.customize.all_panels.url"); url = url.replace(/%SIDEBAR_VERSION%/g, SIDEBAR_VERSION); - - var locale = prefs.CopyCharPref("intl.content.langcode"); - if (locale == "") { - // activation part not ready yet! - debug("\n -->intl.content.langcode: activation part not ready yet! \n"); - var locale_progid = 'component://netscape/intl/nslocaleservice'; - var syslocale = Components.classes[locale_progid].getService(); - syslocale = syslocale.QueryInterface(Components.interfaces.nsILocaleService); - locale = syslocale.GetLocaleComponentForUserAgent(); - } - locale = locale.toLowerCase(); - url = url.replace(/%LOCALE%/g, locale); - - debug("Remote url is " + url); + locale = prefs.CopyCharPref("intl.content.langcode"); } catch(ex) { debug("Unable to get remote url pref. What now? "+ex); } + + if (!locale) { + // activation part not ready yet! + + try { + var locale_progid = 'component://netscape/intl/nslocaleservice'; + var syslocale = Components.classes[locale_progid].getService(); + syslocale = syslocale.QueryInterface(Components.interfaces.nsILocaleService); + locale = syslocale.GetLocaleComponentForUserAgent(); + } catch(ex) { + debug("Unable to get system locale. What now? "+ex); + } + } + + if (locale) { + locale = locale.toLowerCase(); + url = url.replace(/%LOCALE%/g, locale); + } + debug("Remote url is " + url); } return url; }