Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Cleanup Kotlin/Swift translations (#1340)

Leendert de Borst31c78327452f
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
index 2f1d5150c..fcb88ead9 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
@@ -76,7 +76,7 @@ class PinViewModel(
}
} catch (e: Exception) {
PinResult.Error(
- e.message ?: context.getString(R.string.pin_unlock_failed),
+ e.message ?: context.getString(R.string.unknown_error),
shouldClear = true,
)
}
diff --git a/apps/mobile-app/android/app/src/main/res/layout/activity_pin_unlock.xml b/apps/mobile-app/android/app/src/main/res/layout/activity_pin_unlock.xml
index 399243ddf..f8d013fd6 100644
--- a/apps/mobile-app/android/app/src/main/res/layout/activity_pin_unlock.xml
+++ b/apps/mobile-app/android/app/src/main/res/layout/activity_pin_unlock.xml
@@ -12,7 +12,7 @@
android:id="@+id/cancelButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/pin_cancel"
+ android:text="@string/common_cancel"
android:textColor="@color/primary"
style="?android:attr/borderlessButtonStyle"
android:layout_marginTop="8dp"
diff --git a/apps/mobile-app/android/app/src/main/res/layout/fragment_passkey_form.xml b/apps/mobile-app/android/app/src/main/res/layout/fragment_passkey_form.xml
index 03460a67d..3c9c8ab75 100644
--- a/apps/mobile-app/android/app/src/main/res/layout/fragment_passkey_form.xml
+++ b/apps/mobile-app/android/app/src/main/res/layout/fragment_passkey_form.xml
@@ -212,7 +212,7 @@
android:id="@+id/cancelButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/passkey_cancel_button"
+ android:text="@string/common_cancel"
android:textColor="@color/av_primary"
style="@style/Widget.Material3.Button.TextButton"
android:paddingVertical="14dp"
diff --git a/apps/mobile-app/android/app/src/main/res/layout/fragment_passkey_selection.xml b/apps/mobile-app/android/app/src/main/res/layout/fragment_passkey_selection.xml
index 033243de2..71b14a064 100644
--- a/apps/mobile-app/android/app/src/main/res/layout/fragment_passkey_selection.xml
+++ b/apps/mobile-app/android/app/src/main/res/layout/fragment_passkey_selection.xml
@@ -99,7 +99,7 @@
android:id="@+id/cancelButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/passkey_cancel_button"
+ android:text="@string/common_cancel"
android:textColor="@color/av_primary"
style="@style/Widget.Material3.Button.TextButton"
android:paddingVertical="14dp"
diff --git a/apps/mobile-app/android/app/src/main/res/values/strings.xml b/apps/mobile-app/android/app/src/main/res/values/strings.xml
index 7ded86dc2..2b214b425 100644
--- a/apps/mobile-app/android/app/src/main/res/values/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values/strings.xml
@@ -9,6 +9,8 @@
<!-- Common strings -->
<string name="common_close">Close</string>
<string name="common_next">Next</string>
+ <string name="common_cancel">Cancel</string>
+ <string name="unknown_error">An unknown error occurred</string>
<!-- AutofillService strings -->
<string name="autofill_failed_to_retrieve">Failed to retrieve, open app</string>
@@ -32,7 +34,6 @@
<string name="passkey_website_label">Website</string>
<string name="passkey_username_label">Username</string>
<string name="passkey_create_button">Create Passkey</string>
- <string name="passkey_cancel_button">Cancel</string>
<string name="passkey_creating">Creating passkey…</string>
<string name="passkey_saving">Saving to vault…</string>
<string name="passkey_syncing">Syncing with server…</string>
@@ -69,15 +70,12 @@
<string name="error_unlock_method_required">Please enable biometric or PIN authentication in the main AliasVault app in order to continue</string>
<string name="error_unlock_vault_first">Please unlock vault in AliasVault app first</string>
<string name="error_vault_decrypt_failed">Failed to decrypt vault</string>
- <string name="error_vault_unlock_failed">Failed to unlock vault</string>
<string name="error_biometric_cancelled">Biometric authentication cancelled</string>
<string name="error_encryption_key_failed">Failed to retrieve encryption key</string>
<!-- PIN unlock -->
<string name="pin_unlock_vault">Unlock Vault</string>
<string name="pin_enter_to_unlock">Enter your PIN to unlock your vault</string>
- <string name="pin_cancel">Cancel</string>
- <string name="pin_unlock_failed">Unlock failed</string>
<string name="pin_locked_max_attempts">PIN locked after too many failed attempts</string>
<string name="pin_incorrect_attempts_remaining">Incorrect PIN. %d attempts remaining</string>
diff --git a/apps/mobile-app/ios/VaultUI/Auth/PinSetupViewModel.swift b/apps/mobile-app/ios/VaultUI/Auth/PinSetupViewModel.swift
index 728a69554..73c831b01 100644
--- a/apps/mobile-app/ios/VaultUI/Auth/PinSetupViewModel.swift
+++ b/apps/mobile-app/ios/VaultUI/Auth/PinSetupViewModel.swift
@@ -123,7 +123,7 @@ public class PinSetupViewModel: ObservableObject {
// Check if PINs match
guard let firstPin = configuration.firstStepPin else {
isProcessing = false
- self.error = String(localized: "pin_setup_error", bundle: locBundle)
+ self.error = String(localized: "unknown_error", bundle: locBundle)
triggerErrorFeedback()
return
}
@@ -157,7 +157,7 @@ public class PinSetupViewModel: ObservableObject {
} catch {
// Generic error fallback
isProcessing = false
- self.error = String(localized: "pin_setup_error", bundle: locBundle)
+ self.error = String(localized: "unknown_error", bundle: locBundle)
triggerErrorFeedback()
shakeAndClear()
}
diff --git a/apps/mobile-app/ios/VaultUI/Auth/PinUnlockView.swift b/apps/mobile-app/ios/VaultUI/Auth/PinUnlockView.swift
index c1699422b..b72bd6a94 100644
--- a/apps/mobile-app/ios/VaultUI/Auth/PinUnlockView.swift
+++ b/apps/mobile-app/ios/VaultUI/Auth/PinUnlockView.swift
@@ -305,11 +305,10 @@ public class PinUnlockViewModel: ObservableObject {
shakeAndClear()
}
} catch {
- // Generic error fallback
- isUnlocking = false
- self.error = String(localized: "unlock_failed", bundle: locBundle)
+ // Generic error fallback, dismiss view
+ self.error = nil
triggerErrorFeedback()
- shakeAndClear()
+ cancelHandler()
}
}
diff --git a/apps/mobile-app/ios/VaultUI/en.lproj/Localizable.strings b/apps/mobile-app/ios/VaultUI/en.lproj/Localizable.strings
index c2d5a2bdc..947b7d9eb 100644
--- a/apps/mobile-app/ios/VaultUI/en.lproj/Localizable.strings
+++ b/apps/mobile-app/ios/VaultUI/en.lproj/Localizable.strings
@@ -1,7 +1,14 @@
/* English localization strings for VaultUI */
"error" = "Error";
"cancel" = "Cancel";
+"back" = "Back";
"next" = "Next";
+"edit" = "Edit";
+"website" = "Website";
+"username" = "Username";
+"title" = "Title";
+"unknown_error" = "An unknown error occurred";
+
"loading_credentials" = "Loading credentials...";
"no_credentials_found" = "No credentials found";
"no_credentials_match" = "No existing credentials match your search";
@@ -24,7 +31,6 @@
"copy_password" = "Copy Password";
"copy_email" = "Copy Email";
"view_details" = "View Details";
-"edit" = "Edit";
"username_copied" = "Username copied";
"password_copied" = "Password copied";
"email_copied" = "Email copied";
@@ -36,9 +42,6 @@
"create_passkey_title" = "Create New Passkey";
"create_passkey_subtitle" = "Register a new passkey for this website. It will be securely stored in your vault and automatically synced across your devices with AliasVault.";
"create_passkey_button_confirm" = "Create Passkey";
-"website" = "Website";
-"username" = "Username";
-"title" = "Title";
/* Passkey provider */
"passkey" = "Passkey";
@@ -49,7 +52,6 @@
"passkeys_load_error" = "Failed to load passkeys. Please open the AliasVault app to check for updates.";
/* Passkey replacement */
-"back" = "Back";
"create_new_passkey" = "Create New Passkey";
"select_passkey_to_replace" = "Or, replace an existing passkey";
"confirm_replace" = "Replace Passkey";
@@ -59,11 +61,7 @@
/* PIN Unlock */
"unlock_vault" = "Unlock Vault";
-"enter_pin" = "Enter PIN";
"enter_pin_to_unlock_vault" = "Enter your PIN to unlock your vault";
-"unlock_failed" = "Unlock failed";
-
-/* PIN Error Messages */
"pin_locked_max_attempts" = "PIN locked after too many failed attempts";
"pin_incorrect_attempts_remaining" = "Incorrect PIN. %d attempts remaining";
@@ -73,5 +71,4 @@
"pin_confirm_title" = "Confirm PIN";
"pin_confirm_subtitle" = "Re-enter your PIN to confirm";
"pin_mismatch" = "PINs do not match. Please try again.";
-"pin_setup_error" = "An error occurred during PIN setup";