Skip to content

Revert "feat: Extract all UI strings to resources" #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pwltr merged 1 commit into from
Dec 22, 2025
Merged

Revert "feat: Extract all UI strings to resources" #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bitkit/AppScene.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ struct AppScene: View {

private func handleCurrencyStaleData(_: Bool) {
if currency.hasStaleData {
app.toast(type: .error, title: t("other__rates_unavailable_title"), description: t("other__rates_unavailable_description"))
app.toast(type: .error, title: "Rates currently unavailable", description: "An error has occurred. Please try again later.")
}
}

Expand Down
2 changes: 1 addition & 1 deletion Bitkit/Components/Activity/ActivityBanner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ struct ActivityBanner: View {
.frame(width: 20, height: 20)
.foregroundColor(accentColor)

Text(t("wallet__activity_transfer_in_progress"))
Text(tTodo("TRANSFER IN PROGRESS"))
.font(Fonts.black(size: 20))
.foregroundColor(.textPrimary)
.kerning(0)
Expand Down
2 changes: 1 addition & 1 deletion Bitkit/Components/Home/Suggestions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ let cards: [SuggestionCardData] = [
SuggestionCardData(
id: "notifications",
title: t("cards__notifications__title"),
description: t("cards__notifications__description"),
description: tTodo("When Bitkit is closed"),
imageName: "bell-figure",
color: .purple24,
action: .notifications
Expand Down
16 changes: 8 additions & 8 deletions Bitkit/MainNavView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ struct MainNavView: View {
Logger.error("Failed to sync push notifications with backend: \(error)")
app.toast(
type: .error,
title: t("other__notification_registration_failed_title"),
description: t("other__notification_registration_failed_description")
title: tTodo("Notification Registration Failed"),
description: tTodo("Bitkit was unable to register for push notifications.")
)
}
}
Expand All @@ -210,8 +210,8 @@ struct MainNavView: View {
Logger.error("Failed to sync push notifications: \(error)")
app.toast(
type: .error,
title: t("other__notification_registration_failed_title"),
description: t("other__notification_registration_failed_description")
title: tTodo("Notification Registration Failed"),
description: tTodo("Bitkit was unable to register for push notifications.")
)
}
}
Expand Down Expand Up @@ -271,14 +271,14 @@ struct MainNavView: View {
case .contacts:
if app.hasSeenContactsIntro {
// ContactsView()
Text(t("common__coming_soon"))
Text("Coming Soon")
} else {
ContactsIntroView()
}
case .profile:
if app.hasSeenProfileIntro {
// ProfileView()
Text(t("common__coming_soon"))
Text("Coming Soon")
} else {
ProfileIntroView()
}
Expand Down Expand Up @@ -306,7 +306,7 @@ struct MainNavView: View {
case let .activityDetail(activity): ActivityItemView(item: activity)
case let .activityExplorer(activity): ActivityExplorerView(item: activity)
case .buyBitcoin: BuyBitcoinView()
case .contacts: Text(t("common__coming_soon"))
case .contacts: Text("Coming Soon")
case .contactsIntro: ContactsIntroView()
case .savingsWallet: SavingsWalletView()
case .spendingWallet: SpendingWalletView()
Expand All @@ -327,7 +327,7 @@ struct MainNavView: View {
case .savingsConfirm: SavingsConfirmView()
case .savingsAdvanced: SavingsAdvancedView()
case .savingsProgress: SavingsProgressView()
case .profile: Text(t("common__coming_soon"))
case .profile: Text("Coming Soon")
case .profileIntro: ProfileIntroView()
case .scanner: ScannerScreen()

Expand Down
24 changes: 12 additions & 12 deletions Bitkit/Managers/ScannerManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,17 +150,17 @@ class ScannerManager: ObservableObject {
else {
app.toast(
type: .error,
title: t("other__scan__error__title_process"),
description: t("other__scan__error__image_load")
title: "Error",
description: tTodo("Sorry. Bitkit wasn't able to load this image.")
)
return
}

guard let cgImage = image.cgImage else {
app.toast(
type: .error,
title: t("other__scan__error__title_process"),
description: t("other__scan__error__image_process")
title: "Error",
description: tTodo("Sorry. Bitkit wasn't able to process this image.")
)
return
}
Expand All @@ -171,8 +171,8 @@ class ScannerManager: ObservableObject {
DispatchQueue.main.async {
app.toast(
type: .error,
title: t("other__scan__error__title"),
description: t("other__scan__error__detection")
title: tTodo("Detection Error"),
description: tTodo("Failed to process the image for QR codes.")
)
}
return
Expand All @@ -183,8 +183,8 @@ class ScannerManager: ObservableObject {
DispatchQueue.main.async {
app.toast(
type: .error,
title: t("other__scan__error__title_no_qr"),
description: t("other__scan__error__no_qr")
title: tTodo("No QR Code Found"),
description: tTodo("Sorry. Bitkit wasn't able to detect a QR code in this image.")
)
}
return
Expand All @@ -198,8 +198,8 @@ class ScannerManager: ObservableObject {
DispatchQueue.main.async {
app.toast(
type: .error,
title: t("other__scan__error__title_no_qr"),
description: t("other__scan__error__no_qr")
title: tTodo("No QR Code Found"),
description: tTodo("Sorry. Bitkit wasn't able to detect a QR code in this image.")
)
}
return
Expand Down Expand Up @@ -230,8 +230,8 @@ class ScannerManager: ObservableObject {
Logger.error(error, context: "Failed to process image")
app.toast(
type: .error,
title: t("other__scan__error__title_process"),
description: t("other__scan__error__image_process")
title: tTodo("Error"),
description: tTodo("Sorry. An error occurred when trying to process this image.")
)
}
}
Expand Down
Loading
Loading