Fix: Weird localization words order in onboarding title screen. (#158)

* fix: Odd localization interpolation on onboarding title * chore: Add a placeholder to "onboarding.title" on Localizable.strings (German) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (English) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (French) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Hebrew) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Italian) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Japanese) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Korean) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Norwegian Bokmål (Norway)) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Dutch) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Polish) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Russian) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Turkish) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Chinese, Simplified) * chore: Add a placeholder to "onboarding.title" on Localizable.strings (Chinese, Traditional) * refactor: changed styling method for `Swiftcord` string into simpler way. * refactor: removed unneccesary emphasize clause(****) thanks to 90d7a7e
SwiftcordApp · Jun 18, 2023 · b5a38c0 · b5a38c0
1 parent 89f4833
commit b5a38c0
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 19 deletions.
diff --git a/Swiftcord/Views/OnboardingView.swift b/Swiftcord/Views/OnboardingView.swift
@@ -16,11 +16,22 @@ struct OnboardingWelcomeView: View {
 	var body: some View {
 		VStack(alignment: .leading, spacing: 16) {
 			Group {
-				Text("onboarding.title").font(.largeTitle)
-				+ Text(appName ?? "")
-					.foregroundColor(.accentColor)
-					.font(.system(size: 72))
-					.fontWeight(.heavy)
+				var attributedTitle: AttributedString {
+					var attributedString: AttributedString = .init(localized: "onboarding.title \(appName ?? "")")
+
+					let appNameRange = attributedString.range(of: appName ?? "")
+
+					if let appNameRange = appNameRange {
+						attributedString[appNameRange].foregroundColor = .accentColor
+						attributedString[appNameRange].font = .system(size: 72).weight(.heavy)
+					}
+
+					return attributedString
+				}
+
+				Text(attributedTitle)
+					.font(.largeTitle)
+
 				Text("onboarding.subtitle").padding(.top, -20)
 			}
 			.padding(.top, 6)

diff --git a/Swiftcord/de.lproj/Localizable.strings b/Swiftcord/de.lproj/Localizable.strings
@@ -2,7 +2,7 @@
 "action.continue" = "Fortfahren";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Willkommen zu\n";
+"onboarding.title %@" = "Willkommen zu\n%@";
 "onboarding.subtitle" = "Ein Discord-Client konzipiert für macOS";
 "onboarding.lightweight.header" = "Effizient — Ressourcen schonend";
 "onboarding.lightweight.body" = "Verbraucht bis zu 7x weniger RAM als Discord bei wenig CPU-Last.";

diff --git a/Swiftcord/en.lproj/Localizable.strings b/Swiftcord/en.lproj/Localizable.strings
@@ -4,7 +4,7 @@
 "action.close" = "Close";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Welcome to\n";
+"onboarding.title %@" = "Welcome to\n%@";
 "onboarding.subtitle" = "A Discord client built and designed for macOS";
 "onboarding.lightweight.header" = "Efficient — Light on Resources";
 "onboarding.lightweight.body" = "Up to 7x less RAM than Discord, with low CPU usage.";

diff --git a/Swiftcord/fr.lproj/Localizable.strings b/Swiftcord/fr.lproj/Localizable.strings
@@ -4,7 +4,7 @@
 "action.continue" = "Continuer";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Bienvenue sur\n";
+"onboarding.title %@" = "Bienvenue sur\n%@";
 "onboarding.subtitle" = "Un client Discord construit et conçu pour macOS";
 "onboarding.lightweight.body" = "Utilise jusqu'à 7 fois moins de mémoire vive que Discord, avec très peu d'utilisation du processeur.";
 "onboarding.features.header" = "Riche en fonctionnalités";

diff --git a/Swiftcord/he.lproj/Localizable.strings b/Swiftcord/he.lproj/Localizable.strings
@@ -8,7 +8,7 @@
 "action.continue" = "המשך";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "ברוכים הביים ל\n";
+"onboarding.title %@" = "ברוכים הביים ל\n%@";
 "action.done" = "בוצע";
 "action.close" = "סגור";
 "onboarding.lightweight.header" = "יעיל - פחות מעמיס על המחשב.";
diff --git a/Swiftcord/it.lproj/Localizable.strings b/Swiftcord/it.lproj/Localizable.strings
@@ -6,7 +6,7 @@
 "action.continue" = "Prosegui";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Benvenuto su\n";
+"onboarding.title %@" = "Benvenuto su\n%@";
 "onboarding.subtitle" = "Un client Discord costruito e disegnato per macOS";
 "user.roles.one" = "Ruolo";
 "user.roles.many" = "Ruoli";

diff --git a/Swiftcord/ja.lproj/Localizable.strings b/Swiftcord/ja.lproj/Localizable.strings
@@ -111,7 +111,7 @@
 "action.continue" = "続ける";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "へようこそ！\n";
+"onboarding.title %@" = "%@\nへようこそ！";
 "onboarding.lightweight.body" = "CPU 使用率が低く、RAM が Discord の最大 7 分の 1 です。";
 "onboarding.wip.body" = "何か問題がありますか？ GitHub の問題を作成するか、Discord サーバーで問題を報告してください";
 "onboarding.footer" = "Swiftcord はアルファ版ソフトウェアであり、制限やバグがあります。 現時点では、公式クライアントを置き換える予定はありませんが、いつかは置き換えられることを望んでいます。";

diff --git a/Swiftcord/ko.lproj/Localizable.strings b/Swiftcord/ko.lproj/Localizable.strings
@@ -70,7 +70,7 @@
 "server.noChannels.header" = "채팅 채널 없음";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "환영합니다\n";
+"onboarding.title %@" = "환영합니다\n%@";
 "server.channel.title %@" = "#%@에 오신 걸 환영합니다!";
 "server.channel.header %@ %@" = "#%@ 채널의 시작이에요. %@";
 "loader.panic.logout" = "시간이 좀 걸리네요, 로그아웃하시겠어요?";

diff --git a/Swiftcord/nb-NO.lproj/Localizable.strings b/Swiftcord/nb-NO.lproj/Localizable.strings
@@ -65,7 +65,7 @@
 "action.continue" = "Fortsett";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Velkommen til\n";
+"onboarding.title %@" = "Velkommen til\n%@";
 "onboarding.wip.body" = "Er noe galt? Opprett en feilrapport på GitHub, eller levn en melding i vår Discord-tjener";
 "onboarding.footer" = "Alfa-programvare, med begrensninger og feil. Tar foreløpig kun sikte å erstatte den offisielle klienten.";
 "dm.group.composeMsg.hint %@" = "Melding %@";

diff --git a/Swiftcord/nl.lproj/Localizable.strings b/Swiftcord/nl.lproj/Localizable.strings
@@ -4,7 +4,7 @@
 "action.close" = "Dicht";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Welkom bij\n";
+"onboarding.title %@" = "Welkom bij\n%@";
 "onboarding.subtitle" = "Een Discord client gemaakt en ontworpen voor macOS";
 "onboarding.lightweight.header" = "Efficiënt - Gebruikt niet veel Bronnen";
 "onboarding.features.header" = "Goed Aanbevolen";

diff --git a/Swiftcord/pl.lproj/Localizable.strings b/Swiftcord/pl.lproj/Localizable.strings
@@ -8,7 +8,7 @@
 "action.close" = "Zamknij";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Witaj w aplikacji\n";
+"onboarding.title %@" = "Witaj w aplikacji\n%@";
 "onboarding.subtitle" = "Będącej klientem Discorda zbudowanym specjalnie dla systemu MacOS";
 "onboarding.lightweight.header" = "Wygodnym i lekkim";
 "onboarding.lightweight.body" = "Zużywającym nawet 7 razy mniej pamięci RAM.";

diff --git a/Swiftcord/ru.lproj/Localizable.strings b/Swiftcord/ru.lproj/Localizable.strings
@@ -9,7 +9,7 @@
 "action.continue" = "Продолжить";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Добро пожаловать в\n";
+"onboarding.title %@" = "Добро пожаловать в\n%@";
 "onboarding.features.body" = "Основные функции присутствуют, и ведется работа над добавлением новых";
 "onboarding.lightweight.header" = "Эффективный - Легкая системная нагрузка";
 "onboarding.lightweight.body" = "Использование оперативной памияти до 7 раз меньше, чем в Discord, при низкой загрузке процессора.";

diff --git a/Swiftcord/tr.lproj/Localizable.strings b/Swiftcord/tr.lproj/Localizable.strings
@@ -7,7 +7,7 @@
 "action.close" = "Kapat";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "Hoş geldiniz\n";
+"onboarding.title %@" = "Hoş geldiniz\n%@";
 "onboarding.subtitle" = "macOS için tasarlanmış bir Discord istemcisi";
 "onboarding.lightweight.header" = "Verimli - Kaynak Kullanımı Hafif";
 "onboarding.lightweight.body" = "Düşük işlemci kullanımı ile Discord'a göre 7 kat daha az RAM kullanır.";

diff --git a/Swiftcord/zh-Hans.lproj/Localizable.strings b/Swiftcord/zh-Hans.lproj/Localizable.strings
@@ -2,7 +2,7 @@
 "action.continue" = "继续";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "欢迎使用\n";
+"onboarding.title %@" = "欢迎使用\n%@";
 "onboarding.subtitle" = "专为macOS打造和设计的Discord客户端";
 "onboarding.lightweight.header" = "高效—轻量级的资源";
 "onboarding.lightweight.body" = "使用的内存比Discord少7倍，CPU使用率低。";

diff --git a/Swiftcord/zh-Hant.lproj/Localizable.strings b/Swiftcord/zh-Hant.lproj/Localizable.strings
@@ -24,7 +24,7 @@
 "settings.app.advanced.analytics.caption" = "我們將通過Appcenter收集匯總（匿名）的使用統計資料（如渲染語言，應用程式版本和功能的使用狀態）。所獲取的資料將用於提升Swiftcord的功能體驗；我們無法以此資料追蹤到你身上。";
 
 /* ====== Onboarding ====== */
-"onboarding.title" = "歡迎使用\n";
+"onboarding.title %@" = "歡迎使用\n%@";
 "onboarding.subtitle" = "一個專門為macOS打造和設計的Discord用戶端";
 "onboarding.lightweight.body" = "記憶體使用率較Discord少高達7倍，且CPU使用率亦較低。";
 "onboarding.features.header" = "功能完善";