From 677818a18ec424698e1efb34a3543fb83e2ef44c Mon Sep 17 00:00:00 2001
From: Adam Brown <adampsbrown@gmail.com>
Date: Fri, 15 Jul 2022 11:32:34 +0100
Subject: [PATCH] updating reset password copy

---
 .../ftueauth/FtueAuthResetPasswordBreakerFragment.kt   |  2 +-
 .../FtueAuthResetPasswordEmailEntryFragment.kt         | 10 ++++++++++
 .../fragment_ftue_reset_password_email_input.xml       |  1 -
 vector/src/main/res/values/donottranslate.xml          |  5 ++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
index 41e24e96c2..721423ecdf 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordBreakerFragment.kt
@@ -57,7 +57,7 @@ class FtueAuthResetPasswordBreakerFragment : AbstractFtueAuthFragment<FragmentFt
         views.resetPasswordBreakerGradientContainer.setBackgroundResource(themeProvider.ftueBreakerBackground())
         views.resetPasswordBreakerTitle.text = getString(R.string.ftue_auth_reset_password_breaker_title)
                 .colorTerminatingFullStop(ThemeUtils.getColor(requireContext(), R.attr.colorSecondary))
-        views.resetPasswordBreakerSubtitle.text = getString(R.string.ftue_auth_email_verification_subtitle, params.email)
+        views.resetPasswordBreakerSubtitle.text = getString(R.string.ftue_auth_password_reset_email_confirmation_subtitle, params.email)
         views.resetPasswordBreakerResendEmail.debouncedClicks { viewModel.handle(OnboardingAction.ResendResetPassword) }
         views.resetPasswordBreakerFooter.debouncedClicks {
             viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnResetPasswordBreakerConfirmed))
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
index e8110569a2..5fa1a8ed82 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthResetPasswordEmailEntryFragment.kt
@@ -21,13 +21,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
 import im.vector.app.core.extensions.associateContentStateWith
 import im.vector.app.core.extensions.clearErrorOnChange
 import im.vector.app.core.extensions.content
 import im.vector.app.core.extensions.isEmail
 import im.vector.app.core.extensions.setOnImeDoneListener
+import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.databinding.FragmentFtueResetPasswordEmailInputBinding
 import im.vector.app.features.onboarding.OnboardingAction
+import im.vector.app.features.onboarding.OnboardingViewState
 
 @AndroidEntryPoint
 class FtueAuthResetPasswordEmailEntryFragment : AbstractFtueAuthFragment<FragmentFtueResetPasswordEmailInputBinding>() {
@@ -53,6 +56,13 @@ class FtueAuthResetPasswordEmailEntryFragment : AbstractFtueAuthFragment<Fragmen
         viewModel.handle(OnboardingAction.ResetPassword(email = email, newPassword = null))
     }
 
+    override fun updateWithState(state: OnboardingViewState) {
+        views.emailEntryHeaderSubtitle.text = getString(
+                R.string.ftue_auth_reset_password_email_subtitle,
+                state.selectedHomeserver.userFacingUrl.toReducedUrl()
+        )
+    }
+
     override fun onError(throwable: Throwable) {
         views.emailEntryInput.error = errorFormatter.toHumanReadable(throwable)
     }
diff --git a/vector/src/main/res/layout/fragment_ftue_reset_password_email_input.xml b/vector/src/main/res/layout/fragment_ftue_reset_password_email_input.xml
index 0ab4d5b00d..046d9de552 100644
--- a/vector/src/main/res/layout/fragment_ftue_reset_password_email_input.xml
+++ b/vector/src/main/res/layout/fragment_ftue_reset_password_email_input.xml
@@ -70,7 +70,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:gravity="center"
-            android:text="@string/ftue_auth_reset_password_email_subtitle"
             android:textColor="?vctr_content_secondary"
             app:layout_constraintBottom_toTopOf="@id/titleContentSpacing"
             app:layout_constraintEnd_toEndOf="@id/emailEntryGutterEnd"
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index fad9504eb0..a296db0fb8 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -42,7 +42,8 @@
     <string name="ftue_auth_phone_entry_title">Phone Number</string>
     <string name="ftue_auth_phone_confirmation_entry_title">Confirmation code</string>
 
-    <string name="ftue_auth_reset_password_email_subtitle">We will send you a verification link.</string>
+    <!-- Note for translators, %s is the homeserver name, eg matrix.org -->
+    <string name="ftue_auth_reset_password_email_subtitle">%s will send you a verification link</string>
     <string name="ftue_auth_reset_password_breaker_title">Check your email.</string>
     <string name="ftue_auth_new_password_entry_title">New Password</string>
     <string name="ftue_auth_new_password_title">Choose a new password</string>
@@ -62,6 +63,8 @@
     <string name="ftue_auth_email_resend_email">Resend email</string>
     <string name="ftue_auth_forgot_password">Forgot password</string>
     <string name="ftue_auth_password_reset_confirmation">Password reset</string>
+    <!-- Note for translators, %s is the users email address -->
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Follow the instructions send to %s</string>
 
     <string name="ftue_auth_captcha_title">Are you a human?</string>