From 612302f42fb486bc1c4559fba867de936ffdbc1d Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Wed, 9 Apr 2025 11:57:06 +0800 Subject: [PATCH] feat: add LXGW WenKai TC in CJK fonts list (#847) --- apps/readest-app/public/locales/ar/translation.json | 3 ++- apps/readest-app/public/locales/de/translation.json | 3 ++- apps/readest-app/public/locales/el/translation.json | 3 ++- apps/readest-app/public/locales/en/translation.json | 3 ++- apps/readest-app/public/locales/es/translation.json | 3 ++- apps/readest-app/public/locales/fr/translation.json | 3 ++- apps/readest-app/public/locales/hi/translation.json | 3 ++- apps/readest-app/public/locales/id/translation.json | 3 ++- apps/readest-app/public/locales/it/translation.json | 3 ++- apps/readest-app/public/locales/ja/translation.json | 3 ++- apps/readest-app/public/locales/ko/translation.json | 3 ++- apps/readest-app/public/locales/pl/translation.json | 3 ++- apps/readest-app/public/locales/pt/translation.json | 3 ++- apps/readest-app/public/locales/ru/translation.json | 3 ++- apps/readest-app/public/locales/tr/translation.json | 3 ++- apps/readest-app/public/locales/uk/translation.json | 3 ++- apps/readest-app/public/locales/vi/translation.json | 3 ++- .../readest-app/public/locales/zh-CN/translation.json | 1 + .../readest-app/public/locales/zh-TW/translation.json | 3 ++- apps/readest-app/src/services/constants.ts | 6 ++++++ apps/readest-app/src/utils/style.ts | 11 ++++++----- 21 files changed, 49 insertions(+), 23 deletions(-) diff --git a/apps/readest-app/public/locales/ar/translation.json b/apps/readest-app/public/locales/ar/translation.json index 070d6039..7d973df1 100644 --- a/apps/readest-app/public/locales/ar/translation.json +++ b/apps/readest-app/public/locales/ar/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "تم النسخ إلى الحافظة", "Export Annotations": "تصدير التعليقات", "Auto Import on File Open": "استيراد تلقائي عند فتح الملف", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "تبديل منطقة التقليب بالنقر", "No chapters detected.": "لم يتم التعرف على فصول.", "Failed to parse the EPUB file.": "فشل في تحليل ملف EPUB.", diff --git a/apps/readest-app/public/locales/de/translation.json b/apps/readest-app/public/locales/de/translation.json index b2eca669..5bcba975 100644 --- a/apps/readest-app/public/locales/de/translation.json +++ b/apps/readest-app/public/locales/de/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "In die Zwischenablage kopiert", "Export Annotations": "Anmerkungen exportieren", "Auto Import on File Open": "Automatischer Import beim Öffnen einer Datei", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Klick-zu-Blättern-Bereich tauschen", "No chapters detected.": "Keine Kapitel erkannt.", "Failed to parse the EPUB file.": "Fehler beim Parsen der EPUB-Datei.", diff --git a/apps/readest-app/public/locales/el/translation.json b/apps/readest-app/public/locales/el/translation.json index e66f57d2..62352924 100644 --- a/apps/readest-app/public/locales/el/translation.json +++ b/apps/readest-app/public/locales/el/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Αντιγράφηκε στο πρόχειρο", "Export Annotations": "Εξαγωγή σχολιασμών", "Auto Import on File Open": "Αυτόματη εισαγωγή κατά το άνοιγμα αρχείου", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Ανταλλαγή περιοχής κλικ για γύρισμα σελίδας", "No chapters detected.": "Δεν εντοπίστηκαν κεφάλαια.", "Failed to parse the EPUB file.": "Αποτυχία ανάλυσης του αρχείου EPUB.", diff --git a/apps/readest-app/public/locales/en/translation.json b/apps/readest-app/public/locales/en/translation.json index 9cb76ded..1f34a3b2 100644 --- a/apps/readest-app/public/locales/en/translation.json +++ b/apps/readest-app/public/locales/en/translation.json @@ -1,3 +1,4 @@ { - "LXGW WenKai GB Screen": "LXGW WenKai" + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC" } diff --git a/apps/readest-app/public/locales/es/translation.json b/apps/readest-app/public/locales/es/translation.json index 92fbbc95..05745a39 100644 --- a/apps/readest-app/public/locales/es/translation.json +++ b/apps/readest-app/public/locales/es/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Copiado al portapapeles", "Export Annotations": "Exportar anotaciones", "Auto Import on File Open": "Importación automática al abrir archivo", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Intercambiar área de clic para voltear", "No chapters detected.": "No se detectaron capítulos.", "Failed to parse the EPUB file.": "Error al analizar el archivo EPUB.", diff --git a/apps/readest-app/public/locales/fr/translation.json b/apps/readest-app/public/locales/fr/translation.json index 8c86c7f7..8258e094 100644 --- a/apps/readest-app/public/locales/fr/translation.json +++ b/apps/readest-app/public/locales/fr/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Copié dans le presse-papiers", "Export Annotations": "Exporter les annotations", "Auto Import on File Open": "Importation automatique à l'ouverture du fichier", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Échanger la zone de clic pour tourner", "No chapters detected.": "Aucun chapitre détecté.", "Failed to parse the EPUB file.": "Échec de l'analyse du fichier EPUB.", diff --git a/apps/readest-app/public/locales/hi/translation.json b/apps/readest-app/public/locales/hi/translation.json index 219108ea..0e426f3b 100644 --- a/apps/readest-app/public/locales/hi/translation.json +++ b/apps/readest-app/public/locales/hi/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "क्लिपबोर्ड पर कॉपी किया गया", "Export Annotations": "टिप्पणियाँ निर्यात करें", "Auto Import on File Open": "फ़ाइल खोलने पर स्वचालित आयात", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "क्लिक-टू-फ्लिप क्षेत्र स्वैप करें", "No chapters detected.": "कोई अध्याय नहीं मिला।", "Failed to parse the EPUB file.": "EPUB फ़ाइल को पार्स करने में विफल।", diff --git a/apps/readest-app/public/locales/id/translation.json b/apps/readest-app/public/locales/id/translation.json index f143cf59..278418f9 100644 --- a/apps/readest-app/public/locales/id/translation.json +++ b/apps/readest-app/public/locales/id/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Disalin ke papan klip", "Export Annotations": "Ekspor Anotasi", "Auto Import on File Open": "Impor Otomatis saat File Dibuka", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Tukar Area Klik untuk Membalik", "No chapters detected.": "Tidak ada bab yang terdeteksi.", "Failed to parse the EPUB file.": "Gagal mengurai file EPUB.", diff --git a/apps/readest-app/public/locales/it/translation.json b/apps/readest-app/public/locales/it/translation.json index 2348c490..6cb29f2e 100644 --- a/apps/readest-app/public/locales/it/translation.json +++ b/apps/readest-app/public/locales/it/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Copiato negli appunti", "Export Annotations": "Esporta annotazioni", "Auto Import on File Open": "Importazione automatica all'apertura del file", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Scambia area click per voltare pagina", "No chapters detected.": "Nessun capitolo rilevato.", "Failed to parse the EPUB file.": "Impossibile analizzare il file EPUB.", diff --git a/apps/readest-app/public/locales/ja/translation.json b/apps/readest-app/public/locales/ja/translation.json index 1c5187c9..bb6ec3ff 100644 --- a/apps/readest-app/public/locales/ja/translation.json +++ b/apps/readest-app/public/locales/ja/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "クリップボードにコピー", "Export Annotations": "注釈をエクスポート", "Auto Import on File Open": "ファイルを開くと自動インポート", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "クリックめくりエリアを入れ替え", "No chapters detected.": "章が検出されません。", "Failed to parse the EPUB file.": "EPUBファイルの解析に失敗しました。", diff --git a/apps/readest-app/public/locales/ko/translation.json b/apps/readest-app/public/locales/ko/translation.json index 954a683a..bbb8a534 100644 --- a/apps/readest-app/public/locales/ko/translation.json +++ b/apps/readest-app/public/locales/ko/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "클립보드에 복사", "Export Annotations": "주석 내보내기", "Auto Import on File Open": "파일 열 때 자동 가져오기", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "클릭-뒤집기 영역 교환", "No chapters detected.": "장 발견되지 않음.", "Failed to parse the EPUB file.": "EPUB 파일 구문 분석 실패.", diff --git a/apps/readest-app/public/locales/pl/translation.json b/apps/readest-app/public/locales/pl/translation.json index bbbc684c..f93cfe36 100644 --- a/apps/readest-app/public/locales/pl/translation.json +++ b/apps/readest-app/public/locales/pl/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Skopiowano do schowka", "Export Annotations": "Eksportuj adnotacje", "Auto Import on File Open": "Automatyczne importowanie przy otwieraniu pliku", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Zamień obszar kliknięcia na przewracanie", "No chapters detected.": "Nie wykryto rozdziałów.", "Failed to parse the EPUB file.": "Nie udało się przeanalizować pliku EPUB.", diff --git a/apps/readest-app/public/locales/pt/translation.json b/apps/readest-app/public/locales/pt/translation.json index 5431b140..d69b8cc8 100644 --- a/apps/readest-app/public/locales/pt/translation.json +++ b/apps/readest-app/public/locales/pt/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Copiado para a área de transferência", "Export Annotations": "Exportar Anotações", "Auto Import on File Open": "Importação Automática ao Abrir Arquivo", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Trocar Área de Clique para Virar", "No chapters detected.": "Nenhum capítulo detectado.", "Failed to parse the EPUB file.": "Falha ao analisar o arquivo EPUB.", diff --git a/apps/readest-app/public/locales/ru/translation.json b/apps/readest-app/public/locales/ru/translation.json index e453b44d..c2b6f1d5 100644 --- a/apps/readest-app/public/locales/ru/translation.json +++ b/apps/readest-app/public/locales/ru/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Скопировано в буфер обмена", "Export Annotations": "Экспортировать аннотации", "Auto Import on File Open": "Автоматический импорт при открытии файла", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Переключить область клика для переворота", "No chapters detected.": "Не обнаружено глав.", "Failed to parse the EPUB file.": "Не удалось разобрать файл EPUB.", diff --git a/apps/readest-app/public/locales/tr/translation.json b/apps/readest-app/public/locales/tr/translation.json index 6a64035e..2e8899c3 100644 --- a/apps/readest-app/public/locales/tr/translation.json +++ b/apps/readest-app/public/locales/tr/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Panoya kopyalandı", "Export Annotations": "Notları Dışa Aktar", "Auto Import on File Open": "Dosya Açıldığında Otomatik İçe Aktar", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Tıkla-Çevir Alanını Değiştir", "No chapters detected.": "Bölüm bulunamadı.", "Failed to parse the EPUB file.": "EPUB dosyası ayrıştırılamadı.", diff --git a/apps/readest-app/public/locales/uk/translation.json b/apps/readest-app/public/locales/uk/translation.json index 70d7df02..92b71e7a 100644 --- a/apps/readest-app/public/locales/uk/translation.json +++ b/apps/readest-app/public/locales/uk/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Скопійовано в буфер обміну", "Export Annotations": "Експортувати анотації", "Auto Import on File Open": "Автоматичний імпорт при відкритті файлу", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Поміняти місцями область кліку для перевороту", "No chapters detected.": "Не виявлено жодного розділу.", "Failed to parse the EPUB file.": "Не вдалося розібрати файл EPUB.", diff --git a/apps/readest-app/public/locales/vi/translation.json b/apps/readest-app/public/locales/vi/translation.json index 06d469be..d16bca53 100644 --- a/apps/readest-app/public/locales/vi/translation.json +++ b/apps/readest-app/public/locales/vi/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "Đã sao chép vào bảng ghi", "Export Annotations": "Xuất chú thích", "Auto Import on File Open": "Tự động nhập khi mở tệp", - "LXGW WenKai GB Screen": "LXGW WenKai", + "LXGW WenKai GB Screen": "LXGW WenKai SC", + "LXGW WenKai TC": "LXGW WenKai TC", "Swap Click-to-Flip Area": "Hoán đổi khu vực nhấp để lật trang", "No chapters detected.": "Không phát hiện thấy chương nào.", "Failed to parse the EPUB file.": "Không thể phân tích tệp EPUB.", diff --git a/apps/readest-app/public/locales/zh-CN/translation.json b/apps/readest-app/public/locales/zh-CN/translation.json index 11fe7b7d..ff5411b3 100644 --- a/apps/readest-app/public/locales/zh-CN/translation.json +++ b/apps/readest-app/public/locales/zh-CN/translation.json @@ -260,6 +260,7 @@ "Export Annotations": "导出笔记", "Auto Import on File Open": "打开文件时自动导入", "LXGW WenKai GB Screen": "霞鹜文楷", + "LXGW WenKai TC": "霞鶩文楷", "Swap Click-to-Flip Area": "交换点击翻页区域", "No chapters detected.": "未检测到章节。", "Failed to parse the EPUB file.": "无法解析 EPUB 文件。", diff --git a/apps/readest-app/public/locales/zh-TW/translation.json b/apps/readest-app/public/locales/zh-TW/translation.json index 7cf421ea..86629af7 100644 --- a/apps/readest-app/public/locales/zh-TW/translation.json +++ b/apps/readest-app/public/locales/zh-TW/translation.json @@ -259,7 +259,8 @@ "Copied to clipboard": "已複製到剪貼板", "Export Annotations": "匯出筆記", "Auto Import on File Open": "打開文件時自動導入", - "LXGW WenKai GB Screen": "霞鶩文楷", + "LXGW WenKai GB Screen": "霞鶩文楷 SC", + "LXGW WenKai TC": "霞鶩文楷 TC", "Swap Click-to-Flip Area": "交換點擊翻頁區域", "No chapters detected.": "未檢測到章節。", "Failed to parse the EPUB file.": "無法解析 EPUB 文件。", diff --git a/apps/readest-app/src/services/constants.ts b/apps/readest-app/src/services/constants.ts index 0bc37ead..09ee5055 100644 --- a/apps/readest-app/src/services/constants.ts +++ b/apps/readest-app/src/services/constants.ts @@ -146,6 +146,7 @@ export const SERIF_FONTS = [ 'Georgia', 'Times New Roman', _('LXGW WenKai GB Screen'), + _('LXGW WenKai TC'), ]; export const SANS_SERIF_FONTS = ['Roboto', 'Noto Sans', 'Open Sans', 'Helvetica', 'Arial']; @@ -183,6 +184,7 @@ export const WINDOWS_FONTS = [ 'Lucida Console', 'Lucida Sans Unicode', 'LXGW WenKai GB Screen', + 'LXGW WenKai TC', 'Malgun Gothic', 'Marlett', 'Microsoft Himalaya', @@ -278,6 +280,7 @@ export const MACOS_FONTS = [ 'Lucida Grande', 'Luminari', 'LXGW WenKai GB Screen', + 'LXGW WenKai TC', 'Marker Felt', 'Menlo', 'Microsoft Sans Serif', @@ -335,6 +338,7 @@ export const LINUX_FONTS = [ 'Liberation Sans', 'Liberation Serif', 'LXGW WenKai GB Screen', + 'LXGW WenKai TC', 'Noto Mono', 'Noto Sans', 'Noto Sans JP', @@ -372,6 +376,7 @@ export const IOS_FONTS = [ 'Hiragino Sans', 'Kaiti', 'LXGW WenKai GB Screen', + 'LXGW WenKai TC', 'Palatino', 'PingFang SC', 'PingFang TC', @@ -395,6 +400,7 @@ export const ANDROID_FONTS = [ 'Heiti', 'Kaiti', 'LXGW WenKai GB Screen', + 'LXGW WenKai TC', 'Noto Sans', 'Noto Sans CJK', 'Noto Sans JP', diff --git a/apps/readest-app/src/utils/style.ts b/apps/readest-app/src/utils/style.ts index 1d3035d3..e70fbb5a 100644 --- a/apps/readest-app/src/utils/style.ts +++ b/apps/readest-app/src/utils/style.ts @@ -29,16 +29,16 @@ const getFontStyles = ( themeCode: ThemeCode, ) => { const { fg, primary } = themeCode; - const lastSerifFonts = ['LXGW WenKai GB Screen', 'Georgia', 'Times New Roman']; + const lastSerifFonts = ['LXGW WenKai GB Screen', 'LXGW WenKai TC', 'Georgia', 'Times New Roman']; const serifFonts = [ serif, ...SERIF_FONTS.filter( (font) => font !== serif && font !== defaultCJKFont && !lastSerifFonts.includes(font), ), - ...(defaultCJKFont !== serif && !lastSerifFonts.includes(defaultCJKFont) - ? [defaultCJKFont] - : []), - ...lastSerifFonts.filter((font) => SERIF_FONTS.includes(font)), + ...(defaultCJKFont !== serif ? [defaultCJKFont] : []), + ...lastSerifFonts.filter( + (font) => SERIF_FONTS.includes(font) && !lastSerifFonts.includes(defaultCJKFont), + ), ...FALLBACK_FONTS, ]; const sansSerifFonts = [ @@ -106,6 +106,7 @@ const getFontStyles = ( const getAdditionalFontLinks = () => ` + `;