Merge pull request #15 from nnn-ed-nico-extension/develop

release v4.3.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "n-yobi-char-counter",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "private": true,
   "author": "tsutoringo (https://github.com/tsutoringo/)",
   "scripts": {

public/_locales/en/messages.json

@@ -1,8 +1,8 @@
 {
   "extName": {
-    "message": "n-yobi-char-counter"
+    "message": "Char counter for N予備校"
   },
   "extDesc": {
-		"message": "Show the number of letters in the test at N yobiko."
+		"message": "Show the number of letters in the test at N予備校."
 	}
 }

public/_locales/ja/messages.json

@@ -1,9 +1,9 @@
 {
 	"extName": {
-	  "message": "N予備校文字数カウンタ"
+	  "message": "文字数カウンタ for N予備校"
 	},
 	"extDesc": {
-		"message": "N予備校の記述形式のテストの文字数を表示します"
+		"message": "N予備校の記述形式のテストの文字数を表示します。"
 	}
   }
 

src/popup/Footer.vue

@@ -1,30 +1,29 @@
 <template>
 	<footer>
 		<div class="git">
-			<octicon :icon="gitBranch" class="icon"/>
+			<octicon :icon="iGitBranch" class="icon"/>
 			<span class="repository">
 				<a :href="baseURL" target="_blank">N-yobiko-char-counter</a>
 			</span>@<span class="commit-hash"><a :href="`${baseURL}/commit/${commitHash}`" target="_blank">{{commitHash}}</a></span>
 		</div>
 		<div class="left">
 			<div>
-				<router-link to="/info"><fa-icon icon="info-circle"></fa-icon>情報</router-link>
+				<router-link to="/info">
+					<fa-icon icon="info-circle" />
+					{{extName}}について
+				</router-link>
 			</div>
 		</div>
 	</footer>
 </template>
 <script>
-import { gitBranch } from 'octicons-vue';
+import { gitBranch as iGitBranch } from 'octicons-vue';
 
 export default {
 	name: 'VFooter',
 	data: () => ({
-		gitBranch
-	}),
-	computed: {
-		commitHash: () => process.env.VUE_APP_GIT_HASH,
-		baseURL: () => process.env.VUE_APP_HOMEPAGE
-	}
+		iGitBranch
+	})
 }
 </script>
 <style scoped>

src/popup/main.js

@@ -3,17 +3,21 @@ import App from './App.vue';
 import { Octicon } from 'octicons-vue';
 import router from './router';
 
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faArrowLeft, faInfoCircle } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { faArrowLeft, faInfoCircle } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+
+import mixin from './mixin';
 
 library.add(faArrowLeft, faInfoCircle);
 
-Vue.component('fa-icon', FontAwesomeIcon)
+Vue.component('fa-icon', FontAwesomeIcon);
 
 
 Vue.component('octicon', Octicon);
 
+Vue.mixin(mixin);
+
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

src/popup/mixin.js

@@ -0,0 +1,12 @@
+export default {
+	computed: {
+		commitHash: () => process.env.VUE_APP_GIT_HASH,
+		baseURL: () => process.env.VUE_APP_HOMEPAGE,
+		manifest: () => browser.runtime.getManifest(),
+		extName: () => browser.i18n.getMessage('extName'),
+		extVersion() { return this.manifest.version },
+		extID: () => browser.app.getDetails().id,
+		gitBranch: () => process.env.VUE_APP_GIT_BRANCH,
+		gitHash: () => process.env.VUE_APP_GIT_HASH,
+    }
+}

src/popup/pages/Info.vue

@@ -57,16 +57,7 @@
 </template>
 <script>
 export default {
-	name: 'Info',
-	computed: {
-		manifest: () => browser.runtime.getManifest(),
-		extName: () => browser.i18n.getMessage('extName'),
-		extVersion() { return this.manifest.version },
-		extID: () => browser.app.getDetails().id,
-		gitBranch: () => process.env.VUE_APP_GIT_BRANCH,
-		gitHash: () => process.env.VUE_APP_GIT_HASH,
-		baseURL: () => process.env.VUE_APP_HOMEPAGE
-	}
+	name: 'Info'
 }
 </script>
 <style scoped>