laoxong/misskey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing username conversions (#3922)

Browse Source
This commit is contained in:
MeiMei 2019-01-19 08:28:46 +09:00 committed by syuilo
parent fa051df381
commit 160f424466
7 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/app/common/views/components/games/reversi/reversi.game.vue
View File

@ -4,8 +4,13 @@
<header><b><router-link :to="blackUser | userPage"><mk-user-name :user="blackUser"/></router-link></b>({{ $t('@.reversi.black') }}) vs <b><router-link :to="whiteUser | userPage"><mk-user-name :user="whiteUser"/></router-link></b>({{ $t('@.reversi.white') }})</header>
<div style="overflow: hidden; line-height: 28px;">
<p class="turn" v-if="!iAmPlayer && !game.isEnded">{{ $t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) }) }}<mk-ellipsis/></p>
<p class="turn" v-if="logPos != logs.length">{{ $t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) }) }}</p>
<p class="turn" v-if="!iAmPlayer && !game.isEnded">
<misskey-flavored-markdown :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :shouldBreak="false" :plainText="true" :custom-emojis="turnUser.emojis"/>
<mk-ellipsis/>
</p>
<p class="turn" v-if="logPos != logs.length">
<misskey-flavored-markdown :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :shouldBreak="false" :plainText="true" :custom-emojis="turnUser.emojis"/>
</p>
<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">{{ $t('@.reversi.opponent-turn') }}<mk-ellipsis/></p>
<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">{{ $t('@.reversi.my-turn') }}</p>
<p class="result" v-if="game.isEnded && logPos == logs.length">

6
src/client/app/common/views/pages/follow.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="syxhndwprovvuqhmyvveewmbqayniwkv" v-if="!fetching">
<div class="signed-in-as" v-html="this.$t('signed-in-as').replace('{}', `<b>${myName}`)"></div>
<div class="signed-in-as">
<misskey-flavored-markdown :text="$t('signed-in-as').replace('{}', myName)" :shouldBreak="false" :plainText="true" :custom-emojis="$store.state.i.emojis"/>
</div>
<main>
<div class="banner" :style="bannerStyle"></div>
<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
@ -127,6 +128,7 @@ export default Vue.extend({
> .signed-in-as
margin-bottom 16px
font-size 14px
font-weight bold
> main
margin-bottom 16px

8
src/client/app/desktop/views/pages/deck/deck.note-column.vue
View File

@ -1,7 +1,7 @@
<template>
<x-column>
<span slot="header">
<fa :icon="['far', 'comment-alt']"/><span>{{ title }}</span>
<fa :icon="['far', 'comment-alt']"/><mk-user-name :user="note.user" v-if="note"/>
</span>
<div class="rvtscbadixhhbsczoorqoaygovdeecsx" v-if="note">
@ -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;

6
src/client/app/desktop/views/pages/deck/deck.user-column.vue
View File

@ -1,7 +1,7 @@
<template>
<x-column>
<span slot="header">
<fa icon="user"/><span>{{ title }}</span>
<fa icon="user"/><mk-user-name :user="user" v-if="user"/>
</span>
<div class="zubukjlciycdsyynicqrnlsmdwmymzqu" v-if="user">
@ -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 {};

3
src/client/app/mobile/views/pages/followers.vue
View File

@ -1,7 +1,8 @@
<template>
<mk-ui>
<template slot="header" v-if="!fetching">
<img :src="user.avatarUrl" alt="">{{ $t('followers-of', { name }) }}
<img :src="user.avatarUrl" alt="">
<misskey-flavored-markdown :text="$t('followers-of', { name })" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
</template>
<mk-users-list
v-if="!fetching"

3
src/client/app/mobile/views/pages/following.vue
View File

@ -1,7 +1,8 @@
<template>
<mk-ui>
<template slot="header" v-if="!fetching">
<img :src="user.avatarUrl" alt="">{{ $t('following-of', { name }) }}
<img :src="user.avatarUrl" alt="">
<misskey-flavored-markdown :text="$t('following-of', { name })" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
</template>
<mk-users-list
v-if="!fetching"

6
src/client/app/mobile/views/pages/settings.vue
View File

@ -2,8 +2,9 @@
<mk-ui>
<span slot="header"><span style="margin-right:4px;"><fa icon="cog"/></span>{{ $t('settings') }}</span>
<main>
<div class="signin-as" v-html="this.$t('signed-in-as').replace('{}', `<b>${name}</b>`)"></div>
<div class="signed-in-as">
<misskey-flavored-markdown :text="$t('signed-in-as').replace('{}', name)" :shouldBreak="false" :plainText="true" :custom-emojis="$store.state.i.emojis"/>
</div>
<div>
<x-profile-editor/>
@ -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