Added Italian translation, added strings to strings.xml and optimized…

… a date for localization
Ivy-Apps · Apr 24, 2022 · a277075 · a277075
1 parent 6ce9108
commit a277075
Show file tree

Hide file tree

Showing 6 changed files with 461 additions and 19 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/domain/data/entity/Budget.kt b/app/src/main/java/com/ivy/wallet/domain/data/entity/Budget.kt
@@ -2,6 +2,8 @@ package com.ivy.wallet.domain.data.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.ivy.wallet.R
+import com.ivy.wallet.stringRes
 import java.util.*
 
 @Entity(tableName = "budgets")
@@ -26,9 +28,9 @@ data class Budget(
 
         fun type(categoriesCount: Int): String {
             return when (categoriesCount) {
-                0 -> "Total Budget"
-                1 -> "Category Budget"
-                else -> "Multi-Category ($categoriesCount) Budget"
+                0 -> stringRes(R.string.total_budget)
+                1 -> stringRes(R.string.category_budget)
+                else -> stringRes(R.string.multi_category_budget, categoriesCount.toString())
             }
         }
     }

diff --git a/app/src/main/java/com/ivy/wallet/domain/data/entity/Loan.kt b/app/src/main/java/com/ivy/wallet/domain/data/entity/Loan.kt
@@ -2,7 +2,9 @@ package com.ivy.wallet.domain.data.entity
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.ivy.wallet.R
 import com.ivy.wallet.domain.data.LoanType
+import com.ivy.wallet.stringRes
 import java.util.*
 
 @Entity(tableName = "loans")
@@ -22,6 +24,7 @@ data class Loan(
     val id: UUID = UUID.randomUUID()
 ) {
     fun humanReadableType(): String {
-        return if (type == LoanType.BORROW) "BORROWED" else "LENT"
+        return if (type == LoanType.BORROW) stringRes(R.string.borrowed_uppercase) else stringRes(
+                    R.string.lent_uppercase)
     }
 }
diff --git a/app/src/main/java/com/ivy/wallet/ui/theme/modal/model/Month.kt b/app/src/main/java/com/ivy/wallet/ui/theme/modal/model/Month.kt
@@ -1,5 +1,7 @@
 package com.ivy.wallet.ui.theme.modal.model
 
+import com.ivy.wallet.R
+import com.ivy.wallet.stringRes
 import com.ivy.wallet.ui.IvyWalletCtx
 import com.ivy.wallet.ui.onboarding.model.TimePeriod
 import com.ivy.wallet.utils.dateNowUTC
@@ -11,18 +13,18 @@ data class Month(
 ) {
     companion object {
         fun monthsList(): MutableList<Month> = mutableListOf(
-            Month(1, "January"),
-            Month(2, "February"),
-            Month(3, "March"),
-            Month(4, "April"),
-            Month(5, "May"),
-            Month(6, "June"),
-            Month(7, "July"),
-            Month(8, "August"),
-            Month(9, "September"),
-            Month(10, "October"),
-            Month(11, "November"),
-            Month(12, "December"),
+            Month(1, stringRes(R.string.january)),
+            Month(2, stringRes(R.string.february)),
+            Month(3, stringRes(R.string.march)),
+            Month(4, stringRes(R.string.april)),
+            Month(5, stringRes(R.string.may)),
+            Month(6, stringRes(R.string.june)),
+            Month(7, stringRes(R.string.july)),
+            Month(8, stringRes(R.string.august)),
+            Month(9, stringRes(R.string.september)),
+            Month(10, stringRes(R.string.october)),
+            Month(11, stringRes(R.string.november)),
+            Month(12, stringRes(R.string.december)),
         )
 
         fun fromMonthValue(code: Int): Month =

diff --git a/app/src/main/java/com/ivy/wallet/utils/DateExt.kt b/app/src/main/java/com/ivy/wallet/utils/DateExt.kt
@@ -99,9 +99,9 @@ fun LocalDateTime.formatNicelyWithTime(
         }
         else -> {
             if (isThisYear) {
-                this.formatLocal("EEE, dd MMM 'at' HH:mm", zone)
+                this.formatLocal("EEE, dd MMM HH:mm", zone)
             } else {
-                this.formatLocal("dd MMM, yyyy 'at' HH:mm", zone)
+                this.formatLocal("dd MMM, yyyy HH:mm", zone)
             }
         }
     }