diff --git a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt index 4ddf24414f..6a9d434aea 100644 --- a/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt +++ b/vector/src/main/java/im/vector/app/core/resources/LocaleProvider.kt @@ -27,3 +27,5 @@ class LocaleProvider @Inject constructor(private val resources: Resources) { return ConfigurationCompat.getLocales(resources.configuration)[0] } } + +fun LocaleProvider.isEnglishSpeaking() = current().language.startsWith("en") diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt index 2b544ac81e..96cd4a89a9 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/SplashCarouselStateFactory.kt @@ -21,14 +21,17 @@ import androidx.annotation.AttrRes import im.vector.app.R import im.vector.app.core.epoxy.charsequence.EpoxyCharSequence import im.vector.app.core.epoxy.charsequence.toEpoxyCharSequence +import im.vector.app.core.resources.LocaleProvider import im.vector.app.core.resources.StringProvider +import im.vector.app.core.resources.isEnglishSpeaking import im.vector.app.features.themes.ThemeUtils import me.gujun.android.span.span import javax.inject.Inject class SplashCarouselStateFactory @Inject constructor( private val context: Context, - private val stringProvider: StringProvider + private val stringProvider: StringProvider, + private val localeProvider: LocaleProvider, ) { fun create() = SplashCarouselState(listOf( @@ -51,13 +54,20 @@ class SplashCarouselStateFactory @Inject constructor( R.drawable.bg_carousel_page_3 ), SplashCarouselState.Item( - R.string.ftue_auth_carousel_4_title.colorTerminatingFullStop(R.attr.colorAccent), + collaborationTitle().colorTerminatingFullStop(R.attr.colorAccent), R.string.ftue_auth_carousel_4_body, R.drawable.ic_splash_collaboration, R.drawable.bg_carousel_page_4 ) )) + private fun collaborationTitle(): Int { + return when { + localeProvider.isEnglishSpeaking() -> R.string.cut_the_slack_from_teams + else -> R.string.ftue_auth_carousel_4_title + } + } + private fun Int.colorTerminatingFullStop(@AttrRes color: Int): EpoxyCharSequence { val string = stringProvider.getString(this) val fullStop = "." diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml index 3a9a60f912..af2319883c 100755 --- a/vector/src/main/res/values/donottranslate.xml +++ b/vector/src/main/res/values/donottranslate.xml @@ -14,6 +14,9 @@ Not implemented yet in ${app_name} + + Cut the slack from teams. + Who will you chat to the most? We\'ll help you get connected. @@ -24,5 +27,4 @@ You can skip this question Looking to join an existing server? Connect to server - diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 62ef0198b5..01ff829eda 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -2525,7 +2525,8 @@ You\'re in control. Element lets you choose where your messages are stored, keeping you in control of your data. Secure Messaging. - No phone number required, so you don\'t have to share those details with the outside world. No ads, no tracking or datamining. + No phone number required, so you don\'t have to share those details with the outside world. No ads, no datamining. + Cut the slack from teams. As universal as email, Element is a completely new type of collaboration. @@ -3657,8 +3658,8 @@ %s in Settings to receive invites directly in Element. - Enable LaTeX mathematics - Restart the application for the change to take effect. + Enable LaTeX mathematics + Restart the application for the change to take effect. Create Poll diff --git a/vector/src/main/res/values/strings_no_weblate.xml b/vector/src/main/res/values/strings_no_weblate.xml index a34f8207f3..35e0d43fb4 100644 --- a/vector/src/main/res/values/strings_no_weblate.xml +++ b/vector/src/main/res/values/strings_no_weblate.xml @@ -9,5 +9,4 @@ US Latn - \ No newline at end of file