Explorar o código

use different labels to differentiate the creating and the updating of a rule

Gildas %!s(int64=7) %!d(string=hai) anos
pai
achega
a62eb9a5a2

+ 7 - 3
_locales/en/messages.json

@@ -11,9 +11,13 @@
         "message": "Select the default profile",
         "message": "Select the default profile",
         "description": "Menu entry: 'Select the default profile'"
         "description": "Menu entry: 'Select the default profile'"
     },
     },
-    "menuAssociateWithProfile": {
-        "message": "Select the profile of the current auto-settings rule",
-        "description": "Menu entry: 'Select the profile of the current auto-settings rule'"
+    "menuUpdateRule": {
+        "message": "Select the profile of the current rule",
+        "description": "Menu entry: 'Select the profile of the current rule'"
+    },
+    "menuCreateDomainRule": {
+        "message": "Select the profile of the current domain",
+        "description": "Menu entry: 'Select the profile of the current domain'"
     },
     },
     "menuSaveSelection": {
     "menuSaveSelection": {
         "message": "Save selection",
         "message": "Save selection",

+ 7 - 3
_locales/fr/messages.json

@@ -11,9 +11,13 @@
         "message": "Sélectionner le profil par défaut",
         "message": "Sélectionner le profil par défaut",
         "description": "Menu entry: 'Select the default profile'"
         "description": "Menu entry: 'Select the default profile'"
     },
     },
-    "menuAssociateWithProfile": {
-        "message": "Sélectionner le profil de la règle d'auto-configuration courante",
-        "description": "Menu entry: 'Select the profile of the current auto-settings rule'"
+    "menuUpdateRule": {
+        "message": "Sélectionner le profil de la règle courante",
+        "description": "Menu entry: 'Select the profile of the current rule'"
+    },
+    "menuCreateDomainRule": {
+        "message": "Selectionner le profil du domaine courant",
+        "description": "Menu entry: 'Select the profile of the current domain'"
     },
     },
     "menuSaveSelection": {
     "menuSaveSelection": {
         "message": "Sauver la sélection",
         "message": "Sauver la sélection",

+ 7 - 3
_locales/ja/messages.json

@@ -11,9 +11,13 @@
         "message": "Select the default profile",
         "message": "Select the default profile",
         "description": "Menu entry: 'Select the default profile'"
         "description": "Menu entry: 'Select the default profile'"
     },
     },
-    "menuAssociateWithProfile": {
-        "message": "Select the profile of the current auto-settings rule",
-        "description": "Menu entry: 'Select the profile of the current auto-settings rule'"
+    "menuUpdateRule": {
+        "message": "Select the profile of the current rule",
+        "description": "Menu entry: 'Select the profile of the current rule'"
+    },
+    "menuCreateDomainRule": {
+        "message": "Select the profile of the current domain",
+        "description": "Menu entry: 'Select the profile of the current domain'"
     },
     },
     "menuSaveSelection": {
     "menuSaveSelection": {
         "message": "選択を保存",
         "message": "選択を保存",

+ 7 - 3
_locales/pl/messages.json

@@ -11,9 +11,13 @@
         "message": "Select the default profile",
         "message": "Select the default profile",
         "description": "Menu entry: 'Select the default profile'"
         "description": "Menu entry: 'Select the default profile'"
     },
     },
-    "menuAssociateWithProfile": {
-        "message": "Select the profile of the current auto-settings rule",
-        "description": "Menu entry: 'Select the profile of the current auto-settings rule'"
+    "menuUpdateRule": {
+        "message": "Select the profile of the current rule",
+        "description": "Menu entry: 'Select the profile of the current rule'"
+    },
+    "menuCreateDomainRule": {
+        "message": "Select the profile of the current domain",
+        "description": "Menu entry: 'Select the profile of the current domain'"
     },
     },
     "menuSaveSelection": {
     "menuSaveSelection": {
         "message": "Zapisz wybór",
         "message": "Zapisz wybór",

+ 7 - 3
_locales/ru/messages.json

@@ -11,9 +11,13 @@
         "message": "Select the default profile",
         "message": "Select the default profile",
         "description": "Menu entry: 'Select the default profile'"
         "description": "Menu entry: 'Select the default profile'"
     },
     },
-    "menuAssociateWithProfile": {
-        "message": "Select the profile of the current auto-settings rule",
-        "description": "Menu entry: 'Select the profile of the current auto-settings rule'"
+    "menuUpdateRule": {
+        "message": "Select the profile of the current rule",
+        "description": "Menu entry: 'Select the profile of the current rule'"
+    },
+    "menuCreateDomainRule": {
+        "message": "Select the profile of the current domain",
+        "description": "Menu entry: 'Select the profile of the current domain'"
     },
     },
     "menuSaveSelection": {
     "menuSaveSelection": {
         "message": "Сохранить выделенное",
         "message": "Сохранить выделенное",

+ 7 - 3
_locales/zh_CN/messages.json

@@ -11,9 +11,13 @@
         "message": "Select the default profile",
         "message": "Select the default profile",
         "description": "Menu entry: 'Select the default profile'"
         "description": "Menu entry: 'Select the default profile'"
     },
     },
-    "menuAssociateWithProfile": {
-        "message": "Select the profile of the current auto-settings rule",
-        "description": "Menu entry: 'Select the profile of the current auto-settings rule'"
+    "menuUpdateRule": {
+        "message": "Select the profile of the current rule",
+        "description": "Menu entry: 'Select the profile of the current rule'"
+    },
+    "menuCreateDomainRule": {
+        "message": "Select the profile of the current domain",
+        "description": "Menu entry: 'Select the profile of the current domain'"
     },
     },
     "menuSaveSelection": {
     "menuSaveSelection": {
         "message": "保存选中部分",
         "message": "保存选中部分",

+ 5 - 1
extension/ui/bg/ui-menu.js

@@ -124,7 +124,7 @@ singlefile.ui.menu = (() => {
 				});
 				});
 				menus.create({
 				menus.create({
 					id: MENU_ID_ASSOCIATE_WITH_PROFILE,
 					id: MENU_ID_ASSOCIATE_WITH_PROFILE,
-					title: browser.i18n.getMessage("menuAssociateWithProfile"),
+					title: browser.i18n.getMessage("menuCreateDomainRule"),
 					contexts: defaultContexts,
 					contexts: defaultContexts,
 				});
 				});
 				let rule;
 				let rule;
@@ -286,6 +286,7 @@ singlefile.ui.menu = (() => {
 					if (rule) {
 					if (rule) {
 						await singlefile.config.updateRule(rule.url, rule.url, profileName, profileName);
 						await singlefile.config.updateRule(rule.url, rule.url, profileName, profileName);
 					} else {
 					} else {
+						await menus.update(MENU_ID_ASSOCIATE_WITH_PROFILE, { title: browser.i18n.getMessage("menuUpdateRule") });
 						await singlefile.config.addRule(new URL(tab.url).hostname, profileName, profileName);
 						await singlefile.config.addRule(new URL(tab.url).hostname, profileName, profileName);
 					}
 					}
 				}
 				}
@@ -311,14 +312,17 @@ singlefile.ui.menu = (() => {
 				await menus.update(MENU_ID_AUTO_SAVE_ALL, { checked: Boolean(tabsData.autoSaveAll) });
 				await menus.update(MENU_ID_AUTO_SAVE_ALL, { checked: Boolean(tabsData.autoSaveAll) });
 				if (tab && tab.url) {
 				if (tab && tab.url) {
 					let selectedEntryId = MENU_ID_ASSOCIATE_WITH_PROFILE_PREFIX + "default";
 					let selectedEntryId = MENU_ID_ASSOCIATE_WITH_PROFILE_PREFIX + "default";
+					let title = browser.i18n.getMessage("menuCreateDomainRule");
 					const rule = await singlefile.config.getRule(tab.url);
 					const rule = await singlefile.config.getRule(tab.url);
 					if (rule) {
 					if (rule) {
 						const profileIndex = profileIndexes.get(rule.profile);
 						const profileIndex = profileIndexes.get(rule.profile);
 						if (profileIndex) {
 						if (profileIndex) {
 							selectedEntryId = MENU_ID_ASSOCIATE_WITH_PROFILE_PREFIX + profileIndex;
 							selectedEntryId = MENU_ID_ASSOCIATE_WITH_PROFILE_PREFIX + profileIndex;
+							title = browser.i18n.getMessage("menuUpdateRule");
 						}
 						}
 					}
 					}
 					await menus.update(selectedEntryId, { checked: true });
 					await menus.update(selectedEntryId, { checked: true });
+					await menus.update(MENU_ID_ASSOCIATE_WITH_PROFILE, { title });
 				}
 				}
 			} catch (error) {
 			} catch (error) {
 				/* ignored */
 				/* ignored */