Merge branch 'master' into v0.4.4_rc1

i18n/en_US/index.json

@@ -5,7 +5,6 @@
     "noscript": "To view this webpage you need to have javascript enabled"
   },
   "index": {
-    "already_subscribed": "Already subscribed",
     "description_p1": "eosDAC is a decentralized autonomous community which means it is owned and operated by the token holders who agree to the constitution and register as members of the community.",
     "description_p2": "When completed, this member client will allow you to read the constitution, register as a member, submit worker proposals, register as a custodian candidate, vote on custodians, transfer tokens, and more. If you have any questions, please reach out to us using the links below.",
     "discord_description": "eosDAC exists as an active, engaged community building tools to enable other DACs. Discord is where we bring our skills together and coordinate our activites.",

pages/home.vue

@@ -358,11 +358,9 @@ export default {
         return false;
       }
 
-      // let url =
-      //   this.$helper.noBackSlash(this.$configFile.get("memberclientapi")) +
-      //   "/subscribe";
-
-      let url = "https://toolkit-api.eosdac.io/subscribe";
+      let url =
+        this.$helper.noBackSlash(this.$configFile.get("memberclientapi")) +
+        "/subscribe";
 
       this.loading = true;
       try {

statics/config/wp_categories.json

@@ -1,12 +1,12 @@
 [
-    { "label": "wp_categories.cat_0", "value": "0", "desc": "wp_categories.cat_0_desc"},
-    { "label": "wp_categories.cat_1", "value": "1", "desc": "wp_categories.cat_1_desc"},
-    { "label": "wp_categories.cat_2", "value": "2", "desc": "wp_categories.cat_2_desc"},
-    { "label": "wp_categories.cat_3", "value": "3", "desc": "wp_categories.cat_3_desc"},
-    { "label": "wp_categories.cat_4", "value": "4", "desc": "wp_categories.cat_4_desc"},
-    { "label": "wp_categories.cat_5", "value": "5", "desc": "wp_categories.cat_5_desc"},
-    { "label": "wp_categories.cat_6", "value": "6", "desc": "wp_categories.cat_6_desc"},
-    { "label": "wp_categories.cat_7", "value": "7", "desc": "wp_categories.cat_7_desc"},
-    { "label": "wp_categories.cat_8", "value": "8", "desc": "wp_categories.cat_8_desc"},
-    { "label": "wp_categories.cat_9", "value": "9", "desc": "wp_categories.cat_9_desc"}
+    { "label": "cat_0", "value": "0", "desc": "cat_0_desc"},
+    { "label": "cat_1", "value": "1", "desc": "cat_1_desc"},
+    { "label": "cat_2", "value": "2", "desc": "cat_2_desc"},
+    { "label": "cat_3", "value": "3", "desc": "cat_3_desc"},
+    { "label": "cat_4", "value": "4", "desc": "cat_4_desc"},
+    { "label": "cat_5", "value": "5", "desc": "cat_5_desc"},
+    { "label": "cat_6", "value": "6", "desc": "cat_6_desc"},
+    { "label": "cat_7", "value": "7", "desc": "cat_7_desc"},
+    { "label": "cat_8", "value": "8", "desc": "cat_8_desc"},
+    { "label": "cat_9", "value": "9", "desc": "cat_9_desc"}
 ]