From 84f6f19cf4f66b0309e07f82e120d83abdea326e Mon Sep 17 00:00:00 2001 From: alansley Date: Tue, 30 Jul 2024 11:03:46 +1000 Subject: [PATCH] Changed some hard-coded 'Session' text in strings and renamed another --- .../start/invitefriend/InviteFriend.kt | 8 ++++- .../res/layout/fragment_enter_public_key.xml | 2 +- .../src/main/res/values-fa-rIR/strings.xml | 1 - .../src/main/res/values-fr-rFR/strings.xml | 1 - libsession/src/main/res/values-fr/strings.xml | 1 - libsession/src/main/res/values/strings.xml | 29 ++++++++----------- 6 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt index df90fe351c..dbc122096d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/invitefriend/InviteFriend.kt @@ -12,10 +12,13 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview +import com.squareup.phrase.Phrase import network.loki.messenger.R +import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY import org.thoughtcrime.securesms.ui.components.AppBar import org.thoughtcrime.securesms.ui.components.SlimOutlineButton import org.thoughtcrime.securesms.ui.components.SlimOutlineCopyButton @@ -61,7 +64,10 @@ internal fun InviteFriend( Spacer(modifier = Modifier.height(LocalDimensions.current.xsSpacing)) Text( - stringResource(R.string.shareAccountIdDescription), + stringResource(R.string.shareAccountIdDescription).let { txt -> + val c = LocalContext.current + Phrase.from(txt).put(APP_NAME_KEY, c.getString(R.string.sessionMessenger)).format().toString() + }, textAlign = TextAlign.Center, style = LocalType.current.small, color = LocalColors.current.textSecondary, diff --git a/app/src/main/res/layout/fragment_enter_public_key.xml b/app/src/main/res/layout/fragment_enter_public_key.xml index f75733a24c..cf66f65f2e 100644 --- a/app/src/main/res/layout/fragment_enter_public_key.xml +++ b/app/src/main/res/layout/fragment_enter_public_key.xml @@ -52,7 +52,7 @@ android:layout_marginHorizontal="@dimen/large_spacing" android:layout_marginTop="@dimen/medium_spacing" android:alpha="0.6" - android:text="@string/fragment_enter_public_key_prompt" + android:text="@string/messageNewDescriptionMobile" android:textAlignment="center" android:textColor="?android:textColorPrimary" android:textSize="@dimen/very_small_font_size" diff --git a/libsession/src/main/res/values-fa-rIR/strings.xml b/libsession/src/main/res/values-fa-rIR/strings.xml index c2de5403e3..fabffaac87 100644 --- a/libsession/src/main/res/values-fa-rIR/strings.xml +++ b/libsession/src/main/res/values-fa-rIR/strings.xml @@ -245,5 +245,4 @@ بازگشت به ایموجی پاک کردن ورودی جستجو حالت شب خودکار - یک مکالمه جدید را با وارد کردن شناسه Session شخصی شروع کنید یا شناسه جلسه خود را با آنها به اشتراک بگذارید. diff --git a/libsession/src/main/res/values-fr-rFR/strings.xml b/libsession/src/main/res/values-fr-rFR/strings.xml index ffe8035561..08b8e6aa30 100644 --- a/libsession/src/main/res/values-fr-rFR/strings.xml +++ b/libsession/src/main/res/values-fr-rFR/strings.xml @@ -258,5 +258,4 @@ Retour à l\'émoticône Effacer la recherche Thème sombre automatique - Commencez une nouvelle conversation en entrant l\'ID Session de quelqu\'un ou en lui partageant votre ID Session. diff --git a/libsession/src/main/res/values-fr/strings.xml b/libsession/src/main/res/values-fr/strings.xml index 3a4d16c05e..96aacf17c5 100644 --- a/libsession/src/main/res/values-fr/strings.xml +++ b/libsession/src/main/res/values-fr/strings.xml @@ -260,5 +260,4 @@ Retour à l\'émoticône Effacer la recherche Thème sombre automatique - Commencez une nouvelle conversation en entrant l\'ID Session de quelqu\'un ou en lui partageant votre ID Session. diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml index 8ae235063d..986975b746 100644 --- a/libsession/src/main/res/values/strings.xml +++ b/libsession/src/main/res/values/strings.xml @@ -49,12 +49,7 @@ - - Start a new conversation by entering someone\'s Session ID or share your Session ID with them. - - Disappears @@ -235,7 +230,7 @@ Camera unavailable. Grant Camera Access {app_name} needs camera access to take photos and videos, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\". - {app_name} needs camera access to take photos or videos. + {app_name} needs camera access to take photos and videos, or scan QR codes. {app_name} needs camera access to scan QR codes {app_name} needs storage access to send photos and videos, but it has been permanently denied. Please continue to app settings, select "Permissions", and enable "Storage". Cancel @@ -323,14 +318,14 @@ Original version of disappearing messages. {name} set the disappearing message timer to {time} Delete Message - Are you sure you want to delete these messages? + Are you sure you want to delete this message? Message deleted Are you sure you want to delete this message from your device? Are you sure you want to delete this message for everyone? Delete on this device only Delete for everyone Delete Messages - Delete Messages + Are you sure you want to delete these messages? Messages deleted Are you sure you want to delete these messages from your device? Are you sure you want to delete these messages for everyone? @@ -510,7 +505,7 @@ Require Touch ID, Face ID or your passcode to unlock Session. You must enable a passcode in your iOS Settings in order to use Screen Lock. {app_name} is locked - Quick response is unavailable when {app_name} is locked! + Quick response unavailable when {app_name} is locked! Lock status Tap to unlock {app_name} is unlocked @@ -533,7 +528,7 @@ Message limit reached Received a message encrypted using an old version of {app_name} that is no longer supported. Please ask the sender to update to the most recent version and resend the message. Original message not found - Message Info + Message Info Mark read Mark unread New Message @@ -708,7 +703,7 @@ Remove Reply Resend - Resolving... + Loading country information... Restart Resync Retry @@ -748,10 +743,10 @@ Recovery Password Settings Set - You must restart Session to apply your new settings. + You must restart {app_name} to apply your new settings. Share - Invite your friend to chat with you on Session by sharing your Account ID with them. - Share to Session + Invite your friend to chat with you on {app_name} by sharing your Account ID with them. + Share to {app_name} Show Show All Show Less @@ -766,10 +761,10 @@ Undo Unknown App updates - The update has been downloaded. Restart Session to apply the updates. + Updated installed, click to restart Cannot Update A new version of {app_name} is available, tap to update - There is a new version of Session available. Would you like to download the update? + There is a new version of {app_name} available. Would you like to download the update? Go to Release Notes {app_name} Update Version {version}