From 8b00bb59de30b0dec65649df7772d5961beb1a29 Mon Sep 17 00:00:00 2001 From: jamesgeorge007 Date: Fri, 7 Feb 2020 14:43:13 +0530 Subject: [PATCH 1/4] refactor: use typeof as an operator --- functions/network.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/network.js b/functions/network.js index 63d04db5d..9294ba036 100644 --- a/functions/network.js +++ b/functions/network.js @@ -3,7 +3,7 @@ import FirefoxStrategy from "./strategies/FirefoxStrategy"; import ChromeStrategy, { hasChromeExtensionInstalled } from "./strategies/ChromeStrategy"; const isExtensionsAllowed = ({ state }) => { - return typeof(state.postwoman.settings.EXTENSIONS_ENABLED) === 'undefined' + return typeof state.postwoman.settings.EXTENSIONS_ENABLED === 'undefined' || state.postwoman.settings.EXTENSIONS_ENABLED; } From a351abd5d9ba2493c697ef10afcf5ea11c7eccd1 Mon Sep 17 00:00:00 2001 From: jamesgeorge007 Date: Fri, 7 Feb 2020 14:44:14 +0530 Subject: [PATCH 2/4] refactor: use typeof as an operator --- pages/settings.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/settings.vue b/pages/settings.vue index 8300bb54c..29bca1f7f 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -339,7 +339,7 @@ export default { "https://postwoman.apollotv.xyz/", PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "", EXTENSIONS_ENABLED: - (typeof(this.$store.state.postwoman.settings.EXTENSIONS_ENABLED) !== 'undefined') ? + (typeof this.$store.state.postwoman.settings.EXTENSIONS_ENABLED !== 'undefined') ? this.$store.state.postwoman.settings.EXTENSIONS_ENABLED : true }, From 6037daedcd936c5461deb407af6ccde122da5972 Mon Sep 17 00:00:00 2001 From: jamesgeorge007 Date: Fri, 7 Feb 2020 14:52:06 +0530 Subject: [PATCH 3/4] refactor: use localizable string --- components/collections/editCollection.vue | 2 +- lang/en-US.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/collections/editCollection.vue b/components/collections/editCollection.vue index 084bb78bf..9a48d1e1a 100644 --- a/components/collections/editCollection.vue +++ b/components/collections/editCollection.vue @@ -60,7 +60,7 @@ export default { methods: { saveCollection() { if (!this.$data.name) { - this.$toast.info("Please provide a valid name for the collection"); + this.$toast.info($t("invalid_collection_name")); return; } const collectionUpdated = { diff --git a/lang/en-US.js b/lang/en-US.js index d1074e4bd..9191cec5f 100644 --- a/lang/en-US.js +++ b/lang/en-US.js @@ -140,6 +140,7 @@ export default { deleted: "Deleted", undo: "Undo", collection_empty: "Collection is empty", + invalid_collection_name: "Please provide a valid name for the collection", new_collection: "New Collection", my_new_collection: "My New Collection", edit_collection: "Edit Collection", From 6575d03f45a99ffc5b351b6a5d9c0882a64f824d Mon Sep 17 00:00:00 2001 From: jamesgeorge007 Date: Fri, 7 Feb 2020 14:54:09 +0530 Subject: [PATCH 4/4] refactor: use localizable string --- components/collections/addCollection.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/collections/addCollection.vue b/components/collections/addCollection.vue index 0fa8bad33..9b173839b 100644 --- a/components/collections/addCollection.vue +++ b/components/collections/addCollection.vue @@ -58,7 +58,7 @@ export default { methods: { addNewCollection() { if (!this.$data.name) { - this.$toast.info("Please provide a valid name for the collection"); + this.$toast.info($t("invalid_collection_name")); return; } this.$store.commit("postwoman/addNewCollection", {