Skip to content

Fixing string keys #1624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 21, 2025
Merged

Fixing string keys #1624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bee1a1b
Fixing string keys
ThomasSession Oct 21, 2025
ae03291
Merge branch 'dev' into fix/string-keys-pt2
ThomasSession Oct 21, 2025
8262f77
Merge branch 'dev' into fix/string-keys-pt2
ThomasSession Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/java/org/session/libsession/utilities/StringSubKeys.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ object StringSubstitutionConstants {
const val BUILD_VARIANT_KEY: StringSubKey = "build_variant"
const val APP_PRO_KEY: StringSubKey = "app_pro"
const val PRO_KEY: StringSubKey = "pro"
const val CURRENT_PLAN_KEY: StringSubKey = "current_plan"
const val CURRENT_PLAN_LENGTH_KEY: StringSubKey = "current_plan_length"
const val SELECTED_PLAN_LENGTH_KEY: StringSubKey = "selected_plan_length"
const val SELECTED_PLAN_LENGTH_SINGULAR_KEY: StringSubKey = "selected_plan_length_singular"
Expand Down
5 changes: 2 additions & 3 deletions ...org/thoughtcrime/securesms/preferences/prosettings/chooseplan/ChoosePlanNonOriginating.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ import androidx.compose.animation.ExperimentalSharedTransitionApi
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import com.squareup.phrase.Phrase
import network.loki.messenger.R
import org.session.libsession.utilities.NonTranslatableStringConstants
import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.APP_PRO_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.CURRENT_PLAN_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.CURRENT_PLAN_LENGTH_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.DATE_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.DEVICE_TYPE_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.PLATFORM_ACCOUNT_KEY
Expand Down Expand Up @@ -55,7 +54,7 @@ fun ChoosePlanNonOriginating(

is SubscriptionType.Active.AutoRenewing -> Phrase.from(context.getText(R.string.proAccessActivatedAutoShort))
.put(PRO_KEY, NonTranslatableStringConstants.PRO)
.put(CURRENT_PLAN_KEY, DateUtils.getLocalisedTimeDuration(
.put(CURRENT_PLAN_LENGTH_KEY, DateUtils.getLocalisedTimeDuration(
context = context,
amount = subscription.duration.duration.months,
unit = MeasureUnit.MONTH
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/thoughtcrime/securesms/preferences/prosettings/chooseplan/ChoosePlanScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import kotlinx.coroutines.launch
import network.loki.messenger.R
import org.session.libsession.utilities.NonTranslatableStringConstants
import org.session.libsession.utilities.StringSubstitutionConstants.APP_PRO_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.CURRENT_PLAN_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.CURRENT_PLAN_LENGTH_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.DATE_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.ICON_KEY
import org.session.libsession.utilities.StringSubstitutionConstants.MONTHLY_PRICE_KEY
Expand Down Expand Up @@ -117,7 +117,7 @@ fun ChoosePlan(
is SubscriptionType.Active.AutoRenewing -> Phrase.from(context.getText(R.string.proAccessActivatesAuto))
.put(PRO_KEY, NonTranslatableStringConstants.PRO)
.put(
CURRENT_PLAN_KEY, DateUtils.getLocalisedTimeDuration(
CURRENT_PLAN_LENGTH_KEY, DateUtils.getLocalisedTimeDuration(
context = context,
amount = planData.subscriptionType.duration.duration.months,
unit = MeasureUnit.MONTH
Expand Down