From 6101048f070f67c24c3752b40e1d03d60b686cc2 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Mon, 18 Apr 2022 16:38:06 -0300 Subject: [PATCH] Update donor badge strings. --- .../ExpiredBadgeBottomSheetDialogFragment.kt | 12 ++--- .../settings/app/AppSettingsFragment.kt | 4 +- .../app/subscription/boost/BoostFragment.kt | 4 +- .../subscribe/SubscribeFragment.kt | 2 +- ...ForYourSupportBottomSheetDialogFragment.kt | 6 +-- .../securesms/megaphone/Megaphones.java | 6 +-- ...earn_more_bottom_sheet_dialog_fragment.xml | 6 +-- app/src/main/res/values/strings.xml | 46 +++++++++++-------- 8 files changed, 48 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt index 5900e16c2e..06c5205240 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt @@ -41,9 +41,9 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment( sectionHeaderPref( DSLSettingsText.from( if (badge.isBoost()) { - R.string.ExpiredBadgeBottomSheetDialogFragment__your_badge_has_expired + R.string.ExpiredBadgeBottomSheetDialogFragment__boost_badge_expired } else { - R.string.ExpiredBadgeBottomSheetDialogFragment__subscription_cancelled + R.string.ExpiredBadgeBottomSheetDialogFragment__monthly_donation_cancelled }, DSLSettingsText.CenterModifier ) @@ -54,11 +54,11 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment( noPadTextPref( DSLSettingsText.from( if (badge.isBoost()) { - getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired) + getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and) } else if (inactive) { - getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_sustainer_subscription_was_automatically, badge.name) + getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically, badge.name) } else { - getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_sustainer_subscription_was_canceled) + getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled) }, DSLSettingsText.CenterModifier ) @@ -72,7 +72,7 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment( if (isLikelyASustainer) { R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate } else { - R.string.ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_technology + R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_keep } } else { R.string.ExpiredBadgeBottomSheetDialogFragment__you_can diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt index e43f61ee0d..a040f26d63 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt @@ -151,7 +151,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men if (state.hasActiveSubscription) { R.string.preferences__subscription } else { - R.string.preferences__become_a_signal_sustainer + R.string.preferences__monthly_donation } ), icon = DSLSettingsIcon.from(R.drawable.ic_heart_24), @@ -166,7 +166,7 @@ class AppSettingsFragment : DSLSettingsFragment(R.string.text_secure_normal__men ) ) clickPref( - title = DSLSettingsText.from(R.string.preferences__signal_boost), + title = DSLSettingsText.from(R.string.preferences__one_time_donation), icon = DSLSettingsIcon.from(R.drawable.ic_boost_24), onClick = { findNavController().safeNavigate(AppSettingsFragmentDirections.actionAppSettingsFragmentToBoostsFragment()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt index 0c0ce99500..f0aa9707fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostFragment.kt @@ -70,7 +70,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment( private var errorDialog: DialogInterface? = null private val sayThanks: CharSequence by lazy { - SpannableStringBuilder(requireContext().getString(R.string.BoostFragment__say_thanks_and_earn, 30)) + SpannableStringBuilder(requireContext().getString(R.string.BoostFragment__make_a_one_time, 30)) .append(" ") .append( SpanUtil.learnMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_accent_primary)) { @@ -239,7 +239,7 @@ class BoostFragment : DSLSettingsBottomSheetFragment( } private fun onGooglePayButtonClicked() { - viewModel.requestTokenFromGooglePay(getString(R.string.preferences__signal_boost)) + viewModel.requestTokenFromGooglePay(getString(R.string.preferences__one_time_donation)) } private fun onPaymentConfirmed(boostBadge: Badge) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt index ed60a6e643..0506bd44c2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt @@ -52,7 +52,7 @@ class SubscribeFragment : DSLSettingsFragment( private val lifecycleDisposable = LifecycleDisposable() private val supportTechSummary: CharSequence by lazy { - SpannableStringBuilder(requireContext().getString(R.string.SubscribeFragment__support_technology_that_is_built_for_you_not)) + SpannableStringBuilder(requireContext().getString(R.string.SubscribeFragment__make_a_recurring_monthly_donation)) .append(" ") .append( SpanUtil.readMore(requireContext(), ContextCompat.getColor(requireContext(), R.color.signal_button_secondary_text)) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt index 176ba4e48a..dd166ede5e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/thanks/ThanksForYourSupportBottomSheetDialogFragment.kt @@ -67,9 +67,9 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh if (args.badge.isBoost()) { if (Recipient.self().badges.any { !it.isBoost() }) { - subhead.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_help_signal) + subhead.setText(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display) } else { - subhead.text = SpannableStringBuilder(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_help_signal)) + subhead.text = SpannableStringBuilder(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_display)) .append(" ") .append(getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also)) .append(" ") @@ -84,7 +84,7 @@ class ThanksForYourSupportBottomSheetDialogFragment : FixedRoundedCornerBottomSh ) } } else { - subhead.text = getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_help_signal, args.badge.name) + subhead.text = getString(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_display, args.badge.name) } val otherBadges = Recipient.self().badges.filterNot { it.id == args.badge.id } diff --git a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java index dd56d36041..a527ae95c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java +++ b/app/src/main/java/org/thoughtcrime/securesms/megaphone/Megaphones.java @@ -270,12 +270,12 @@ public final class Megaphones { return new Megaphone.Builder(Event.BECOME_A_SUSTAINER, Megaphone.Style.BASIC) .setTitle(R.string.BecomeASustainerMegaphone__become_a_sustainer) .setImage(R.drawable.ic_become_a_sustainer_megaphone) - .setBody(R.string.BecomeASustainerMegaphone__signal_is_powered) - .setActionButton(R.string.BecomeASustainerMegaphone__contribute, (megaphone, listener) -> { + .setBody(R.string.BecomeASustainerMegaphone__signal_is_powered_by) + .setActionButton(R.string.BecomeASustainerMegaphone__donate, (megaphone, listener) -> { listener.onMegaphoneNavigationRequested(AppSettingsActivity.subscriptions(context)); listener.onMegaphoneCompleted(Event.BECOME_A_SUSTAINER); }) - .setSecondaryButton(R.string.BecomeASustainerMegaphone__no_thanks, (megaphone, listener) -> { + .setSecondaryButton(R.string.BecomeASustainerMegaphone__not_now, (megaphone, listener) -> { listener.onMegaphoneCompleted(Event.BECOME_A_SUSTAINER); }) .build(); diff --git a/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml b/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml index 8a62e4e19e..b609887a44 100644 --- a/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml +++ b/app/src/main/res/layout/subscribe_learn_more_bottom_sheet_dialog_fragment.xml @@ -55,7 +55,7 @@ android:layout_marginStart="@dimen/dsl_settings_gutter" android:layout_marginTop="16dp" android:layout_marginEnd="@dimen/dsl_settings_gutter" - android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_non_profit_with_no" + android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__signal_is_a_nonprofit_with_no" android:textAppearance="@style/Signal.Text.Body" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -68,7 +68,7 @@ android:layout_marginStart="@dimen/dsl_settings_gutter" android:layout_marginTop="36dp" android:layout_marginEnd="@dimen/dsl_settings_gutter" - android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__why_contribute" + android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__why_donate" android:textAppearance="@style/TextAppearance.Signal.Title2" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -95,7 +95,7 @@ android:layout_marginTop="24dp" android:layout_marginEnd="@dimen/dsl_settings_gutter" android:paddingBottom="36dp" - android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__your_contribution" + android:text="@string/SubscribeLearnMoreBottomSheetDialogFragment__your_donation" android:textAppearance="@style/Signal.Text.Body" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d01c99d09a..2e678ddb09 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2482,9 +2482,12 @@ Help Advanced Donate to Signal + Subscription - Become a Signal Sustainer - Signal Boost + + Monthly Donation + + One Time Donation Privacy MMS User Agent Manual MMS settings @@ -3884,9 +3887,10 @@ Become a Sustainer - Signal is powered by people like you. Contribute and receive a profile badge. - No thanks - Contribute + + Signal is powered by people like you. Donate and receive a badge. + Not now + Donate Emoji @@ -4094,6 +4098,7 @@ Signal is powered by people like you. Support technology that is built for you—not for your data—by joining the community of people that sustain it. Support technology that is built for you, not for your data, by joining the community that sustains Signal. + Make a recurring monthly donation to Signal to support technology built for you, not your data. Currency More Payment Options Cancel Subscription @@ -4111,15 +4116,16 @@ %1$s/month · Renews %2$s %1$s/month · Expires %2$s - Signal is a non-profit with no advertisers or investors, sustained only by the people who use and value it. Make a recurring monthly contribution and receive a profile badge to share your support. - Why Contribute? + + Signal is a nonprofit with no advertisers or investors, sustained only by the people who use and value it. Make a recurring monthly donation and receive a profile badge to share your support. + Why Donate? Signal is committed to developing open source privacy technology that protects free expression and enables secure global communication. - Your contribution fuels this cause and pays for the development and operations of an app used by millions for private communication. No ads. No trackers. No kidding. + Your donation fuels this cause and pays for the development and operations of an app used by millions for private communication. No ads. No trackers. No kidding. Thanks for your Support! Thanks for the Boost! - You\'ve earned %s badge! Help Signal build awareness by displaying this badge on your profile. - You\'ve earned a Boost badge! Help Signal build awareness by displaying this badge on your profile. + You\'ve earned %s badge! Display this badge on your profile to build awareness for donating to Signal. + You\'ve earned a Boost badge! Display this badge on your profile to build awareness for donating to Signal. You can also become a monthly Sustainer. Display on Profile @@ -4139,7 +4145,8 @@ Error getting subscription. Give Signal a Boost - Say \"Thanks!\" and earn the Boost badge for %1$d days. + + Make a one time donation and earn a Boost badge for %1$d days. Enter Custom Amount One-time contribution @@ -4152,19 +4159,22 @@ Couldn\'t add badge. %1$s Please contact support. - Your Badge has Expired - Badge expired - Subscription cancelled - Your Boost badge has expired and is no longer visible to others on your profile. + + Boost Badge Expired + + Monthly Donation Cancelled + + Your Boost badge has expired and is no longer visible on your profile. You can reactivate your Boost badge for another 30 days with a one-time contribution. - To continue supporting technology that is built for you, please consider becoming a monthly Sustainer. + + You can keep using Signal but to support technology that is built for you, consider becoming a sustainer by making a monthly donation. Become a Sustainer Add a Boost Not now - Your Sustainer subscription was automatically cancelled because you were inactive for too long. Your %1$s badge is no longer visible on your profile. + Your recurring monthly donation was automatically cancelled because you were inactive for too long. Your %1$s badge is no longer visible on your profile. - Your Sustainer subscription was cancelled because we couldn\'t process your payment. Your badge is no longer visible on your profile. + Your recurring monthly donation was cancelled because we couldn\'t process your payment. Your badge is no longer visible on your profile. You can keep using Signal but to support the app and reactivate your badge, renew now. Renew subscription