Merge pull request #120 from izzy/bugfix/translation-error

Bugfixes in inject div/translation output
izzy · Oct 22, 2022 · 5b51d95 · 5b51d95
2 parents d3757a2 + 8ac7da8
commit 5b51d95
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 CHANGELOG
 =============================
+* 5.1.1
+  * Fixed a bug where some translations would not be retrieved properly
+  * Fixed a bug where the Timestamp to Date function would sometimes return [object Object]
 * 5.1.0
   * Added browser polyfill in preparation for Firefox compatibility
 * 5.0.2

diff --git a/js/D3.js b/js/D3.js
@@ -203,34 +203,34 @@ var D3 = {
 		});
 	},
 
-	createContextMenu: function () {
-		const function_list = {
-			'functions_rot13': ['function_rot13', "rot13decode"],
-			'functions_timestamp': ['function_timestamp', "timestampToDate"],
-			'functions_bin2hex': ['function_bin2hex', "bin2hex"],
-			'functions_bin2txt': ['function_bin2txt', "bin2txt"],
-			'functions_txt2hex': ['function_ascii2hex', "txt2hex"],
-			'functions_hex2txt': ['function_hex2ascii', "hex2txt"],
-			'functions_uri_encode': ['function_uri_encode', "uri_encode"],
-			'functions_uri_decode': ['function_uri_decode', "uri_decode"],
-			'functions_htmlentities': ['function_html_entities', "htmlentities"],
-			'functions_html_entity_decode': ['function_html_entity_decode', "html_entity_decode"],
-			'functions_htmlspecialchars': ['function_htmlspecialchars', "htmlspecialchars"],
-			'functions_htmlspecialchars_decode': ['function_htmlspecialchars_decode', "htmlspecialchars_decode"],
-			'functions_md5': ['function_md5', "md5"],
-			'functions_sha1': ['function_sha1', "sha1"],
-			'functions_crc32': ['function_crc32', "crc32"],
-			'functions_quoted_printable_decode': ['function_quoted_printable_decode', "quoted_printable_decode"],
-			'functions_quoted_printable_encode': ['function_quoted_printable_encode', "quoted_printable_encode"],
-			'functions_escapeshellarg': ['function_escapeshellarg', "escapeshellarg"],
-			'functions_base64_encode': ['function_base64_encode', "base64_encode"],
-			'functions_base64_decode': ['function_base64_decode', "base64_decode"],
-			'functions_unserialize': ['function_unserialize', "unserialize"],
-			'functions_leet_encode': ['function_leet_encode', "leetEncode"],
-			'functions_leet_decode': ['function_leet_decode', "leetDecode"],
-			'functions_reverse': ['function_reverse_text', "reverseText"],
-		};
+	function_list: {
+		'functions_rot13': ['function_rot13', "rot13decode"],
+		'functions_timestamp': ['function_timestamp', "timestampToDate"],
+		'functions_bin2hex': ['function_bin2hex', "bin2hex"],
+		'functions_bin2txt': ['function_bin2txt', "bin2txt"],
+		'functions_txt2hex': ['function_ascii2hex', "txt2hex"],
+		'functions_hex2txt': ['function_hex2ascii', "hex2txt"],
+		'functions_uri_encode': ['function_uri_encode', "uri_encode"],
+		'functions_uri_decode': ['function_uri_decode', "uri_decode"],
+		'functions_htmlentities': ['function_html_entities', "htmlentities"],
+		'functions_html_entity_decode': ['function_html_entity_decode', "html_entity_decode"],
+		'functions_htmlspecialchars': ['function_htmlspecialchars', "htmlspecialchars"],
+		'functions_htmlspecialchars_decode': ['function_htmlspecialchars_decode', "htmlspecialchars_decode"],
+		'functions_md5': ['function_md5', "md5"],
+		'functions_sha1': ['function_sha1', "sha1"],
+		'functions_crc32': ['function_crc32', "crc32"],
+		'functions_quoted_printable_decode': ['function_quoted_printable_decode', "quoted_printable_decode"],
+		'functions_quoted_printable_encode': ['function_quoted_printable_encode', "quoted_printable_encode"],
+		'functions_escapeshellarg': ['function_escapeshellarg', "escapeshellarg"],
+		'functions_base64_encode': ['function_base64_encode', "base64_encode"],
+		'functions_base64_decode': ['function_base64_decode', "base64_decode"],
+		'functions_unserialize': ['function_unserialize', "unserialize"],
+		'functions_leet_encode': ['function_leet_encode', "leetEncode"],
+		'functions_leet_decode': ['function_leet_decode', "leetDecode"],
+		'functions_reverse': ['function_reverse_text', "reverseText"],
+	},
 
+	createContextMenu: function () {
 		function clearMenu() {
 			for (id in D3.menuIds) {
 				if (id && D3.menuIds[id] != null) {
@@ -246,9 +246,9 @@ var D3 = {
 			if (items.checkboxes[name] == true && !D3.menuIds[name]) {
 				// Menu for selected text
 				menu = {
-					"title": D3.translate(function_list[name][0]),
+					"title": D3.translate(D3.function_list[name][0]),
 					"contexts": ["selection", "editable"],
-					"id": "d3coder-selection-" + function_list[name][1]
+					"id": "d3coder-selection-" + D3.function_list[name][1]
 				};
 				try {
 					D3.menuIds[name] = browser.contextMenus.create(menu);

diff --git a/js/D3lib.js b/js/D3lib.js
@@ -52,7 +52,7 @@ var D3lib = {
 
         var dateObject = new Date();
         dateObject.setTime(timestamp * 1000);
-        return dateObject;
+        return dateObject.toString();
     },
 
     crc32: function (str) {

diff --git a/js/serviceworker.js b/js/serviceworker.js
@@ -21,31 +21,37 @@ browser.runtime.onMessage.addListener(
 
         if (request.command == "doCopy") {
             var responseStatus = D3.copyToClipboard(D3.lastMessage);
-            sendResponse({status: [browser.i18n.getMessage("message_copied_to_clipboard"), responseStatus] });
+            sendResponse({
+                status: [browser.i18n.getMessage("message_copied_to_clipboard"), responseStatus]
+            });
         } else if (request.command == "setContextMenuTitle") {
-            browser.contextMenus.update(contextMenuId, {title: request.message});
+            browser.contextMenus.update(contextMenuId, {
+                title: request.message
+            });
         } else {
             sendResponse({});
         }
-});
+    });
 
 browser.contextMenus.onClicked.addListener(
     (info, tab) => {
         menuId = info.menuItemId;
 
         // Get just the name and a boolean for editable text
         let fn_normalized = menuId.replace(/d3coder-(selection-|)/, "");
-        let fn_name = menuId.replace(/d3coder-(selection-|)function_/, "")
+
+        let fn_name = Object.entries(D3.function_list).find(fn => fn[1].includes(fn_normalized))[1][0];
+
         let fn_selection = menuId.includes("-selection-");
 
         // Menu item for the extension's settings page
         if (menuId === 'd3coder-settings') {
             browser.runtime.openOptionsPage();
-        // Menu for selected/editable text
+            // Menu for selected/editable text
         } else if (fn_selection === true && fn_normalized in D3lib) {
             browser.storage.sync.get(null).then((items) => {
                 D3.createPopup(
-                    D3.translate(`function_${fn_normalized}`),
+                    D3.translate(`${fn_name}`),
                     D3lib[fn_normalized](info.selectionText),
                     items["messageType"],
                     items["clipboardSave"],

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "__MSG_extName__", 
-  "version": "5.1.0",
+  "version": "5.1.1",
   "description": "__MSG_extDescription__",
   "options_ui": {
     "page": "html/menu_ui.html",