From 9ea353ddf9cf4cc5cc80585d041079ac1ff68528 Mon Sep 17 00:00:00 2001 From: Yingtao Guo Date: Wed, 25 Sep 2024 20:17:45 -0400 Subject: [PATCH] feat: Improve text localizations --- .../FontSettingsView.swift | 8 +++---- .../en.lproj/Localizable.strings | 23 +++++++++++++++++-- .../ja.lproj/Localizable.strings | 23 +++++++++++++++++-- .../zh-Hans.lproj/Localizable.strings | 23 +++++++++++++++++-- 4 files changed, 67 insertions(+), 10 deletions(-) diff --git a/Sources/SwiftUIFontSettingsView/FontSettingsView.swift b/Sources/SwiftUIFontSettingsView/FontSettingsView.swift index 8478a22..20ad922 100644 --- a/Sources/SwiftUIFontSettingsView/FontSettingsView.swift +++ b/Sources/SwiftUIFontSettingsView/FontSettingsView.swift @@ -129,19 +129,19 @@ public struct FontSettingsView: } else { Picker(NSLocalizedString("fontSettings.textStyle", bundle: .module, comment: ""), selection: $fontSettings.textStyle) { ForEach(Font.TextStyle.allTextStyles, id: \.self) { style in - Text(NSLocalizedString(style.description, bundle: .module, comment: "")) + Text(NSLocalizedString("textStyle." + style.description.lowercased(), bundle: .module, comment: "")) } } Picker(NSLocalizedString("fontSettings.fontWeight", bundle: .module, comment: ""), selection: $fontSettings.fontWeight) { ForEach(Font.Weight.allWeights, id: \.self) { weight in - Text(NSLocalizedString(weight.description, bundle: .module, comment: "")) + Text(NSLocalizedString("fontWeight." + weight.description.lowercased(), bundle: .module, comment: "")) } } Picker(NSLocalizedString("fontSettings.fontDesign", bundle: .module, comment: ""), selection: $fontSettings.fontDesign) { ForEach(Font.Design.allDesigns, id: \.self) { design in - Text(NSLocalizedString(design.description, bundle: .module, comment: "")) + Text(NSLocalizedString("fontDesign." + design.description.lowercased(), bundle: .module, comment: "")) .fontDesign(design) } } @@ -150,7 +150,7 @@ public struct FontSettingsView: if !fontSettings.useCustomFont || fontSettings.useCustomFont && fontSettings.customFontNames.isEmpty { Picker(NSLocalizedString("fontSettings.fontWidth", bundle: .module, comment: ""), selection: $fontSettings.fontWidth) { ForEach(Font.Width.allWidths, id: \.self) { width in - Text(NSLocalizedString(width.description, bundle: .module, comment: "")) + Text(NSLocalizedString("fontWidth." + width.description.lowercased(), bundle: .module, comment: "")) } } } diff --git a/Sources/SwiftUIFontSettingsView/en.lproj/Localizable.strings b/Sources/SwiftUIFontSettingsView/en.lproj/Localizable.strings index 8de4b2e..3b2ce1f 100644 --- a/Sources/SwiftUIFontSettingsView/en.lproj/Localizable.strings +++ b/Sources/SwiftUIFontSettingsView/en.lproj/Localizable.strings @@ -5,7 +5,7 @@ "fontSettings.fontDesign" = "Font Design"; // Font Weight Options -"fontWeight.ultraLight" = "Ultra Light"; +"fontWeight.ultra light" = "Ultra Light"; "fontWeight.thin" = "Thin"; "fontWeight.light" = "Light"; "fontWeight.regular" = "Regular"; @@ -43,4 +43,23 @@ "fontSettings.fontName" = "Font Name"; "fontSettings.textStyle" = "Text Style"; "fontSettings.fontWidth" = "Font Width"; -"fontSettings.fontSize" = "Font Size: %d"; \ No newline at end of file +"fontSettings.fontSize" = "Font Size: %d"; + +// New Text Style localizations +"textStyle.large title" = "Large Title"; +"textStyle.title" = "Title"; +"textStyle.title2" = "Title 2"; +"textStyle.title3" = "Title 3"; +"textStyle.headline" = "Headline"; +"textStyle.subheadline" = "Subheadline"; +"textStyle.body" = "Body"; +"textStyle.callout" = "Callout"; +"textStyle.footnote" = "Footnote"; +"textStyle.caption" = "Caption"; +"textStyle.caption2" = "Caption 2"; + +// New Font Width localizations +"fontWidth.compressed" = "Compressed"; +"fontWidth.condensed" = "Condensed"; +"fontWidth.standard" = "Standard"; +"fontWidth.expanded" = "Expanded"; diff --git a/Sources/SwiftUIFontSettingsView/ja.lproj/Localizable.strings b/Sources/SwiftUIFontSettingsView/ja.lproj/Localizable.strings index 898e435..dbb78f7 100644 --- a/Sources/SwiftUIFontSettingsView/ja.lproj/Localizable.strings +++ b/Sources/SwiftUIFontSettingsView/ja.lproj/Localizable.strings @@ -5,7 +5,7 @@ "fontSettings.fontDesign" = "フォントデザイン"; // Font Weight Options -"fontWeight.ultraLight" = "極細"; +"fontWeight.ultra light" = "極細"; "fontWeight.thin" = "細"; "fontWeight.light" = "軽"; "fontWeight.regular" = "標準"; @@ -43,4 +43,23 @@ "fontSettings.fontName" = "フォント名"; "fontSettings.textStyle" = "テキストスタイル"; "fontSettings.fontWidth" = "フォントの幅"; -"fontSettings.fontSize" = "フォントサイズ：%d"; \ No newline at end of file +"fontSettings.fontSize" = "フォントサイズ：%d"; + +// New Text Style localizations +"textStyle.large title" = "ラージタイトル"; +"textStyle.title" = "タイトル"; +"textStyle.title2" = "タイトル2"; +"textStyle.title3" = "タイトル3"; +"textStyle.headline" = "見出し"; +"textStyle.subheadline" = "サブ見出し"; +"textStyle.body" = "本文"; +"textStyle.callout" = "コールアウト"; +"textStyle.footnote" = "脚注"; +"textStyle.caption" = "キャプション"; +"textStyle.caption2" = "キャプション2"; + +// New Font Width localizations +"fontWidth.compressed" = "圧縮"; +"fontWidth.condensed" = "凝縮"; +"fontWidth.standard" = "標準"; +"fontWidth.expanded" = "拡張"; diff --git a/Sources/SwiftUIFontSettingsView/zh-Hans.lproj/Localizable.strings b/Sources/SwiftUIFontSettingsView/zh-Hans.lproj/Localizable.strings index 7c822a9..f614ec2 100644 --- a/Sources/SwiftUIFontSettingsView/zh-Hans.lproj/Localizable.strings +++ b/Sources/SwiftUIFontSettingsView/zh-Hans.lproj/Localizable.strings @@ -5,7 +5,7 @@ "fontSettings.fontDesign" = "字体设计"; // Font Weight Options -"fontWeight.ultraLight" = "极细"; +"fontWeight.ultra light" = "极细"; "fontWeight.thin" = "纤细"; "fontWeight.light" = "细体"; "fontWeight.regular" = "常规"; @@ -43,4 +43,23 @@ "fontSettings.fontName" = "字体名称"; "fontSettings.textStyle" = "文本样式"; "fontSettings.fontWidth" = "字体宽度"; -"fontSettings.fontSize" = "字体大小：%d"; \ No newline at end of file +"fontSettings.fontSize" = "字体大小：%d"; + +// New Text Style localizations +"textStyle.large title" = "大标题"; +"textStyle.title" = "标题"; +"textStyle.title2" = "标题2"; +"textStyle.title3" = "标题3"; +"textStyle.headline" = "头条"; +"textStyle.subheadline" = "副标题"; +"textStyle.body" = "正文"; +"textStyle.callout" = "引用"; +"textStyle.footnote" = "脚注"; +"textStyle.caption" = "说明"; +"textStyle.caption2" = "说明2"; + +// New Font Width localizations +"fontWidth.compressed" = "压缩"; +"fontWidth.condensed" = "紧缩"; +"fontWidth.standard" = "标准"; +"fontWidth.expanded" = "扩展";