add hint about email update (#343)

* add hint about email update

* externalize contact links and forms

* Update pool/app/pool_common/locales/i18n_de.ml

Co-authored-by: Marc <marc.biedermann@econ.uzh.ch>

---------

Co-authored-by: Timo Huber <timo.huber@econ.uzh.ch>
Co-authored-by: Marc <marc.biedermann@econ.uzh.ch>

Author: timohuber

pool/app/pool_common/entity_i18n.ml

@@ -151,6 +151,7 @@ type hint =
   | ContactEnrollmentDoesNotMatchFilter
   | ContactEnrollmentRegistrationDisabled
   | ContactEnterCellPhoneToken of string
+  | ContactInformationEmailHint
   | ContactLanguage
   | ContactNoCellPhone
   | ContactOnWaitingList

pool/app/pool_common/locales/i18n_de.ml

@@ -234,6 +234,8 @@ Beim Einladen von Kontakten bevorzugt der Filter den überschreibenden Wert, wen
       "Bitte geben Sie den Verifizierungscode ein, den wir Ihnen an %s   \
        geschickt haben. Der Code ist eine Stunde lang gültig."
       cell_phone
+  | ContactInformationEmailHint ->
+    "Um Ihre E-Mail-Adresse anzupassen, folgen Sie bitte folgendem Link."
   | ContactLanguage ->
     "Bei einigen Experimenten wird in einer anderen Sprache kommuniziert, ohne \
      Rücksicht auf die Kontaktsprache."

pool/app/pool_common/locales/i18n_en.ml

@@ -230,6 +230,8 @@ When inviting contacts, the filter will prefer the overriding value if both are
       "Please enter the verification code we sent yout to %s. The code is \
        valid for one hour."
       cell_phone
+  | ContactInformationEmailHint ->
+    "To change your e-mail address, please follow this link."
   | ContactLanguage ->
     "Some experiments choose to communicate in a different language, \
      disregarding your contact language."

pool/web/handler/contact_signup.ml

@@ -150,7 +150,7 @@ let sign_up_create req =
        let%lwt () = Pool_event.handle_events ~tags database_label events in
        HttpUtils.(
          redirect_to_with_actions
-           (path_with_language query_language "/email-confirmation")
+           "/email-confirmation"
            [ Message.set
                ~success:[ Pool_common.Message.EmailConfirmationMessage ]
            ])

pool/web/view/page/page_contact_edit.ml

@@ -353,6 +353,19 @@ let contact_information
   let hint_to_html =
     CCFun.(Utils.hint_to_string language %> fun hint -> div [ txt hint ])
   in
+  let email_hint =
+    let link =
+      HttpUtils.path_with_language query_language "/user/login-information"
+    in
+    [ txt
+        Pool_common.(
+          Utils.hint_to_string language I18n.ContactInformationEmailHint)
+    ]
+    |> Notification.notification
+         language
+         ~link:(link, Pool_common.I18n.LoginInformation)
+         `Warning
+  in
   let form_title i18n =
     h2
       ~a:[ a_class [ "heading-3" ] ]
@@ -397,7 +410,7 @@ let contact_information
   in
   let form_as_link url i18n =
     form
-      ~a:[ a_method `Post; a_action (Sihl.Web.externalize_path url) ]
+      ~a:[ a_method `Post; a_action (externalize url) ]
       [ csrf_element csrf ()
       ; submit_element ~classnames:[ "as-link" ] language i18n ()
       ]
@@ -445,20 +458,21 @@ let contact_information
     | Some { Pool_user.UnverifiedCellPhone.cell_phone; _ } ->
       verify_form cell_phone
   in
-  div [ div ~a:[ a_class [ "grid-col-2"; "gap-lg" ] ] [ form ] ]
+  div [ email_hint; div ~a:[ a_class [ "grid-col-2"; "gap-lg" ] ] [ form ] ]
   |> contact_profile_layout language Pool_common.I18n.ContactInformation
 ;;
 
 let pause_account Pool_context.{ language; query_language; csrf; _ } ?token () =
   let open Pool_common in
+  let externalize = HttpUtils.externalize_path_with_lang query_language in
   let action =
     match token with
-    | None -> "/user/update/pause" |> Sihl.Web.externalize_path
+    | None -> "/user/update/pause" |> externalize
     | Some token ->
       Message.add_field_query_params
         "/unsubscribe"
         [ Message.Field.Token, User_import.Token.value token ]
-      |> HttpUtils.externalize_path_with_lang query_language
+      |> externalize
   in
   let open Utils in
   div

pool/web/view/page/page_contact_experiment.ml

@@ -28,7 +28,7 @@ let index
   waiting_list
   past_experiments
   custom_fields_ansered
-  Pool_context.{ language; _ }
+  Pool_context.{ language; query_language; _ }
   =
   let list_html ?empty_msg ?note title classnames list =
     div
@@ -82,7 +82,8 @@ let index
       [ a
           ~a:
             [ a_href
-                (Sihl.Web.externalize_path
+                (HttpUtils.externalize_path_with_lang
+                   query_language
                    (Format.asprintf "/experiments/%s" (Experiment.Id.value id)))
             ]
           [ txt Pool_common.(Message.More |> Utils.control_to_string language) ]
@@ -202,7 +203,7 @@ let show
   past_sessions
   user_is_enlisted
   contact
-  Pool_context.{ language; csrf; _ }
+  Pool_context.{ language; query_language; csrf; _ }
   =
   let open Pool_common in
   let hint_to_string = Utils.hint_to_string language in
@@ -236,7 +237,7 @@ let show
         Experiment.(experiment |> Public.id |> Id.value)
       |> (fun url ->
            if user_is_enlisted then Format.asprintf "%s/remove" url else url)
-      |> Sihl.Web.externalize_path
+      |> HttpUtils.externalize_path_with_lang query_language
     in
     let text_blocks =
       let base =
@@ -249,7 +250,11 @@ let show
         if CCOption.is_none contact.Contact.cell_phone
         then
           [ Component.Notification.notification
-              ~link:("/user/contact-information", I18n.PersonalDetails)
+              ~link:
+                ( HttpUtils.path_with_language
+                    query_language
+                    "/user/contact-information"
+                , I18n.PersonalDetails )
               language
               `Warning
               [ txt (hint_to_string I18n.WaitingListPhoneMissingContact) ]