Skip to content

Commit 45b2323

Browse files
piotr-iohkpiotr-iohk
authored
Merge branch 'master' into test/send2
2 parents 3fba3b1 + 8543137 commit 45b2323

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+235
-147
lines changed

‎Bitkit/AppScene.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ struct AppScene: View {
187187

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

‎Bitkit/Components/Activity/ActivityBanner.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct ActivityBanner: View {
2626
.frame(width: 20, height: 20)
2727
.foregroundColor(accentColor)
2828

29-
Text(tTodo("TRANSFER IN PROGRESS"))
29+
Text(t("wallet__activity_transfer_in_progress"))
3030
.font(Fonts.black(size: 20))
3131
.foregroundColor(.textPrimary)
3232
.kerning(0)

‎Bitkit/Components/Home/Suggestions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ let cards: [SuggestionCardData] = [
8282
SuggestionCardData(
8383
id: "notifications",
8484
title: t("cards__notifications__title"),
85-
description: tTodo("When Bitkit is closed"),
85+
description: t("cards__notifications__description"),
8686
imageName: "bell-figure",
8787
color: .purple24,
8888
action: .notifications

‎Bitkit/MainNavView.swift‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ struct MainNavView: View {
189189
Logger.error("Failed to sync push notifications with backend: \(error)")
190190
app.toast(
191191
type: .error,
192-
title: tTodo("Notification Registration Failed"),
193-
description: tTodo("Bitkit was unable to register for push notifications.")
192+
title: t("other__notification_registration_failed_title"),
193+
description: t("other__notification_registration_failed_description")
194194
)
195195
}
196196
}
@@ -210,8 +210,8 @@ struct MainNavView: View {
210210
Logger.error("Failed to sync push notifications: \(error)")
211211
app.toast(
212212
type: .error,
213-
title: tTodo("Notification Registration Failed"),
214-
description: tTodo("Bitkit was unable to register for push notifications.")
213+
title: t("other__notification_registration_failed_title"),
214+
description: t("other__notification_registration_failed_description")
215215
)
216216
}
217217
}
@@ -271,14 +271,14 @@ struct MainNavView: View {
271271
case .contacts:
272272
if app.hasSeenContactsIntro {
273273
// ContactsView()
274-
Text("Coming Soon")
274+
Text(t("common__coming_soon"))
275275
} else {
276276
ContactsIntroView()
277277
}
278278
case .profile:
279279
if app.hasSeenProfileIntro {
280280
// ProfileView()
281-
Text("Coming Soon")
281+
Text(t("common__coming_soon"))
282282
} else {
283283
ProfileIntroView()
284284
}
@@ -306,7 +306,7 @@ struct MainNavView: View {
306306
case let .activityDetail(activity): ActivityItemView(item: activity)
307307
case let .activityExplorer(activity): ActivityExplorerView(item: activity)
308308
case .buyBitcoin: BuyBitcoinView()
309-
case .contacts: Text("Coming Soon")
309+
case .contacts: Text(t("common__coming_soon"))
310310
case .contactsIntro: ContactsIntroView()
311311
case .savingsWallet: SavingsWalletView()
312312
case .spendingWallet: SpendingWalletView()
@@ -327,7 +327,7 @@ struct MainNavView: View {
327327
case .savingsConfirm: SavingsConfirmView()
328328
case .savingsAdvanced: SavingsAdvancedView()
329329
case .savingsProgress: SavingsProgressView()
330-
case .profile: Text("Coming Soon")
330+
case .profile: Text(t("common__coming_soon"))
331331
case .profileIntro: ProfileIntroView()
332332
case .scanner: ScannerScreen()
333333

‎Bitkit/Managers/ScannerManager.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,17 @@ class ScannerManager: ObservableObject {
150150
else {
151151
app.toast(
152152
type: .error,
153-
title: "Error",
154-
description: tTodo("Sorry. Bitkit wasn't able to load this image.")
153+
title: t("other__scan__error__title_process"),
154+
description: t("other__scan__error__image_load")
155155
)
156156
return
157157
}
158158

159159
guard let cgImage = image.cgImage else {
160160
app.toast(
161161
type: .error,
162-
title: "Error",
163-
description: tTodo("Sorry. Bitkit wasn't able to process this image.")
162+
title: t("other__scan__error__title_process"),
163+
description: t("other__scan__error__image_process")
164164
)
165165
return
166166
}
@@ -171,8 +171,8 @@ class ScannerManager: ObservableObject {
171171
DispatchQueue.main.async {
172172
app.toast(
173173
type: .error,
174-
title: tTodo("Detection Error"),
175-
description: tTodo("Failed to process the image for QR codes.")
174+
title: t("other__scan__error__title"),
175+
description: t("other__scan__error__detection")
176176
)
177177
}
178178
return
@@ -183,8 +183,8 @@ class ScannerManager: ObservableObject {
183183
DispatchQueue.main.async {
184184
app.toast(
185185
type: .error,
186-
title: tTodo("No QR Code Found"),
187-
description: tTodo("Sorry. Bitkit wasn't able to detect a QR code in this image.")
186+
title: t("other__scan__error__title_no_qr"),
187+
description: t("other__scan__error__no_qr")
188188
)
189189
}
190190
return
@@ -198,8 +198,8 @@ class ScannerManager: ObservableObject {
198198
DispatchQueue.main.async {
199199
app.toast(
200200
type: .error,
201-
title: tTodo("No QR Code Found"),
202-
description: tTodo("Sorry. Bitkit wasn't able to detect a QR code in this image.")
201+
title: t("other__scan__error__title_no_qr"),
202+
description: t("other__scan__error__no_qr")
203203
)
204204
}
205205
return
@@ -230,8 +230,8 @@ class ScannerManager: ObservableObject {
230230
Logger.error(error, context: "Failed to process image")
231231
app.toast(
232232
type: .error,
233-
title: tTodo("Error"),
234-
description: tTodo("Sorry. An error occurred when trying to process this image.")
233+
title: t("other__scan__error__title_process"),
234+
description: t("other__scan__error__image_process")
235235
)
236236
}
237237
}

0 commit comments

Comments
 (0)