mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 03:18:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed hardcoded french text

Browse source
This commit is contained in:
Sylvain Berfini 2024-05-03 11:17:09 +02:00
parent 78052cae12
commit 86beb60507
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/linphone/ui/assistant/model/AcceptConditionsAndPolicyDialogModel.kt
View file

@ -26,7 +26,10 @@ import android.view.View
import androidx.annotation.UiThread
import androidx.lifecycle.MutableLiveData
import java.util.regex.Pattern
import org.linphone.LinphoneApplication.Companion.coreContext
import org.linphone.R
import org.linphone.core.tools.Log
import org.linphone.utils.AppUtils
import org.linphone.utils.Event
class AcceptConditionsAndPolicyDialogModel @UiThread constructor() {
@ -45,13 +48,16 @@ class AcceptConditionsAndPolicyDialogModel @UiThread constructor() {
val privacyPolicyClickedEvent = MutableLiveData<Event<Boolean>>()
init {
val privacy = "politique de confidentialité"
val terms = "conditions d'utilisation"
val label = "En continuant, vous acceptez notre $privacy et nos $terms."
val generalTerms = AppUtils.getString(R.string.assistant_dialog_general_terms_label)
val privacyPolicy = AppUtils.getString(R.string.assistant_dialog_privacy_policy_label)
val label = coreContext.context.getString(
R.string.assistant_dialog_general_terms_and_privacy_policy_message,
generalTerms,
privacyPolicy
)
val spannable = SpannableString(label)
val termsMatcher = Pattern.compile(terms).matcher(label)
val termsMatcher = Pattern.compile(generalTerms).matcher(label)
if (termsMatcher.find()) {
val clickableSpan: ClickableSpan = object : ClickableSpan() {
override fun onClick(widget: View) {
@ -67,7 +73,7 @@ class AcceptConditionsAndPolicyDialogModel @UiThread constructor() {
)
}
val policyMatcher = Pattern.compile(privacy).matcher(label)
val policyMatcher = Pattern.compile(privacyPolicy).matcher(label)
if (policyMatcher.find()) {
val clickableSpan: ClickableSpan = object : ClickableSpan() {
override fun onClick(widget: View) {

4
app/src/main/res/values-fr/strings.xml
View file

@ -115,7 +115,9 @@
<!-- Assistant related string (account register / login / etc...) -->
<string name="assistant_dialog_general_terms_and_privacy_policy_title">Conditions de service &amp; politique de confidentialité</string>
<string name="assistant_dialog_general_terms_and_privacy_policy_message">blah blah blah</string> <!-- TODO FIXME -->
<string name="assistant_dialog_general_terms_label">conditions de service</string>
<string name="assistant_dialog_privacy_policy_label">politique de confidentialité</string>
<string name="assistant_dialog_general_terms_and_privacy_policy_message">En continuant, vous acceptez nos %1$s et %2$s.</string>
<string name="assistant_dialog_confirm_phone_number_title">Confirmez votre numéro de téléphone</string>
<string name="assistant_dialog_confirm_phone_number_message">Êtes-vous sûr de vouloir utiliser ce numéro de téléphone ?</string>
<string name="assistant_account_login">Connexion</string>

4
app/src/main/res/values/strings.xml
View file

@ -150,7 +150,9 @@
<!-- Assistant related string (account register / login / etc...) -->
<string name="assistant_dialog_general_terms_and_privacy_policy_title">General terms &amp; privacy policy</string>
<string name="assistant_dialog_general_terms_and_privacy_policy_message">blah blah blah</string> <!-- TODO FIXME -->
<string name="assistant_dialog_general_terms_label">general terms</string>
<string name="assistant_dialog_privacy_policy_label">privacy policy</string>
<string name="assistant_dialog_general_terms_and_privacy_policy_message">By continuing, you accept our %1$s and %2$s.</string>
<string name="assistant_dialog_confirm_phone_number_title">Confirm phone number</string>
<string name="assistant_dialog_confirm_phone_number_message">Are you sure you want to use this phone number?</string>
<string name="assistant_account_login">Login</string>