Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 06:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1378366 - If the default font is not found, use 'Default' as the name for an unchanged font preference. Previously this would show up as blank in this case. r=timdream

Browse Source 
MozReview-Commit-ID: G1GEwWNtBMi

--HG--
extra : rebase_source : 9c972fd4f2108325fddb9413ad364dd94b99e832
This commit is contained in:
Jared Wein 2017-10-26 12:25:12 -04:00
parent c46d36dffb
commit f953e19feb
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/locales/en-US/chrome/browser/preferences/preferences.properties
View File

@ -12,6 +12,7 @@ phishBeforeText=Selecting this option will send the address of web pages you are
#### Fonts
labelDefaultFont=Default (%S)
labelDefaultFontUnnamed=Default
veryLargeMinimumFontTitle=Large minimum font size
veryLargeMinimumFontWarning=You have selected a very large minimum font size (more than 24 pixels). This may make it difficult or impossible to use some important configuration pages like this one.

20
toolkit/mozapps/preferences/fontbuilder.js
View File

@ -39,17 +39,17 @@ var FontBuilder = {
var popup = document.createElement("menupopup");
var separator;
if (fonts.length > 0) {
if (defaultFont) {
var bundlePreferences = document.getElementById("bundlePreferences");
var label = bundlePreferences.getFormattedString("labelDefaultFont", [defaultFont]);
var menuitem = document.createElement("menuitem");
menuitem.setAttribute("label", label);
menuitem.setAttribute("value", ""); // Default Font has a blank value
popup.appendChild(menuitem);
var bundlePreferences = document.getElementById("bundlePreferences");
var defaultLabel = defaultFont ?
bundlePreferences.getFormattedString("labelDefaultFont", [defaultFont]) :
bundlePreferences.getString("labelDefaultFontUnnamed");
var menuitem = document.createElement("menuitem");
menuitem.setAttribute("label", defaultLabel);
menuitem.setAttribute("value", ""); // Default Font has a blank value
popup.appendChild(menuitem);
separator = document.createElement("menuseparator");
popup.appendChild(separator);
}
separator = document.createElement("menuseparator");
popup.appendChild(separator);
for (var i = 0; i < fonts.length; ++i) {
menuitem = document.createElement("menuitem");