diff --git a/RIADigiDoc/Domain/NFC/NFCSessionStringsUtil.swift b/RIADigiDoc/Domain/NFC/NFCSessionStringsUtil.swift index 943a43e7..5a192d3f 100644 --- a/RIADigiDoc/Domain/NFC/NFCSessionStringsUtil.swift +++ b/RIADigiDoc/Domain/NFC/NFCSessionStringsUtil.swift @@ -44,7 +44,7 @@ public struct NFCSessionStringsUtil { customLocalizations( pinName: pinName, step4Message: localize("Signing in progress", []), - successMessage: localize("Signature added", []), + successMessage: localize("Container signed successfully", []), courierCardErrorMessage: localize("ID card courier must activate to sign", []) ) } diff --git a/RIADigiDoc/Supporting files/Localizable.xcstrings b/RIADigiDoc/Supporting files/Localizable.xcstrings index 25ba3fcc..eecbc180 100644 --- a/RIADigiDoc/Supporting files/Localizable.xcstrings +++ b/RIADigiDoc/Supporting files/Localizable.xcstrings @@ -1187,6 +1187,24 @@ } } }, + "Container signed successfully" : { + "comment" : "Shown as Toast when signing succeeds", + "extractionState" : "manual", + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "Container signed successfully!" + } + }, + "et" : { + "stringUnit" : { + "state" : "translated", + "value" : "Ümbrik edukalt allkirjastatud!" + } + } + } + }, "Container signing" : { "comment" : "Signing view container files title (unsigned)", "extractionState" : "manual", @@ -7954,24 +7972,6 @@ } } }, - "Signature added" : { - "comment" : "Shown as Toast when signing succeeds", - "extractionState" : "manual", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Signature added" - } - }, - "et" : { - "stringUnit" : { - "state" : "translated", - "value" : "Allkiri lisatud" - } - } - } - }, "Signature detail invalid reason" : { "comment" : "Signature detail", "extractionState" : "manual", diff --git a/RIADigiDoc/UI/Component/Container/Signing/NFC/NFCView.swift b/RIADigiDoc/UI/Component/Container/Signing/NFC/NFCView.swift index 4a3b693b..a3d55010 100644 --- a/RIADigiDoc/UI/Component/Container/Signing/NFC/NFCView.swift +++ b/RIADigiDoc/UI/Component/Container/Signing/NFC/NFCView.swift @@ -105,8 +105,8 @@ struct NFCView: View { } } - private var signatureAddedMessage: String { - languageSettings.localized("Signature added") + private var containerSignedMessage: String { + languageSettings.localized("Container signed successfully") } private var extendingSignaturesFailedMessage: String { @@ -491,9 +491,9 @@ struct NFCView: View { AccessibilityUtil.announceMessage(extendingSignaturesFailedMessage) } } else { - Toast.show(signatureAddedMessage, type: .success) + Toast.show(containerSignedMessage, type: .success) if voiceOverEnabled { - AccessibilityUtil.announceMessage(signatureAddedMessage) + AccessibilityUtil.announceMessage(containerSignedMessage) } } diff --git a/RIADigiDoc/ViewModel/Signing/MobileId/MobileIdViewModel.swift b/RIADigiDoc/ViewModel/Signing/MobileId/MobileIdViewModel.swift index 6c33e283..26a1dea5 100644 --- a/RIADigiDoc/ViewModel/Signing/MobileId/MobileIdViewModel.swift +++ b/RIADigiDoc/ViewModel/Signing/MobileId/MobileIdViewModel.swift @@ -243,7 +243,7 @@ class MobileIdViewModel: MobileIdViewModelProtocol, Loggable { let isLTAEnabled = await dataStore.getIsDefaultLTAEnabled() do { let extendedContainer = try await updatedContainer.extendSignature(isLTAEnabled) - mobileIdSuccessMessageKey = "Signature added" + mobileIdSuccessMessageKey = "Container signed successfully" return extendedContainer } catch { MobileIdViewModel.logger().error("Unable to extend signature (Mobile-ID): \(error)") diff --git a/RIADigiDoc/ViewModel/Signing/SmartId/SmartIdViewModel.swift b/RIADigiDoc/ViewModel/Signing/SmartId/SmartIdViewModel.swift index 4f2fdc10..4670199d 100644 --- a/RIADigiDoc/ViewModel/Signing/SmartId/SmartIdViewModel.swift +++ b/RIADigiDoc/ViewModel/Signing/SmartId/SmartIdViewModel.swift @@ -288,7 +288,7 @@ class SmartIdViewModel: SmartIdViewModelProtocol, Loggable { let isLTAEnabled = await dataStore.getIsDefaultLTAEnabled() do { let extendedContainer = try await updatedContainer.extendSignature(isLTAEnabled) - smartIdSuccessMessageKey = "Signature added" + smartIdSuccessMessageKey = "Container signed successfully" return extendedContainer } catch { SmartIdViewModel.logger().error("Unable to extend signature (Smart-ID): \(error)") diff --git a/RIADigiDocTests/ViewModel/Signing/MobileId/MobileIdViewModelTests.swift b/RIADigiDocTests/ViewModel/Signing/MobileId/MobileIdViewModelTests.swift index b1ec1971..5995b223 100644 --- a/RIADigiDocTests/ViewModel/Signing/MobileId/MobileIdViewModelTests.swift +++ b/RIADigiDocTests/ViewModel/Signing/MobileId/MobileIdViewModelTests.swift @@ -215,7 +215,7 @@ struct MobileIdViewModelTests { #expect(result != nil) #expect(viewModel.controlCode == "1234") - #expect(viewModel.mobileIdSuccessMessageKey == "Signature added") + #expect(viewModel.mobileIdSuccessMessageKey == "Container signed successfully") } @Test