From 69ba0e13e6fc68b78b95c48e6f8553e89190c845 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 30 Dec 2018 14:05:13 +0900
Subject: [PATCH] Better setting

---
 locales/ja-JP.yml                                         | 2 +-
 .../views/components/games/reversi/reversi.game.vue       | 4 ++--
 src/client/app/desktop/views/components/settings.vue      | 8 ++++----
 src/client/app/mobile/views/pages/settings.vue            | 8 ++++----
 src/client/app/store.ts                                   | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index a38845109..29bd5da9e 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -117,7 +117,7 @@ common:
   my-token-regenerated: "あなたのトークンが更新されたのでサインアウトします。"
   i-like-sushi: "私は(プリンよりむしろ)寿司が好き"
   show-reversi-board-labels: "リバーシのボードの行と列のラベルを表示"
-  use-white-black-reversi-stones: "リバーシに白黒の石を使う"
+  use-avatar-reversi-stones: "リバーシの石にアバターを使う"
   verified-user: "公式アカウント"
   disable-animated-mfm: "投稿内の動きのあるテキストを無効にする"
   suggest-recent-hashtags: "最近のハッシュタグを投稿フォームに表示する"
diff --git a/src/client/app/common/views/components/games/reversi/reversi.game.vue b/src/client/app/common/views/components/games/reversi/reversi.game.vue
index 174d45818..71eb3d1c9 100644
--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@@ -30,11 +30,11 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<template v-if="!$store.state.settings.games.reversi.useWhiteBlackStones">
+					<template v-if="$store.state.settings.games.reversi.useAvatarStones">
 						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black">
 						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white">
 					</template>
-					<template v-if="$store.state.settings.games.reversi.useWhiteBlackStones">
+					<template v-else>
 						<fa v-if="stone === true" :icon="fasCircle"/>
 						<fa v-if="stone === false" :icon="farCircle"/>
 					</template>
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 8bdf1b19b..23b7d78c9 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -135,7 +135,7 @@
 			</section>
 			<section>
 				<ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@.show-reversi-board-labels') }}</ui-switch>
-				<ui-switch v-model="games_reversi_useWhiteBlackStones">{{ $t('@.use-white-black-reversi-stones') }}</ui-switch>
+				<ui-switch v-model="games_reversi_useAvatarStones">{{ $t('@.use-avatar-reversi-stones') }}</ui-switch>
 			</section>
 		</ui-card>
 
@@ -506,9 +506,9 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.showBoardLabels', value }); }
 		},
 
-		games_reversi_useWhiteBlackStones: {
-			get() { return this.$store.state.settings.games.reversi.useWhiteBlackStones; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useWhiteBlackStones', value }); }
+		games_reversi_useAvatarStones: {
+			get() { return this.$store.state.settings.games.reversi.useAvatarStones; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useAvatarStones', value }); }
 		},
 
 		disableAnimatedMfm: {
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index 164a773b0..87db25721 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -28,7 +28,7 @@
 
 				<section>
 					<ui-switch v-model="games_reversi_showBoardLabels">{{ $t('@.show-reversi-board-labels') }}</ui-switch>
-					<ui-switch v-model="games_reversi_useWhiteBlackStones">{{ $t('@.use-white-black-reversi-stones') }}</ui-switch>
+					<ui-switch v-model="games_reversi_useAvatarStones">{{ $t('@.use-avatar-reversi-stones') }}</ui-switch>
 				</section>
 
 				<section>
@@ -285,9 +285,9 @@ export default Vue.extend({
 			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.showBoardLabels', value }); }
 		},
 
-		games_reversi_useWhiteBlackStones: {
-			get() { return this.$store.state.settings.games.reversi.useWhiteBlackStones; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useWhiteBlackStones', value }); }
+		games_reversi_useAvatarStones: {
+			get() { return this.$store.state.settings.games.reversi.useAvatarStones; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useAvatarStones', value }); }
 		},
 
 		disableAnimatedMfm: {
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index c372343a3..604bf2d46 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -41,7 +41,7 @@ const defaultSettings = {
 	games: {
 		reversi: {
 			showBoardLabels: false,
-			useWhiteBlackStones: false,
+			useAvatarStones: true,
 		}
 	}
 };