update the terms agreement

diff --git a/src/assets/language/cn.js b/src/assets/language/cn.js
index 8cbd821..444e8a7 100644 (file)
--- a/src/assets/language/cn.js
+++ b/src/assets/language/cn.js
@@ -28,13 +28,11 @@ const cn = {
     enterMain:'进入主界面',
     title: '欢迎使用BYTOM精简Chrome钱包',
     use: '开始',
-    terms: '使用条款',
+    term: '同意{0}和{1}',
     confirm: '确认',
     cancel: '取消',
     register: '注册',
     restore: '恢复',
-    term1:'我同意',
-    term2:'使用条款'
   },
   restore:{
     title:'导入钱包',

diff --git a/src/assets/language/en.js b/src/assets/language/en.js
index 19825b1..f22a57e 100644 (file)
--- a/src/assets/language/en.js
+++ b/src/assets/language/en.js
@@ -28,13 +28,11 @@ const en = {
     enterMain:"Enter Main View",
     title: 'Welcome to the BYTOM Chrome Wallet',
     use: 'Start',
-    terms: 'Terms of Use',
+    term: 'I agree with {0} and {1}',
     confirm: 'I agree',
     cancel: 'Cancel',
     register: 'Register',
     restore: 'Restore',
-    term1:'I agree with ',
-    term2:'Service Agreement'
   },
   restore:{
     title:'Import Wallet',
@@ -295,7 +293,7 @@ const en = {
   },
   protocol: {
     title: 'Service Agreement',
-    content:`    Dear users:
+    content:`Dear users:
     Thank you for choosing Bytom Chrome Wallet. This“Bytom Chrome Wallet Terms of Service”(“Agreement”) is made between you (“User”) and Chainboat Technology Ltd. (Company Registration Number: 1963344), a company incorporated in The British Virgin Islands (BVI) (“Company”) and is legally binding between you and Company. In this Agreement (a) “we” and “us” refer to the Company and “our” shall be construed accordingly; and (b) “you” refers to User and “your” shall be construed accordingly. Each of you and the Company shall hereinafter be referred to as a “Party”, and collectively, you and the Company shall hereinafter be referred to as the “Parties”.
 
     Company hereby reminds you that you must carefully read the full content of this Agreement and other documents mentioned in this Agreement before using our Bytom Chrome Wallet（You can use Bytom Chrome Wallet by chrome browser Plug-in to obtain related services）. In particular, you must carefully read the section of “Disclaimer and Limitation of Liability” and other sections which are displayed in bold in this Agreement. You must make sure that you fully understand the whole Agreement and evaluate the risks of using Bytom MOV on your own.
@@ -536,7 +534,7 @@ const en = {
   },
   privacy:{
     "title":"Privacy Police",
-    "content":` Dear Users,
+    "content":`Dear Users,
 
 Chainboat Technology Ltd. (“Company”, “we”, “us”, or “our”) respects and protects the privacy of Users (“you”, “your” or “Users”). The Company will collect, use, disclose and process your Personal Information, in accordance with this Privacy Policy (“Policy”) when you:
 

diff --git a/src/components/MenubarComponent.vue b/src/components/MenubarComponent.vue
index 057ca35..918fd4c 100644 (file)
--- a/src/components/MenubarComponent.vue
+++ b/src/components/MenubarComponent.vue
@@ -107,6 +107,7 @@
                   case RouteNames.SETTING_PASSWORD:
                   case RouteNames.ENABLE:
                   case RouteNames.BAPP_PROMPT:
+                  case RouteNames.PRIVACY:
                   case RouteNames.PROTOCOL: return false;
                   default: return true;
               }

diff --git a/src/views/welcome/creation.vue b/src/views/welcome/creation.vue
index 4c99d19..f488171 100644 (file)
--- a/src/views/welcome/creation.vue
+++ b/src/views/welcome/creation.vue
@@ -99,8 +99,12 @@
                      v-model="formItem.checked"
               >
               <label for="checkbox1">
-                {{ $t('welcome.term1') }}<a class="color-green" @click="$router.push({ name: 'welcome-protocol' })">{{  $t('protocl.title')}}</a>
+                <i18n path="welcome.term" tag="label" for="protocol.title">
+                  <a class="color-green" @click="$router.push({ name: 'welcome-privacy' })">{{ $t('privacy.title') }}</a>
+                  <a class="color-green" @click="$router.push({ name: 'welcome-protocol' })">{{ $t('protocol.title') }}</a>
+                </i18n>
               </label>
+
             </div>
           </div>
           <div>
@@ -259,7 +263,6 @@ export default {
         ])
     },
     mounted() {
-        this.i18n = getLanguage(this.language);
     }
 };
 </script>