Updated translation coverage

Author: Crustack

TRANSLATIONS.md

@@ -19,34 +19,34 @@ See [Android Translations Converter](https://github.com/Crustack/android-transla
 <!-- translations:start -->
 | Language | Coverage |
 |----------|----------|
-| 🇺🇸 English | 100% (333/333) |
-| 🇪🇸 Catalan | 19% (65/333) |
-| 🇨🇿 Czech | 93% (313/333) |
-| 🇩🇰 Danish | 20% (69/333) |
-| 🇩🇪 German | 98% (327/333) |
-| 🇬🇷 Greek | 21% (72/333) |
-| 🇪🇸 Spanish | 94% (314/333) |
-| 🇫🇷 French | 98% (327/333) |
-| 🇭🇺 Hungarian | 19% (65/333) |
-| 🇮🇩 Indonesian | 22% (75/333) |
-| 🇮🇹 Italian | 87% (291/333) |
-| 🇯🇵 Japanese | 21% (73/333) |
-| 🇲🇲 Burmese | 27% (90/333) |
-| 🇳🇴 Norwegian Bokmål | 31% (106/333) |
-| 🇳🇱 Dutch | 63% (212/333) |
-| 🇳🇴 Norwegian Nynorsk | 31% (106/333) |
-| 🇵🇱 Polish | 90% (300/333) |
-| 🇧🇷 Portuguese (Brazil) | 93% (312/333) |
-| 🇵🇹 Portuguese (Portugal) | 21% (71/333) |
-| 🇷🇴 Romanian | 90% (301/333) |
-| 🇷🇺 Russian | 91% (305/333) |
-| 🇸🇰 Slovak | 19% (65/333) |
-| 🇸🇮 Slovenian | 32% (109/333) |
-| 🇸🇪 Swedish | 18% (63/333) |
-| 🇵🇭 Tagalog | 19% (65/333) |
-| 🇹🇷 Turkish | 21% (73/333) |
-| 🇺🇦 Ukrainian | 97% (326/333) |
-| 🇻🇳 Vietnamese | 32% (107/333) |
-| 🇨🇳 Chinese (Simplified) | 96% (323/333) |
-| 🇹🇼 Chinese (Traditional) | 88% (294/333) |
+| 🇺🇸 English | 100% (336/336) |
+| 🇪🇸 Catalan | 19% (65/336) |
+| 🇨🇿 Czech | 93% (313/336) |
+| 🇩🇰 Danish | 20% (69/336) |
+| 🇩🇪 German | 97% (327/336) |
+| 🇬🇷 Greek | 21% (72/336) |
+| 🇪🇸 Spanish | 93% (314/336) |
+| 🇫🇷 French | 97% (327/336) |
+| 🇭🇺 Hungarian | 19% (65/336) |
+| 🇮🇩 Indonesian | 22% (75/336) |
+| 🇮🇹 Italian | 86% (291/336) |
+| 🇯🇵 Japanese | 21% (73/336) |
+| 🇲🇲 Burmese | 26% (90/336) |
+| 🇳🇴 Norwegian Bokmål | 31% (106/336) |
+| 🇳🇱 Dutch | 63% (212/336) |
+| 🇳🇴 Norwegian Nynorsk | 31% (106/336) |
+| 🇵🇱 Polish | 89% (300/336) |
+| 🇧🇷 Portuguese (Brazil) | 92% (312/336) |
+| 🇵🇹 Portuguese (Portugal) | 21% (71/336) |
+| 🇷🇴 Romanian | 89% (301/336) |
+| 🇷🇺 Russian | 90% (305/336) |
+| 🇸🇰 Slovak | 19% (65/336) |
+| 🇸🇮 Slovenian | 32% (109/336) |
+| 🇸🇪 Swedish | 18% (63/336) |
+| 🇵🇭 Tagalog | 19% (65/336) |
+| 🇹🇷 Turkish | 21% (73/336) |
+| 🇺🇦 Ukrainian | 97% (326/336) |
+| 🇻🇳 Vietnamese | 31% (107/336) |
+| 🇨🇳 Chinese (Simplified) | 96% (323/336) |
+| 🇹🇼 Chinese (Traditional) | 87% (294/336) |
 <!-- translations:end -->

app/src/main/java/com/philkes/notallyx/data/model/ModelExtensions.kt

@@ -330,15 +330,9 @@ fun Reminder.toRepetitionText(context: Context): String {
         val dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH)
         val isLastDayOfMonth = dayOfMonth == calendar.getActualMaximum(Calendar.DAY_OF_MONTH)
 
-        val prefix =
-            if (rep.value == 1) ""
-            else
-                "${context.getString(R.string.every)} ${rep.value} ${context.getString(R.string.months)}"
-        val postfix =
-            if (isLastDayOfMonth)
-                context.getString(R.string.of_the_month_last, context.getString(R.string.day))
-            else context.getString(R.string.of_the_month, "$dayOfMonth.")
-        return "$prefix $postfix"
+        return if (isLastDayOfMonth)
+            context.getString(R.string.of_the_month_last, context.getString(R.string.day))
+        else context.getString(R.string.of_the_month, "$dayOfMonth.")
     }
     return rep.toText(context)
 }
@@ -347,10 +341,6 @@ fun Repetition.toText(context: Context): String {
     if (unit == RepetitionTimeUnit.MONTHS && occurrence != null && dayOfWeek != null) {
         val dayOfWeekStr =
             SimpleDateFormat("EEEE", Locale.getDefault())
-                .apply {
-                    val cal = Calendar.getInstance()
-                    cal.set(Calendar.DAY_OF_WEEK, dayOfWeek!!)
-                }
                 .format(
                     Calendar.getInstance().apply { set(Calendar.DAY_OF_WEEK, dayOfWeek!!) }.time
                 )
@@ -457,13 +447,19 @@ fun Reminder.nextNotification(from: Date = Date()): Date? {
             next.add(Calendar.MONTH, rep.value)
         }
     }
+    val calendar = dateTime.toCalendar()
+    val field = repetition!!.unit.toCalendarField()
+    val value = repetition!!.value
+
+    // If from is exactly at dateTime, we want the next one
+    while (true) {
+        calendar.add(field, value)
+        if (calendar.time.after(from)) {
+            break
+        }
+    }
 
-    val timeDifferenceMillis: Long = from.time - dateTime.time
-    val intervalsPassed = timeDifferenceMillis / rep.toMillis()
-    val unitsUntilNext = ((rep.value) * (intervalsPassed + 1)).toInt()
-    val reminderStart = dateTime.toCalendar()
-    reminderStart.add(rep.unit.toCalendarField(), unitsUntilNext)
-    return reminderStart.time
+    return calendar.time
 }
 
 private fun findOccurrenceInMonth(

app/src/test/kotlin/com/philkes/notallyx/data/model/ReminderRepetitionTest.kt

@@ -150,16 +150,14 @@ class ReminderRepetitionTest {
     }
 
     @Test
-    fun `nextNotification for Advanced Monthly - 1st Sunday when 1st is Monday`() {
-        // Oct 2023: 1st is Sunday.
-        // Nov 2023: 1st is Wednesday. 1st Sunday is Nov 5th.
-        val start = createDate(2023, Calendar.OCTOBER, 1, 10, 0)
+    fun `nextNotification for Advanced Monthly - 1st Sunday when 2nd is Monday`() {
+        val start = createDate(2023, Calendar.OCTOBER, 2, 10, 0)
         val repetition =
             Repetition(1, RepetitionTimeUnit.MONTHS, occurrence = 1, dayOfWeek = Calendar.SUNDAY)
         val reminder = Reminder(1, start, repetition)
 
         // From Oct 2nd
-        val from = createDate(2023, Calendar.OCTOBER, 2, 9, 0)
+        val from = createDate(2023, Calendar.OCTOBER, 2, 11, 0)
         val expected = createDate(2023, Calendar.NOVEMBER, 5, 10, 0)
         assertEquals(expected, reminder.nextNotification(from))
     }