From 358fa5a78a71b963a87e06a0d937cadfa1406833 Mon Sep 17 00:00:00 2001 From: Hadia Date: Wed, 7 Dec 2022 16:28:30 +0200 Subject: [PATCH 1/3] [no-jira]: Update String translation for facebook deprecation (#1714) * update with FB translation Signed-off-by: hadia * update with FB translation Signed-off-by: hadia * Fix code format Signed-off-by: hadia Signed-off-by: hadia --- app/src/main/assets/json/server-config.json | 83 +++++++++++++------ .../ui/activities/LoginActivity.kt | 15 +++- .../ui/activities/LoginToutActivity.kt | 4 +- .../ui/activities/ResetPasswordActivity.kt | 2 +- .../ui/activities/SetPasswordActivity.kt | 4 +- .../com/kickstarter/ui/data/LoginReason.kt | 1 + .../ui/data/ResetPasswordScreenState.kt | 4 +- .../kickstarter/viewmodels/LoginViewModel.kt | 16 ++-- .../main/res/layout/activity_set_password.xml | 17 +--- .../main/res/layout/reset_password_layout.xml | 2 +- app/src/main/res/values-de/strings_i18n.xml | 27 +++--- app/src/main/res/values-es/strings_i18n.xml | 9 +- app/src/main/res/values-fr/strings_i18n.xml | 9 +- app/src/main/res/values-ja/strings_i18n.xml | 9 +- app/src/main/res/values/strings.xml | 10 --- app/src/main/res/values/strings_i18n.xml | 9 +- 16 files changed, 135 insertions(+), 86 deletions(-) diff --git a/app/src/main/assets/json/server-config.json b/app/src/main/assets/json/server-config.json index a4fc7b95da..b2ef629627 100644 --- a/app/src/main/assets/json/server-config.json +++ b/app/src/main/assets/json/server-config.json @@ -361,7 +361,6 @@ "Kickstarter_is_not_a_store_Its_a_way_to_bring_creative_projects_to_life_Learn_more_about_accountability": "Kickstarter is not a store. It's a way to bring creative projects to life.
Learn more about accountability", "Kickstarter_Music": "Kickstarter Music", "Kickstarter_on_Film": "Kickstarter on Film", - "Kickstarters_community_guidelines": "Kickstarter’s Community Guidelines.", "Know_when_creators_and_backers_message_you": "Know when creators and backers message you by enabling notifications.", "Learn_more_about_accountability": "Learn more about accountability", "Learn_more_about_comment_guidelines": "Learn more about comment guidelines", @@ -593,6 +592,7 @@ "Request_my_personal_data": "Request my personal data", "Resend_email": "Resend email", "Resend_verification_email": "Re-send verification email", + "Reset_your_password": "Reset your password", "Retry": "Retry", "Retry_or_select_another_method": "Retry or select another method.", "Reusability_and_recyclability": "Reusability and recyclability", @@ -657,6 +657,8 @@ "Selected_reward": "Selected reward", "Send": "Send", "Send_verfication_email": "Send verification email", + "Set_new_password": "Set new password", + "Set_your_password": "Set your password", "Share": "Share", "Share_an_update_about_your_project": "Share an update about your project…", "Share_this_live_stream": "Share this live stream.", @@ -738,7 +740,6 @@ "This_allows_you_to_see_project_goal_and_pledge_amounts_in_your_preferred_currency": "This allows you to see project goal and pledge amounts in your preferred currency.", "This_comment_has_been_removed_by_Kickstarter": "This comment has been removed by Kickstarter.", "This_comment_is_under_review": "This comment is under review.", - "This_comment_is_under_review_for_potentially_violating": "This comment is under review for potentially violating", "This_comment_is_under_review_for_potentially_violating_kickstarters_community_guidelines": "This comment is under review for potentially violating Kickstarter’s Community Guidelines.", "This_facebook_account_is_already_linked_to_another_Kickstarter_user": "This Facebook account is already linked to another Kickstarter user.", "This_holiday_season_support_a_project_for_no_reward": "This holiday season, support a project for no reward, just because it speaks to you.", @@ -809,6 +810,7 @@ "Visit_our_Environmental_Resources_Center": "Visit our Environmental Resources Center", "Visit_our_Environmental_Resources_Center_Alternative": "Visit our Environmental Resources Center", "Watch_live": "Watch live", + "We_can_no_longer_log_you_in_through_Facebook": "We can no longer log you in through Facebook. Please log in with your Kickstarter password, or set a new password with your Facebook email.", "We_cant_process_your_pledge": "We can't process your pledge.", "We_cant_process_your_pledge_for": "We can't process your pledge for:", "We_cant_process_this_pledge_because_of_a_problem_with_the_backers_payment_method": "We can’t process this pledge because of a problem with the backer’s payment method.", @@ -828,10 +830,12 @@ "We_use_your_activity_internally_to_make_recommendations_for_you": "We use your activity internally to make recommendations for you. Turn recommendations off to opt out of this.", "We_were_unable_to_connect_to_the_live_stream_chat": "We were unable to connect to the live stream chat.", "We_were_unable_to_load_the_shipping_destinations": "We were unable to load the shipping destinations.\nPlease try again later.", + "We_will_be_discontinuing_the_ability_to_log_in_via_FB": "We will be discontinuing the ability to log in via Facebook. To log in to your account using the email %{email}, please set a password that’s at least 6 characters long.", "We_wont_share_this_with_the_creator": "We won’t share this with the creator.", "We_ve_been_unable_to_send_email": "We've been unable to send email to this address. Please make sure it is typed correctly.", "We_re_processing_this_pledge_pull_to_refresh": "We're processing this pledge—pull to refresh.", "We_re_processing_your_pledge_pull_to_refresh": "We're processing your pledge—pull to refresh.", + "We_re_simplifying_our_login_process_To_log_in": "We’re simplifying our login process. To access your Kickstarter account, enter the email associated to your Facebook account and we’ll send you a link to set a password", "When_following_is_on_you_can_follow_the_acticity_of_others": "When following is on, you can follow the activity of others and others can follow your activity. Turn following off to permanently delete this data.", "When_you_save_a_project_we_ll_send_you_a_reminder": "When you save a project we’ll send you a reminder 48 hours before it ends", "Which_categories_interest_you": "Which categories interest you?", @@ -1461,6 +1465,7 @@ "ok": "OK" }, "we_sent_an_email_to_email_address_with_instructions_to_reset_your_password": "We’ve sent an email to %{email} with instructions to reset your password.", + "we_sent_an_email_to_email_address_with_instructions_to_set_your_password": "We’ve sent an email to %{email} with instructions to set your password.", "error": "Sorry, we don’t know that email address. Try again?", "placeholder_email": "Email address" }, @@ -2493,7 +2498,7 @@ "Back_this_project": "Projekt unterstützen", "Back_this_project_below": "Folgendes Projekt unterstützen", "Backed_by_Friends": "Von Freunden unterstützt", - "Backed_by_people_you_follow": "Unterstützt von deinen Freunden", + "Backed_by_people_you_follow": "Unterstützt von Personen, denen du folgst", "Backed_projects_projects_count": "Unterstützte Projekte: %{project_count}", "Backer_has_pledged_to_this_project": "Hat dieses Projekt unterstützt.", "Backers_count_separator_backers": { @@ -2727,9 +2732,9 @@ "Follow_more_friends": "Folge noch mehr Freunden", "Follow_your_Facebook_friends_and_get_notified": "Folge deinen Freunden und wir werden dich benachrichtigen, sobald sie ein Projekt unterstützen oder veröffentlichen.", "Follow_your_Facebook_friends_and_keep_up_with_the_projects": "Folge deinen Facebook-Freunden - wir halten dich auf dem Laufenden, wenn sie ein Projekt unterstützen oder veröffentlichen.", - "Followed": "Abonniert", - "Following": "Abonniert", - "Following_Disabled_Info": "Die Funktion \"Abonnieren\" muss aktiviert sein, um Freunde auf Facebook zu finden. Gehe dazu zu Einstellungen > Datenschutz.", + "Followed": "Gefolgt", + "Following": "Gefolgt", + "Following_Disabled_Info": "Die Funktion „Folgen“ muss aktiviert sein, um Freunde auf Facebook zu finden. Gehe dazu zu Einstellungen > Datenschutz.", "Following_More_Info": "Mehr Info zu Folgen", "Funding_successful": "Finanzierung erfolgreich", "Games_newsletter": "Jetzt abonnieren - du erhältst von Kickstarters Games-Team alle zwei Wochen News zu neuen Projekten und Updates rund um Games.", @@ -2798,7 +2803,6 @@ "Kickstarter_is_not_a_store_Its_a_way_to_bring_creative_projects_to_life_Learn_more_about_accountability": "Kickstarter ist kein Geschäft, sondern eine Plattform, um kreative Projekte zu verwirklichen.
Hier findest du mehr Info zur Rechenschftspflicht", "Kickstarter_Music": "Kickstarter Music", "Kickstarter_on_Film": "Kickstarter on Film", - "Kickstarters_community_guidelines": "die Community-Richtlinien von Kickstarter.", "Know_when_creators_and_backers_message_you": "Aktiviere Benachrichtigungen, damit du über eingehende Nachrichten von Projektgründern und Unterstützern Bescheid weißt.", "Learn_more_about_accountability": "Weitere Informationen zur Rechenschaftspflicht", "Learn_more_about_comment_guidelines": "Mehr Info zu Kommentar-Richtlinien", @@ -2892,7 +2896,7 @@ "No_saved_projects": "Keine gespeicherten Projekte", "No_unread_messages": "Keine ungelesenen Nachrichten", "Not_available": "Nicht verfügbar", - "Not_followed": "Nicht abonniert", + "Not_followed": "Nicht gefolgt", "Not_delivered": "Nicht verschickt", "Not_now": "Nicht jetzt", "Notification_email_notification_off": "%{notification}, Benachrichtigung per E-Mail, Aus", @@ -3030,6 +3034,7 @@ "Request_my_personal_data": "Meine persönlichen Daten anfordern", "Resend_email": "Erneut senden", "Resend_verification_email": "Verifizierungs-E-Mail erneut senden", + "Reset_your_password": "Passwort zurücksetzen", "Retry": "Erneut versuchen", "Retry_or_select_another_method": "Versuche es erneut oder wähle eine andere Karte.", "Reusability_and_recyclability": "Wiederverwertung und Recyclingfähigkeit", @@ -3094,6 +3099,8 @@ "Selected_reward": "Gewählte Belohnung", "Send": "Senden", "Send_verfication_email": "Verifizeirungs-E-Mail senden", + "Set_new_password": "Neues Passwort festlegen", + "Set_your_password": "Passwort festlegen", "Share": "Teilen", "Share_an_update_about_your_project": "Teile einen Update zu deinem Projekt …", "Share_this_live_stream": "Live-Stream teilen.", @@ -3175,7 +3182,6 @@ "This_allows_you_to_see_project_goal_and_pledge_amounts_in_your_preferred_currency": "Hier kannst du das Finanzierungsziel und die Finanzierungsbeiträge in deiner bevorzugten Währung ansehen.", "This_comment_has_been_removed_by_Kickstarter": "Dieser Kommentar wurde von Kickstarter entfernt.", "This_comment_is_under_review": "Dieser Kommentar wird gerade überprüft.", - "This_comment_is_under_review_for_potentially_violating": "Dieser Kommentar wird gerade geprüft, weil er möglicherweise gegen Folgendes verstößt:", "This_comment_is_under_review_for_potentially_violating_kickstarters_community_guidelines": "Dieser Kommentar wird gerade geprüft, weil er möglicherweise gegen die Community-Richtlinien von Kickstarter verstößt.", "This_facebook_account_is_already_linked_to_another_Kickstarter_user": "Dieses Facebook-Konto ist bereits einem anderen Kickstarter-Nutzer zugeordnet.", "This_holiday_season_support_a_project_for_no_reward": "Weihnachten steht kurz vor der Tür - unterstütze ein Projekt ohne Belohnung. Einfach, weil es dich anspricht.", @@ -3246,6 +3252,7 @@ "Visit_our_Environmental_Resources_Center": "Ressourcen für den Umweltschutz", "Visit_our_Environmental_Resources_Center_Alternative": "Ressourcen für den Umweltschutz", "Watch_live": "Live ansehen", + "We_can_no_longer_log_you_in_through_Facebook": "Wir können dich nicht mehr über Facebook anmelden. Bitte melde dich mit deinem Kickstarter-Passwort an oder leg für deine Facebook-E-Mail-Adresse ein neues Passwort fest.", "We_cant_process_your_pledge": "Wir können deine Zahlung leider nicht bearbeiten.", "We_cant_process_your_pledge_for": "Wir können deine Zahlung aus folgendem Grund leider nicht bearbeiten:", "We_cant_process_this_pledge_because_of_a_problem_with_the_backers_payment_method": "Dieser Finanzierungsbeitrag konnte aufgrund eines Problems mit der Zahlungsmethode des Unterstützers nicht bearbeitet werden.", @@ -3265,11 +3272,13 @@ "We_use_your_activity_internally_to_make_recommendations_for_you": "Deine Aktivitäten werden intern genutzt, um dir Empfehlungen zu unterbreiten. Um dies zu deaktivieren, wähle \"Empfehlungen\" einfach ab.", "We_were_unable_to_connect_to_the_live_stream_chat": "Es konnte leider keine Verbindung zum Chat des Live-Streams hergestellt werden.", "We_were_unable_to_load_the_shipping_destinations": "Das Laden der Versandadressen war leider nicht möglich.\nBitte versuche es später noch einmal.", + "We_will_be_discontinuing_the_ability_to_log_in_via_FB": "Wir werden die Anmeldung über Facebook einstellen. Um dich mit der E-Mail-Adresse %{email} in deinem Konto anzumelden, leg bitte ein Passwort fest, das mindestens 6 Zeichen lang ist.", "We_wont_share_this_with_the_creator": "Diese Information wird nicht mit dem Projektgründer geteilt.", "We_ve_been_unable_to_send_email": "Wir konnten keine E-Mails an diese Adresse senden. Bitte prüfe, ob sie richtig eingegeben wurde.", "We_re_processing_this_pledge_pull_to_refresh": "Der Finanzierungsbeitrag wird derzeit bearbeitet — zur Aktualisierung nach unten ziehen.", "We_re_processing_your_pledge_pull_to_refresh": "Dein Finanzierungsbeitrag wird derzeit bearbeitet — zur Aktualisierung nach unten ziehen.", - "When_following_is_on_you_can_follow_the_acticity_of_others": "Wenn die Funktion Folgen gewählt wurde, kannst du die Aktivitäten von anderen einsehen und diese sehen deine Aktivitäten. Wenn die Funktion abgewählt wurde, werden diese Daten endgültig gelöscht.", + "We_re_simplifying_our_login_process_To_log_in": "Wir vereinfachen unseren Anmeldeprozess. Wenn du auf dein Kickstarter-Konto zugreifen möchtest, gib die E-Mail-Adresse ein, die mit deinem Facebook-Konto verknüpft ist. Wir senden dir dann einen Link, über den du ein Passwort festlegen kannst", + "When_following_is_on_you_can_follow_the_acticity_of_others": "Wenn die Funktion Folgen aktiviert wurde, kannst du die Aktivitäten von anderen einsehen und diese sehen deine Aktivitäten. Wenn die Funktion deaktiviert wurde, werden diese Daten endgültig gelöscht.", "When_you_save_a_project_we_ll_send_you_a_reminder": "Wenn du ein Projekt speicherst, senden wir dir 48 Stunden vor Ablauf eine Erinnerungs-E-Mail", "Which_categories_interest_you": "Welche Kategorien interessieren dich?", "Write_a_bio": "Schreibe eine kurze Biografie, ein oder zwei Sätze genügen.", @@ -3585,11 +3594,11 @@ "is_following_you": "folgt dir!", "buttons": { "follow": "Folgen", - "following": "Abonniert" + "following": "Gefolgt" } }, "user_name_is_now_following_you": "%{user_name} folgt dir!", - "follow_back": "Ihm/ihr auch folgen?", + "follow_back": "Auch folgen?", "project_was_not_successfully_funded": "Wurde nicht erfolgreich finanziert.", "user_name_launched_project": "%{user_name} hat ein Projekt veröffentlicht.", "successfully_funded": "Erfolgreich finanziert!", @@ -3898,6 +3907,7 @@ "ok": "OK" }, "we_sent_an_email_to_email_address_with_instructions_to_reset_your_password": "Wir haben eine E-Mail mit einer Anleitung zum Zurücksetzen deines Passworts an %{email} geschickt.", + "we_sent_an_email_to_email_address_with_instructions_to_set_your_password": "Wir haben eine E-Mail mit einer Anleitung zum Festlegen deines Passworts an %{email} geschickt.", "error": "Diese E-Mail-Adresse ist uns leider nicht bekannt. Nochmal versuchen?", "placeholder_email": "E-Mail-Adresse" }, @@ -4547,7 +4557,7 @@ "other": "%{created_count} erstellt" }, "buttons": { - "following": "Abonniert", + "following": "Gefolgt", "follow": "Folgen" } }, @@ -5235,7 +5245,6 @@ "Kickstarter_is_not_a_store_Its_a_way_to_bring_creative_projects_to_life_Learn_more_about_accountability": "Kickstarter no es una tienda. Es una forma de dar vida a proyectos creativos.
Más información sobre las responsabilidades", "Kickstarter_Music": "Kickstarter Music", "Kickstarter_on_Film": "Kickstarter on Film", - "Kickstarters_community_guidelines": "Kickstarter’s Community Guidelines.", "Know_when_creators_and_backers_message_you": "Entérate cuando los creadores y patrocinadores te envíen mensajes habilitando las notificaciones.", "Learn_more_about_accountability": "Más información sobre las responsabilidades", "Learn_more_about_comment_guidelines": "Más información sobre las reglas de los comentarios", @@ -5467,6 +5476,7 @@ "Request_my_personal_data": "Solicitar mis datos personales", "Resend_email": "Reenviar correo", "Resend_verification_email": "Volver a enviar correo electrónico de verificación", + "Reset_your_password": "Restablece tu contraseña", "Retry": "Volver a intentar", "Retry_or_select_another_method": "Vuelve a intentarlo o selecciona otro método.", "Reusability_and_recyclability": "Reutilización y reciclabilidad", @@ -5531,6 +5541,8 @@ "Selected_reward": "Recompensa seleccionada", "Send": "Enviar", "Send_verfication_email": "Enviar correo de verificación", + "Set_new_password": "Configurar nueva contraseña", + "Set_your_password": "Configura tu contraseña", "Share": "Compartir", "Share_an_update_about_your_project": "Comparte una actualización de tu proyecto …", "Share_this_live_stream": "Compartir este Live-Stream.", @@ -5612,7 +5624,6 @@ "This_allows_you_to_see_project_goal_and_pledge_amounts_in_your_preferred_currency": "Esto te permite ver la meta del proyecto y los montos de las contribuciones en la moneda de tu preferencia.", "This_comment_has_been_removed_by_Kickstarter": "Este comentario ha sido eliminado por Kickstarter.", "This_comment_is_under_review": "Este comentario está en revisión.", - "This_comment_is_under_review_for_potentially_violating": "This comment is under review for potentially violating", "This_comment_is_under_review_for_potentially_violating_kickstarters_community_guidelines": "Este comentario está en revisión por una posible infracción de las Reglas de la comunidad de Kickstarter.", "This_facebook_account_is_already_linked_to_another_Kickstarter_user": "Esta cuenta de Facebook ya está asociada a otro usuario de Kickstarter.", "This_holiday_season_support_a_project_for_no_reward": "Esta temporada de fiestas, apoya un proyecto sin recompensa, simplemente porque te resulta interesante.", @@ -5683,6 +5694,7 @@ "Visit_our_Environmental_Resources_Center": "Visita nuestro Centro de recursos medioambientales", "Visit_our_Environmental_Resources_Center_Alternative": "Visita nuestro Centro de recursos medioambientales", "Watch_live": "Ver en vivo", + "We_can_no_longer_log_you_in_through_Facebook": "Ya no admitimos el inicio de sesión a través de Facebook. Inicia sesión con tu contraseña de Kickstarter o configura una nueva contraseña con tu correo electrónico de Facebook.", "We_cant_process_your_pledge": "No podemos procesar tu contribución.", "We_cant_process_your_pledge_for": "No podemos procesar tu contribución para:", "We_cant_process_this_pledge_because_of_a_problem_with_the_backers_payment_method": "No podemos procesar esta contribución por un problema con el método de pago del patrocinador.", @@ -5702,10 +5714,12 @@ "We_use_your_activity_internally_to_make_recommendations_for_you": "Utilizamos tu actividad internamente para hacerte recomendaciones. Desactiva las recomendaciones si no quieres recibirlas.", "We_were_unable_to_connect_to_the_live_stream_chat": "No se pudo conectar al chat de live stream.", "We_were_unable_to_load_the_shipping_destinations": "No se pudieron cargar los destinos de envío.\nPor favor inténtalo de nuevo más tarde.", + "We_will_be_discontinuing_the_ability_to_log_in_via_FB": "Descontinuaremos la posibilidad de iniciar sesión a través de Facebook. Para acceder a tu cuenta con el correo electrónico %{email}, configura una contraseña que tenga al menos seis caracteres.", "We_wont_share_this_with_the_creator": "No lo compartiremos con el creador.", "We_ve_been_unable_to_send_email": "No pudimos enviar el correo electrónico a esta dirección. Asegúrate de que esté escrita correctamente.", "We_re_processing_this_pledge_pull_to_refresh": "Estamos procesando la contribución, desliza para actualizar.", "We_re_processing_your_pledge_pull_to_refresh": "Estamos procesando tu actualización, desliza para actualizar.", + "We_re_simplifying_our_login_process_To_log_in": "Simplificaremos el proceso de inicio de sesión. Para acceder a tu cuenta de Kickstarter, escribe el correo electrónico asociado a tu cuenta de Facebook y te enviaremos un enlace para configurar una contraseña.", "When_following_is_on_you_can_follow_the_acticity_of_others": "Cuando el seguimiento está activado, puedes seguir la actividad de los demás y otros pueden seguir tu actividad. Desactiva el seguimiento para eliminar esta información definitivamente.", "When_you_save_a_project_we_ll_send_you_a_reminder": "Cuando guardes un proyecto, te enviaremos un recordatorio por correo electrónico 48 horas antes de que finalice", "Which_categories_interest_you": "¿Qué categorías te interesan?", @@ -6335,6 +6349,7 @@ "ok": "Ok" }, "we_sent_an_email_to_email_address_with_instructions_to_reset_your_password": "Hemos enviado un correo electrónico a %{email} con las instrucciones para restablecer tu contraseña.", + "we_sent_an_email_to_email_address_with_instructions_to_set_your_password": "Hemos enviado un correo electrónico a %{email} con las instrucciones para configurar tu contraseña.", "error": "Lo sentimos, no conocemos esa dirección de correo electrónico. ¿Quieres intentarlo de nuevo?", "placeholder_email": "Dirección de correo electrónico" }, @@ -7672,7 +7687,6 @@ "Kickstarter_is_not_a_store_Its_a_way_to_bring_creative_projects_to_life_Learn_more_about_accountability": "Kickstarter n'est pas un magasin, mais un moyen de faire vivre des projets créatifs.
En savoir plus sur la notion de responsabilité", "Kickstarter_Music": "Kickstarter Music", "Kickstarter_on_Film": "Kickstarter on Film", - "Kickstarters_community_guidelines": "Kickstarter’s Community Guidelines.", "Know_when_creators_and_backers_message_you": "Activez vos notifications pour savoir quand un créateur ou un contributeur vous envoie un message.", "Learn_more_about_accountability": "En savoir plus sur la responsabilité", "Learn_more_about_comment_guidelines": "En savoir plus sur les directives applicables aux commentaires", @@ -7904,6 +7918,7 @@ "Request_my_personal_data": "Demander mes données personnelles", "Resend_email": "Renvoyer", "Resend_verification_email": "Renvoyer l'e-mail de vérification", + "Reset_your_password": "Réinitialiser votre mot de passe", "Retry": "Réessayer", "Retry_or_select_another_method": "Veuillez réessayer ou choisir un autre moyen de paiement.", "Reusability_and_recyclability": "Recyclage et valorisation des déchets", @@ -7968,6 +7983,8 @@ "Selected_reward": "Récompense sélectionnée", "Send": "Envoyer", "Send_verfication_email": "Envoyer un e-mail de vérification", + "Set_new_password": "Création d'un mot de passe", + "Set_your_password": "Veuillez créer un mot de passe", "Share": "Partager", "Share_an_update_about_your_project": "Parlez de votre projet dans une actu.", "Share_this_live_stream": "Partager cette diffusion en direct.", @@ -8049,7 +8066,6 @@ "This_allows_you_to_see_project_goal_and_pledge_amounts_in_your_preferred_currency": "L'objectif du projet et les montants des engagements s'afficheront ainsi dans la devise de votre choix.", "This_comment_has_been_removed_by_Kickstarter": "Ce commentaire a été supprimé par Kickstarter.", "This_comment_is_under_review": "Ce commentaire est en cours de vérification.", - "This_comment_is_under_review_for_potentially_violating": "This comment is under review for potentially violating", "This_comment_is_under_review_for_potentially_violating_kickstarters_community_guidelines": "Ce commentaire est en cours d'examen pour manquement possible aux Règles de bonne conduite de Kickstarter.", "This_facebook_account_is_already_linked_to_another_Kickstarter_user": "Ce compte Facebook est déjà relié à un autre utilisateur Kickstarter.", "This_holiday_season_support_a_project_for_no_reward": "Pour les fêtes, soutenez un projet simplement parce qu'il vous parle, sans choisir de récompense.", @@ -8120,6 +8136,7 @@ "Visit_our_Environmental_Resources_Center": "Rendez-vous dans notre Centre de ressources pour l'environnement", "Visit_our_Environmental_Resources_Center_Alternative": "Consultez notre Centre de ressources pour l'environnement", "Watch_live": "Regarder en direct", + "We_can_no_longer_log_you_in_through_Facebook": "La connexion Facebook est désormais impossible. Veuillez vous connecter avec votre mot de passe Kickstarter, ou créer un autre mot de passe pour votre adresse Facebook.", "We_cant_process_your_pledge": "Impossible de traiter votre engagement.", "We_cant_process_your_pledge_for": "Impossible de traiter votre engagement pour :", "We_cant_process_this_pledge_because_of_a_problem_with_the_backers_payment_method": "Impossible de traiter cet engagement en raison d'un problème survenu au niveau du moyen de paiement du contributeur.", @@ -8139,10 +8156,12 @@ "We_use_your_activity_internally_to_make_recommendations_for_you": "À l'interne, nous nous servons de vos activités pour vous faire des recommandations. Si vous ne souhaitez pas participer, nous vous invitons à désactiver vos recommandations.", "We_were_unable_to_connect_to_the_live_stream_chat": "Connexion au chat en direct impossible.", "We_were_unable_to_load_the_shipping_destinations": "Nous n'avons pas été en mesure de charger les destinations d'expédition.\nVeuillez réessayer ultérieurement.", + "We_will_be_discontinuing_the_ability_to_log_in_via_FB": "La fonctionnalité de connexion avec Facebook va être éliminée. Pour vous connecter à votre compte avec l'adresse %{email}, veuillez créer un mot de passe qui contient au moins 6 caractères.", "We_wont_share_this_with_the_creator": "Le créateur ne verra pas votre réponse.", "We_ve_been_unable_to_send_email": "Échec de l'envoi. Veuillez vérifier l'orthographe de votre adresse e-mail.", "We_re_processing_this_pledge_pull_to_refresh": "Cet engagement est en cours de traitement, veuillez tirer sur la page pour actualiser.", "We_re_processing_your_pledge_pull_to_refresh": "Votre engagement est en cours de traitement, veuillez tirer sur la page pour actualiser.", + "We_re_simplifying_our_login_process_To_log_in": "Notre procédure de connexion est en cours de simplification. Pour accéder à votre compte Kickstarter, saisissez l'adresse e-mail associée à votre compte Facebook et nous vous enverrons un lien de réinitialisation.", "When_following_is_on_you_can_follow_the_acticity_of_others": "Lorsque les fonctionnalités de suivi sont activées, vous pouvez vous abonner aux activités des autres, qui pourront à leur tour s'abonner aux vôtres. Pour supprimer définitivement ces données, il vous suffit de désactiver les fonctionnalités de suivi.", "When_you_save_a_project_we_ll_send_you_a_reminder": "Pour chaque projet que vous enregistrez, nous vous enverrons un rappel 48 heures avant la fin de sa campagne.", "Which_categories_interest_you": "Quelles sont les catégories qui vous intéressent ?", @@ -8772,6 +8791,7 @@ "ok": "OK" }, "we_sent_an_email_to_email_address_with_instructions_to_reset_your_password": "Nous avons envoyé un e-mail à %{email} contenant les instructions nécessaires pour réinitialiser votre mot de passe.", + "we_sent_an_email_to_email_address_with_instructions_to_set_your_password": "Nous avons envoyé un e-mail à %{email} contenant les instructions nécessaires pour définir votre mot de passe.", "error": "Désolé, nous ne connaissons pas cette adresse e-mail. Réessayer ?", "placeholder_email": "Adresse e-mail" }, @@ -10109,7 +10129,6 @@ "Kickstarter_is_not_a_store_Its_a_way_to_bring_creative_projects_to_life_Learn_more_about_accountability": "Kickstarter is not a store. It's a way to bring creative projects to life.
Learn more about accountability", "Kickstarter_Music": "Kickstarter Music", "Kickstarter_on_Film": "Kickstarter on Film", - "Kickstarters_community_guidelines": "Kickstarter’s Community Guidelines.", "Know_when_creators_and_backers_message_you": "Know when creators and backers message you by enabling notifications.", "Learn_more_about_accountability": "Learn more about accountability", "Learn_more_about_comment_guidelines": "Learn more about comment guidelines", @@ -10341,6 +10360,7 @@ "Request_my_personal_data": "Request my personal data", "Resend_email": "Resend email", "Resend_verification_email": "Re-send verification email", + "Reset_your_password": "Reset your password", "Retry": "Retry", "Retry_or_select_another_method": "Retry or select another method.", "Reusability_and_recyclability": "Reusability and recyclability", @@ -10405,6 +10425,8 @@ "Selected_reward": "Selected reward", "Send": "Send", "Send_verfication_email": "Send verification email", + "Set_new_password": "Set new password", + "Set_your_password": "Set your password", "Share": "Share", "Share_an_update_about_your_project": "Share an update about your project…", "Share_this_live_stream": "Share this live stream.", @@ -10486,7 +10508,6 @@ "This_allows_you_to_see_project_goal_and_pledge_amounts_in_your_preferred_currency": "This allows you to see project goal and pledge amounts in your preferred currency.", "This_comment_has_been_removed_by_Kickstarter": "This comment has been removed by Kickstarter.", "This_comment_is_under_review": "This comment is under review.", - "This_comment_is_under_review_for_potentially_violating": "This comment is under review for potentially violating", "This_comment_is_under_review_for_potentially_violating_kickstarters_community_guidelines": "This comment is under review for potentially violating Kickstarter’s Community Guidelines.", "This_facebook_account_is_already_linked_to_another_Kickstarter_user": "This Facebook account is already linked to another Kickstarter user.", "This_holiday_season_support_a_project_for_no_reward": "This holiday season, support a project for no reward, just because it speaks to you.", @@ -10557,6 +10578,7 @@ "Visit_our_Environmental_Resources_Center": "Visit our Environmental Resources Center", "Visit_our_Environmental_Resources_Center_Alternative": "Visit our Environmental Resources Center", "Watch_live": "Watch live", + "We_can_no_longer_log_you_in_through_Facebook": "We can no longer log you in through Facebook. Please log in with your Kickstarter password, or set a new password with your Facebook email.", "We_cant_process_your_pledge": "We can't process your pledge.", "We_cant_process_your_pledge_for": "We can't process your pledge for:", "We_cant_process_this_pledge_because_of_a_problem_with_the_backers_payment_method": "We can’t process this pledge because of a problem with the backer’s payment method.", @@ -10576,10 +10598,12 @@ "We_use_your_activity_internally_to_make_recommendations_for_you": "We use your activity internally to make recommendations for you. Turn recommendations off to opt out of this.", "We_were_unable_to_connect_to_the_live_stream_chat": "We were unable to connect to the live stream chat.", "We_were_unable_to_load_the_shipping_destinations": "We were unable to load the shipping destinations.\nPlease try again later.", + "We_will_be_discontinuing_the_ability_to_log_in_via_FB": "We will be discontinuing the ability to log in via Facebook. To log in to your account using the email %{email}, please set a password that’s at least 6 characters long.", "We_wont_share_this_with_the_creator": "We won’t share this with the creator.", "We_ve_been_unable_to_send_email": "We've been unable to send email to this address. Please make sure it is typed correctly.", "We_re_processing_this_pledge_pull_to_refresh": "We're processing this pledge—pull to refresh.", "We_re_processing_your_pledge_pull_to_refresh": "We're processing your pledge—pull to refresh.", + "We_re_simplifying_our_login_process_To_log_in": "We’re simplifying our login process. To access your Kickstarter account, enter the email associated to your Facebook account and we’ll send you a link to set a password", "When_following_is_on_you_can_follow_the_acticity_of_others": "When following is on, you can follow the activity of others and others can follow your activity. Turn following off to permanently delete this data.", "When_you_save_a_project_we_ll_send_you_a_reminder": "When you save a project we’ll send you a reminder 48 hours before it ends", "Which_categories_interest_you": "Which categories interest you?", @@ -11209,6 +11233,7 @@ "ok": "OK" }, "we_sent_an_email_to_email_address_with_instructions_to_reset_your_password": "We’ve sent an email to %{email} with instructions to reset your password.", + "we_sent_an_email_to_email_address_with_instructions_to_set_your_password": "We’ve sent an email to %{email} with instructions to set your password.", "error": "Sorry, we don’t know that email address. Try again?", "placeholder_email": "Email address" }, @@ -12546,7 +12571,6 @@ "Kickstarter_is_not_a_store_Its_a_way_to_bring_creative_projects_to_life_Learn_more_about_accountability": "Kickstarter は普通のお店とは全く違います。クリエイティブなプロジェクトに生命を吹き込む場です。
アカウンタビリティについて詳しくみる。", "Kickstarter_Music": "Kickstarter Music", "Kickstarter_on_Film": "Kickstarter on Film", - "Kickstarters_community_guidelines": "Kickstarter’s Community Guidelines.", "Know_when_creators_and_backers_message_you": "クリエイターやバッカ―からメッセージが届いた場合にすぐ分かるように、通知機能を有効にしましょう。", "Learn_more_about_accountability": "報告義務に関してさらに詳しく", "Learn_more_about_comment_guidelines": "コメントのガイドラインについてもっと詳しく", @@ -12778,6 +12802,7 @@ "Request_my_personal_data": "自分の個人データをリクエストする", "Resend_email": "メールを再送", "Resend_verification_email": "認証メールをもう一度送信", + "Reset_your_password": "パスワードをリセット", "Retry": "もう一度試す", "Retry_or_select_another_method": "再試行するか別のお支払い方法を選択してください。", "Reusability_and_recyclability": "再利用可能性とリサイクル可能性", @@ -12842,6 +12867,8 @@ "Selected_reward": "選択したリワード", "Send": "送信", "Send_verfication_email": "認証メールを送信する", + "Set_new_password": "新しいパスワードを設定", + "Set_your_password": "パスワードを設定", "Share": "シェア", "Share_an_update_about_your_project": "アップデートをシェアしよう", "Share_this_live_stream": "ライブ配信をシェアする", @@ -12923,7 +12950,6 @@ "This_allows_you_to_see_project_goal_and_pledge_amounts_in_your_preferred_currency": "これにより、プロジェクトのファンディングゴールとプレッジ金額をご希望の通貨で表示することができます。", "This_comment_has_been_removed_by_Kickstarter": "このコメントは Kickstarter によって削除されました。", "This_comment_is_under_review": "このコメントは現在審査中です。", - "This_comment_is_under_review_for_potentially_violating": "This comment is under review for potentially violating", "This_comment_is_under_review_for_potentially_violating_kickstarters_community_guidelines": "このコメントは Kickstarter のコミュニティガイドラインに違反している可能性があるとして現在審査中です。", "This_facebook_account_is_already_linked_to_another_Kickstarter_user": "このFacebookアカウントはすでに他のKickstarterユーザーとつながっています", "This_holiday_season_support_a_project_for_no_reward": "このホリデーシーズンはぜひ、リワード無しでも「支援したい！」と思わせてくれるような、あなたの心に訴えかけるプロジェクトをサポートしてみませんか？", @@ -12994,6 +13020,7 @@ "Visit_our_Environmental_Resources_Center": "Kickstarter の環境リソースセンターにアクセス", "Visit_our_Environmental_Resources_Center_Alternative": "Kickstarter の環境リソースセンターにアクセス", "Watch_live": "ライブをみる", + "We_can_no_longer_log_you_in_through_Facebook": "Facebook を介したログインはできなくなりました。Kickstarter のパスワードを使ってログインするか、Facebook のメールアドレスを使って新しいパスワードを設定してください。", "We_cant_process_your_pledge": "プレッジを処理することができません。", "We_cant_process_your_pledge_for": "以下のプレッジを処理することが出来ません:", "We_cant_process_this_pledge_because_of_a_problem_with_the_backers_payment_method": "バッカーのお支払い方法で問題があったためこのプレッジを処理することができません。", @@ -13013,10 +13040,12 @@ "We_use_your_activity_internally_to_make_recommendations_for_you": "あなたのアクティビティをもとにおすすめの提供を行っています。オプトアウトするにはおすすめ機能をオフにしてください。", "We_were_unable_to_connect_to_the_live_stream_chat": "ライブ配信への接続に失敗。", "We_were_unable_to_load_the_shipping_destinations": "配送先の読込に失敗。\n再度お試しください。", + "We_will_be_discontinuing_the_ability_to_log_in_via_FB": "Facebook 経由でのログイン機能の提供がまもなく終了します。メールアドレス %{email} を使ってアカウントにログインするには、6 文字以上のパスワードを設定してください。", "We_wont_share_this_with_the_creator": "これはクリエイターには共有されません。", "We_ve_been_unable_to_send_email": "このアドレスにメールを送信できませんでした。メールアドレスが正確に入力されていることをご確認ください。", "We_re_processing_this_pledge_pull_to_refresh": "このプレッジを処理中です。リフレッシュするにはプルしてください。", "We_re_processing_your_pledge_pull_to_refresh": "プレッジを処理中です。リフレッシュするにはプルしてください。", + "We_re_simplifying_our_login_process_To_log_in": "Kickstarter ではログインの手続きが簡素化されます。Kickstarter アカウントにアクセスするには、Facebook アカウントに登録されているメールアドレスを入力してください。パスワードを設定するためのリンクをお送りします。", "When_following_is_on_you_can_follow_the_acticity_of_others": "フォローがオンになっていると、他の人のアクティビティをフォローすることができ、また、他の人もあなたのアクティビティをフォローすることができます。このようなデータを永久に削除するためにはフォローをオフにしてください。", "When_you_save_a_project_we_ll_send_you_a_reminder": "プロジェクトを保存し、終了の48時間前にリマインドする。", "Which_categories_interest_you": "興味のあるカテゴリーは？", @@ -13646,6 +13675,7 @@ "ok": "OK" }, "we_sent_an_email_to_email_address_with_instructions_to_reset_your_password": "%{email} にメールを送信しました。パスワードのリセット法が書かれています。", + "we_sent_an_email_to_email_address_with_instructions_to_set_your_password": "パスワードの設定方法が記載されたメールを %{email} に送信しました。", "error": "登録されていないメールアドレスです。再度ご確認ください。", "placeholder_email": "メールアドレス" }, @@ -14983,7 +15013,6 @@ "Kickstarter_is_not_a_store_Its_a_way_to_bring_creative_projects_to_life_Learn_more_about_accountability": "Kickstarter is not a store. It's a way to bring creative projects to life.
Learn more about accountability", "Kickstarter_Music": "Kickstarter Music", "Kickstarter_on_Film": "Kickstarter on Film", - "Kickstarters_community_guidelines": "Kickstarter’s Community Guidelines.", "Know_when_creators_and_backers_message_you": "Know when creators and backers message you by enabling notifications.", "Learn_more_about_accountability": "Learn more about accountability", "Learn_more_about_comment_guidelines": "Learn more about comment guidelines", @@ -15215,6 +15244,7 @@ "Request_my_personal_data": "Request my personal data", "Resend_email": "Resend email", "Resend_verification_email": "Re-send verification email", + "Reset_your_password": "Reset your password", "Retry": "Retry", "Retry_or_select_another_method": "Retry or select another method.", "Reusability_and_recyclability": "Reusability and recyclability", @@ -15279,6 +15309,8 @@ "Selected_reward": "Selected reward", "Send": "Send", "Send_verfication_email": "Send verification email", + "Set_new_password": "Set new password", + "Set_your_password": "Set your password", "Share": "Share", "Share_an_update_about_your_project": "Share an update about your project…", "Share_this_live_stream": "Share this live stream.", @@ -15360,7 +15392,6 @@ "This_allows_you_to_see_project_goal_and_pledge_amounts_in_your_preferred_currency": "This allows you to see project goal and pledge amounts in your preferred currency.", "This_comment_has_been_removed_by_Kickstarter": "This comment has been removed by Kickstarter.", "This_comment_is_under_review": "This comment is under review.", - "This_comment_is_under_review_for_potentially_violating": "This comment is under review for potentially violating", "This_comment_is_under_review_for_potentially_violating_kickstarters_community_guidelines": "This comment is under review for potentially violating Kickstarter’s Community Guidelines.", "This_facebook_account_is_already_linked_to_another_Kickstarter_user": "This Facebook account is already linked to another Kickstarter user.", "This_holiday_season_support_a_project_for_no_reward": "This holiday season, support a project for no reward, just because it speaks to you.", @@ -15431,6 +15462,7 @@ "Visit_our_Environmental_Resources_Center": "Visit our Environmental Resources Center", "Visit_our_Environmental_Resources_Center_Alternative": "Visit our Environmental Resources Center", "Watch_live": "Watch live", + "We_can_no_longer_log_you_in_through_Facebook": "We can no longer log you in through Facebook. Please log in with your Kickstarter password, or set a new password with your Facebook email.", "We_cant_process_your_pledge": "We can't process your pledge.", "We_cant_process_your_pledge_for": "We can't process your pledge for:", "We_cant_process_this_pledge_because_of_a_problem_with_the_backers_payment_method": "We can’t process this pledge because of a problem with the backer’s payment method.", @@ -15450,10 +15482,12 @@ "We_use_your_activity_internally_to_make_recommendations_for_you": "We use your activity internally to make recommendations for you. Turn recommendations off to opt out of this.", "We_were_unable_to_connect_to_the_live_stream_chat": "We were unable to connect to the live stream chat.", "We_were_unable_to_load_the_shipping_destinations": "We were unable to load the shipping destinations.\nPlease try again later.", + "We_will_be_discontinuing_the_ability_to_log_in_via_FB": "We will be discontinuing the ability to log in via Facebook. To log in to your account using the email %{email}, please set a password that’s at least 6 characters long.", "We_wont_share_this_with_the_creator": "We won’t share this with the creator.", "We_ve_been_unable_to_send_email": "We've been unable to send email to this address. Please make sure it is typed correctly.", "We_re_processing_this_pledge_pull_to_refresh": "We're processing this pledge—pull to refresh.", "We_re_processing_your_pledge_pull_to_refresh": "We're processing your pledge—pull to refresh.", + "We_re_simplifying_our_login_process_To_log_in": "We’re simplifying our login process. To access your Kickstarter account, enter the email associated to your Facebook account and we’ll send you a link to set a password", "When_following_is_on_you_can_follow_the_acticity_of_others": "When following is on, you can follow the activity of others and others can follow your activity. Turn following off to permanently delete this data.", "When_you_save_a_project_we_ll_send_you_a_reminder": "When you save a project we’ll send you a reminder 48 hours before it ends", "Which_categories_interest_you": "Which categories interest you?", @@ -16083,6 +16117,7 @@ "ok": "OK" }, "we_sent_an_email_to_email_address_with_instructions_to_reset_your_password": "We’ve sent an email to %{email} with instructions to reset your password.", + "we_sent_an_email_to_email_address_with_instructions_to_set_your_password": "We’ve sent an email to %{email} with instructions to set your password.", "error": "Sorry, we don’t know that email address. Try again?", "placeholder_email": "Email address" }, @@ -17807,6 +17842,6 @@ ] } }, - "country_code": "US", + "country_code": "EG", "locale": "en" } \ No newline at end of file diff --git a/app/src/main/java/com/kickstarter/ui/activities/LoginActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/LoginActivity.kt index 02335b56f8..3c0a77845a 100644 --- a/app/src/main/java/com/kickstarter/ui/activities/LoginActivity.kt +++ b/app/src/main/java/com/kickstarter/ui/activities/LoginActivity.kt @@ -16,6 +16,7 @@ import com.kickstarter.libs.utils.TransitionUtils.slideInFromLeft import com.kickstarter.libs.utils.ViewUtils import com.kickstarter.libs.utils.extensions.getResetPasswordIntent import com.kickstarter.ui.IntentKey +import com.kickstarter.ui.data.LoginReason import com.kickstarter.ui.extensions.hideKeyboard import com.kickstarter.ui.extensions.onChange import com.kickstarter.ui.extensions.showSnackbar @@ -31,6 +32,7 @@ class LoginActivity : BaseActivity() { private val forgotPasswordString = R.string.login_buttons_forgot_password_html private val forgotPasswordSentEmailString = R.string.forgot_password_we_sent_an_email_to_email_address_with_instructions_to_reset_your_password + private val resetPasswordSentEmailString = R.string.forgot_password_we_sent_an_email_to_email_address_with_instructions_to_set_your_password private val loginDoesNotMatchString = R.string.login_errors_does_not_match private val unableToLoginString = R.string.login_errors_unable_to_log_in private val loginString = R.string.login_buttons_log_in @@ -90,9 +92,9 @@ class LoginActivity : BaseActivity() { val show = showAndEmail.first val email = showAndEmail.second if (show) { - resetPasswordSuccessDialog(email).show() + resetPasswordSuccessDialog(email.first, showAndEmail.second.second).show() } else { - resetPasswordSuccessDialog(email).dismiss() + resetPasswordSuccessDialog(email.first, showAndEmail.second.second).dismiss() } } @@ -114,9 +116,14 @@ class LoginActivity : BaseActivity() { /** * Lazily creates a reset password success confirmation dialog and stores it in an instance variable. */ - private fun resetPasswordSuccessDialog(email: String): ConfirmDialog { + private fun resetPasswordSuccessDialog(email: String, loginReason: LoginReason): ConfirmDialog { if (this.confirmResetPasswordSuccessDialog == null) { - val message = this.ksString.format(getString(this.forgotPasswordSentEmailString), "email", email) + val message = if (loginReason == LoginReason.RESET_FACEBOOK_PASSWORD) { + this.ksString.format(getString(this.resetPasswordSentEmailString), "email", email) + } else { + this.ksString.format(getString(this.resetPasswordSentEmailString), "email", email) + } + this.confirmResetPasswordSuccessDialog = ConfirmDialog(this, null, message) this.confirmResetPasswordSuccessDialog!! diff --git a/app/src/main/java/com/kickstarter/ui/activities/LoginToutActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/LoginToutActivity.kt index 0dcc563317..fd7cb69938 100644 --- a/app/src/main/java/com/kickstarter/ui/activities/LoginToutActivity.kt +++ b/app/src/main/java/com/kickstarter/ui/activities/LoginToutActivity.kt @@ -90,8 +90,8 @@ class LoginToutActivity : BaseActivity() { .observeOn(AndroidSchedulers.mainThread()) .subscribe { this.showAlertDialog( - message = getString(R.string.FPO_we_can_no_longer_log_you_in_through_Facebook), - positiveActionTitle = getString(R.string.FPO_Set_new_password), + message = getString(R.string.We_can_no_longer_log_you_in_through_Facebook), + positiveActionTitle = getString(R.string.Set_new_password), negativeActionTitle = getString(R.string.accessibility_discovery_buttons_log_in), isCancelable = false, positiveAction = { diff --git a/app/src/main/java/com/kickstarter/ui/activities/ResetPasswordActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/ResetPasswordActivity.kt index 4264ff8a10..c499a4a6fc 100644 --- a/app/src/main/java/com/kickstarter/ui/activities/ResetPasswordActivity.kt +++ b/app/src/main/java/com/kickstarter/ui/activities/ResetPasswordActivity.kt @@ -99,7 +99,7 @@ class ResetPasswordActivity : BaseActivity() { private fun navigateToLoginActivity() { setFormEnabled(false) - val intent = Intent().getLoginActivityIntent(this, binding.resetPasswordFormView.email.text(), LoginReason.RESET_PASSWORD) + val intent = Intent().getLoginActivityIntent(this, binding.resetPasswordFormView.email.text(), LoginReason.RESET_FACEBOOK_PASSWORD) startActivityWithTransition(intent, R.anim.fade_in_slide_in_left, R.anim.slide_out_right) finish() } diff --git a/app/src/main/java/com/kickstarter/ui/activities/SetPasswordActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/SetPasswordActivity.kt index aa57042975..9c457efe4d 100644 --- a/app/src/main/java/com/kickstarter/ui/activities/SetPasswordActivity.kt +++ b/app/src/main/java/com/kickstarter/ui/activities/SetPasswordActivity.kt @@ -24,7 +24,7 @@ class SetPasswordActivity : BaseActivity() { setContentView(binding.root) setSupportActionBar(binding.resetPasswordToolbar.loginToolbar) - binding.resetPasswordToolbar.loginToolbar.setTitle(getString(R.string.FPO_Set_your_password)) + binding.resetPasswordToolbar.loginToolbar.setTitle(getString(R.string.Set_your_password)) binding.resetPasswordToolbar.backButton.isGone = true binding.newPassword.onChange { this.viewModel.inputs.newPassword(it) } binding.confirmPassword.onChange { this.viewModel.inputs.confirmPassword(it) } @@ -44,7 +44,7 @@ class SetPasswordActivity : BaseActivity() { .compose(bindToLifecycle()) .compose(Transformers.observeForUI()) .subscribe { - binding.setPasswordHint.text = getString(R.string.FPO_We_will_be_discontinuing_the_ability_to_log_in_via_Facebook, it) + binding.setPasswordHint.text = this.environment().ksString()?.format(getString(R.string.We_will_be_discontinuing_the_ability_to_log_in_via_FB), "email", it) } this.viewModel.outputs.passwordWarning() diff --git a/app/src/main/java/com/kickstarter/ui/data/LoginReason.kt b/app/src/main/java/com/kickstarter/ui/data/LoginReason.kt index 5cf97d78c9..c22aa02274 100644 --- a/app/src/main/java/com/kickstarter/ui/data/LoginReason.kt +++ b/app/src/main/java/com/kickstarter/ui/data/LoginReason.kt @@ -9,6 +9,7 @@ enum class LoginReason { BACK_PROJECT, MESSAGE_CREATOR, RESET_PASSWORD, + RESET_FACEBOOK_PASSWORD, STAR_PROJECT; val isDefaultFlow: Boolean diff --git a/app/src/main/java/com/kickstarter/ui/data/ResetPasswordScreenState.kt b/app/src/main/java/com/kickstarter/ui/data/ResetPasswordScreenState.kt index 9288e4490c..bedad4b9c2 100644 --- a/app/src/main/java/com/kickstarter/ui/data/ResetPasswordScreenState.kt +++ b/app/src/main/java/com/kickstarter/ui/data/ResetPasswordScreenState.kt @@ -8,8 +8,8 @@ enum class ResetPasswordScreenState( @StringRes val hint: Int? ) { ResetPassword( - title = R.string.FPO_reset_your_password, - hint = R.string.FPO_we_re_simplifying_our_login_process_To_log_in + title = R.string.Reset_your_password, + hint = R.string.We_re_simplifying_our_login_process_To_log_in ), ForgetPassword( title = R.string.forgot_password_title, diff --git a/app/src/main/java/com/kickstarter/viewmodels/LoginViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/LoginViewModel.kt index 2873f979c8..6af0544d2a 100644 --- a/app/src/main/java/com/kickstarter/viewmodels/LoginViewModel.kt +++ b/app/src/main/java/com/kickstarter/viewmodels/LoginViewModel.kt @@ -61,7 +61,7 @@ interface LoginViewModel { fun showCreatedPasswordSnackbar(): Observable /** Emits a boolean to determine whether reset password dialog should be shown. */ - fun showResetPasswordSuccessDialog(): Observable> + fun showResetPasswordSuccessDialog(): Observable>> /** Start two factor activity for result. */ fun tfaChallenge(): Observable @@ -81,7 +81,7 @@ interface LoginViewModel { private val prefillEmail = BehaviorSubject.create() private val showChangedPasswordSnackbar = BehaviorSubject.create() private val showCreatedPasswordSnackbar = BehaviorSubject.create() - private val showResetPasswordSuccessDialog = BehaviorSubject.create>() + private val showResetPasswordSuccessDialog = BehaviorSubject.create>>() private val tfaChallenge: Observable private val loginError = PublishSubject.create() @@ -144,8 +144,12 @@ interface LoginViewModel { emailAndReason .filter { it.second == LoginReason.RESET_PASSWORD } - .map { it.first } - .ofType(String::class.java) + .map { e -> Pair.create(true, e) } + .compose(bindToLifecycle()) + .subscribe(this.showResetPasswordSuccessDialog) + + emailAndReason + .filter { it.second == LoginReason.RESET_FACEBOOK_PASSWORD } .map { e -> Pair.create(true, e) } .compose(bindToLifecycle()) .subscribe(this.showResetPasswordSuccessDialog) @@ -169,7 +173,7 @@ interface LoginViewModel { this.resetPasswordConfirmationDialogDismissed .map { it.negate() } .compose>>(combineLatestPair(emailAndReason)) - .map { Pair.create(it.first, it.second.first) } + .map { Pair.create(it.first, it.second) } .compose(bindToLifecycle()) .subscribe(this.showResetPasswordSuccessDialog) @@ -256,7 +260,7 @@ interface LoginViewModel { override fun showCreatedPasswordSnackbar(): Observable = this.showCreatedPasswordSnackbar - override fun showResetPasswordSuccessDialog(): BehaviorSubject> = this.showResetPasswordSuccessDialog + override fun showResetPasswordSuccessDialog(): BehaviorSubject>> = this.showResetPasswordSuccessDialog override fun tfaChallenge() = this.tfaChallenge } diff --git a/app/src/main/res/layout/activity_set_password.xml b/app/src/main/res/layout/activity_set_password.xml index e6f19645ba..f59053e62a 100644 --- a/app/src/main/res/layout/activity_set_password.xml +++ b/app/src/main/res/layout/activity_set_password.xml @@ -25,24 +25,11 @@ android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:text="@string/FPO_We_will_be_discontinuing_the_ability_to_log_in_via_Facebook" + android:text="@string/We_will_be_discontinuing_the_ability_to_log_in_via_FB" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/reset_password_toolbar" /> - - + app:layout_constraintTop_toBottomOf="@+id/set_password_hint"> Projekt unterstützen Folgendes Projekt unterstützen Von Freunden unterstützt - Unterstützt von deinen Freunden + Unterstützt von Personen, denen du folgst Unterstützte Projekte: %{project_count} Hat dieses Projekt unterstützt. %{backers_count}\n @@ -254,9 +254,9 @@ Antippen und erneut versuchen Folge noch mehr Freunden Folge deinen Freunden und wir werden dich benachrichtigen, sobald sie ein Projekt unterstützen oder veröffentlichen. Folge deinen Facebook-Freunden - wir halten dich auf dem Laufenden, wenn sie ein Projekt unterstützen oder veröffentlichen. - Abonniert - Abonniert - Die Funktion "Abonnieren" muss aktiviert sein, um Freunde auf Facebook zu finden. Gehe dazu zu Einstellungen > Datenschutz. + Gefolgt + Gefolgt + Die Funktion „Folgen“ muss aktiviert sein, um Freunde auf Facebook zu finden. Gehe dazu zu Einstellungen > Datenschutz. Mehr Info zu Folgen %{friend_name} folgen. Häufige Fragen @@ -334,7 +334,6 @@ Antippen und erneut versuchen Kickstarter ist kein Geschäft, sondern eine Plattform, um kreative Projekte zu verwirklichen. Kickstarter ist kein Geschäft, sondern eine Plattform, um kreative Projekte zu verwirklichen. <br/><a href="%{trust_link}">Hier findest du mehr Info zur Rechenschftspflicht</a> Kickstarter on Film - die Community-Richtlinien von Kickstarter. Aktiviere Benachrichtigungen, damit du über eingehende Nachrichten von Projektgründern und Unterstützern Bescheid weißt. Näheres zur Rechenschaftspflicht auf Kickstarter Weitere Informationen zur Rechenschaftspflicht @@ -404,7 +403,7 @@ Antippen und erneut versuchen Keine ungelesenen Nachrichten Nicht verfügbar Nicht verschickt - Nicht abonniert + Nicht gefolgt Nicht jetzt %{notification}, Benachrichtigung per E-Mail, Aus %{notification}, Benachrichtigung per E-Mail, An @@ -511,6 +510,7 @@ Antippen und erneut versuchen Meine persönlichen Daten anfordern Erneut senden Verifizierungs-E-Mail erneut senden + Passwort zurücksetzen Erneut versuchen Versuche es erneut oder wähle eine andere Karte. Wiederverwertung und Recyclingfähigkeit @@ -567,6 +567,8 @@ Antippen und erneut versuchen Gewählte Belohnung Senden Verifizeirungs-E-Mail senden + Neues Passwort festlegen + Passwort festlegen Teilen Teile einen Update zu deinem Projekt … Live-Stream teilen. @@ -646,7 +648,6 @@ Antippen und erneut versuchen Hier kannst du das Finanzierungsziel und die Finanzierungsbeiträge in deiner bevorzugten Währung ansehen. Dieser Kommentar wurde von Kickstarter entfernt. Dieser Kommentar wird gerade überprüft. - Dieser Kommentar wird gerade geprüft, weil er möglicherweise gegen Folgendes verstößt: Dieser Kommentar wird gerade geprüft, weil er möglicherweise gegen die <a href="%{community_guidelines}">Community-Richtlinien von Kickstarter</a> verstößt. Dieses Facebook-Konto ist bereits einem anderen Kickstarter-Nutzer zugeordnet. Weihnachten steht kurz vor der Tür - unterstütze ein Projekt ohne Belohnung. Einfach, weil es dich anspricht. @@ -705,6 +706,7 @@ Antippen und erneut versuchen Ressourcen für den Umweltschutz <a href="%{environment_link}">Ressourcen für den Umweltschutz</a> Live ansehen + Wir können dich nicht mehr über Facebook anmelden. Bitte melde dich mit deinem Kickstarter-Passwort an oder leg für deine Facebook-E-Mail-Adresse ein neues Passwort fest. Dieser Finanzierungsbeitrag konnte aufgrund eines Problems mit der Zahlungsmethode des Unterstützers nicht bearbeitet werden. Wir können deine Zahlung leider nicht bearbeiten. Dein Finanzierungsbeitrag kann nicht bearbeitet werden. Bitte aktualisiere deine Zahlungsmethode. @@ -716,12 +718,14 @@ Antippen und erneut versuchen Es ist nicht gestattet, innerhalb der letzten 24 Stunden vor Beendigung eines Projekts einen Finanzierungsbeitrag zurückzuziehen, wenn dadurch das Finanzierungsziel nicht mehr erreicht werden würde. Der Finanzierungsbeitrag wird derzeit bearbeitet — zur Aktualisierung nach unten ziehen. Dein Finanzierungsbeitrag wird derzeit bearbeitet — zur Aktualisierung nach unten ziehen. + Wir vereinfachen unseren Anmeldeprozess. Wenn du auf dein Kickstarter-Konto zugreifen möchtest, gib die E-Mail-Adresse ein, die mit deinem Facebook-Konto verknüpft ist. Wir senden dir dann einen Link, über den du ein Passwort festlegen kannst Wir denken, diese Projekte könnten dir auch gefallen Deine Aktivitäten werden intern genutzt, um dir Empfehlungen zu unterbreiten. Um dies zu deaktivieren, wähle "Empfehlungen" einfach ab. Wir konnten keine E-Mails an diese Adresse senden. Bitte prüfe, ob sie richtig eingegeben wurde. Es konnte leider keine Verbindung zum Chat des Live-Streams hergestellt werden. Das Laden der Versandadressen war leider nicht möglich.\n Bitte versuche es später noch einmal. + Wir werden die Anmeldung über Facebook einstellen. Um dich mit der E-Mail-Adresse %{email} in deinem Konto anzumelden, leg bitte ein Passwort fest, das mindestens 6 Zeichen lang ist. Diese Information wird nicht mit dem Projektgründer geteilt. Webseiten Willkommen in unserer Bibliothek. Viel Spaß beim Stöbern. @@ -729,7 +733,7 @@ Bitte versuche es später noch einmal. Wir helfen dir dabei, Projekte nach deinem Geschmack zu finden. Wir importieren deinen Namen und dein Profilfoto und können auf die Liste deiner Freunde zugreifen. Wir werden jedoch niemals etwas ohne deine Zustimmung posten. Wir werden dir 48 Stunden vor Ablauf dieses Projekts eine Benachrichtigung senden, sowie für alle Projekte, die du in Zukunft speicherst. Um alle gespeicherten Projekte anzusehen, gehe bitte zu deiner Profilseite. - Wenn die Funktion Folgen gewählt wurde, kannst du die Aktivitäten von anderen einsehen und diese sehen deine Aktivitäten. Wenn die Funktion abgewählt wurde, werden diese Daten endgültig gelöscht. + Wenn die Funktion Folgen aktiviert wurde, kannst du die Aktivitäten von anderen einsehen und diese sehen deine Aktivitäten. Wenn die Funktion deaktiviert wurde, werden diese Daten endgültig gelöscht. Wenn du ein Projekt speicherst, senden wir dir 48 Stunden vor Ablauf eine Erinnerungs-E-Mail Welche Kategorien interessieren dich? Working on it @@ -838,7 +842,7 @@ Bitte versuche es später noch einmal. Projekte entdecken Wenn du ein Projekt unterstützt oder einem Freund folgst, werden diese Aktivitäten hier angezeigt. Noch keine Aktivitäten - Ihm/ihr auch folgen? + Auch folgen? %{friend_name} hat ein Kunst-Projekt unterstützt. %{friend_name} hat ein Comics-Projekt unterstützt. %{friend_name} hat ein Kunsthandwerk-Projekt unterstützt. @@ -856,7 +860,7 @@ Bitte versuche es später noch einmal. %{friend_name} hat ein Technologie-Projekt unterstützt. %{friend_name} hat ein Theater-Projekt unterstützt. Folgen - Abonniert + Gefolgt folgt dir! Finanzierung abgebrochen. Aktivität @@ -1329,6 +1333,7 @@ Bitte versuche es später noch einmal. E-Mail-Adresse Passwort vergessen? Wir haben eine E-Mail mit einer Anleitung zum Zurücksetzen deines Passworts an %{email} geschickt. + Wir haben eine E-Mail mit einer Anleitung zum Festlegen deines Passworts an %{email} geschickt. Kickstarter OK %{backer_count} Unterstützer @@ -1739,7 +1744,7 @@ gespeichert Keine Internetverbindung. Versuche es später noch einmal. Schau dir diese Projekte an! Folgen - Abonniert + Gefolgt %{backed_count} unterstützt %{backed_count} unterstützt 1 unterstützt diff --git a/app/src/main/res/values-es/strings_i18n.xml b/app/src/main/res/values-es/strings_i18n.xml index f087b23d30..a1c799366a 100644 --- a/app/src/main/res/values-es/strings_i18n.xml +++ b/app/src/main/res/values-es/strings_i18n.xml @@ -335,7 +335,6 @@ Toca para intentar de nuevo. Kickstarter no es una tienda. Es una forma de dar vida a proyectos creativos. Kickstarter no es una tienda. Es una forma de dar vida a proyectos creativos.<br/><a href="%{trust_link}">Más información sobre las responsabilidades</a> Kickstarter on Film - Kickstarter’s Community Guidelines. Entérate cuando los creadores y patrocinadores te envíen mensajes habilitando las notificaciones. Más información sobre el concepto de responsabilidad en Kickstarter Más información sobre las responsabilidades @@ -512,6 +511,7 @@ Toca para intentar de nuevo. Solicitar mis datos personales Reenviar correo Volver a enviar correo electrónico de verificación + Restablece tu contraseña Volver a intentar Vuelve a intentarlo o selecciona otro método. Reutilización y reciclabilidad @@ -568,6 +568,8 @@ Toca para intentar de nuevo. Recompensa seleccionada Enviar Enviar correo de verificación + Configurar nueva contraseña + Configura tu contraseña Compartir Comparte una actualización de tu proyecto … Compartir este Live-Stream. @@ -647,7 +649,6 @@ Toca para intentar de nuevo. Esto te permite ver la meta del proyecto y los montos de las contribuciones en la moneda de tu preferencia. Este comentario ha sido eliminado por Kickstarter. Este comentario está en revisión. - This comment is under review for potentially violating Este comentario está en revisión por una posible infracción de las <a href="%{community_guidelines}">Reglas de la comunidad de Kickstarter.</a> Esta cuenta de Facebook ya está asociada a otro usuario de Kickstarter. Esta temporada de fiestas, apoya un proyecto sin recompensa, simplemente porque te resulta interesante. @@ -706,6 +707,7 @@ Toca para intentar de nuevo. Visita nuestro Centro de recursos medioambientales <a href="%{environment_link}">Visita nuestro Centro de recursos medioambientales</a> Ver en vivo + Ya no admitimos el inicio de sesión a través de Facebook. Inicia sesión con tu contraseña de Kickstarter o configura una nueva contraseña con tu correo electrónico de Facebook. No podemos procesar esta contribución por un problema con el método de pago del patrocinador. No podemos procesar tu contribución. No podemos procesar la contribución. Por favor actualiza tu método de pago. @@ -717,12 +719,14 @@ Toca para intentar de nuevo. No permitimos cancelaciones que ocasionen que un proyecto no alcance su meta en las últimas 24 horas. Estamos procesando la contribución, desliza para actualizar. Estamos procesando tu actualización, desliza para actualizar. + Simplificaremos el proceso de inicio de sesión. Para acceder a tu cuenta de Kickstarter, escribe el correo electrónico asociado a tu cuenta de Facebook y te enviaremos un enlace para configurar una contraseña. ¡Te van a encantar, también! Utilizamos tu actividad internamente para hacerte recomendaciones. Desactiva las recomendaciones si no quieres recibirlas. No pudimos enviar el correo electrónico a esta dirección. Asegúrate de que esté escrita correctamente. No se pudo conectar al chat de live stream. No se pudieron cargar los destinos de envío.\n Por favor inténtalo de nuevo más tarde. + Descontinuaremos la posibilidad de iniciar sesión a través de Facebook. Para acceder a tu cuenta con el correo electrónico %{email}, configura una contraseña que tenga al menos seis caracteres. No lo compartiremos con el creador. Sitios web Bienvenidos a nuestra biblioteca. Descubre montones de libros con nosotros. @@ -1330,6 +1334,7 @@ Por favor inténtalo de nuevo más tarde. Dirección de correo electrónico ¿Olvidaste tu contraseña? Hemos enviado un correo electrónico a %{email} con las instrucciones para restablecer tu contraseña. + Hemos enviado un correo electrónico a %{email} con las instrucciones para configurar tu contraseña. Kickstarter OK %{backer_count} patrocinadores diff --git a/app/src/main/res/values-fr/strings_i18n.xml b/app/src/main/res/values-fr/strings_i18n.xml index 272878f9a9..bc09b63214 100644 --- a/app/src/main/res/values-fr/strings_i18n.xml +++ b/app/src/main/res/values-fr/strings_i18n.xml @@ -334,7 +334,6 @@ Cliquez pour réessayer. Kickstarter n\'est pas un magasin, mais un moyen de faire vivre des projets créatifs. Kickstarter n\'est pas un magasin, mais un moyen de faire vivre des projets créatifs. </br><a href="%{trust_link}">En savoir plus sur la notion de responsabilité</a> Kickstarter on Film - Kickstarter’s Community Guidelines. Activez vos notifications pour savoir quand un créateur ou un contributeur vous envoie un message. En savoir plus sur la notion de responsabilité sur Kickstarter En savoir plus sur la responsabilité @@ -512,6 +511,7 @@ n\'ont rien soutenu. Demander mes données personnelles Renvoyer Renvoyer l\'e-mail de vérification + Réinitialiser votre mot de passe Réessayer Veuillez réessayer ou choisir un autre moyen de paiement. Recyclage et valorisation des déchets @@ -568,6 +568,8 @@ n\'ont rien soutenu. Récompense sélectionnée Envoyer Envoyer un e-mail de vérification + Création d\'un mot de passe + Veuillez créer un mot de passe Partager Parlez de votre projet dans une actu. Partager cette diffusion en direct. @@ -647,7 +649,6 @@ n\'ont rien soutenu. L\'objectif du projet et les montants des engagements s\'afficheront ainsi dans la devise de votre choix. Ce commentaire a été supprimé par Kickstarter. Ce commentaire est en cours de vérification. - This comment is under review for potentially violating Ce commentaire est en cours d\'examen pour manquement possible aux <a href="%{community_guidelines}">Règles de bonne conduite de Kickstarter.</a> Ce compte Facebook est déjà relié à un autre utilisateur Kickstarter. Pour les fêtes, soutenez un projet simplement parce qu\'il vous parle, sans choisir de récompense. @@ -706,6 +707,7 @@ n\'ont rien soutenu. Rendez-vous dans notre Centre de ressources pour l\'environnement <a href="%{environment_link}">Consultez notre Centre de ressources pour l\'environnement</a> Regarder en direct + La connexion Facebook est désormais impossible. Veuillez vous connecter avec votre mot de passe Kickstarter, ou créer un autre mot de passe pour votre adresse Facebook. Impossible de traiter cet engagement en raison d\'un problème survenu au niveau du moyen de paiement du contributeur. Impossible de traiter votre engagement. Impossible de traiter votre engagement. Veuillez mettre à jour votre moyen de paiement. @@ -717,12 +719,14 @@ n\'ont rien soutenu. Les annulations qui empêcheraient le créateur d\'atteindre son objectif de financement sont interdits dans les dernières 24 heures de la campagne. Cet engagement est en cours de traitement, veuillez tirer sur la page pour actualiser. Votre engagement est en cours de traitement, veuillez tirer sur la page pour actualiser. + Notre procédure de connexion est en cours de simplification. Pour accéder à votre compte Kickstarter, saisissez l\'adresse e-mail associée à votre compte Facebook et nous vous enverrons un lien de réinitialisation. D\'autres projets qui pourraient vous plaire À l\'interne, nous nous servons de vos activités pour vous faire des recommandations. Si vous ne souhaitez pas participer, nous vous invitons à désactiver vos recommandations. Échec de l\'envoi. Veuillez vérifier l\'orthographe de votre adresse e-mail. Connexion au chat en direct impossible. Nous n\'avons pas été en mesure de charger les destinations d\'expédition.\n Veuillez réessayer ultérieurement. + La fonctionnalité de connexion avec Facebook va être éliminée. Pour vous connecter à votre compte avec l\'adresse %{email}, veuillez créer un mot de passe qui contient au moins 6 caractères. Le créateur ne verra pas votre réponse. Sites Web Bienvenue dans notre bibliothèque. Flânons ensemble parmi ses rayons. @@ -1330,6 +1334,7 @@ Veuillez réessayer ultérieurement. Adresse e-mail Mot de passe oublié ? Nous avons envoyé un e-mail à %{email} contenant les instructions nécessaires pour réinitialiser votre mot de passe. + Nous avons envoyé un e-mail à %{email} contenant les instructions nécessaires pour définir votre mot de passe. Kickstarter OK %{backer_count} contributeurs diff --git a/app/src/main/res/values-ja/strings_i18n.xml b/app/src/main/res/values-ja/strings_i18n.xml index dd1983cbdb..48ff57c497 100644 --- a/app/src/main/res/values-ja/strings_i18n.xml +++ b/app/src/main/res/values-ja/strings_i18n.xml @@ -332,7 +332,6 @@ Kickstarter は普通のお店とは全く違います。クリエイティブなプロジェクトに生命を吹き込む場です。 Kickstarter は普通のお店とは全く違います。クリエイティブなプロジェクトに生命を吹き込む場です。<br/><a href="%{trust_link}">アカウンタビリティについて詳しくみる。</a> Kickstarter on Film - Kickstarter’s Community Guidelines. クリエイターやバッカ―からメッセージが届いた場合にすぐ分かるように、通知機能を有効にしましょう。 Kickstarter上の説明責任について詳しく知る 報告義務に関してさらに詳しく @@ -510,6 +509,7 @@ 自分の個人データをリクエストする メールを再送 認証メールをもう一度送信 + パスワードをリセット もう一度試す 再試行するか別のお支払い方法を選択してください。 再利用可能性とリサイクル可能性 @@ -566,6 +566,8 @@ 選択したリワード 送信 認証メールを送信する + 新しいパスワードを設定 + パスワードを設定 シェア アップデートをシェアしよう ライブ配信をシェアする @@ -645,7 +647,6 @@ これにより、プロジェクトのファンディングゴールとプレッジ金額をご希望の通貨で表示することができます。 このコメントは Kickstarter によって削除されました。 このコメントは現在審査中です。 - This comment is under review for potentially violating このコメントは <a href="%{community_guidelines}">Kickstarter のコミュニティガイドライン</a>に違反している可能性があるとして現在審査中です。 このFacebookアカウントはすでに他のKickstarterユーザーとつながっています このホリデーシーズンはぜひ、リワード無しでも「支援したい！」と思わせてくれるような、あなたの心に訴えかけるプロジェクトをサポートしてみませんか？ @@ -704,6 +705,7 @@ Kickstarter の環境リソースセンターにアクセス <a href="%{environment_link}">Kickstarter の環境リソースセンターにアクセス</a> ライブをみる + Facebook を介したログインはできなくなりました。Kickstarter のパスワードを使ってログインするか、Facebook のメールアドレスを使って新しいパスワードを設定してください。 バッカーのお支払い方法で問題があったためこのプレッジを処理することができません。 プレッジを処理することができません。 プレッジを処理できません。お支払い方法を更新してください。 @@ -715,12 +717,14 @@ キャンペーンの最後の24時間において、プレッジを取り消すことよってプロジェクトがファンディングゴールに到達できなくなる場合においては、そのようなプレッジの取り消しは許可されません。 このプレッジを処理中です。リフレッシュするにはプルしてください。 プレッジを処理中です。リフレッシュするにはプルしてください。 + Kickstarter ではログインの手続きが簡素化されます。Kickstarter アカウントにアクセスするには、Facebook アカウントに登録されているメールアドレスを入力してください。パスワードを設定するためのリンクをお送りします。 その他おすすめプロジェクト あなたのアクティビティをもとにおすすめの提供を行っています。オプトアウトするにはおすすめ機能をオフにしてください。 このアドレスにメールを送信できませんでした。メールアドレスが正確に入力されていることをご確認ください。 ライブ配信への接続に失敗。 配送先の読込に失敗。\n 再度お試しください。 + Facebook 経由でのログイン機能の提供がまもなく終了します。メールアドレス %{email} を使ってアカウントにログインするには、6 文字以上のパスワードを設定してください。 これはクリエイターには共有されません。 ウェブサイト Kickstarter ライブラリーへようこそ。色んなストーリーを一緒に読み漁ろう！ @@ -1329,6 +1333,7 @@ メールアドレス パスワードを忘れましたか？ %{email} にメールを送信しました。パスワードのリセット法が書かれています。 + パスワードの設定方法が記載されたメールを %{email} に送信しました。 Kickstarter OK %{backer_count} バッカー diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b03001e52f..29a6de994d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -81,14 +81,4 @@ Story - - - Reset your password - FPO : We’ve sent an email to %s with instructions to reset your password - FPO : We’re simplifying our login process. To access your Kickstarter account, enter the email associated to your Facebook account and we’ll send you a link to set a password. - FPO: We can no longer log you in through Facebook. Please log in with your Kickstarter password, or set a new password with your Facebook email. - Set new password - Set your password - We will be discontinuing the ability to log in via Facebook. To log in to your account using the email %s. - Please set a password that is at least 6 characters long. diff --git a/app/src/main/res/values/strings_i18n.xml b/app/src/main/res/values/strings_i18n.xml index 0b818e9cc7..a732ca9d04 100644 --- a/app/src/main/res/values/strings_i18n.xml +++ b/app/src/main/res/values/strings_i18n.xml @@ -335,7 +335,6 @@ with friends. Kickstarter is not a store. It\'s a way to bring creative projects to life. Kickstarter is not a store. It\'s a way to bring creative projects to life.<br/><a href="%{trust_link}">Learn more about accountability</a> Kickstarter on Film - Kickstarter’s Community Guidelines. Know when creators and backers message you by enabling notifications. Learn about accountability on Kickstarter Learn more about accountability @@ -514,6 +513,7 @@ daring ideas. Request my personal data Resend email Re-send verification email + Reset your password Retry Retry or select another method. Reusability and recyclability @@ -570,6 +570,8 @@ daring ideas. Selected reward Send Send verification email + Set new password + Set your password Share Share an update about your project… Share this live stream. @@ -650,7 +652,6 @@ catch your eye? This allows you to see project goal and pledge amounts in your preferred currency. This comment has been removed by Kickstarter. This comment is under review. - This comment is under review for potentially violating This comment is under review for potentially violating <a href="%{community_guidelines}">Kickstarter’s Community Guidelines.</a> This Facebook account is already linked to another Kickstarter user. This holiday season, support a project for no reward, just because it speaks to you. @@ -709,6 +710,7 @@ catch your eye? Visit our Environmental Resources Center <a href="%{environment_link}">Visit our Environmental Resources Center</a> Watch live + We can no longer log you in through Facebook. Please log in with your Kickstarter password, or set a new password with your Facebook email. We can’t process this pledge because of a problem with the backer’s payment method. We can\'t process your pledge. We can’t process your pledge. Please update your payment method. @@ -720,12 +722,14 @@ catch your eye? We don’t allow cancelations that will cause a project to fall short of its goal within the last 24 hours. We\'re processing this pledge—pull to refresh. We\'re processing your pledge—pull to refresh. + We’re simplifying our login process. To access your Kickstarter account, enter the email associated to your Facebook account and we’ll send you a link to set a password We think you’ll like these, too We use your activity internally to make recommendations for you. Turn recommendations off to opt out of this. We\'ve been unable to send email to this address. Please make sure it is typed correctly. We were unable to connect to the live stream chat. We were unable to load the shipping destinations.\n Please try again later. + We will be discontinuing the ability to log in via Facebook. To log in to your account using the email %{email}, please set a password that’s at least 6 characters long. We won’t share this with the creator. Websites Welcome to our library. Peruse the stacks with us. @@ -1333,6 +1337,7 @@ Please try again later. Email address Forgot your password? We’ve sent an email to %{email} with instructions to reset your password. + We’ve sent an email to %{email} with instructions to set your password. Kickstarter OK %{backer_count} backers From f14116a4f5d4b6200f3e03a8052f2b8c7ac9efe0 Mon Sep 17 00:00:00 2001 From: Isabel Martin Date: Wed, 7 Dec 2022 09:13:51 -0800 Subject: [PATCH 2/3] NTV-364: Creator dashboard not loading for release 3.7.0(#1715) Co-authored-by: Hadia --- .../com/kickstarter/libs/utils/AnalyticEventsUtils.kt | 3 +-- .../java/com/kickstarter/libs/utils/DateTimeUtils.kt | 5 ++--- .../java/com/kickstarter/mock/factories/RewardFactory.kt | 2 +- app/src/main/java/com/kickstarter/models/Reward.kt | 9 +++++---- .../services/transformers/GraphQLTransformers.kt | 2 +- .../kickstarter/viewmodels/BackingFragmentViewModel.kt | 4 ++-- .../kickstarter/viewmodels/RewardViewHolderViewModel.kt | 4 ++-- .../java/com/kickstarter/libs/utils/DateTimeUtilsTest.kt | 8 +++----- .../viewmodels/RewardViewHolderViewModelTest.kt | 6 +----- 9 files changed, 18 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/kickstarter/libs/utils/AnalyticEventsUtils.kt b/app/src/main/java/com/kickstarter/libs/utils/AnalyticEventsUtils.kt index 13e7a77a62..c9f7ae0978 100644 --- a/app/src/main/java/com/kickstarter/libs/utils/AnalyticEventsUtils.kt +++ b/app/src/main/java/com/kickstarter/libs/utils/AnalyticEventsUtils.kt @@ -33,7 +33,6 @@ import com.kickstarter.models.extensions.getCreatedAndDraftProjectsCount import com.kickstarter.services.DiscoveryParams import com.kickstarter.ui.data.CheckoutData import com.kickstarter.ui.data.PledgeData -import org.joda.time.DateTime import java.util.Locale import kotlin.math.ceil import kotlin.math.roundToInt @@ -193,7 +192,7 @@ object AnalyticEventsUtils { val project = pledgeData.projectData().project() val properties = HashMap().apply { reward.estimatedDeliveryOn()?.let { deliveryDate -> - put("estimated_delivery_on", DateTime(deliveryDate.time)) + put("estimated_delivery_on", deliveryDate) } put("has_items", isItemized(reward)) put("id", reward.id().toString()) diff --git a/app/src/main/java/com/kickstarter/libs/utils/DateTimeUtils.kt b/app/src/main/java/com/kickstarter/libs/utils/DateTimeUtils.kt index 98c5277591..0be6954fcb 100644 --- a/app/src/main/java/com/kickstarter/libs/utils/DateTimeUtils.kt +++ b/app/src/main/java/com/kickstarter/libs/utils/DateTimeUtils.kt @@ -12,7 +12,6 @@ import org.joda.time.DateTimeZone import org.joda.time.Seconds import org.joda.time.format.DateTimeFormat import java.text.SimpleDateFormat -import java.util.Date import java.util.Locale import kotlin.math.abs import kotlin.math.floor @@ -22,9 +21,9 @@ object DateTimeUtils { * e.g.: December 2015. */ @JvmOverloads - fun estimatedDeliveryOn(date: Date, locale: Locale = Locale.getDefault()): String { + fun estimatedDeliveryOn(date: DateTime, locale: Locale = Locale.getDefault()): String { val formatter = SimpleDateFormat("MMMM yyyy", locale) - return formatter.format(date) + return formatter.format(date.toDate()) } fun isDateToday(dateTime: DateTime): Boolean { diff --git a/app/src/main/java/com/kickstarter/mock/factories/RewardFactory.kt b/app/src/main/java/com/kickstarter/mock/factories/RewardFactory.kt index 00d2b4b823..edc982ceb4 100644 --- a/app/src/main/java/com/kickstarter/mock/factories/RewardFactory.kt +++ b/app/src/main/java/com/kickstarter/mock/factories/RewardFactory.kt @@ -8,7 +8,7 @@ import com.kickstarter.models.SingleLocation import org.joda.time.DateTime object RewardFactory { - val ESTIMATED_DELIVERY = DateTime.parse("2019-03-26T19:26:09Z").toDate() + val ESTIMATED_DELIVERY = DateTime.parse("2019-03-26T19:26:09Z") @JvmStatic fun addOn(): Reward { diff --git a/app/src/main/java/com/kickstarter/models/Reward.kt b/app/src/main/java/com/kickstarter/models/Reward.kt index 65b8b782bc..e56da5b80d 100644 --- a/app/src/main/java/com/kickstarter/models/Reward.kt +++ b/app/src/main/java/com/kickstarter/models/Reward.kt @@ -5,7 +5,6 @@ import androidx.annotation.StringDef import com.kickstarter.libs.utils.extensions.isZero import kotlinx.parcelize.Parcelize import org.joda.time.DateTime -import java.util.Date @Parcelize class Reward private constructor( @@ -16,7 +15,7 @@ class Reward private constructor( private val id: Long, private val limit: Int?, private val minimum: Double, - private val estimatedDeliveryOn: Date?, + private val estimatedDeliveryOn: DateTime?, private val remaining: Int?, private val rewardsItems: List?, private val shippingPreference: String?, @@ -86,7 +85,7 @@ class Reward private constructor( private var id: Long = 0L, private var limit: Int? = null, private var minimum: Double = 0.0, - private var estimatedDeliveryOn: Date? = null, + private var estimatedDeliveryOn: DateTime? = null, private var remaining: Int? = null, private var rewardsItems: List? = emptyList(), private var shippingPreference: String? = null, @@ -111,7 +110,9 @@ class Reward private constructor( fun id(id: Long?) = apply { this.id = id ?: -1L } fun limit(limit: Int?) = apply { this.limit = limit } fun minimum(minimum: Double?) = apply { this.minimum = minimum ?: 0.0 } - fun estimatedDeliveryOn(estimatedDeliveryOn: Date?) = apply { this.estimatedDeliveryOn = estimatedDeliveryOn } + fun estimatedDeliveryOn(estimatedDeliveryOn: DateTime?) = apply { + this.estimatedDeliveryOn = estimatedDeliveryOn + } fun remaining(remaining: Int?) = apply { this.remaining = remaining } fun rewardsItems(rewardsItems: List?) = apply { this.rewardsItems = rewardsItems ?: emptyList() } fun shippingPreference(shippingPreference: String?) = apply { this.shippingPreference = shippingPreference } diff --git a/app/src/main/java/com/kickstarter/services/transformers/GraphQLTransformers.kt b/app/src/main/java/com/kickstarter/services/transformers/GraphQLTransformers.kt index 5b2171bc47..5039467597 100644 --- a/app/src/main/java/com/kickstarter/services/transformers/GraphQLTransformers.kt +++ b/app/src/main/java/com/kickstarter/services/transformers/GraphQLTransformers.kt @@ -113,7 +113,7 @@ fun rewardTransformer( rewardGr.convertedAmount().fragments().amount().amount()?.toDouble() ?: 0.0 val desc = rewardGr.description() val title = rewardGr.name() - val estimatedDelivery = rewardGr.estimatedDeliveryOn() + val estimatedDelivery = rewardGr.estimatedDeliveryOn()?.let { DateTime(it) } val remaining = rewardGr.remainingQuantity() val endsAt = rewardGr.endsAt()?.let { DateTime(it) } val startsAt = rewardGr.startsAt()?.let { DateTime(it) } diff --git a/app/src/main/java/com/kickstarter/viewmodels/BackingFragmentViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/BackingFragmentViewModel.kt index 9dc380976c..963412e15c 100644 --- a/app/src/main/java/com/kickstarter/viewmodels/BackingFragmentViewModel.kt +++ b/app/src/main/java/com/kickstarter/viewmodels/BackingFragmentViewModel.kt @@ -32,13 +32,13 @@ import com.kickstarter.ui.data.ProjectData import com.kickstarter.ui.fragments.BackingFragment import com.stripe.android.model.Card import com.stripe.android.model.CardBrand +import org.joda.time.DateTime import rx.Observable import rx.subjects.BehaviorSubject import rx.subjects.PublishSubject import type.CreditCardPaymentType import type.CreditCardTypes import java.text.SimpleDateFormat -import java.util.Date import java.util.Locale import java.util.concurrent.TimeUnit @@ -473,7 +473,7 @@ interface BackingFragmentViewModel { reward .filter { RewardUtils.isReward(it) && ObjectUtils.isNotNull(it.estimatedDeliveryOn()) } - .map { it.estimatedDeliveryOn() } + .map { it.estimatedDeliveryOn() } .map { DateTimeUtils.estimatedDeliveryOn(it) } .compose(bindToLifecycle()) .subscribe(this.estimatedDelivery) diff --git a/app/src/main/java/com/kickstarter/viewmodels/RewardViewHolderViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/RewardViewHolderViewModel.kt index f98028d8fa..35e69b7421 100644 --- a/app/src/main/java/com/kickstarter/viewmodels/RewardViewHolderViewModel.kt +++ b/app/src/main/java/com/kickstarter/viewmodels/RewardViewHolderViewModel.kt @@ -23,11 +23,11 @@ import com.kickstarter.ui.data.PledgeData import com.kickstarter.ui.data.PledgeFlowContext import com.kickstarter.ui.data.ProjectData import com.kickstarter.ui.viewholders.RewardViewHolder +import org.joda.time.DateTime import rx.Observable import rx.subjects.BehaviorSubject import rx.subjects.PublishSubject import java.math.RoundingMode -import java.util.Date interface RewardViewHolderViewModel { interface Inputs { @@ -423,7 +423,7 @@ interface RewardViewHolderViewModel { reward .filter { RewardUtils.isReward(it) && ObjectUtils.isNotNull(it.estimatedDeliveryOn()) } - .map { it.estimatedDeliveryOn() } + .map { it.estimatedDeliveryOn() } .map { DateTimeUtils.estimatedDeliveryOn(it) } .compose(bindToLifecycle()) .subscribe(this.estimatedDelivery) diff --git a/app/src/test/java/com/kickstarter/libs/utils/DateTimeUtilsTest.kt b/app/src/test/java/com/kickstarter/libs/utils/DateTimeUtilsTest.kt index bdbff56c2a..0c8882d281 100644 --- a/app/src/test/java/com/kickstarter/libs/utils/DateTimeUtilsTest.kt +++ b/app/src/test/java/com/kickstarter/libs/utils/DateTimeUtilsTest.kt @@ -9,11 +9,9 @@ import org.joda.time.DateTimeZone import org.junit.Before import org.junit.Test import org.robolectric.annotation.Config -import java.text.SimpleDateFormat import java.util.Locale class DateTimeUtilsTest : KSRobolectricTestCase() { - private val DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) @Before fun init() { @@ -25,16 +23,16 @@ class DateTimeUtilsTest : KSRobolectricTestCase() { fun testEstimatedDeliveryOn() { assertEquals( "December 2015", - DateTimeUtils.estimatedDeliveryOn(DATE_FORMAT.parse("2015-12-17T18:35:05Z")) + DateTimeUtils.estimatedDeliveryOn(DateTime.parse("2015-12-17T18:35:05Z"), Locale.getDefault()) ) assertEquals( "décembre 2015", - DateTimeUtils.estimatedDeliveryOn(DATE_FORMAT.parse("2015-12-17T18:35:05Z"), Locale.FRENCH) + DateTimeUtils.estimatedDeliveryOn(DateTime.parse("2015-12-17T18:35:05Z"), Locale.FRENCH) ) assertEquals( "12月 2015", DateTimeUtils.estimatedDeliveryOn( - DATE_FORMAT.parse("2015-12-17T18:35:05Z"), + DateTime.parse("2015-12-17T18:35:05Z"), Locale.JAPANESE ) ) diff --git a/app/src/test/java/com/kickstarter/viewmodels/RewardViewHolderViewModelTest.kt b/app/src/test/java/com/kickstarter/viewmodels/RewardViewHolderViewModelTest.kt index 7d300d37d4..423d1ab4b6 100644 --- a/app/src/test/java/com/kickstarter/viewmodels/RewardViewHolderViewModelTest.kt +++ b/app/src/test/java/com/kickstarter/viewmodels/RewardViewHolderViewModelTest.kt @@ -20,8 +20,6 @@ import org.joda.time.DateTime import org.junit.Test import rx.observers.TestSubscriber import java.math.RoundingMode -import java.text.SimpleDateFormat -import java.util.Locale class RewardViewHolderViewModelTest : KSRobolectricTestCase() { @@ -57,8 +55,6 @@ class RewardViewHolderViewModelTest : KSRobolectricTestCase() { private val localPickUpIsGone = TestSubscriber() private val localPickUpName = TestSubscriber() - private val DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) - private fun setUpEnvironment(@NonNull environment: Environment) { this.vm = RewardViewHolderViewModel.ViewModel(environment) this.vm.outputs.backersCount().subscribe(this.backersCount) @@ -647,7 +643,7 @@ class RewardViewHolderViewModelTest : KSRobolectricTestCase() { val reward = RewardFactory.reward() .toBuilder() - .estimatedDeliveryOn(DATE_FORMAT.parse(("2019-09-11T20:12:47+00:00"))) + .estimatedDeliveryOn(DateTime.parse(("2019-09-11T20:12:47+00:00"))) .build() this.vm.inputs.configureWith(ProjectDataFactory.project(ProjectFactory.project()), reward) From a45dc1fbf8ffe3547dd4d9dfd3e9c77975a3d516 Mon Sep 17 00:00:00 2001 From: Isabel Martin Date: Thu, 8 Dec 2022 08:53:45 -0800 Subject: [PATCH 3/3] NTV-637: Messages screen unable to load more messages (#1716) --- .../libs/RecyclerViewPaginator.java | 2 - .../main/res/layout/message_thread_view.xml | 148 +++++++++--------- 2 files changed, 72 insertions(+), 78 deletions(-) diff --git a/app/src/main/java/com/kickstarter/libs/RecyclerViewPaginator.java b/app/src/main/java/com/kickstarter/libs/RecyclerViewPaginator.java index d58a0d88ef..7237e5f02b 100644 --- a/app/src/main/java/com/kickstarter/libs/RecyclerViewPaginator.java +++ b/app/src/main/java/com/kickstarter/libs/RecyclerViewPaginator.java @@ -22,7 +22,6 @@ public final class RecyclerViewPaginator { private final @NonNull Action0 nextPage; private final Observable isLoading; private Subscription subscription; - private static final int DIRECTION_DOWN = 1; private Subscription retrySubscription; private final PublishSubject retryLoadingNextPageSubject = PublishSubject.create(); @@ -51,7 +50,6 @@ public void start() { final Observable> lastVisibleAndCount = RxRecyclerView.scrollEvents(this.recyclerView) .filter(__ -> BoolenExtKt.isFalse(Secrets.IS_OSS)) - .filter(__ -> this.recyclerView.canScrollVertically(DIRECTION_DOWN)) .map(__ -> this.recyclerView.getLayoutManager()) .ofType(LinearLayoutManager.class) .map(this::displayedItemFromLinearLayout) diff --git a/app/src/main/res/layout/message_thread_view.xml b/app/src/main/res/layout/message_thread_view.xml index 7de98ed0d3..1f82044148 100644 --- a/app/src/main/res/layout/message_thread_view.xml +++ b/app/src/main/res/layout/message_thread_view.xml @@ -1,94 +1,90 @@ - - - + android:layout_height="wrap_content"> + android:id="@+id/participant_avatar_image_view" + android:layout_width="@dimen/grid_7" + android:layout_height="@dimen/grid_7" + android:layout_centerVertical="true" + android:layout_marginLeft="@dimen/grid_3" + android:layout_marginRight="@dimen/grid_3" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:background="@color/accent" + tools:ignore="ContentDescription" /> - - - - - - - - + android:layout_marginEnd="@dimen/grid_1_half" + android:layout_weight="1" + android:ellipsize="end" + android:lines="1" + tools:text="Somebody once told me that" + app:layout_constraintStart_toStartOf="@+id/guideline1" + app:layout_constraintEnd_toStartOf="@+id/message_thread_unread_count_text_view" + app:layout_constraintTop_toTopOf="parent"/> - + - + android:layout_marginTop="@dimen/grid_1" + tools:text="Thanks for backing our project!" + app:layout_constraintTop_toBottomOf="@+id/participant_name_text_view" + app:layout_constraintStart_toStartOf="@+id/guideline1" + app:layout_constraintEnd_toEndOf="@+id/guideline2" /> + + - + - + - + \ No newline at end of file