Enable localization of session related strings

This commit is contained in:
Ingo Brückl
2022-08-30 07:52:27 +02:00
parent e3d9a2ef2d
commit 42ffd1a49e
3 changed files with 21 additions and 13 deletions

View File

@@ -79,12 +79,12 @@ class AccountActivity : BaseActivity() {
} }
AuthState.Available -> { AuthState.Available -> {
updateStatus("Verifying session") updateStatus(getString(R.string.session_verifying))
updateActionLayout(false) updateActionLayout(false)
} }
AuthState.Unavailable -> { AuthState.Unavailable -> {
updateStatus("You need to login first") updateStatus(getString(R.string.session_login))
updateActionLayout(true) updateActionLayout(true)
} }
@@ -93,7 +93,7 @@ class AccountActivity : BaseActivity() {
} }
AuthState.SignedOut -> { AuthState.SignedOut -> {
updateStatus("Last session scrapped") updateStatus(getString(R.string.session_scrapped))
updateActionLayout(true) updateActionLayout(true)
} }
@@ -114,10 +114,10 @@ class AccountActivity : BaseActivity() {
when (event) { when (event) {
is BusEvent.GoogleAAS -> { is BusEvent.GoogleAAS -> {
if (event.success) { if (event.success) {
updateStatus("Verifying Google Session") updateStatus(getString(R.string.session_verifying_google))
VM.buildGoogleAuthData(event.email, event.aasToken) VM.buildGoogleAuthData(event.email, event.aasToken)
} else { } else {
updateStatus("Failed to login via Google") updateStatus(getString(R.string.session_login_failed_google))
} }
} }
else -> { else -> {
@@ -129,10 +129,10 @@ class AccountActivity : BaseActivity() {
private fun updateContents() { private fun updateContents() {
if (accountProvider.isSignedIn()) { if (accountProvider.isSignedIn()) {
B.viewFlipper.displayedChild = 1 B.viewFlipper.displayedChild = 1
updateStatus("Woah! all good.") updateStatus(getString(R.string.session_good))
} else { } else {
B.viewFlipper.displayedChild = 0 B.viewFlipper.displayedChild = 0
updateStatus("Login and enjoy.") updateStatus(getString(R.string.session_enjoy))
} }
updateUserProfile() updateUserProfile()

View File

@@ -77,7 +77,7 @@ class SplashActivity : BaseActivity() {
attachActions() attachActions()
//Initial status //Initial status
updateStatus("Getting things ready..") updateStatus(getString(R.string.session_init))
VM.liveData.observe(this, { VM.liveData.observe(this, {
when (it) { when (it) {
@@ -86,12 +86,12 @@ class SplashActivity : BaseActivity() {
} }
AuthState.Available -> { AuthState.Available -> {
updateStatus("Verifying session") updateStatus(getString(R.string.session_verifying))
updateActionLayout(false) updateActionLayout(false)
} }
AuthState.Unavailable -> { AuthState.Unavailable -> {
updateStatus("You need to login first") updateStatus(getString(R.string.session_login))
updateActionLayout(true) updateActionLayout(true)
} }
@@ -100,7 +100,7 @@ class SplashActivity : BaseActivity() {
} }
AuthState.SignedOut -> { AuthState.SignedOut -> {
updateStatus("Last session scrapped") updateStatus(getString(R.string.session_scrapped))
updateActionLayout(true) updateActionLayout(true)
} }
@@ -164,10 +164,10 @@ class SplashActivity : BaseActivity() {
when (event) { when (event) {
is BusEvent.GoogleAAS -> { is BusEvent.GoogleAAS -> {
if (event.success) { if (event.success) {
updateStatus("Verifying Google Session") updateStatus(getString(R.string.session_verifying_google))
VM.buildGoogleAuthData(event.email, event.aasToken) VM.buildGoogleAuthData(event.email, event.aasToken)
} else { } else {
updateStatus("Failed to login via Google") updateStatus(getString(R.string.session_login_failed_google))
} }
} }
else -> { else -> {

View File

@@ -316,6 +316,14 @@
<string name="purchase_not_found">"App not found"</string> <string name="purchase_not_found">"App not found"</string>
<string name="purchase_no_file">"Could not get files"</string> <string name="purchase_no_file">"Could not get files"</string>
<string name="purchase_session_expired">"Session expired, re-login to obtain new session."</string> <string name="purchase_session_expired">"Session expired, re-login to obtain new session."</string>
<string name="session_enjoy">Login and enjoy.</string>
<string name="session_good">Woah! All good.</string>
<string name="session_init">Getting things ready…</string>
<string name="session_login">You need to login first</string>
<string name="session_login_failed_google">Failed to login via Google</string>
<string name="session_scrapped">Last session scrapped</string>
<string name="session_verifying">Verifying session</string>
<string name="session_verifying_google">Verifying Google Session</string>
<string name="spoof_apply">"Make sure you re-login to apply the spoof"</string> <string name="spoof_apply">"Make sure you re-login to apply the spoof"</string>
<string name="insecure_anonymous_apply">"Make sure you re-login and restart app to apply changes."</string> <string name="insecure_anonymous_apply">"Make sure you re-login and restart app to apply changes."</string>
<string name="tab_categories">"Categories"</string> <string name="tab_categories">"Categories"</string>