CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-02 10:24:59 +12:00
Code Issues Releases Wiki Activity

preparing for i18n + better defaults

Browse source
This commit is contained in:
gorhill 2015-05-07 18:38:29 -04:00
parent 1d2954c39c
commit 05089dc370
6 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/_locales/en/messages.json
View file

@ -587,6 +587,26 @@
"message": "filter expression(s)",
"description": "Appears in the input filed where filter expressions are entered"
},
"loggerEntryUserAgentSpoofing" : {
"message": "spoofing user agent with: {{value}}",
"description": "An entry for when a new user agent string is selected"
},
"loggerEntryCookieDeleted" : {
"message": "cookie deleted: {{value}}",
"description": "An entry for when a cookie is deleted"
},
"loggerEntryDeleteCookieError" : {
"message": "browser cache cleared",
"description": "An entry for when the browser cache is cleared"
},
"loggerEntryBrowserCacheCleared" : {
"message": "failed to delete cookie: {{value}}",
"description": "An entry for when a cookie can't be deleted"
},
"loggerEntryAssetUpdated" : {
"message": "asset updated: {{value}}",
"description": "An entry for when an asset was updated"
},
"mainBlockedPrompt1": {
"message": "uMatrix has prevented the following page from loading:",

4
src/js/background.js
View file

@ -61,8 +61,8 @@ return {
deleteLocalStorage: false,
displayTextSize: '13px',
externalHostsFiles: '',
iconBadgeEnabled: true,
maxLoggedRequests: 2000,
iconBadgeEnabled: false,
maxLoggedRequests: 1000,
popupCollapseDomains: false,
popupCollapseSpecificDomains: {},
popupHideBlacklisted: false,

2
src/js/browsercache.js
View file

@ -50,7 +50,7 @@ var clearCache = function() {
µm.browserCacheClearedCounter++;
// TODO: i18n
µm.logger.writeOne('', 'info', 'browser cache cleared');
µm.logger.writeOne('', 'info', vAPI.i18n('loggerEntryBrowserCacheCleared'));
//console.debug('clearBrowserCacheCallback()> vAPI.browserData.clearCache() called');
};

8
src/js/cookies.js
View file

@ -296,18 +296,18 @@ var chromeCookieRemove = function(url, name) {
var success = !!details;
if ( removeCookieFromDict(sessionCookieKey) ) {
if ( success ) {
µm.logger.writeOne('', 'info', 'cookie deleted: ' + sessionCookieKey);
µm.logger.writeOne('', 'info', vAPI.i18n('loggerEntryCookieDeleted').replace('{{value}}', sessionCookieKey));
µm.cookieRemovedCounter += 1;
} else {
µm.logger.writeOne('', 'error', 'failed to delete cookie: ' + sessionCookieKey);
µm.logger.writeOne('', 'error', vAPI.i18n('loggerEntryDeleteCookieError').replace('{{value}}', sessionCookieKey));
}
}
if ( removeCookieFromDict(persistCookieKey) ) {
if ( success ) {
µm.logger.writeOne('', 'info', 'cookie deleted: ' + persistCookieKey);
µm.logger.writeOne('', 'info', vAPI.i18n('loggerEntryCookieDeleted').replace('{{value}}', persistCookieKey));
µm.cookieRemovedCounter += 1;
} else {
µm.logger.writeOne('', 'error', 'failed to delete cookie: ' + persistCookieKey);
µm.logger.writeOne('', 'error', vAPI.i18n('loggerEntryDeleteCookieError').replace('{{value}}', persistCookieKey));
}
}
};

2
src/js/storage.js
View file

@ -408,7 +408,7 @@
var path = details.path || '';
if ( path !== '' ) {
this.logger.writeOne('', 'info', 'asset updated: ' + path);
this.logger.writeOne('', 'info', vAPI.i18n('loggerEntryAssetUpdated').replace('{{value}}', path));
}
if ( this.liveHostsFiles.hasOwnProperty(path) === false ) {

6
src/js/useragent.js
View file

@ -60,7 +60,11 @@ var userAgentSpoofer = function(force) {
if ( uaStr === '' ) {
µm.userAgentReplaceStr = userAgentRandomPicker();
µm.userAgentReplaceStrBirth = Date.now();
µm.logger.writeOne('', 'info', 'spoofing user agent with: ' + µm.userAgentReplaceStr);
µm.logger.writeOne(
'',
'info',
vAPI.i18n('loggerEntryUserAgentSpoofing').replace('{{value}}', µm.userAgentReplaceStr)
);
}
};