OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-14 01:50:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix #5930

Browse source
This commit is contained in:
syuilo 2020-02-13 11:44:58 +09:00
parent 1cd3419688
commit c228155514
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,6 +1,11 @@
ChangeLog ChangeLog
========= =========
unreleased
-------------------
### 🐛Fixes
* グループがない状態でグループチャットを開始しようとするとフリーズする問題を修正
12.8.0 (2020/02/13) 12.8.0 (2020/02/13)
-------------------- --------------------
### ✨Improvements ### ✨Improvements

2
locales/ja-JP.yml
View file

@ -389,6 +389,8 @@ uiLanguage: "UIの表示言語"
groupInvited: "グループに招待されました" groupInvited: "グループに招待されました"
aboutX: "{x}について" aboutX: "{x}について"
useOsNativeEmojis: "OSネイティブの絵文字を使用" useOsNativeEmojis: "OSネイティブの絵文字を使用"
noGroups: "グループがありません"
joinOrCreateGroup: "既存のグループに招待してもらうか、新しくグループを作成してください。"
_ago: _ago:
unknown: "謎" unknown: "謎"

8
src/client/pages/messaging.vue
View file

@ -139,6 +139,14 @@ export default Vue.extend({
async startGroup() { async startGroup() {
const groups1 = await this.$root.api('users/groups/owned'); const groups1 = await this.$root.api('users/groups/owned');
const groups2 = await this.$root.api('users/groups/joined'); const groups2 = await this.$root.api('users/groups/joined');
if (groups1.length === 0 && groups2.length === 0) {
this.$root.dialog({
type: 'warning',
title: this.$t('noGroups'),
text: this.$t('joinOrCreateGroup'),
});
return;
}
const { canceled, result: group } = await this.$root.dialog({ const { canceled, result: group } = await this.$root.dialog({
type: null, type: null,
title: this.$t('group'), title: this.$t('group'),