natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

This commit is contained in:
syuilo 2020-10-28 22:48:25 +09:00
parent 9394f4f540 4e968216ad
commit 471911a54f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
locales/ja-JP.yml
View File

@ -601,6 +601,7 @@ editTheseSettingsMayBreakAccount: "これらの設定を編集するとアカウ
instanceTicker: "ノートのインスタンス情報" instanceTicker: "ノートのインスタンス情報"
waitingFor: "{x}を待っています" waitingFor: "{x}を待っています"
random: "ランダム" random: "ランダム"
system: "システム"
_reversi: _reversi:
reversi: "リバーシ" reversi: "リバーシ"

3
src/client/pages/instance/files.vue
View File

@ -42,7 +42,8 @@
<small style="opacity: 0.7;">{{ file.name }}</small> <small style="opacity: 0.7;">{{ file.name }}</small>
</div> </div>
<div> <div>
<MkAcct :user="file.user"/> <MkAcct v-if="file.user" :user="file.user"/>
<div v-else>{{ $t('system') }}</div>
</div> </div>
<div> <div>
<span style="margin-right: 1em;">{{ file.type }}</span> <span style="margin-right: 1em;">{{ file.type }}</span>

4
src/models/repositories/drive-file.ts
View File

@ -124,8 +124,8 @@ export class DriveFileRepository extends Repository<DriveFile> {
folder: opts.detail && file.folderId ? DriveFolders.pack(file.folderId, { folder: opts.detail && file.folderId ? DriveFolders.pack(file.folderId, {
detail: true detail: true
}) : null, }) : null,
userId: opts.withUser ? file.userId! : null, userId: opts.withUser ? file.userId : null,
user: opts.withUser ? Users.pack(file.userId!) : null user: (opts.withUser && file.userId) ? Users.pack(file.userId) : null
}); });
} }