Merge branch 'master' into 'master'

whyorean · whyorean · commit 42d0d8936849 · 2022-09-25T01:12:03.000Z
Allow for better localization

See merge request AuroraOSS/AuroraStore!190
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
@@ -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
@@ -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/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/layout/view_app_update.xml b/app/src/main/res/layout/view_app_update.xml
@@ -123,7 +123,7 @@
 
             <LinearLayout
                 android:id="@+id/layout_action"
-                android:layout_width="100dp"
+                android:layout_width="115dp"
                 android:layout_height="@dimen/height_button"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -177,6 +177,9 @@
     <string name="download_completed">"Downloaded"</string>
     <string name="download_deleted">"Deleted"</string>
     <string name="download_eta_calculating">"Calculating"</string>
+    <string name="download_eta_hrs">%1$dh %2$dm %3$ds left</string>
+    <string name="download_eta_min">%1$dm %2$ds left</string>
+    <string name="download_eta_sec">%1$ds left</string>
     <string name="download_failed">"Download failed"</string>
     <string name="download_force_clear_all">"Force clear all"</string>
     <string name="download_metadata">"Getting metadata"</string>
@@ -318,6 +321,14 @@
     <string name="purchase_not_found">"App not found"</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="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="insecure_anonymous_apply">"Make sure you re-login and restart app to apply changes."</string>
     <string name="tab_categories">"Categories"</string>
@@ -387,4 +398,6 @@
     <string name="ui_accent_11">Light blue</string>
     <string name="ui_accent_12">Disskord blue</string>
     <string name="ui_accent_13">Deep blue</string>
+    <string name="update_available">update available</string>
+    <string name="updates_available">updates available</string>
 </resources>
diff --git 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 @@
     <string name="app_name">"Aurora Store"</string>
 
     <string name="app_list_rating">"%s • %s★ • %s"</string>
-    <string name="download_eta_hrs" translatable="false">%1$dh %2$dm %3$ds left</string>
-    <string name="download_eta_min" translatable="false">%1$dm %2$ds left</string>
-    <string name="download_eta_sec" translatable="false">%1$ds left</string>
     <string name="download_speed_bytes" translatable="false">%1$d B/s</string>
     <string name="download_speed_kb" translatable="false">%1$s KB/s</string>
     <string name="download_speed_mb" translatable="false">%1$s MB/s</string>

Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,12 @@ class AccountActivity : BaseActivity() {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`AuthState.Available -> {`
`82`		`- updateStatus("Verifying session")`
	`82`	`+ updateStatus(getString(R.string.session_verifying))`
`83`	`83`	`updateActionLayout(false)`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`AuthState.Unavailable -> {`
`87`		`- updateStatus("You need to login first")`
	`87`	`+ updateStatus(getString(R.string.session_login))`
`88`	`88`	`updateActionLayout(true)`
`89`	`89`	`}`
`90`	`90`
`@@ -93,7 +93,7 @@ class AccountActivity : BaseActivity() {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`AuthState.SignedOut -> {`
`96`		`- updateStatus("Last session scrapped")`
	`96`	`+ updateStatus(getString(R.string.session_scrapped))`
`97`	`97`	`updateActionLayout(true)`
`98`	`98`	`}`
`99`	`99`
`@@ -114,10 +114,10 @@ class AccountActivity : BaseActivity() {`
`114`	`114`	`when (event) {`
`115`	`115`	`is BusEvent.GoogleAAS -> {`
`116`	`116`	`if (event.success) {`
`117`		`- updateStatus("Verifying Google Session")`
	`117`	`+ updateStatus(getString(R.string.session_verifying_google))`
`118`	`118`	`VM.buildGoogleAuthData(event.email, event.aasToken)`
`119`	`119`	`} else {`
`120`		`- updateStatus("Failed to login via Google")`
	`120`	`+ updateStatus(getString(R.string.session_login_failed_google))`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`else -> {`
`@@ -129,10 +129,10 @@ class AccountActivity : BaseActivity() {`
`129`	`129`	`private fun updateContents() {`
`130`	`130`	`if (accountProvider.isSignedIn()) {`
`131`	`131`	`B.viewFlipper.displayedChild = 1`
`132`		`- updateStatus("Woah! all good.")`
	`132`	`+ updateStatus(getString(R.string.session_good))`
`133`	`133`	`} else {`
`134`	`134`	`B.viewFlipper.displayedChild = 0`
`135`		`- updateStatus("Login and enjoy.")`
	`135`	`+ updateStatus(getString(R.string.session_enjoy))`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`updateUserProfile()`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class SplashActivity : BaseActivity() {`
`77`	`77`	`attachActions()`
`78`	`78`
`79`	`79`	`//Initial status`
`80`		`- updateStatus("Getting things ready..")`
	`80`	`+ updateStatus(getString(R.string.session_init))`
`81`	`81`
`82`	`82`	`VM.liveData.observe(this, {`
`83`	`83`	`when (it) {`
`@@ -86,12 +86,12 @@ class SplashActivity : BaseActivity() {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`AuthState.Available -> {`
`89`		`- updateStatus("Verifying session")`
	`89`	`+ updateStatus(getString(R.string.session_verifying))`
`90`	`90`	`updateActionLayout(false)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`AuthState.Unavailable -> {`
`94`		`- updateStatus("You need to login first")`
	`94`	`+ updateStatus(getString(R.string.session_login))`
`95`	`95`	`updateActionLayout(true)`
`96`	`96`	`}`
`97`	`97`
`@@ -100,7 +100,7 @@ class SplashActivity : BaseActivity() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`AuthState.SignedOut -> {`
`103`		`- updateStatus("Last session scrapped")`
	`103`	`+ updateStatus(getString(R.string.session_scrapped))`
`104`	`104`	`updateActionLayout(true)`
`105`	`105`	`}`
`106`	`106`
`@@ -164,10 +164,10 @@ class SplashActivity : BaseActivity() {`
`164`	`164`	`when (event) {`
`165`	`165`	`is BusEvent.GoogleAAS -> {`
`166`	`166`	`if (event.success) {`
`167`		`- updateStatus("Verifying Google Session")`
	`167`	`+ updateStatus(getString(R.string.session_verifying_google))`
`168`	`168`	`VM.buildGoogleAuthData(event.email, event.aasToken)`
`169`	`169`	`} else {`
`170`		`- updateStatus("Failed to login via Google")`
	`170`	`+ updateStatus(getString(R.string.session_login_failed_google))`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`else -> {`