From e1e5d6840ebff3bb933934479ce79b73ab1561ff Mon Sep 17 00:00:00 2001 From: Scott Clampet <110618242+scottkicks@users.noreply.github.com> Date: Tue, 28 Nov 2023 09:30:40 -0600 Subject: [PATCH] [NO TICKET] Update Block User Strings (#1889) * run make strings * use localized strings in block user flow --- .../Locales/Base.lproj/Localizable.strings | 4 +- .../Locales/de.lproj/Localizable.strings | 2 + .../Locales/es.lproj/Localizable.strings | 4 +- .../Locales/fr.lproj/Localizable.strings | 4 +- .../Locales/ja.lproj/Localizable.strings | 2 + Library/Strings.swift | 44 ++++++++++++++++--- Library/UIAlertController.swift | 2 +- .../CommentCellViewModelTests.swift | 4 +- 8 files changed, 55 insertions(+), 11 deletions(-) diff --git a/Kickstarter-iOS/Locales/Base.lproj/Localizable.strings b/Kickstarter-iOS/Locales/Base.lproj/Localizable.strings index 20bf2acd0a..2c9431825c 100644 --- a/Kickstarter-iOS/Locales/Base.lproj/Localizable.strings +++ b/Kickstarter-iOS/Locales/Base.lproj/Localizable.strings @@ -72,12 +72,13 @@ "Big_Kickstarter_news_and_events_near_you" = "Big Kickstarter news and events near you, delivered just a few times a year."; "Big_Kickstarter_news_plus_occasional_projects_and_events_chosen_just_for_you" = "Big Kickstarter news, plus occasional projects and events chosen just for you."; "Biography" = "Biography"; +"Block" = "Block"; "Block_this_user" = "Block this user"; "Block_user_fail" = "Your request did not go through. Try again."; "Block_user_success" = "This user has been successfully blocked"; "Block_username" = "Block %{username}?"; "Blocked_user" = "Blocked User"; -"Blocked_user_confirmation" = "Blocking this user means that you won’t see their comments or content anymore. If you have saved or backed projects from this user and would like to withdraw your support, you must remove your pledge before blocking. To unblock a user in the future, please go through our Help Center."; +"Blocked_user_confirmation" = "Blocking this user means that you won’t see their comments or content anymore. If you have saved or backed projects from this user, you must remove your pledge before blocking. To unblock a user in the future, please go through our Help Center."; "Bonus" = "Bonus"; "Bonus_support" = "Bonus support"; "Bookmarks" = "Bookmarks"; @@ -443,6 +444,7 @@ "Opens_rewards" = "Opens rewards."; "Opens_shipping_options" = "Opens shipping options."; "Opens_update" = "Opens update."; +"Opens_user_menu" = "Opens user menu."; "Or_select_a_different_reward_below_colon" = "Or select a different reward below:"; "Other_payment_methods" = "Other payment methods"; "Other_projects_you_might_like" = "Other projects you might like."; diff --git a/Kickstarter-iOS/Locales/de.lproj/Localizable.strings b/Kickstarter-iOS/Locales/de.lproj/Localizable.strings index 4f2049d145..4ea992a8ef 100644 --- a/Kickstarter-iOS/Locales/de.lproj/Localizable.strings +++ b/Kickstarter-iOS/Locales/de.lproj/Localizable.strings @@ -72,6 +72,7 @@ "Big_Kickstarter_news_and_events_near_you" = "Ein paar Mal pro Jahr: Kickstarter-Neuigkeiten und Events in deiner Nähe."; "Big_Kickstarter_news_plus_occasional_projects_and_events_chosen_just_for_you" = "Das Neueste von Kickstarter plus gelegentlich für dich ausgewählte Projekte und Events."; "Biography" = "Biografie"; +"Block" = "Block"; "Block_this_user" = "Diesen Nutzer blockieren"; "Block_user_fail" = "Deine Anfrage konnte nicht verarbeitet werden. Bitte versuche es noch einmal."; "Block_user_success" = "Dieser Nutzer wurde erfolgreich blockiert"; @@ -443,6 +444,7 @@ "Opens_rewards" = "Öffnet Belohnungen."; "Opens_shipping_options" = "Öffnet Versandoptionen."; "Opens_update" = "Öffnet Update."; +"Opens_user_menu" = "Opens user menu."; "Or_select_a_different_reward_below_colon" = "Oder eine andere Belohnung wählen:"; "Other_payment_methods" = "Weitere Zahlungsmethoden"; "Other_projects_you_might_like" = "Ähnliche Projekte:"; diff --git a/Kickstarter-iOS/Locales/es.lproj/Localizable.strings b/Kickstarter-iOS/Locales/es.lproj/Localizable.strings index 546f1580d7..0af4d46054 100644 --- a/Kickstarter-iOS/Locales/es.lproj/Localizable.strings +++ b/Kickstarter-iOS/Locales/es.lproj/Localizable.strings @@ -72,12 +72,13 @@ "Big_Kickstarter_news_and_events_near_you" = "Unas cuantas veces al año: Noticias sobresalientes de Kickstarter y eventos cerca de ti."; "Big_Kickstarter_news_plus_occasional_projects_and_events_chosen_just_for_you" = "Importantes novedades de Kickstarter, además de proyectos y eventos ocasionales elegidos especialmente para ti."; "Biography" = "Biografía"; +"Block" = "Bloquear"; "Block_this_user" = "Bloquear a este usuario"; "Block_user_fail" = "Tu solicitud no se procesó. Intenta otra vez."; "Block_user_success" = "Este usuario se bloqueó con éxito."; "Block_username" = "¿Bloquear a %{username}?"; "Blocked_user" = "Usuario bloqueado"; -"Blocked_user_confirmation" = "Al bloquear a este usuario, ya no verás sus comentarios ni su contenido. Si guardaste o patrocinaste proyectos del usuario y quieres revertir tu apoyo, debes eliminar tu contribución antes de bloquearlo. Puedes desbloquear usuarios desde nuestro Centro de ayuda."; +"Blocked_user_confirmation" = "Al bloquear a este usuario, ya no verás sus comentarios ni su contenido. Si guardaste o patrocinaste proyectos del usuario, debes eliminar tu contribución antes de bloquearlo. Puedes desbloquear usuarios desde nuestro Centro de ayuda."; "Bonus" = "Extra"; "Bonus_support" = "Apoyo extra"; "Bookmarks" = "Marcadores"; @@ -443,6 +444,7 @@ "Opens_rewards" = "Abre recompensas."; "Opens_shipping_options" = "Abre las opciones de envío."; "Opens_update" = "Abre actualización."; +"Opens_user_menu" = "Abre el menú del usuario."; "Or_select_a_different_reward_below_colon" = "También puedes seleccionar una de las siguientes recompensas:"; "Other_payment_methods" = "Otros métodos de pago"; "Other_projects_you_might_like" = "Otros proyectos que te pueden gustar."; diff --git a/Kickstarter-iOS/Locales/fr.lproj/Localizable.strings b/Kickstarter-iOS/Locales/fr.lproj/Localizable.strings index b8be62f155..9115476142 100644 --- a/Kickstarter-iOS/Locales/fr.lproj/Localizable.strings +++ b/Kickstarter-iOS/Locales/fr.lproj/Localizable.strings @@ -72,12 +72,13 @@ "Big_Kickstarter_news_and_events_near_you" = "Les grandes nouvelles et les événements près de chez vous, quelques fois par an."; "Big_Kickstarter_news_plus_occasional_projects_and_events_chosen_just_for_you" = "Les grandes actualités Kickstarter et quelques projets et événements de temps et temps, rien que pour vous."; "Biography" = "Biographie"; +"Block" = "Bloquer"; "Block_this_user" = "Bloquer cet utilisateur"; "Block_user_fail" = "Votre demande a échoué. Veuillez réessayer."; "Block_user_success" = "Cet utilisateur a bien été bloqué."; "Block_username" = "Bloquer %{username} ?"; "Blocked_user" = "Utilisateur bloqué"; -"Blocked_user_confirmation" = "Si vous bloquez cet utilisateur, vous ne verrez plus ses commentaires ni son contenu. Si vous avez sauvegardé ou soutenu ses projets et que vous souhaitez retirer votre soutien, vous devez supprimer votre engagement avant de le bloquer. Pour débloquer un utilisateur, veuillez consulter notre Centre d'assistance."; +"Blocked_user_confirmation" = "Si vous bloquez cet utilisateur, vous ne verrez plus ses commentaires ni son contenu. Si vous avez sauvegardé ou soutenu ses projets, veuillez supprimer votre engagement avant de le bloquer. Pour débloquer un utilisateur, veuillez consulter notre Centre d'assistance."; "Bonus" = "Bonus"; "Bonus_support" = "Coup de pouce"; "Bookmarks" = "Signets"; @@ -443,6 +444,7 @@ "Opens_rewards" = "Ouvre les récompenses."; "Opens_shipping_options" = "Ouvre les options de livraison."; "Opens_update" = "Ouvre l'actu."; +"Opens_user_menu" = "Ouvre le menu utilisateur."; "Or_select_a_different_reward_below_colon" = "Ou sélectionner une autre récompense ci-dessous :"; "Other_payment_methods" = "Autres moyens de paiement"; "Other_projects_you_might_like" = "Autre projets qui pourraient vous intéresser"; diff --git a/Kickstarter-iOS/Locales/ja.lproj/Localizable.strings b/Kickstarter-iOS/Locales/ja.lproj/Localizable.strings index 46ced82d80..44fe63f38a 100644 --- a/Kickstarter-iOS/Locales/ja.lproj/Localizable.strings +++ b/Kickstarter-iOS/Locales/ja.lproj/Localizable.strings @@ -72,6 +72,7 @@ "Big_Kickstarter_news_and_events_near_you" = "Kickstarter に関するビッグニュースやお近くのイベントについて、年に数回お届け。"; "Big_Kickstarter_news_plus_occasional_projects_and_events_chosen_just_for_you" = "Kickstarter のニュースに加え、あなたにピッタリのおすすめプロジェクトやイベントを随時お送りします."; "Biography" = "自己紹介"; +"Block" = "Block"; "Block_this_user" = "このユーザーをブロックする"; "Block_user_fail" = "リクエストを処理できませんでした。もう一度お試しください。"; "Block_user_success" = "このユーザーをブロックしました"; @@ -443,6 +444,7 @@ "Opens_rewards" = "リワードをみる"; "Opens_shipping_options" = "配送方法をみる"; "Opens_update" = "アップデートをみる"; +"Opens_user_menu" = "Opens user menu."; "Or_select_a_different_reward_below_colon" = "別のリワードをみる："; "Other_payment_methods" = "その他の支払方法"; "Other_projects_you_might_like" = "おすすめをさらに見る"; diff --git a/Library/Strings.swift b/Library/Strings.swift index b518c273a9..f7c19c4c94 100644 --- a/Library/Strings.swift +++ b/Library/Strings.swift @@ -1208,6 +1208,23 @@ contributeurs" substitutions: [:] ) } + /** + "Block" + + - **en**: "Block" + - **de**: "Block" + - **es**: "Bloquear" + - **fr**: "Bloquer" + - **ja**: "Block" + */ + public static func Block() -> String { + return localizedString( + key: "Block", + defaultValue: "Block", + count: nil, + substitutions: [:] + ) + } /** "Block this user" @@ -1294,18 +1311,18 @@ contributeurs" ) } /** - "Blocking this user means that you won’t see their comments or content anymore. If you have saved or backed projects from this user and would like to withdraw your support, you must remove your pledge before blocking. To unblock a user in the future, please go through our Help Center." + "Blocking this user means that you won’t see their comments or content anymore. If you have saved or backed projects from this user, you must remove your pledge before blocking. To unblock a user in the future, please go through our Help Center." - - **en**: "Blocking this user means that you won’t see their comments or content anymore. If you have saved or backed projects from this user and would like to withdraw your support, you must remove your pledge before blocking. To unblock a user in the future, please go through our Help Center." + - **en**: "Blocking this user means that you won’t see their comments or content anymore. If you have saved or backed projects from this user, you must remove your pledge before blocking. To unblock a user in the future, please go through our Help Center." - **de**: "Wenn du diesen Nutzer blockierst, siehst du keine Kommentare oder Inhalte mehr von ihm. Falls du Projekte von diesem Nutzer gespeichert oder unterstützt hast und deine Unterstützung zurückziehen möchtest, musst du deinen Beitrag vor dem Blockieren entfernen. Weitere Informationen dazu, wie du die Blockierung eines Nutzers aufheben kannst, findest du im Hilfecenter." - - **es**: "Al bloquear a este usuario, ya no verás sus comentarios ni su contenido. Si guardaste o patrocinaste proyectos del usuario y quieres revertir tu apoyo, debes eliminar tu contribución antes de bloquearlo. Puedes desbloquear usuarios desde nuestro Centro de ayuda." - - **fr**: "Si vous bloquez cet utilisateur, vous ne verrez plus ses commentaires ni son contenu. Si vous avez sauvegardé ou soutenu ses projets et que vous souhaitez retirer votre soutien, vous devez supprimer votre engagement avant de le bloquer. Pour débloquer un utilisateur, veuillez consulter notre Centre d'assistance." + - **es**: "Al bloquear a este usuario, ya no verás sus comentarios ni su contenido. Si guardaste o patrocinaste proyectos del usuario, debes eliminar tu contribución antes de bloquearlo. Puedes desbloquear usuarios desde nuestro Centro de ayuda." + - **fr**: "Si vous bloquez cet utilisateur, vous ne verrez plus ses commentaires ni son contenu. Si vous avez sauvegardé ou soutenu ses projets, veuillez supprimer votre engagement avant de le bloquer. Pour débloquer un utilisateur, veuillez consulter notre Centre d'assistance." - **ja**: "このユーザーをブロックすると、その後はこのユーザーのコメントやコンテンツを閲覧することができなくなります。このユーザーのプロジェクトを保存またはバックしたことがあり、そのサポートを撤回したい場合は、ブロックする前にプレッジを取り消す必要があります。今後ユーザーのブロックを解除するには、ヘルプセンターをご参照ください。" */ public static func Blocked_user_confirmation() -> String { return localizedString( key: "Blocked_user_confirmation", - defaultValue: "Blocking this user means that you won’t see their comments or content anymore. If you have saved or backed projects from this user and would like to withdraw your support, you must remove your pledge before blocking. To unblock a user in the future, please go through our Help Center.", + defaultValue: "Blocking this user means that you won’t see their comments or content anymore. If you have saved or backed projects from this user, you must remove your pledge before blocking. To unblock a user in the future, please go through our Help Center.", count: nil, substitutions: [:] ) @@ -7329,6 +7346,23 @@ n'ont rien soutenu." substitutions: [:] ) } + /** + "Opens user menu." + + - **en**: "Opens user menu." + - **de**: "Opens user menu." + - **es**: "Abre el menú del usuario." + - **fr**: "Ouvre le menu utilisateur." + - **ja**: "Opens user menu." + */ + public static func Opens_user_menu() -> String { + return localizedString( + key: "Opens_user_menu", + defaultValue: "Opens user menu.", + count: nil, + substitutions: [:] + ) + } /** "Or select a different reward below:" diff --git a/Library/UIAlertController.swift b/Library/UIAlertController.swift index d4a596cb0a..c3f4a964a3 100644 --- a/Library/UIAlertController.swift +++ b/Library/UIAlertController.swift @@ -368,7 +368,7 @@ public extension UIAlertController { // Scott TODO: Use localized strings once translations can be done [mbl-1037](https://kickstarter.atlassian.net/browse/MBL-1037) alertController.addAction( UIAlertAction( - title: "Block", + title: Strings.Block(), style: .destructive, handler: blockUserHandler ) diff --git a/Library/ViewModels/CommentCellViewModelTests.swift b/Library/ViewModels/CommentCellViewModelTests.swift index 6568f425e0..503909148b 100644 --- a/Library/ViewModels/CommentCellViewModelTests.swift +++ b/Library/ViewModels/CommentCellViewModelTests.swift @@ -328,9 +328,9 @@ internal final class CommentCellViewModelTests: TestCase { self.vm.inputs.configureWith(comment: comment, project: .template) self.authorBadge.assertValues([.backer], "The default badge is emitted.") - self.authorName.assertValue("Blocked User", "The author's name is hidden.") + self.authorName.assertValue(Strings.Blocked_user(), "The author's name is hidden.") self.authorImageURL.assertValue(nil, "The author's avatar is hidden.") - self.body.assertValue("This user has been blocked", "The comment text is hidden.") + self.body.assertValue(Strings.This_user_has_been_blocked(), "The comment text is hidden.") } func testBindStylesEmitsAuthorBadge() {