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

Bug 1345055 - relabel 'user set' column in about:config to be less misleading, r=jaws

Browse Source 
MozReview-Commit-ID: Ch9Jm2QxNoz

--HG--
extra : rebase_source : 4127c40d517416caf3d6b96f25741501a81e661e
This commit is contained in:
Gijs Kruitbosch 2017-03-07 10:11:10 +00:00
parent b958022605
commit d5f1cd36fd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolkit/components/viewconfig/content/config.js
View File

@ -26,7 +26,7 @@ var gLockStrs = [];
var gTypeStrs = []; var gTypeStrs = [];
const PREF_IS_DEFAULT_VALUE = 0; const PREF_IS_DEFAULT_VALUE = 0;
const PREF_IS_USER_SET = 1; const PREF_IS_MODIFIED = 1;
const PREF_IS_LOCKED = 2; const PREF_IS_LOCKED = 2;
var gPrefHash = {}; var gPrefHash = {};
@ -279,7 +279,7 @@ function fetchPref(prefName, prefIndex) {
if (gPrefBranch.prefIsLocked(prefName)) if (gPrefBranch.prefIsLocked(prefName))
pref.lockCol = PREF_IS_LOCKED; pref.lockCol = PREF_IS_LOCKED;
else if (gPrefBranch.prefHasUserValue(prefName)) else if (gPrefBranch.prefHasUserValue(prefName))
pref.lockCol = PREF_IS_USER_SET; pref.lockCol = PREF_IS_MODIFIED;
try { try {
switch (gPrefBranch.getPrefType(prefName)) { switch (gPrefBranch.getPrefType(prefName)) {
@ -313,7 +313,7 @@ function onConfigLoad() {
gConfigBundle = document.getElementById("configBundle"); gConfigBundle = document.getElementById("configBundle");
gLockStrs[PREF_IS_DEFAULT_VALUE] = gConfigBundle.getString("default"); gLockStrs[PREF_IS_DEFAULT_VALUE] = gConfigBundle.getString("default");
gLockStrs[PREF_IS_USER_SET] = gConfigBundle.getString("user"); gLockStrs[PREF_IS_MODIFIED] = gConfigBundle.getString("modified");
gLockStrs[PREF_IS_LOCKED] = gConfigBundle.getString("locked"); gLockStrs[PREF_IS_LOCKED] = gConfigBundle.getString("locked");
gTypeStrs[nsIPrefBranch.PREF_STRING] = gConfigBundle.getString("string"); gTypeStrs[nsIPrefBranch.PREF_STRING] = gConfigBundle.getString("string");
@ -492,7 +492,7 @@ function updateContextMenu() {
copyValue.setAttribute("disabled", copyDisabled); copyValue.setAttribute("disabled", copyDisabled);
var resetSelected = document.getElementById("resetSelected"); var resetSelected = document.getElementById("resetSelected");
resetSelected.setAttribute("disabled", lockCol != PREF_IS_USER_SET); resetSelected.setAttribute("disabled", lockCol != PREF_IS_MODIFIED);
var canToggle = typeCol == nsIPrefBranch.PREF_BOOL && valueCol != ""; var canToggle = typeCol == nsIPrefBranch.PREF_BOOL && valueCol != "";
// indicates that a pref is locked or no pref is selected at all // indicates that a pref is locked or no pref is selected at all

2
toolkit/locales/en-US/chrome/global/config.properties
View File

@ -4,7 +4,7 @@
# Lock column values # Lock column values
default=default default=default
user=user set modified=modified
locked=locked locked=locked
# Type column values # Type column values