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

Bug 348076 remove generated URLs from region.properties - release notes URL, about page, cleanup (r=mconnor)

Browse Source
This commit is contained in:
dietrich%mozilla.com 2006-08-21 19:14:29 +00:00
parent cd9a3a96f1
commit d372cb6feb
6 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
browser/app/profile/firefox.js
View File

@ -50,26 +50,30 @@
#ifdef OFFICIAL_BRANDING
pref("startup.homepage_override_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/%VERSION%/whatsnew/");
pref("startup.homepage_welcome_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/%VERSION%/firstrun/");
pref("startup.homepage_override_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/whatsnew/");
pref("startup.homepage_welcome_url","http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/firstrun/");
// URL user can browse to manually if for some reason all update installation
// attempts fail.
pref("app.update.url.manual", "http://%LOCALE%.www.mozilla.com/%LOCALE%/products/firefox/");
pref("app.update.url.manual", "http://%LOCALE%.www.mozilla.com/%LOCALE%/products/%APP%/");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/firefox/releases/");
pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/releases/");
// Release notes URL
pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/");
#else
pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
// URL user can browse to manually if for some reason all update installation
// attempts fail.
pref("app.update.url.manual", "http://www.mozilla.org/products/firefox/");
pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "http://www.mozilla.org/projects/firefox/");
pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
// Release notes URL
pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
#endif
pref("general.startup.browser", true);

2
browser/base/content/utilityOverlay.js
View File

@ -410,7 +410,7 @@ function openReleaseNotes(event)
var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
.getService(Components.interfaces.nsIXULAppInfo);
var regionBundle = document.getElementById("bundle_browser_region");
var relnotesURL = regionBundle.getFormattedString("releaseNotesURL", [appInfo.version]);
var relnotesURL = formatURL("app.releaseNotesURL", null, true);
openUILink(relnotesURL, event, false, true);
}

3
browser/locales/en-US/chrome/branding/brand.dtd
View File

@ -1,6 +1,3 @@
<!ENTITY brandShortName "Minefield">
<!ENTITY brandFullName "Minefield">
<!ENTITY vendorShortName "Mozilla">
<!-- LOCALIZATION NOTE (releaseBaseURL): The about: page appends __MOZ_APP_VERSION__.html, e.g. 2.0.html -->
<!ENTITY releaseBaseURL "http://www.mozilla.org/projects/minefield/releases/">

4
browser/locales/en-US/chrome/browser-region/region.properties
View File

@ -1,5 +1,3 @@
releaseNotesURL=http://www.mozilla.com/firefox/releases/%S.html
# Default search engine
browser.search.defaultenginename=Google
@ -7,8 +5,6 @@ browser.search.defaultenginename=Google
browser.search.order.1=Google
browser.search.order.2=Yahoo
searchEnginesURL=https://addons.mozilla.org/search-engines.php
# This is the default set of web based feed handlers shown in the reader
# selection UI
browser.contentHandlers.types.0.title=Bloglines

3
other-licenses/branding/firefox/locales/en-US/brand.dtd
View File

@ -1,6 +1,3 @@
<!ENTITY brandShortName "Firefox">
<!ENTITY brandFullName "Mozilla Firefox">
<!ENTITY vendorShortName "Mozilla">
<!-- LOCALIZATION NOTE (releaseBaseURL): The about: page appends __MOZ_APP_VERSION__.html, e.g. 2.0.html -->
<!ENTITY releaseBaseURL "http://www.mozilla.com/firefox/releases/">

23
toolkit/content/about.xhtml
View File

@ -69,9 +69,30 @@
<ul id="aboutPageList">
<li>&about.copy.beforeLink; <a href="about:credits">&about.copy.linkTitle;</a> &about.copy.afterLink;</li>
<li>&about.license.beforeLink; <a href="about:license">&about.license.linkTitle;</a> &about.license.afterLink;</li>
#expand <li>&about.relnotes.beforeLink; <a href="&releaseBaseURL;__MOZ_APP_VERSION__.html">&about.relnotes.linkTitle;</a> &about.relnotes.afterLink;</li>
<li>&about.relnotes.beforeLink; <a id="releaseNotesURL" href="">&about.relnotes.linkTitle;</a> &about.relnotes.afterLink;</li>
<li>&about.buildconfig.beforeLink; <a href="about:buildconfig">&about.buildconfig.linkTitle;</a> &about.buildconfig.afterLink;</li>
<script type="application/x-javascript">
// get release notes URL from prefs
var releaseNotesURL = formatURL("app.releaseNotesURL", null, true);
var relnotes = document.getElementById("releaseNotesURL");
relnotes.setAttribute("href", releaseNotesURL);
function formatURL(aFormat, aVars, aIsPref) {
var repl = null;
if (aVars) {
repl = Cc["@mozilla.org/dictionary;1"].createInstance(Ci.nsIDictionary);
for (var key in aVars) {
var val = Cc['@mozilla.org/supports-string;1'].createInstance(Ci.nsISupportsString);
val.data = aVars[key];
repl.setValue(key, val);
}
}
var formatter = Components.classes["@mozilla.org/browser/URLFormatterService;1"]
.getService(Components.interfaces.nsIURLFormatter);
return aIsPref ? formatter.formatURLPref(aFormat, repl) : formatter.formatURL(aFormat, repl);
}
var ua = navigator.userAgent;
if (ua) {
var list = document.getElementById("aboutPageList");