From e16fa148c59fd355473a3951a51c0fe7794b1f67 Mon Sep 17 00:00:00 2001 From: NoriDev Date: Thu, 5 Oct 2023 14:38:11 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"fix(frontend):=20=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E8=A8=AD=E5=AE=9A=E3=81=8B?= =?UTF-8?q?=E3=82=8913.7.0=E3=81=A7=E5=89=8A=E9=99=A4=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E3=83=81=E3=83=A3=E3=83=83=E3=83=88=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E3=82=B5=E3=82=A6=E3=83=B3?= =?UTF-8?q?=E3=83=89=E8=A8=AD=E5=AE=9A=E3=82=92=E5=89=8A=E9=99=A4=20(#1191?= =?UTF-8?q?2)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e4ade46a2d3bd1d4b54965f9e59543fa5281c285. --- locales/ar-SA.yml | 2 ++ locales/bn-BD.yml | 2 ++ locales/ca-ES.yml | 1 + locales/cs-CZ.yml | 2 ++ locales/de-DE.yml | 2 ++ locales/el-GR.yml | 2 ++ locales/en-US.yml | 2 ++ locales/es-ES.yml | 2 ++ locales/fr-FR.yml | 2 ++ locales/id-ID.yml | 2 ++ locales/it-IT.yml | 2 ++ locales/ja-KS.yml | 2 ++ locales/ko-KR.yml | 2 ++ locales/lo-LA.yml | 1 + locales/nl-NL.yml | 1 + locales/pl-PL.yml | 2 ++ locales/pt-PT.yml | 1 + locales/ro-RO.yml | 1 + locales/ru-RU.yml | 2 ++ locales/sk-SK.yml | 2 ++ locales/sv-SE.yml | 1 + locales/th-TH.yml | 2 ++ locales/tr-TR.yml | 1 + locales/uk-UA.yml | 2 ++ locales/uz-UZ.yml | 1 + locales/vi-VN.yml | 2 ++ locales/zh-CN.yml | 2 ++ locales/zh-TW.yml | 2 ++ .../frontend/src/pages/settings/sounds-and-vibrations.vue | 4 +++- packages/frontend/src/scripts/sound.ts | 8 ++++++++ 30 files changed, 59 insertions(+), 1 deletion(-) diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index cea927e728..cb98e5a5ac 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -1262,6 +1262,8 @@ _sfx: note: "الملاحظات" noteMy: "ملاحظتي" notification: "الإشعارات" + chat: "المحادثة" + chatBg: "المحادثة (الخلفية)" antenna: "الهوائيات" channel: "إشعارات القنات" _ago: diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index 97fa945ac6..9893261779 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -1097,6 +1097,8 @@ _sfx: note: "নোটগুলি" noteMy: "নোট (আপনার)" notification: "বিজ্ঞপ্তি" + chat: "চ্যাট" + chatBg: "চ্যাট (ব্যাকগ্রাউন্ড)" antenna: "অ্যান্টেনাগুলি" channel: "চ্যানেলের বিজ্ঞপ্তি" _ago: diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index c961961b52..2d3afa3aed 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -398,6 +398,7 @@ _theme: _sfx: note: "Notes" notification: "Notificacions" + chat: "Xat" antenna: "Antenes" _2fa: renewTOTPCancel: "No, gràcies" diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml index 331911c9ef..7efef67b9a 100644 --- a/locales/cs-CZ.yml +++ b/locales/cs-CZ.yml @@ -1647,6 +1647,8 @@ _sfx: note: "Poznámky" noteMy: "Moje poznámka" notification: "Oznámení" + chat: "Zprávy" + chatBg: "Chat (Pozadí)" antenna: "Antény" channel: "Oznámení kanálu" _ago: diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 54d6ac3e36..06b6c21cb8 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -1777,6 +1777,8 @@ _sfx: note: "Notizen" noteMy: "Meine Notizen" notification: "Benachrichtigungen" + chat: "Chat" + chatBg: "Chat (Hintergrund)" antenna: "Antennen" channel: "Kanalbenachrichtigung" _ago: diff --git a/locales/el-GR.yml b/locales/el-GR.yml index 9392fd12fe..e46efcec1f 100644 --- a/locales/el-GR.yml +++ b/locales/el-GR.yml @@ -303,6 +303,8 @@ _theme: _sfx: note: "Σημειώματα" notification: "Ειδοποιήσεις" + chat: "Συνομιλία" + chatBg: "Συνομιλία (Παρασκήνιο)" antenna: "Αντένες" channel: "Ειδοποιήσεις καναλιών" _ago: diff --git a/locales/en-US.yml b/locales/en-US.yml index ec4e8dfea2..5134c26a4d 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1959,6 +1959,8 @@ _sfx: note: "New note" noteMy: "Own note" notification: "Notifications" + chat: "Chat" + chatBg: "Chat (Background)" antenna: "Antennas" channel: "Channel notifications" _ago: diff --git a/locales/es-ES.yml b/locales/es-ES.yml index abc12d864c..04f2cb0e51 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -1771,6 +1771,8 @@ _sfx: note: "Notas" noteMy: "Nota (a mí mismo)" notification: "Notificaciones" + chat: "Chat" + chatBg: "Chat (Fondo)" antenna: "Antena receptora" channel: "Notificaciones del canal" _ago: diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index a1da11bf26..7569961092 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -1435,6 +1435,8 @@ _sfx: note: "Nouvelle note" noteMy: "Ma note" notification: "Notifications" + chat: "Discuter" + chatBg: "Discussion (arrière-plan)" antenna: "Réception de l’antenne" channel: "Notifications de canal" _ago: diff --git a/locales/id-ID.yml b/locales/id-ID.yml index df54aed834..de915a89ca 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -1730,6 +1730,8 @@ _sfx: note: "Catatan" noteMy: "Catatan (Saya)" notification: "Notifikasi" + chat: "Pesan" + chatBg: "Obrolan (Latar Belakang)" antenna: "Penerimaan Antenna" channel: "Notifikasi Kanal" _ago: diff --git a/locales/it-IT.yml b/locales/it-IT.yml index c2d5b88675..2db23e8564 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -1772,6 +1772,8 @@ _sfx: note: "Nota" noteMy: "Mia nota" notification: "Notifiche" + chat: "Messaggi" + chatBg: "Chat (sfondo)" antenna: "Ricezione dell'antenna" channel: "Notifiche di canale" _ago: diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml index 0d72a5e242..98e73e5a88 100644 --- a/locales/ja-KS.yml +++ b/locales/ja-KS.yml @@ -1754,6 +1754,8 @@ _sfx: note: "ノート" noteMy: "ノート(自分)" notification: "通知" + chat: "チャット" + chatBg: "チャット(バックグラウンド)" antenna: "アンテナ受信" channel: "チャンネル通知" _ago: diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index c7a8fcfd7c..5532c2c80e 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1953,6 +1953,8 @@ _sfx: note: "새 노트" noteMy: "내 노트" notification: "알림" + chat: "대화" + chatBg: "대화 (백그라운드)" antenna: "안테나 수신" channel: "채널 알림" _ago: diff --git a/locales/lo-LA.yml b/locales/lo-LA.yml index 98baa023ed..8d43ecced6 100644 --- a/locales/lo-LA.yml +++ b/locales/lo-LA.yml @@ -407,6 +407,7 @@ _theme: _sfx: note: "ບັນທຶກ" notification: "ການແຈ້ງເຕືອນ" + chat: "ແຊ໋ດ" _2fa: renewTOTPCancel: "ບໍ່​ແມ່ນ​ຕອນ​ນີ້" _widgets: diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml index 14548493f7..0c600592e2 100644 --- a/locales/nl-NL.yml +++ b/locales/nl-NL.yml @@ -438,6 +438,7 @@ _theme: _sfx: note: "Notities" notification: "Meldingen" + chat: "Chat" _2fa: renewTOTPCancel: "Nee, bedankt" _widgets: diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 69081e4941..087496f0a5 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -1142,6 +1142,8 @@ _sfx: note: "Wpisy" noteMy: "Mój wpis" notification: "Powiadomienia" + chat: "Wiadomości" + chatBg: "Rozmowy (tło)" antenna: "Anteny" channel: "Powiadomienia kanału" _ago: diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml index ccff68e854..24987221db 100644 --- a/locales/pt-PT.yml +++ b/locales/pt-PT.yml @@ -1320,6 +1320,7 @@ _theme: _sfx: note: "Posts" notification: "Notificações" + chat: "Chat" _ago: invalid: "Não há nada aqui" _timelineTutorial: diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml index faf192b2ce..29cdfaa17e 100644 --- a/locales/ro-RO.yml +++ b/locales/ro-RO.yml @@ -647,6 +647,7 @@ _theme: _sfx: note: "Note" notification: "Notificări" + chat: "Chat" _ago: invalid: "Nu e nimic de văzut aici" _widgets: diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index e5dc5ad5e1..724cacfa7c 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -1656,6 +1656,8 @@ _sfx: note: "Заметки" noteMy: "Собственные заметки" notification: "Уведомления" + chat: "Сообщения" + chatBg: "Сообщения (фон)" antenna: "Антенна" channel: "Канал" _ago: diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index c37add7ff9..0c9a7f68a3 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -1207,6 +1207,8 @@ _sfx: note: "Poznámky" noteMy: "Vlastná poznámka" notification: "Oznámenia" + chat: "Chat" + chatBg: "Chat (pozadie)" antenna: "Antény" channel: "Upozornenia kanála" _ago: diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml index da9fe54367..c8537c68a1 100644 --- a/locales/sv-SE.yml +++ b/locales/sv-SE.yml @@ -507,6 +507,7 @@ _theme: _sfx: note: "Noter" notification: "Notifikationer" + chat: "Chatt" antenna: "Antenner" _2fa: renewTOTPCancel: "Nej tack" diff --git a/locales/th-TH.yml b/locales/th-TH.yml index fd0fed82e9..b602e33c67 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -1766,6 +1766,8 @@ _sfx: note: "หมายเหตุ" noteMy: "โน้ตของตัวเอง" notification: "การเเจ้งเตือน" + chat: "แชท" + chatBg: "แชท (พื้นหลัง)" antenna: "เสาอากาศ" channel: "การแจ้งเตือนช่อง" _ago: diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml index 76f69caa9f..936820b343 100644 --- a/locales/tr-TR.yml +++ b/locales/tr-TR.yml @@ -386,6 +386,7 @@ _theme: _sfx: note: "notlar" notification: "Bildirim" + chat: "Mesajlar" _2fa: renewTOTPCancel: "Hayır, teşekkürler" _permissions: diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml index f74baa2e5d..ce4e261aa1 100644 --- a/locales/uk-UA.yml +++ b/locales/uk-UA.yml @@ -1388,6 +1388,8 @@ _sfx: note: "Нотатки" noteMy: "Мої нотатки" notification: "Сповіщення" + chat: "Чати" + chatBg: "Чати (фон)" antenna: "Прийом антени" channel: "Повідомлення каналу" _ago: diff --git a/locales/uz-UZ.yml b/locales/uz-UZ.yml index f541f1f43c..eb04e2afaf 100644 --- a/locales/uz-UZ.yml +++ b/locales/uz-UZ.yml @@ -910,6 +910,7 @@ _theme: _sfx: note: "Qaydlar" notification: "Xabarnomalar" + chat: "Suhbat" _ago: minutesAgo: "{n} daqiqa oldin" hoursAgo: "{n} soat oldin" diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index 1b971dc5e6..2201e9a4da 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -1572,6 +1572,8 @@ _sfx: note: "Tút" noteMy: "Tút của tôi" notification: "Thông báo" + chat: "Trò chuyện" + chatBg: "Chat (Nền)" antenna: "Trạm phát sóng" channel: "Kênh" _ago: diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index a672a0fa98..49e4c729a4 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1777,6 +1777,8 @@ _sfx: note: "帖子" noteMy: "我的帖子" notification: "通知" + chat: "聊天" + chatBg: "聊天背景" antenna: "天线接收" channel: "频道通知" _ago: diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index deeb133f64..d9ef28186e 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1775,6 +1775,8 @@ _sfx: note: "貼文" noteMy: "我的貼文" notification: "通知" + chat: "聊天" + chatBg: "聊天背景" antenna: "天線接收" channel: "頻道通知" _ago: diff --git a/packages/frontend/src/pages/settings/sounds-and-vibrations.vue b/packages/frontend/src/pages/settings/sounds-and-vibrations.vue index a6892af268..785dc0e587 100644 --- a/packages/frontend/src/pages/settings/sounds-and-vibrations.vue +++ b/packages/frontend/src/pages/settings/sounds-and-vibrations.vue @@ -47,12 +47,14 @@ import { ColdDeviceStorage } from '@/store.js'; const masterVolume = computed(soundConfigStore.makeGetterSetter('sound_masterVolume')); -const soundsKeys = ['note', 'noteMy', 'notification', 'antenna', 'channel'] as const; +const soundsKeys = ['note', 'noteMy', 'notification', 'chat', 'chatBg', 'antenna', 'channel'] as const; const sounds = ref>>({ note: soundConfigStore.reactiveState.sound_note, noteMy: soundConfigStore.reactiveState.sound_noteMy, notification: soundConfigStore.reactiveState.sound_notification, + chat: soundConfigStore.reactiveState.sound_chat, + chatBg: soundConfigStore.reactiveState.sound_chatBg, antenna: soundConfigStore.reactiveState.sound_antenna, channel: soundConfigStore.reactiveState.sound_channel, }); diff --git a/packages/frontend/src/scripts/sound.ts b/packages/frontend/src/scripts/sound.ts index 0712977173..faa681c85b 100644 --- a/packages/frontend/src/scripts/sound.ts +++ b/packages/frontend/src/scripts/sound.ts @@ -27,6 +27,14 @@ export const soundConfigStore = markRaw(new Storage('sound', { where: 'account', default: { type: 'syuilo/n-ea', volume: 1 }, }, + sound_chat: { + where: 'account', + default: { type: 'syuilo/pope1', volume: 1 }, + }, + sound_chatBg: { + where: 'account', + default: { type: 'syuilo/waon', volume: 1 }, + }, sound_antenna: { where: 'account', default: { type: 'syuilo/triple', volume: 1 },