From 64be9baed0b64d882115bbfd3732a0791baa3ff8 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 14 Jul 2022 17:22:06 +0900 Subject: [PATCH 01/36] chore(client): tweak style --- packages/client/src/ui/_common_/sidebar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/ui/_common_/sidebar.vue b/packages/client/src/ui/_common_/sidebar.vue index a72bf786a..f082af9aa 100644 --- a/packages/client/src/ui/_common_/sidebar.vue +++ b/packages/client/src/ui/_common_/sidebar.vue @@ -244,7 +244,7 @@ function more(ev: MouseEvent) { padding: 18px 0; width: 100%; text-align: center; - font-size: $ui-font-size * 1.1; + font-size: $ui-font-size; line-height: initial; > .icon, From 242538ddce37de41d924f12ab8a3637c264d231c Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 14 Jul 2022 17:42:12 +0900 Subject: [PATCH 02/36] refactor(client): rename menu(sidebar) -> navbar --- locales/ja-JP.yml | 1 + packages/client/src/components/launch-pad.vue | 4 ++-- packages/client/src/{menu.ts => navbar.ts} | 2 +- packages/client/src/pages/settings/index.vue | 16 +++++++++------- .../src/pages/settings/{menu.vue => navbar.vue} | 10 +++++----- .../src/pages/settings/statusbars.statusbar.vue | 1 - ...ebar-for-mobile.vue => navbar-for-mobile.vue} | 14 +++++++------- .../src/ui/_common_/{sidebar.vue => navbar.vue} | 12 ++++++------ packages/client/src/ui/classic.header.vue | 16 ++++++++-------- packages/client/src/ui/classic.sidebar.vue | 16 ++++++++-------- packages/client/src/ui/classic.vue | 1 - packages/client/src/ui/deck.vue | 10 +++++----- packages/client/src/ui/universal.vue | 10 +++++----- 13 files changed, 57 insertions(+), 56 deletions(-) rename packages/client/src/{menu.ts => navbar.ts} (98%) rename packages/client/src/pages/settings/{menu.vue => navbar.vue} (90%) rename packages/client/src/ui/_common_/{sidebar-for-mobile.vue => navbar-for-mobile.vue} (85%) rename packages/client/src/ui/_common_/{sidebar.vue => navbar.vue} (89%) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 0e278bead..fd8aca868 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -887,6 +887,7 @@ beta: "ベータ" enableAutoSensitive: "自動NSFW判定" enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにNSFWフラグを設定します。この機能をオフにしても、インスタンスによっては自動で設定されることがあります。" activeEmailValidationDescription: "ユーザーのメールアドレスのバリデーションを、捨てアドかどうかや実際に通信可能かどうかなどを判定しより積極的に行います。オフにすると単に文字列として正しいかどうかのみチェックされます。" +navbar: "ナビゲーションバー" _sensitiveMediaDetection: description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。" diff --git a/packages/client/src/components/launch-pad.vue b/packages/client/src/components/launch-pad.vue index a6025f8b2..4693df291 100644 --- a/packages/client/src/components/launch-pad.vue +++ b/packages/client/src/components/launch-pad.vue @@ -36,7 +36,7 @@ From 77c2a7cd71efea318f4fd7ba0ee54b32e9c8f7ba Mon Sep 17 00:00:00 2001 From: tamaina Date: Thu, 14 Jul 2022 23:32:00 +0900 Subject: [PATCH 24/36] refactor(client): remove useCssModule (#8999) * refactor(client): remove useCssModule() * use MkStickyContainer * Revert "use MkStickyContainer" This reverts commit 639746786bb7e3342db9cbd3452854fc29aacf88. --- packages/client/src/components/global/loading.vue | 4 +--- packages/client/src/components/mention.vue | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/client/src/components/global/loading.vue b/packages/client/src/components/global/loading.vue index 5a7e362fc..bcc6dfac0 100644 --- a/packages/client/src/components/global/loading.vue +++ b/packages/client/src/components/global/loading.vue @@ -16,9 +16,7 @@ diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index fe4fc425c..e4b5de991 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -365,11 +365,11 @@ const wallpaper = localStorage.getItem('wallpaper') != null; height: calc(var(--vh, 1vh) * 100); width: 240px; box-sizing: border-box; + contain: strict; overflow: auto; overscroll-behavior: contain; - background: var(--bg); + background: var(--navBg); } - } From 3d0870f414604129d170d1c55cbd3bfd34de74d1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Jul 2022 22:10:02 +0900 Subject: [PATCH 34/36] 12.114.0-beta.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e252c1c89..75dcf9683 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.114.0-beta.7", + "version": "12.114.0-beta.8", "codename": "indigo", "repository": { "type": "git", From aa5eab746ac985dba4932f54f2fd3ec1a88a92f7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Jul 2022 22:43:42 +0900 Subject: [PATCH 35/36] New Crowdin updates (#9001) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Vietnamese) * New translations ja-JP.yml (Slovak) * New translations ja-JP.yml (German) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Arabic) * New translations ja-JP.yml (Slovak) * New translations ja-JP.yml (Kabyle) * New translations ja-JP.yml (Thai) * New translations ja-JP.yml (Bengali) * New translations ja-JP.yml (Indonesian) * New translations ja-JP.yml (English) * New translations ja-JP.yml (Chinese Simplified) * New translations ja-JP.yml (Russian) * New translations ja-JP.yml (Vietnamese) * New translations ja-JP.yml (Spanish) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (French) * New translations ja-JP.yml (Polish) * New translations ja-JP.yml (German) * New translations ja-JP.yml (Italian) * New translations ja-JP.yml (Korean) --- locales/ar-SA.yml | 1 + locales/bn-BD.yml | 1 + locales/de-DE.yml | 3 +++ locales/en-US.yml | 3 +++ locales/es-ES.yml | 1 + locales/fr-FR.yml | 1 + locales/id-ID.yml | 1 + locales/it-IT.yml | 1 + locales/kab-KAB.yml | 1 + locales/ko-KR.yml | 1 + locales/pl-PL.yml | 1 + locales/ru-RU.yml | 1 + locales/sk-SK.yml | 2 ++ locales/th-TH.yml | 1 + locales/vi-VN.yml | 3 +++ locales/zh-CN.yml | 1 + locales/zh-TW.yml | 2 ++ 17 files changed, 25 insertions(+) diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index 1289fba44..992eeb0f5 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -808,6 +808,7 @@ reverse: "اقلب" colored: "ملوّن" label: "التسمية" localOnly: "المحلي فقط" +account: "الحسابات" _emailUnavailable: used: "هذا البريد الإلكتروني مستخدم" format: "صيغة البريد الإلكتروني غير صالحة" diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index 6017566bb..f6547646c 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -848,6 +848,7 @@ reverse: "উল্টান" colored: "রঙ্গিন" label: "লেবেল" localOnly: "শুধুমাত্র লোকাল" +account: "অ্যাকাউন্টগুলি" _emailUnavailable: used: "এই ইমেইল ঠিকানাটি ইতোমধ্যে ব্যবহৃত হয়েছে" format: "এই ইমেল ঠিকানাটি সঠিকভাবে লিখা হয়নি" diff --git a/locales/de-DE.yml b/locales/de-DE.yml index dfa65198b..b7941cbaf 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -887,6 +887,9 @@ beta: "Beta" enableAutoSensitive: "NSFW-Automarkierung" enableAutoSensitiveDescription: "Setzt soweit möglich durch Verwendung von Machine Learning automatisch NSFW-Markierungen für Medien, die NSFW-Anteile beinhalten. Auch wenn du diese Option deaktiviert hast, ist sie möglicherweise auf Instanzebene aktiviert." activeEmailValidationDescription: "Aktivert strengere Überprüfung von E-Mail-Adressen, d.h. Testen auf Wegwerfadressen und darauf, ob mit der Adresse tatsächlich kommuniziert werden kann. Ist dies deaktiviert, so wird nur das Format der E-Mail überprüft." +navbar: "Navigationsleiste" +shuffle: "Mischen" +account: "Benutzerkonten" _sensitiveMediaDetection: description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische Erkennungen von NSFW-Medien unter Verwendung von Machine Learning. Hierdurch wird die Serverlast etwas erhöht." sensitivity: "Erkennungssensitivität" diff --git a/locales/en-US.yml b/locales/en-US.yml index f0a9924cd..520b54129 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -887,6 +887,9 @@ beta: "Beta" enableAutoSensitive: "Automatic NSFW-Marking" enableAutoSensitiveDescription: "Allows automatic detection and marking of NSFW media through Machine Learning where possible. Even if this option is disabled, it may be enabled instance-wide." activeEmailValidationDescription: "Enables stricter validation of email addresses, which includes checking for disposable addresses and by whether it can actually be communicated with. When unchecked, only the format of the email is validated." +navbar: "Navigation bar" +shuffle: "Shuffle" +account: "Accounts" _sensitiveMediaDetection: description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server." sensitivity: "Detection sensitivity" diff --git a/locales/es-ES.yml b/locales/es-ES.yml index a8f6aaa79..8383864ed 100644 --- a/locales/es-ES.yml +++ b/locales/es-ES.yml @@ -865,6 +865,7 @@ reverse: "Echar de un capirotazo" colored: "Color" label: "Etiqueta" localOnly: "Solo local" +account: "Cuentas" _emailUnavailable: used: "Ya fue usado" format: "Formato no válido." diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index c5f803bb8..b14d3d14b 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -843,6 +843,7 @@ reverse: "Inverser" colored: "Coloré" label: "Étiquette" localOnly: "Local seulement" +account: "Comptes" _emailUnavailable: used: "Non disponible" format: "Le format de cette adresse de courriel est invalide" diff --git a/locales/id-ID.yml b/locales/id-ID.yml index d543fae86..315b690b0 100644 --- a/locales/id-ID.yml +++ b/locales/id-ID.yml @@ -852,6 +852,7 @@ reverse: "Balik" colored: "Diwarnai" label: "Label" localOnly: "Hanya lokal" +account: "Akun" _emailUnavailable: used: "Alamat surel ini telah digunakan" format: "Format tidak valid." diff --git a/locales/it-IT.yml b/locales/it-IT.yml index eb7478dd5..ac14bed13 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -814,6 +814,7 @@ reverse: "Inverti" colored: "Colorato" label: "Etichetta" localOnly: "Soltanto locale" +account: "Account" _emailUnavailable: used: "Email già in uso" format: "Formato email non valido" diff --git a/locales/kab-KAB.yml b/locales/kab-KAB.yml index f0297c66a..29eca64c7 100644 --- a/locales/kab-KAB.yml +++ b/locales/kab-KAB.yml @@ -57,6 +57,7 @@ selectAccount: "Fren amiḍan" accounts: "Imiḍan" searchByGoogle: "Nadi" file: "Ifuyla" +account: "Imiḍan" _email: _follow: title: "Yeṭṭafaṛ-ik·em-id" diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 781de6106..2ba05505c 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -886,6 +886,7 @@ beta: "베타" enableAutoSensitive: "자동 NSFW 탐지" enableAutoSensitiveDescription: "이용 가능할 경우 기계학습을 통해 자동으로 미디어 NSFW를 설정합니다. 이 기능을 해제하더라도, 인스턴스 정책에 따라 자동으로 설정될 수 있습니다." activeEmailValidationDescription: "유저가 입력한 메일 주소가 일회용 메일인지, 실제로 통신할 수 있는 지 엄격하게 검사합니다. 해제할 경우 이메일 형식에 대해서만 검사합니다." +account: "계정" _sensitiveMediaDetection: description: "기계학습을 통해 자동으로 민감한 미디어를 탐지하여, 모더레이션에 참고할 수 있도록 합니다. 서버의 부하를 약간 증가시킵니다." sensitivity: "탐지 민감도" diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index af7d48ea7..41ba8fdd3 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -764,6 +764,7 @@ file: "Pliki" reverse: "Odwróć" colored: "Kolorowe" label: "Etykieta" +account: "Konta" _ffVisibility: public: "Publikuj" _ad: diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index c49cbe138..4386e1c87 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -842,6 +842,7 @@ reverse: "Переворот" colored: "Выделена цветом" label: "Метка" localOnly: "Локально" +account: "Учётные записи" _sensitiveMediaDetection: description: "Машинное обучение может быть использовано для автоматического обнаружения чувствительных медиа для модерации. Нагрузка на сервер увеличивается незначительно." setSensitiveFlagAutomatically: "Установить флаг NSFW" diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index a5641e68f..c5a5d6d0b 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -883,6 +883,8 @@ beta: "Beta" enableAutoSensitive: "Automatická detekcia NSFW" enableAutoSensitiveDescription: "Ak je zapnuté, príznak NSFW sa na médiách automaticky nastaví pomocou strojového učenia. Aj keď je táto funkcia vypnutá, v niektorých prípadoch sa môže nastaviť automaticky." activeEmailValidationDescription: "Dôkladnejšie overí e-mailovú adresu používateľa tým, že zistí, či ide o vyradenú e-mailovú adresu a či sa s ňou dá skutočne komunikovať. Ak nie je začiarknuté, e-mailová adresa sa kontroluje len ako text." +navbar: "Navigačný panel" +account: "Účty" _sensitiveMediaDetection: description: "Strojové učenie sa použije na automatickú detekciu citlivých médií na účely ich moderovania. Mierne sa zvýši zaťaženie servera." sensitivity: "Citlivosť detekcie" diff --git a/locales/th-TH.yml b/locales/th-TH.yml index 1170185db..0c695ff5b 100644 --- a/locales/th-TH.yml +++ b/locales/th-TH.yml @@ -822,6 +822,7 @@ deleteAccountConfirm: "การดำเนินการนี้จะลบ incorrectPassword: "รหัสผ่านไม่ถูกต้อง" searchByGoogle: "ค้นหา" file: "ไฟล์" +account: "บัญชีผู้ใช้" _ffVisibility: public: "เผยแพร่" _ad: diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index 068065487..238491550 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -887,6 +887,9 @@ beta: "Beta" enableAutoSensitive: "Tự động đánh dấu NSFW" enableAutoSensitiveDescription: "Cho phép tự động phát hiện và đánh dấu media NSFW thông qua học máy, nếu có thể. Ngay cả khi tùy chọn này bị tắt, nó vẫn có thể được bật trên toàn máy chủ." activeEmailValidationDescription: "Cho phép xác minh địa chỉ email chặt chẽ hơn, bao gồm việc kiểm tra các địa chỉ dùng một lần và xem nó có thực sự được giao tiếp hay không. Khi bỏ chọn, chỉ định dạng của email được xác minh." +navbar: "Thanh điều hướng" +shuffle: "Xáo trộn" +account: "Tài khoản của bạn" _sensitiveMediaDetection: description: "Giảm nỗ lực kiểm duyệt máy chủ thông qua việc tự động nhận dạng media NSFW thông qua học máy. Điều này sẽ làm tăng một chút áp lực trên máy chủ." sensitivity: "Phát hiện nhạy cảm" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 26f745e65..cb97a1b68 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -878,6 +878,7 @@ cannotUploadBecauseInappropriate: "因为可能含有不适宜的内容,无法 cannotUploadBecauseNoFreeSpace: "因为已无可用空间,无法上传。" beta: "测试" enableAutoSensitive: "自动 NSFW 识别" +account: "账户" _sensitiveMediaDetection: description: "可以使用机器学习技术自动检测敏感媒体,以便进行审核。服务器负载将略微增加。" sensitivity: "检测敏感度" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 945080ee4..0359b03b2 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -887,6 +887,8 @@ beta: "Beta" enableAutoSensitive: "自動NSFW判定" enableAutoSensitiveDescription: "如果可用,請利用機器學習在媒體上自動設置 NSFW 旗標。 即使關閉此功能,依實例而定也可能會自動設置。" activeEmailValidationDescription: "積極地驗證用戶的電子郵件地址,判斷它是否為免洗地址,或者它是否可以通信。 若關閉,則只會檢查字元是否正確。" +navbar: "導覽列" +account: "帳戶" _sensitiveMediaDetection: description: "您可以使用機器學習自動檢測敏感媒體並將其用於審核。 伺服器的負荷會稍微增加。" sensitivity: "檢測敏感度" From 7d6311894132f616f008a7db23ee68663bfadfeb Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 15 Jul 2022 22:44:53 +0900 Subject: [PATCH 36/36] 12.114.0 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efb0d684a..d8129bf7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ You should also include the user name that made the change. --> -## 12.x.x (unreleased) +## 12.114.0 (2022/07/15) ### Improvements - RSSティッカーで表示順序をシャッフルできるように @syuilo diff --git a/package.json b/package.json index 75dcf9683..24cf9a618 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.114.0-beta.8", + "version": "12.114.0", "codename": "indigo", "repository": { "type": "git",