From 160f424466d38ec83a69301948116a7f8b3b7461 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 19 Jan 2019 08:28:46 +0900
Subject: [PATCH] Fix missing username conversions (#3922)
---
.../views/components/games/reversi/reversi.game.vue | 9 +++++++--
src/client/app/common/views/pages/follow.vue | 6 ++++--
.../app/desktop/views/pages/deck/deck.note-column.vue | 8 +-------
.../app/desktop/views/pages/deck/deck.user-column.vue | 6 +-----
src/client/app/mobile/views/pages/followers.vue | 3 ++-
src/client/app/mobile/views/pages/following.vue | 3 ++-
src/client/app/mobile/views/pages/settings.vue | 6 ++++--
7 files changed, 21 insertions(+), 20 deletions(-)
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 71eb3d1c9..98eda88fe 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
@@ -4,8 +4,13 @@
({{ $t('@.reversi.black') }}) vs ({{ $t('@.reversi.white') }})
-
{{ $t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) }) }}
-
{{ $t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) }) }}
+
+
+
+
+
+
+
{{ $t('@.reversi.opponent-turn') }}
{{ $t('@.reversi.my-turn') }}
diff --git a/src/client/app/common/views/pages/follow.vue b/src/client/app/common/views/pages/follow.vue
index 6c945ab22..efcdb4a3b 100644
--- a/src/client/app/common/views/pages/follow.vue
+++ b/src/client/app/common/views/pages/follow.vue
@@ -1,7 +1,8 @@
-
-
+
+
+
@@ -127,6 +128,7 @@ export default Vue.extend({
> .signed-in-as
margin-bottom 16px
font-size 14px
+ font-weight bold
> main
margin-bottom 16px
diff --git a/src/client/app/desktop/views/pages/deck/deck.note-column.vue b/src/client/app/desktop/views/pages/deck/deck.note-column.vue
index 43db32c85..74da48bff 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note-column.vue
@@ -1,7 +1,7 @@
- {{ title }}
+
@@ -45,12 +45,6 @@ export default Vue.extend({
};
},
- computed: {
- title(): string {
- return this.note ? Vue.filter('userName')(this.note.user) : '';
- }
- },
-
created() {
this.$root.api('notes/show', { noteId: this.noteId }).then(note => {
this.note = note;
diff --git a/src/client/app/desktop/views/pages/deck/deck.user-column.vue b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
index b52c41394..07da084b9 100644
--- a/src/client/app/desktop/views/pages/deck/deck.user-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
@@ -1,7 +1,7 @@
- {{ title }}
+
@@ -137,10 +137,6 @@ export default Vue.extend({
},
computed: {
- title(): string {
- return this.user ? Vue.filter('userName')(this.user) : '';
- },
-
bannerStyle(): any {
if (this.user == null) return {};
if (this.user.bannerUrl == null) return {};
diff --git a/src/client/app/mobile/views/pages/followers.vue b/src/client/app/mobile/views/pages/followers.vue
index e5efe185c..a0d80d627 100644
--- a/src/client/app/mobile/views/pages/followers.vue
+++ b/src/client/app/mobile/views/pages/followers.vue
@@ -1,7 +1,8 @@
-
{{ $t('followers-of', { name }) }}
+
+
-
{{ $t('following-of', { name }) }}
+
+
{{ $t('settings') }}
-
-
+
+
+
@@ -381,6 +382,7 @@ main
color var(--mobileSignedInAsFg)
background var(--mobileSignedInAsBg)
box-shadow 0 3px 1px -2px rgba(#000, 0.2), 0 2px 2px 0 rgba(#000, 0.14), 0 1px 5px 0 rgba(#000, 0.12)
+ font-weight bold
> .signout
margin 16px