Skip to content

Commit 2ecfacd

Browse files
committed
Fixed temp strings
1 parent 75a7513 commit 2ecfacd

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsHomeScreen.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ fun ProStats(
260260
ProStatItem(
261261
modifier = Modifier.weight(1f),
262262
title = pluralStringResource(
263-
R.plurals.temp_pro_stats_groups,
263+
R.plurals.proGroupsUpgraded,
264264
data.groupsUpdated,
265265
NumberUtil.getFormattedNumber(data.groupsUpdated.toLong())
266266
),
@@ -272,7 +272,7 @@ fun ProStats(
272272
ProStatItem(
273273
modifier = Modifier.weight(1f),
274274
title = pluralStringResource(
275-
R.plurals.temp_pro_stats_pins,
275+
R.plurals.proPinnedConversations,
276276
data.pinnedConversations,
277277
NumberUtil.getFormattedNumber(data.pinnedConversations.toLong())
278278
),
@@ -287,7 +287,7 @@ fun ProStats(
287287
ProStatItem(
288288
modifier = Modifier.weight(1f),
289289
title = pluralStringResource(
290-
R.plurals.temp_pro_stats_badges,
290+
R.plurals.proBadgesSent,
291291
data.proBadges,
292292
NumberUtil.getFormattedNumber(data.proBadges.toLong())
293293
),
@@ -299,7 +299,7 @@ fun ProStats(
299299
ProStatItem(
300300
modifier = Modifier.weight(1f),
301301
title = pluralStringResource(
302-
R.plurals.temp_pro_stats_long,
302+
R.plurals.proLongerMessagesSent,
303303
data.longMessages,
304304
NumberUtil.getFormattedNumber(data.longMessages.toLong())
305305
),

app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsViewModel.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import org.session.libsession.utilities.StringSubstitutionConstants.PRICE_KEY
2525
import org.session.libsession.utilities.StringSubstitutionConstants.PRO_KEY
2626
import org.session.libsession.utilities.StringSubstitutionConstants.RELATIVE_TIME_KEY
2727
import org.session.libsession.utilities.StringSubstitutionConstants.SELECTED_PLAN_KEY
28+
import org.session.libsession.utilities.StringSubstitutionConstants.TIME_KEY
2829
import org.thoughtcrime.securesms.pro.SubscriptionState
2930
import org.thoughtcrime.securesms.pro.ProStatusManager
3031
import org.thoughtcrime.securesms.pro.subscription.ProSubscriptionDuration
@@ -72,14 +73,16 @@ class ProSettingsViewModel @Inject constructor(
7273
else SubscriptionState.NeverSubscribed,
7374
subscriptionExpiryLabel = when(subscriptionState){
7475
is SubscriptionState.Active.AutoRenewing ->
75-
Phrase.from(context, R.string.proAutoRenew)
76-
.put(RELATIVE_TIME_KEY, dateUtils.getExpiryString(subscriptionState.proStatus.validUntil))
77-
.format()
76+
Phrase.from(context, R.string.proAutoRenewTime)
77+
.put(PRO_KEY, NonTranslatableStringConstants.PRO)
78+
.put(TIME_KEY, dateUtils.getExpiryString(subscriptionState.proStatus.validUntil))
79+
.format()
7880

7981
is SubscriptionState.Active.Expiring ->
80-
Phrase.from(context, R.string.proExpiring)
81-
.put(RELATIVE_TIME_KEY, dateUtils.getExpiryString(subscriptionState.proStatus.validUntil))
82-
.format()
82+
Phrase.from(context, R.string.proExpiringTime)
83+
.put(PRO_KEY, NonTranslatableStringConstants.PRO)
84+
.put(TIME_KEY, dateUtils.getExpiryString(subscriptionState.proStatus.validUntil))
85+
.format()
8386

8487
else -> ""
8588
},

0 commit comments

Comments
 (0)