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

Fixed wrong format in some translated string + added try/catch to prevent a future one from making the app crash

Browse source
This commit is contained in:
Sylvain Berfini 2023-04-17 11:02:19 +02:00
parent 16740044d4
commit 3d93fb2bc1
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/org/linphone/activities/assistant/fragments/WelcomeFragment.kt
View file

@ -38,6 +38,7 @@ import org.linphone.activities.navigateToEmailAccountCreation
import org.linphone.activities.navigateToRemoteProvisioning
import org.linphone.core.tools.Log
import org.linphone.databinding.AssistantWelcomeFragmentBinding
import java.util.UnknownFormatConversionException
class WelcomeFragment : GenericFragment<AssistantWelcomeFragmentBinding>() {
private lateinit var viewModel: WelcomeViewModel
@ -85,11 +86,16 @@ class WelcomeFragment : GenericFragment<AssistantWelcomeFragmentBinding>() {
val terms = getString(R.string.assistant_general_terms)
val privacy = getString(R.string.assistant_privacy_policy)
val label = getString(
R.string.assistant_read_and_agree_terms,
terms,
privacy
)
val label = try {
getString(
R.string.assistant_read_and_agree_terms,
terms,
privacy
)
} catch (e: UnknownFormatConversionException) {
Log.e("[Welcome] Wrong R.string.assistant_read_and_agree_terms format!")
"I accept Belledonne Communications' terms of use and privacy policy"
}
val spannable = SpannableString(label)
val termsMatcher = Pattern.compile(terms).matcher(label)

2
app/src/main/res/values-fi/strings.xml
View file

@ -331,7 +331,7 @@
\n
\nNäet osoitekirjastasi kuka käyttää &appName; ja ystäväsi tietävät myös, että voivat ottaa yhteyttä käyttäen &appName;.
\n"</string>
<string name="assistant_read_and_agree_terms">Hyväksyn Belledonne Communications:n %1$:n ja %2$:n</string>
<string name="assistant_read_and_agree_terms">Hyväksyn Belledonne Communications:n %1$s:n ja %2$s:n</string>
<string name="assistant_generic_account_warning_continue_button_text">Ymmärrän</string>
<string name="assistant_error_phone_number_invalid_characters">Vain numerot ovat sallittuja</string>
<string name="assistant_error_username_already_exists">Käyttäjätunnus on jo käytössä</string>

2
app/src/main/res/values-he/strings.xml
View file

@ -225,7 +225,7 @@
<string name="assistant_remote_provisioning">קבל הגדרות מרחוק</string>
<string name="assistant_ec_calibration">מכייל ביטול הד</string>
<string name="assistant_phone_number_info_title">למה מספר הטלפון שלי ישמש\?</string>
<string name="assistant_read_and_agree_terms">אני מסכים ל%1$ ו %2$ של \"Belledonne Communications\"</string>
<string name="assistant_read_and_agree_terms">אני מסכים ל%1$s ו %2$s של \"Belledonne Communications\"</string>
<string name="assistant_error_phone_number_invalid_characters">מותר מספרים בלבד</string>
<string name="assistant_error_username_already_exists">משתמש בשימוש</string>
<string name="assistant_error_phone_number_already_exists">כבר קיים חשבון המשתמש במספר זה</string>