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.

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

Settings: Add User-Interactive Auth for adding email and msidsn to user's account #2801

Merged
merged 2 commits into from
Oct 24, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
Changes in 0.10.1 (2019-XX-XX)
===============================================

Improvements:
* Settings: Add User-Interactive Auth for adding email and msidsn to user's account (vector-im/riot-ios#2744).

Bug fix:
* Room cell: The states of direct chat and favorite buttons are reversed in the menu (#2788).
* Pasteboard: Fix a crash when passing a nil object to UIPasteboard.
Expand Down
8 changes: 8 additions & 0 deletions Riot/Assets/en.lproj/Vector.strings
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,14 @@
"settings_fail_to_update_password" = "Fail to update password";
"settings_password_updated" = "Your password has been updated";

"settings_add_3pid_password_title_email" = "Add email adress";
"settings_add_3pid_password_title_msidsn" = "Add phone number";
"settings_add_3pid_password_message" = "To continue, please enter your password";
"settings_add_3pid_invalid_password_message" = "Invalid password";
//"settings_add_3pid_auth_flow_not_supported" = "%@ does not support the authentication required by your homeserver to add a third party identifier. Please use the web version of the app.";
"settings_add_3pid_auth_flow_not_supported" = "%@ does not support the authentication required by your homeserver. Please use the web version of the app.";


"settings_crypto_device_name" = "Device Public Name: ";
"settings_crypto_device_id" = "\nDevice ID: ";
"settings_crypto_device_key" = "\nDevice key:\n";
Expand Down
20 changes: 20 additions & 0 deletions Riot/Generated/Strings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2550,6 +2550,26 @@ internal enum VectorL10n {
internal static var serviceTermsModalTitleIdentityServer: String {
return VectorL10n.tr("Vector", "service_terms_modal_title_identity_server")
}
/// %@ does not support the authentication required by your homeserver. Please use the web version of the app.
internal static func settingsAdd3pidAuthFlowNotSupported(_ p1: String) -> String {
return VectorL10n.tr("Vector", "settings_add_3pid_auth_flow_not_supported", p1)
}
/// Invalid password
internal static var settingsAdd3pidInvalidPasswordMessage: String {
return VectorL10n.tr("Vector", "settings_add_3pid_invalid_password_message")
}
/// To continue, please enter your password
internal static var settingsAdd3pidPasswordMessage: String {
return VectorL10n.tr("Vector", "settings_add_3pid_password_message")
}
/// Add email adress
internal static var settingsAdd3pidPasswordTitleEmail: String {
return VectorL10n.tr("Vector", "settings_add_3pid_password_title_email")
}
/// Add phone number
internal static var settingsAdd3pidPasswordTitleMsidsn: String {
return VectorL10n.tr("Vector", "settings_add_3pid_password_title_msidsn")
}
/// Add email address
internal static var settingsAddEmailAddress: String {
return VectorL10n.tr("Vector", "settings_add_email_address")
Expand Down
Loading