mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-16 03:08:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

[BIT-2140] Add strings for typeform and export vault (#3369)

Browse source
This commit is contained in:
Patrick Honkonen 2024-06-27 10:38:19 -04:00 • committed by GitHub
parent d9d1e9a12c
commit 54218f86d8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/build.gradle.kts
View file

@ -108,6 +108,9 @@ android {
unitTests.isIncludeAndroidResources = true
unitTests.isReturnDefaultValues = true
}
lint {
disable.add("MissingTranslation")
}
}
kotlin {

2
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensions.kt
View file

@ -39,7 +39,7 @@ fun TwoFactorAuthMethod.description(email: String): Text = when (this) {
}
TwoFactorAuthMethod.EMAIL -> R.string.enter_verification_code_email.asText(email)
TwoFactorAuthMethod.WEB_AUTH -> R.string.continue_to_complete_web_authn_verfication.asText()
TwoFactorAuthMethod.WEB_AUTH -> R.string.continue_to_complete_web_authn_verification.asText()
TwoFactorAuthMethod.YUBI_KEY -> R.string.yubi_key_instruction.asText()
else -> "".asText()
}

12
app/src/main/res/values/strings.xml
View file

@ -913,4 +913,16 @@ Do you want to switch to this account?</string>
<string name="passkey_operation_failed_because_of_missing_asset_links">Passkey operation failed because of missing asset links</string>
<string name="passkey_operation_failed_because_app_not_found_in_asset_links">Passkey operation failed because app not found in asset links</string>
<string name="passkey_operation_failed_because_app_could_not_be_verified">Passkey operation failed because app could not be verified</string>
<string name="confirm_file_password">Confirm file password</string>
<string name="continue_to_give_feedback">Continue to Give Feedback?</string>
<string name="continue_to_provide_feedback">Select continue to give feedback on the new app!</string>
<string name="file_password">File password</string>
<string name="give_feedback">Give Feedback</string>
<string name="password_protected">Password Protected</string>
<string name="password_used_to_export">This password will be used to export and import this file</string>
<string name="autofill_suggestion">Autofill suggestion</string>
<string name="continue_to_complete_web_authn_verification">Continue to complete WebAuthn verification.</string>
<string name="launch_web_authn">Launch WebAuthn</string>
<string name="there_was_an_error_starting_web_authn_two_factor_authentication">There was an error starting WebAuthn two factor authentication</string>
<string name="self_hosted_server_url">Self-hosted server URL</string>
</resources>

13
app/src/main/res/values/strings_non_localized.xml
View file

@ -6,17 +6,4 @@
<string name="duo_org_title" translatable="false">Duo (%1$s)</string>
<string name="json_extension" translatable="false">.json</string>
<string name="json_extension_formatted" translatable="false">.json (%1$s)</string>
<!-- TODO BIT-2140: Update typeform and vault export strings -->
<string name="confirm_file_password" translatable="false">Confirm file password</string>
<string name="continue_to_give_feedback" translatable="false">Continue to Give Feedback?</string>
<string name="continue_to_provide_feedback" translatable="false">Select continue to give feedback on the new app!</string>
<string name="file_password" translatable="false">File password</string>
<string name="give_feedback" translatable="false">Give Feedback</string>
<string name="password_protected" translatable="false">Password Protected</string>
<string name="password_used_to_export" translatable="false">This password will be used to export and import this file</string>
<string name="autofill_suggestion" translatable="false">Autofill suggestion</string>
<string name="continue_to_complete_web_authn_verfication" translatable="false">Continue to complete WebAuthn verification.</string>
<string name="launch_web_authn" translatable="false">Launch WebAuthn</string>
<string name="there_was_an_error_starting_web_authn_two_factor_authentication" translatable="false">There was an error starting WebAuthn two factor authentication</string>
<string name="self_hosted_server_url" translatable="false">Self-hosted server URL</string>
</resources>

2
app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensionTest.kt
View file

@ -49,7 +49,7 @@ class TwoFactorAuthMethodExtensionTest {
.concat(" ".asText())
.concat(R.string.follow_the_steps_from_duo_to_finish_logging_in.asText()),
TwoFactorAuthMethod.WEB_AUTH to
R.string.continue_to_complete_web_authn_verfication.asText(),
R.string.continue_to_complete_web_authn_verification.asText(),
TwoFactorAuthMethod.RECOVERY_CODE to "".asText(),
)
.forEach { (type, title) ->