Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix VRTL VSTLの名前が表示されないところがある問題 #221

Merged
merged 2 commits into from
Aug 7, 2024
Merged

fix VRTL VSTLの名前が表示されないところがある問題 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1203f24
fix(frontend): VRTL VSTLの名前が表示されないところがある問題 (#97)
anatawa12 Aug 7, 2024
cfafacd
Merge remote-tracking branch 'refs/remotes/anatawa12/vmimi-relay-time…
anatawa12 Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG-VRTL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
VRTLのブランチで行われた変更点をまとめています

<!-- VV Please add changelog here VV -->
- fix(frontend): VRTL VSTLの名前が表示されないところがある問題 (anatawa12#97) - 2024/08/07
- fic(frontend): VRTL VSTLでリプライのトグルが表示されない問題 (anatawa12#92) - 2024/08/04

-- 2024.7.0-kinel.1 --
Expand Down
4 changes: 2 additions & 2 deletions locales/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8836,11 +8836,11 @@ export interface Locale extends ILocale {
/**
* ぶいみみリレー
*/
"vmimiRelay": string;
"vmimi-relay": string;
/**
* ぶいみみソーシャル
*/
"vmimiRelaySocial": string;
"vmimi-relay-social": string;
};
"_play": {
/**
Expand Down
4 changes: 2 additions & 2 deletions locales/ja-JP.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2330,8 +2330,8 @@ _timelines:
local: "ローカル"
social: "ソーシャル"
global: "グローバル"
vmimiRelay: "ぶいみみリレー"
vmimiRelaySocial: "ぶいみみソーシャル"
vmimi-relay: "ぶいみみリレー"
vmimi-relay-social: "ぶいみみソーシャル"

_play:
new: "Playの作成"
Expand Down
4 changes: 2 additions & 2 deletions packages/frontend/src/ui/deck/tl-column.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ async function setType() {
}, {
value: 'global' as const, text: i18n.ts._timelines.global,
}, {
value: 'vmimi-relay' as const, text: i18n.ts._timelines.vmimiRelay,
value: 'vmimi-relay' as const, text: i18n.ts._timelines['vmimi-relay'],
}, {
value: 'vmimi-relay-social' as const, text: i18n.ts._timelines.vmimiRelaySocial,
value: 'vmimi-relay-social' as const, text: i18n.ts._timelines['vmimi-relay-social'],
}],
});
if (canceled) {
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/widgets/WidgetTimeline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<template #header>
<button class="_button" @click="choose">
<span>{{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : widgetProps.src == 'vmimi-relay' ? i18n.ts._timelines.vmimiRelay : widgetProps.src == 'vmimi-relay-social' ? i18n.ts._timelines.vmimiRelaySocial : i18n.ts._timelines[widgetProps.src] }}</span>
<span>{{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : widgetProps.src == 'vmimi-relay' ? i18n.ts._timelines['vmimi-relay'] : widgetProps.src == 'vmimi-relay-social' ? i18n.ts._timelines['vmimi-relay-social'] : i18n.ts._timelines[widgetProps.src] }}</span>
<i :class="menuOpened ? 'ti ti-chevron-up' : 'ti ti-chevron-down'" style="margin-left: 8px;"></i>
</button>
</template>
Expand Down
Loading