Skip to content
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

Jump to bottom

IOS-2393 Add reset-pin service localisation #220

Merged
merged 6 commits into from
Nov 1, 2022
Merged

IOS-2393 Add reset-pin service localisation #220

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed4c495
IOS-2393 IOS-2211 Added backup service localisation
megakoko Oct 25, 2022
e80a193
IOS-2393 IOS-2211 Localisation for multiple chunks
megakoko Oct 25, 2022
7330a77
IOS-2393 Use integer variables in the localisation wording
megakoko Oct 25, 2022
d148684
IOS-2393 Merge branch 'develop' into IOS-2393-add-backup-service-loca…
megakoko Oct 28, 2022
661a03c
IOS-2393 Use correct type of code in the reset message
megakoko Oct 31, 2022
49ec178
Merge branch 'develop' into IOS-2393-add-backup-service-localisation
tureck1y Oct 31, 2022
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
6 changes: 6 additions & 0 deletions TangemSdk/TangemSdk/Common/Extensions/String+.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ public extension String {
Localization.getFormat(for: self)
}

@available(iOS 13.0, *)
internal func localized(_ arguments: [CVarArg]) -> String {
let format = Localization.getFormat(for: self)
return String(format: format, arguments: arguments)
}

@available(iOS 13.0, *)
internal func localized(_ arguments: CVarArg) -> String {
let format = Localization.getFormat(for: self)
Expand Down
4 changes: 4 additions & 0 deletions TangemSdk/TangemSdk/Common/Localization/de.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@
"attestation_online_failed_title" = "Online attestation failed";
"attestation_online_failed_body" = "We cannot finish card's online attestation at this time. You can continue at your own risk and try again later, retry now or cancel the operation";
"attestation_warning_attest_wallets" = "Too many runs of Attest Wallet or Sign looks suspicious.";
"reset_codes_scan_first_card" = "Scan the card on which you want to reset the %@";
"reset_codes_scan_confirmation_card" = "Scan another linked card";
"reset_codes_scan_to_reset" = "Scan card to reset user codes";
"reset_codes_message_title_restore" = "Tap the card you want to restore";
"reset_codes_message_body_restore" = "First, prepare the card for restore process";
"reset_codes_message_title_backup" = "Tap a backup card";
"reset_codes_message_body_backup" = "Tap the linked card";
"reset_codes_message_body_restore_final" = "Tap the restore card again";
"reset_codes_success_message" = "Code was reset successfully";
"sign_multiple_chunks_part" = "Signing part %d of %d";
4 changes: 4 additions & 0 deletions TangemSdk/TangemSdk/Common/Localization/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@
"attestation_online_failed_title" = "Online attestation failed";
"attestation_online_failed_body" = "We cannot finish card's online attestation at this time. You can continue at your own risk and try again later, retry now or cancel the operation";
"attestation_warning_attest_wallets" = "Too many runs of Attest Wallet or Sign looks suspicious.";
"reset_codes_scan_first_card" = "Scan the card on which you want to reset the %@";
"reset_codes_scan_confirmation_card" = "Scan another linked card";
"reset_codes_scan_to_reset" = "Scan card to reset user codes";
"reset_codes_message_title_restore" = "Tap the card you want to restore";
"reset_codes_message_body_restore" = "First, prepare the card for restore process";
"reset_codes_message_title_backup" = "Tap a backup card";
"reset_codes_message_body_backup" = "Tap the linked card";
"reset_codes_message_body_restore_final" = "Tap the restore card again";
"reset_codes_success_message" = "Code was reset successfully";
"sign_multiple_chunks_part" = "Signing part %d of %d";
4 changes: 4 additions & 0 deletions TangemSdk/TangemSdk/Common/Localization/fr.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@
"attestation_online_failed_title" = "Online attestation failed";
"attestation_online_failed_body" = "We cannot finish card's online attestation at this time. You can continue at your own risk and try again later, retry now or cancel the operation";
"attestation_warning_attest_wallets" = "Too many runs of Attest Wallet or Sign looks suspicious.";
"reset_codes_scan_first_card" = "Scan the card on which you want to reset the %@";
"reset_codes_scan_confirmation_card" = "Scan another linked card";
"reset_codes_scan_to_reset" = "Scan card to reset user codes";
"reset_codes_message_title_restore" = "Tap the card you want to restore";
"reset_codes_message_body_restore" = "First, prepare the card for restore process";
"reset_codes_message_title_backup" = "Tap a backup card";
"reset_codes_message_body_backup" = "Tap the linked card";
"reset_codes_message_body_restore_final" = "Tap the restore card again";
"reset_codes_success_message" = "Code was reset successfully";
"sign_multiple_chunks_part" = "Signing part %d of %d";
4 changes: 4 additions & 0 deletions TangemSdk/TangemSdk/Common/Localization/it.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@
"attestation_online_failed_title" = "Online attestation failed";
"attestation_online_failed_body" = "We cannot finish card's online attestation at this time. You can continue at your own risk and try again later, retry now or cancel the operation";
"attestation_warning_attest_wallets" = "Too many runs of Attest Wallet or Sign looks suspicious.";
"reset_codes_scan_first_card" = "Scan the card on which you want to reset the %@";
"reset_codes_scan_confirmation_card" = "Scan another linked card";
"reset_codes_scan_to_reset" = "Scan card to reset user codes";
"reset_codes_message_title_restore" = "Tap the card you want to restore";
"reset_codes_message_body_restore" = "First, prepare the card for restore process";
"reset_codes_message_title_backup" = "Tap a backup card";
"reset_codes_message_body_backup" = "Tap the linked card";
"reset_codes_message_body_restore_final" = "Tap the restore card again";
"reset_codes_success_message" = "Code was reset successfully";
"sign_multiple_chunks_part" = "Signing part %d of %d";
4 changes: 4 additions & 0 deletions TangemSdk/TangemSdk/Common/Localization/ru.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@
"attestation_online_failed_title" = "Онлайн-аттестация не удалась";
"attestation_online_failed_body" = "В настоящее время мы не можем завершить онлайн-аттестацию карты. Вы можете продолжить на свой страх и риск и повторить попытку позже, повторить сейчас или отменить операцию.";
"attestation_warning_attest_wallets" = "Слишком большое количество вызовов Attest Wallet или Sign выглядит подозрительно.";
"reset_codes_scan_first_card" = "Отсканируйте карту, на которой вы хотите сбросить %@";
"reset_codes_scan_confirmation_card" = "Отсканируйте другую привязанную карту";
"reset_codes_scan_to_reset" = "Отсканируйте карту для сброса кода";
"reset_codes_message_title_restore" = "Отсканируйте карту, которую хотите восстановить";
"reset_codes_message_body_restore" = "Сначала подготовьте карту к процессу восстановления";
"reset_codes_message_title_backup" = "Приложите резервную карту";
"reset_codes_message_body_backup" = "Приложите связанную карту";
"reset_codes_message_body_restore_final" = "Приложите еще раз карту, которую хотите восстановить";
"reset_codes_success_message" = "Код успешно сброшен";
"sign_multiple_chunks_part" = "Подпись части %d из %d";
15 changes: 12 additions & 3 deletions TangemSdk/TangemSdk/Operations/ResetCode/ResetPinService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,18 @@ public class ResetPinService: ObservableObject {
}

private func scanResetPinCard(resetCardId: String?, _ completion: @escaping CompletionResult<Void>) {
let userCodeType: UserCodeType
if repo.accessCode != nil {
userCodeType = .accessCode
} else if repo.passcode != nil {
userCodeType = .passcode
} else {
fatalError("Scan card called without the code specified")
}

self.session = TangemSdk().makeSession(with: config,
cardId: resetCardId,
initialMessage: Message(header: "Scan the card on which you want to reset the pin"))
initialMessage: Message(header: "reset_codes_scan_first_card".localized([userCodeType.name.lowercased()])))

session!.start(with: GetResetPinTokenCommand()) { result in
switch result {
Expand All @@ -114,7 +123,7 @@ public class ResetPinService: ObservableObject {

self.session = TangemSdk().makeSession(with: config,
cardId: nil,
initialMessage: Message(header: "Scan the confirmation card"))
initialMessage: Message(header: "reset_codes_scan_confirmation_card".localized))

session!.start(with: SignResetPinTokenCommand(resetPinCard: resetPinCard)) { result in
switch result {
Expand Down Expand Up @@ -163,7 +172,7 @@ public class ResetPinService: ObservableObject {

self.session = TangemSdk().makeSession(with: config,
cardId: resetPinCard.cardId,
initialMessage: Message(header: "Scan card to reset user codes"))
initialMessage: Message(header: "reset_codes_scan_to_reset".localized))


let task = ResetPinTask(confirmationCard: confirmationCard, accessCode: accessCodeUnwrapped, passcode: passcodeUnwrapped)
Expand Down
2 changes: 1 addition & 1 deletion TangemSdk/TangemSdk/Operations/Sign/SignCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class SignCommand: Command {

func sign(in session: CardSession, completion: @escaping CompletionResult<SignResponse>) {
if numberOfChunks > 1 {
session.viewDelegate.showAlertMessage("Signing part \(currentChunkNumber + 1) of \(numberOfChunks)")
session.viewDelegate.showAlertMessage("sign_multiple_chunks_part".localized([currentChunkNumber + 1, numberOfChunks]))
}

transceive(in: session) { result in
Expand Down