From 42ffd1a49e80839fba14ec44cd0a659bcd280a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= Date: Tue, 30 Aug 2022 07:52:27 +0200 Subject: [PATCH 1/4] Enable localization of session related strings --- .../store/view/ui/account/AccountActivity.kt | 14 +++++++------- .../aurora/store/view/ui/splash/SplashActivity.kt | 12 ++++++------ app/src/main/res/values/strings.xml | 8 ++++++++ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt index 4efbad11a..c8bee8c0c 100644 --- a/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/account/AccountActivity.kt @@ -79,12 +79,12 @@ class AccountActivity : BaseActivity() { } AuthState.Available -> { - updateStatus("Verifying session") + updateStatus(getString(R.string.session_verifying)) updateActionLayout(false) } AuthState.Unavailable -> { - updateStatus("You need to login first") + updateStatus(getString(R.string.session_login)) updateActionLayout(true) } @@ -93,7 +93,7 @@ class AccountActivity : BaseActivity() { } AuthState.SignedOut -> { - updateStatus("Last session scrapped") + updateStatus(getString(R.string.session_scrapped)) updateActionLayout(true) } @@ -114,10 +114,10 @@ class AccountActivity : BaseActivity() { when (event) { is BusEvent.GoogleAAS -> { if (event.success) { - updateStatus("Verifying Google Session") + updateStatus(getString(R.string.session_verifying_google)) VM.buildGoogleAuthData(event.email, event.aasToken) } else { - updateStatus("Failed to login via Google") + updateStatus(getString(R.string.session_login_failed_google)) } } else -> { @@ -129,10 +129,10 @@ class AccountActivity : BaseActivity() { private fun updateContents() { if (accountProvider.isSignedIn()) { B.viewFlipper.displayedChild = 1 - updateStatus("Woah! all good.") + updateStatus(getString(R.string.session_good)) } else { B.viewFlipper.displayedChild = 0 - updateStatus("Login and enjoy.") + updateStatus(getString(R.string.session_enjoy)) } updateUserProfile() diff --git a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt index f12cb967f..fffcea6f4 100644 --- a/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/splash/SplashActivity.kt @@ -77,7 +77,7 @@ class SplashActivity : BaseActivity() { attachActions() //Initial status - updateStatus("Getting things ready..") + updateStatus(getString(R.string.session_init)) VM.liveData.observe(this, { when (it) { @@ -86,12 +86,12 @@ class SplashActivity : BaseActivity() { } AuthState.Available -> { - updateStatus("Verifying session") + updateStatus(getString(R.string.session_verifying)) updateActionLayout(false) } AuthState.Unavailable -> { - updateStatus("You need to login first") + updateStatus(getString(R.string.session_login)) updateActionLayout(true) } @@ -100,7 +100,7 @@ class SplashActivity : BaseActivity() { } AuthState.SignedOut -> { - updateStatus("Last session scrapped") + updateStatus(getString(R.string.session_scrapped)) updateActionLayout(true) } @@ -164,10 +164,10 @@ class SplashActivity : BaseActivity() { when (event) { is BusEvent.GoogleAAS -> { if (event.success) { - updateStatus("Verifying Google Session") + updateStatus(getString(R.string.session_verifying_google)) VM.buildGoogleAuthData(event.email, event.aasToken) } else { - updateStatus("Failed to login via Google") + updateStatus(getString(R.string.session_login_failed_google)) } } else -> { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 717b60079..a3bb63fe8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -316,6 +316,14 @@ "App not found" "Could not get files" "Session expired, re-login to obtain new session." + Login and enjoy. + Woah! All good. + Getting things ready… + You need to login first + Failed to login via Google + Last session scrapped + Verifying session + Verifying Google Session "Make sure you re-login to apply the spoof" "Make sure you re-login and restart app to apply changes." "Categories" From 302f062417cacab5b61ae2e6f629889197095daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= Date: Tue, 30 Aug 2022 08:02:58 +0200 Subject: [PATCH 2/4] Enable localization of the title of available updates Choose also a suitable string in singular or plural. --- .../com/aurora/store/view/ui/updates/UpdatesFragment.kt | 7 ++++++- app/src/main/res/values/strings.xml | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt index 630aa4e10..b00c3abfd 100644 --- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt @@ -196,7 +196,12 @@ class UpdatesFragment : BaseFragment() { add( UpdateHeaderViewModel_() .id("header_all") - .title("${updateFileMap.size} updates available") + .title("${updateFileMap.size} " + + if (updateFileMap.size == 1) + getString(R.string.update_available) + else + getString(R.string.updates_available) + ) .action( if (VM.updateAllEnqueued) getString(R.string.action_cancel) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a3bb63fe8..d4cb2b0aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -393,4 +393,6 @@ Light blue Disskord blue Deep blue + update available + updates available \ No newline at end of file From b7ee3ab70aa519ab0d038dd743cf1747164425b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= Date: Tue, 30 Aug 2022 08:29:23 +0200 Subject: [PATCH 3/4] Enable localization of download time related strings --- app/src/main/res/values/strings.xml | 3 +++ app/src/main/res/values/strings_do_not_translate.xml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d4cb2b0aa..894e7c825 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -176,6 +176,9 @@ "Downloaded" "Deleted" "Calculating" + %1$dh %2$dm %3$ds left + %1$dm %2$ds left + %1$ds left "Download failed" "Force clear all" "Getting metadata" diff --git a/app/src/main/res/values/strings_do_not_translate.xml b/app/src/main/res/values/strings_do_not_translate.xml index e7fd4d875..afb88f14d 100644 --- a/app/src/main/res/values/strings_do_not_translate.xml +++ b/app/src/main/res/values/strings_do_not_translate.xml @@ -21,9 +21,6 @@ "Aurora Store" "%s • %s★ • %s" - %1$dh %2$dm %3$ds left - %1$dm %2$ds left - %1$ds left %1$d B/s %1$s KB/s %1$s MB/s From e6dc9fefdd395800c72819566cebcc9183ee8a5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Br=C3=BCckl?= Date: Wed, 31 Aug 2022 21:22:24 +0200 Subject: [PATCH 4/4] Increase the update button width Depending on the localization, the text may not fit into the button and may be unreadable or difficult to read. --- app/src/main/res/layout/view_app_update.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/view_app_update.xml b/app/src/main/res/layout/view_app_update.xml index 60d502e28..1a2997d78 100644 --- a/app/src/main/res/layout/view_app_update.xml +++ b/app/src/main/res/layout/view_app_update.xml @@ -123,7 +123,7 @@