diff --git a/app/src/main/java/com/leanbitlab/lwidget/AwidgetProvider.kt b/app/src/main/java/com/leanbitlab/lwidget/AwidgetProvider.kt index 1dc598a..b5a470d 100644 --- a/app/src/main/java/com/leanbitlab/lwidget/AwidgetProvider.kt +++ b/app/src/main/java/com/leanbitlab/lwidget/AwidgetProvider.kt @@ -232,13 +232,14 @@ class AwidgetProvider : AppWidgetProvider() { } internal fun formatEventTimeText( + context: Context, event: EventInfo, today: LocalDate = LocalDate.now(), showDayAbbr: Boolean = true, is24Hour: Boolean = false ): String { val mapped = CalendarFetcher.EventInfo(event.id, event.title, event.begin, event.end, event.isLocal, event.isAllDay) - return CalendarFetcher.formatEventTimeText(mapped, today, showDayAbbr, is24Hour) + return CalendarFetcher.formatEventTimeText(context, mapped, today, showDayAbbr, is24Hour) } internal fun calculateDailySteps( diff --git a/app/src/main/java/com/leanbitlab/lwidget/SettingsAppearance.kt b/app/src/main/java/com/leanbitlab/lwidget/SettingsAppearance.kt index 3694bc5..e6bfce0 100644 --- a/app/src/main/java/com/leanbitlab/lwidget/SettingsAppearance.kt +++ b/app/src/main/java/com/leanbitlab/lwidget/SettingsAppearance.kt @@ -138,6 +138,8 @@ internal fun MainActivity.setupThemeSection(colorOptions: List) { } internal fun MainActivity.setupLanguageSection() { + // Language names stay in their own script so users can always find theirs. + // i18n-ignore-start val languages = listOf( LanguageOption("", getString(R.string.lang_system_default)), LanguageOption("en", "English"), @@ -152,6 +154,7 @@ internal fun MainActivity.setupLanguageSection() { LanguageOption("ja", "日本語 (Japanese)"), LanguageOption("tr", "Türkçe (Turkish)") ) + // i18n-ignore-end val languageLabels = languages.map { it.displayName } val currentLocales = androidx.appcompat.app.AppCompatDelegate.getApplicationLocales() val currentTag = if (currentLocales.isEmpty) "" else currentLocales.get(0)?.language ?: "" diff --git a/app/src/main/java/com/leanbitlab/lwidget/SettingsDisplaySections.kt b/app/src/main/java/com/leanbitlab/lwidget/SettingsDisplaySections.kt index ab2df3f..eacd1bd 100644 --- a/app/src/main/java/com/leanbitlab/lwidget/SettingsDisplaySections.kt +++ b/app/src/main/java/com/leanbitlab/lwidget/SettingsDisplaySections.kt @@ -151,7 +151,7 @@ internal fun MainActivity.setupBatterySection() { internal fun MainActivity.setupTempSection() { // Temp - val tempUnitOptions = listOf("Celsius (°C)", "Fahrenheit (°F)") + val tempUnitOptions = listOf(getString(R.string.temp_unit_celsius), getString(R.string.temp_unit_fahrenheit)) bindFoldedSection( R.id.header_temp, R.drawable.ic_temp, getString(R.string.section_temp), R.id.content_temp, R.id.row_temp_toggle, diff --git a/app/src/main/java/com/leanbitlab/lwidget/SettingsSearch.kt b/app/src/main/java/com/leanbitlab/lwidget/SettingsSearch.kt index defd349..82376e8 100644 --- a/app/src/main/java/com/leanbitlab/lwidget/SettingsSearch.kt +++ b/app/src/main/java/com/leanbitlab/lwidget/SettingsSearch.kt @@ -79,6 +79,8 @@ internal fun MainActivity.setupGlobalSettingsSearch() { } } + // English search keywords (not shown in UI). + // i18n-ignore-start val cardMap = mapOf( // Style Tab R.id.card_appearance_presets to listOf("presets", "themes", "minimal", "neon", "cockpit", "sunset", "monochrome", "snowfall"), @@ -115,6 +117,7 @@ internal fun MainActivity.setupGlobalSettingsSearch() { R.id.card_about to listOf("about", "version", "github", "source code", "developer", "license", "privacy", "author"), R.id.card_changelog to listOf("changelog", "whats new", "updates", "history") ) + // i18n-ignore-end val headerLabels: List = listOfNotNull( findViewById(R.id.label_category_content), diff --git a/app/src/main/java/com/leanbitlab/lwidget/calendar/CalendarFetcher.kt b/app/src/main/java/com/leanbitlab/lwidget/calendar/CalendarFetcher.kt index 30129df..57d38d3 100644 --- a/app/src/main/java/com/leanbitlab/lwidget/calendar/CalendarFetcher.kt +++ b/app/src/main/java/com/leanbitlab/lwidget/calendar/CalendarFetcher.kt @@ -55,6 +55,7 @@ object CalendarFetcher { } internal fun formatEventTimeText( + context: Context, event: EventInfo, today: LocalDate = LocalDate.now(), showDayAbbr: Boolean = true, @@ -78,9 +79,9 @@ object CalendarFetcher { val isOngoingToday = eventDate.isEqual(today) || (eventDate.isBefore(today) && eventEndDate.isAfter(today)) if (isOngoingToday) { - "Today" + context.getString(R.string.label_today) } else if (eventDate.isEqual(tomorrow)) { - "Tomorrow" + context.getString(R.string.label_tomorrow) } else if (eventDate.isAfter(today) && eventDate.isBefore(oneWeekLater)) { if (showDayAbbr) eventTime.format(allDayNearFormatter) else eventTime.format(getFormatter("d")) @@ -91,9 +92,9 @@ object CalendarFetcher { val eventTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(event.begin), ZoneId.systemDefault()) val eventDate = eventTime.toLocalDate() if (eventDate.isEqual(today)) { - "Today ${eventTime.format(timeFormatter)}" + context.getString(R.string.label_today_time, eventTime.format(timeFormatter)) } else if (eventDate.isEqual(tomorrow)) { - "Tomorrow ${eventTime.format(timeFormatter)}" + context.getString(R.string.label_tomorrow_time, eventTime.format(timeFormatter)) } else if (eventDate.isBefore(oneWeekLater)) { if (showDayAbbr) "${eventTime.format(dayTimeFormatter)}" else eventTime.format(timeFormatter) @@ -207,7 +208,7 @@ object CalendarFetcher { val is24Hour = timeFormatIdx == 1 || (timeFormatIdx == 0 && android.text.format.DateFormat.is24HourFormat(context)) if (events.isEmpty()) { - views.setTextViewText(eventViews[0], "No events today") + views.setTextViewText(eventViews[0], context.getString(R.string.widget_no_events_today)) secondaryColor.applyTextColor(views, eventViews[0]) views.setTextViewTextSize(eventViews[0], android.util.TypedValue.COMPLEX_UNIT_SP, textSizeSp) views.setViewVisibility(eventViews[0], android.view.View.VISIBLE) @@ -232,7 +233,7 @@ object CalendarFetcher { for (i in eventViews.indices) { if (i < events.size) { val event = events[i] - val timeText = formatEventTimeText(event, today, showDayAbbr, is24Hour) + val timeText = formatEventTimeText(context, event, today, showDayAbbr, is24Hour) val fullText = "• $timeText ${event.title}" val spannable = SpannableString(fullText) @@ -275,7 +276,7 @@ object CalendarFetcher { context, android.Manifest.permission.READ_CALENDAR ) != android.content.pm.PackageManager.PERMISSION_GRANTED) { // Interactive permission prompt in widget - views.setTextViewText(eventViews[0], "• Tap to grant calendar permission") + views.setTextViewText(eventViews[0], "• " + context.getString(R.string.widget_tap_grant_calendar)) secondaryColor.applyTextColor(views, eventViews[0]) views.setTextViewTextSize(eventViews[0], android.util.TypedValue.COMPLEX_UNIT_SP, textSizeSp) views.setViewVisibility(eventViews[0], android.view.View.VISIBLE) diff --git a/app/src/main/java/com/leanbitlab/lwidget/render/WidgetRenderer.kt b/app/src/main/java/com/leanbitlab/lwidget/render/WidgetRenderer.kt index d79da33..2f4daff 100644 --- a/app/src/main/java/com/leanbitlab/lwidget/render/WidgetRenderer.kt +++ b/app/src/main/java/com/leanbitlab/lwidget/render/WidgetRenderer.kt @@ -208,15 +208,15 @@ object WidgetRenderer { // Branching for partial TICK/event updates if (mode == UpdateMode.STEPS_ONLY) { val stepViews = RemoteViews(context.packageName, layoutId) - if (showSteps) SystemStatsFetcher.loadStepCount(stepViews, prefs) + if (showSteps) SystemStatsFetcher.loadStepCount(context, stepViews, prefs) return stepViews } else if (mode == UpdateMode.TICK) { val tickViews = RemoteViews(context.packageName, layoutId) SystemStatsFetcher.updateBatteryAndTemp(context, tickViews, prefs, showBattery, showTemp) - if (showSteps) SystemStatsFetcher.loadStepCount(tickViews, prefs) + if (showSteps) SystemStatsFetcher.loadStepCount(context, tickViews, prefs) if (showScreenTime) SystemStatsFetcher.updateScreenTime(context, tickViews, prefs) if (showData) SystemStatsFetcher.updateDataUsage(context, tickViews, prefs) - if (showStorage) SystemStatsFetcher.updateStorageStats(tickViews, prefs) + if (showStorage) SystemStatsFetcher.updateStorageStats(context, tickViews, prefs) if (showRam) SystemStatsFetcher.updateRamStats(context, tickViews, prefs) return tickViews } else if (mode == UpdateMode.CALENDAR_ONLY) { @@ -356,20 +356,21 @@ object WidgetRenderer { )) { hasWarning = true weatherCode = fCode - val dayText = when (index) { - 0 -> "today" - 1 -> "tomorrow" - else -> { - val localDate = java.time.LocalDate.now().plusDays(index.toLong()) - localDate.dayOfWeek.getDisplayName(java.time.format.TextStyle.SHORT, java.util.Locale.getDefault()) - } + val dayName = if (index > 1) { + java.time.LocalDate.now().plusDays(index.toLong()) + .dayOfWeek.getDisplayName(java.time.format.TextStyle.SHORT, java.util.Locale.getDefault()) + } else "" + fun dayRes(todayRes: Int, tomorrowRes: Int, onRes: Int) = when (index) { + 0 -> context.getString(todayRes) + 1 -> context.getString(tomorrowRes) + else -> context.getString(onRes, dayName) } val precipString = if (forecast.precipProbability != null && forecast.precipProbability > 0) "${forecast.precipProbability}% " else "" val conditionWarning = when (fCode) { - in listOf(500, 501, 502, 503, 504, 511, 520, 521, 522, 531) -> if (index <= 1) "Rain $dayText" else "Rain on $dayText" - in listOf(600, 601, 602, 611, 612, 615, 616, 620, 621, 622) -> if (index <= 1) "Snow $dayText" else "Snow on $dayText" - in listOf(210, 211, 212, 221, 230, 231, 232) -> if (index <= 1) "Storm $dayText" else "Storm on $dayText" - else -> "Warning" + in listOf(500, 501, 502, 503, 504, 511, 520, 521, 522, 531) -> dayRes(R.string.weather_rain_today, R.string.weather_rain_tomorrow, R.string.weather_rain_on) + in listOf(600, 601, 602, 611, 612, 615, 616, 620, 621, 622) -> dayRes(R.string.weather_snow_today, R.string.weather_snow_tomorrow, R.string.weather_snow_on) + in listOf(210, 211, 212, 221, 230, 231, 232) -> dayRes(R.string.weather_storm_today, R.string.weather_storm_tomorrow, R.string.weather_storm_on) + else -> context.getString(R.string.weather_warning) } weatherText = "$precipString$conditionWarning" break @@ -379,7 +380,7 @@ object WidgetRenderer { var conditionText = weatherText if (conditionText.isNullOrEmpty()) { - conditionText = "Unknown" + conditionText = context.getString(R.string.weather_unknown) } val weatherDrawableRes = when (weatherCode) { @@ -439,7 +440,7 @@ object WidgetRenderer { if (showStorage) { views.setTextViewTextSize(R.id.text_storage, android.util.TypedValue.COMPLEX_UNIT_SP, sizeStorage) secondaryColor.applyTextColor(views, R.id.text_storage) - SystemStatsFetcher.updateStorageStats(views, prefs) + SystemStatsFetcher.updateStorageStats(context, views, prefs) } // RAM @@ -456,7 +457,7 @@ object WidgetRenderer { views.setTextViewTextSize(R.id.text_steps, android.util.TypedValue.COMPLEX_UNIT_SP, sizeSteps) secondaryColor.applyTextColor(views, R.id.text_steps) secondaryColor.applyColorFilter(views, R.id.icon_steps) - SystemStatsFetcher.loadStepCount(views, prefs) + SystemStatsFetcher.loadStepCount(context, views, prefs) } // Screen Time diff --git a/app/src/main/java/com/leanbitlab/lwidget/stats/SystemStatsFetcher.kt b/app/src/main/java/com/leanbitlab/lwidget/stats/SystemStatsFetcher.kt index 660f818..6567206 100644 --- a/app/src/main/java/com/leanbitlab/lwidget/stats/SystemStatsFetcher.kt +++ b/app/src/main/java/com/leanbitlab/lwidget/stats/SystemStatsFetcher.kt @@ -166,7 +166,7 @@ object SystemStatsFetcher { val totalMinutes = totalForegroundTime / (1000 * 60) val hours = totalMinutes / 60 val mins = totalMinutes % 60 - val timeString = if (hours > 0) "${hours}h ${mins}m" else "${mins}m" + val timeString = if (hours > 0) context.getString(R.string.duration_hours_minutes, hours, mins) else context.getString(R.string.duration_minutes, mins) val span = SpannableString(timeString) if (isBold) span.setSpan(StyleSpan(Typeface.BOLD), 0, span.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) views.setTextViewText(R.id.text_screen_time, span) @@ -221,7 +221,7 @@ object SystemStatsFetcher { } } - fun updateStorageStats(views: RemoteViews, prefs: SharedPreferences) { + fun updateStorageStats(context: Context, views: RemoteViews, prefs: SharedPreferences) { try { val path = Environment.getDataDirectory() val stat = StatFs(path.path) @@ -239,7 +239,7 @@ object SystemStatsFetcher { views.setTextViewText(R.id.text_storage, span) } catch (e: Exception) { - views.setTextViewText(R.id.text_storage, "Err") + views.setTextViewText(R.id.text_storage, context.getString(R.string.widget_error)) } } @@ -263,7 +263,7 @@ object SystemStatsFetcher { views.setTextViewText(R.id.text_ram, span) } catch (e: Exception) { - views.setTextViewText(R.id.text_ram, "Err") + views.setTextViewText(R.id.text_ram, context.getString(R.string.widget_error)) } } @@ -279,7 +279,7 @@ object SystemStatsFetcher { return (totalSteps - baselineSteps).toInt().coerceAtLeast(0) } - fun loadStepCount(views: RemoteViews, prefs: SharedPreferences) { + fun loadStepCount(context: Context, views: RemoteViews, prefs: SharedPreferences) { try { val totalSteps = prefs.getFloat("last_total_steps", 0f) val baselineSteps = prefs.getFloat("step_baseline", 0f) @@ -294,7 +294,7 @@ object SystemStatsFetcher { views.setTextViewText(R.id.text_steps, span) } catch (e: Exception) { - views.setTextViewText(R.id.text_steps, "Err") + views.setTextViewText(R.id.text_steps, context.getString(R.string.widget_error)) } } diff --git a/app/src/main/java/com/leanbitlab/lwidget/tasks/TasksFetcher.kt b/app/src/main/java/com/leanbitlab/lwidget/tasks/TasksFetcher.kt index f81f64f..14a92a3 100644 --- a/app/src/main/java/com/leanbitlab/lwidget/tasks/TasksFetcher.kt +++ b/app/src/main/java/com/leanbitlab/lwidget/tasks/TasksFetcher.kt @@ -60,18 +60,18 @@ object TasksFetcher { return tasks } - fun formatDueSuffix(dueMillis: Long): String { + fun formatDueSuffix(context: Context, dueMillis: Long): String { if (dueMillis <= 0) return "" val dueDate = LocalDateTime.ofInstant(Instant.ofEpochMilli(dueMillis), ZoneId.systemDefault()).toLocalDate() val today = LocalDate.now() val tomorrow = today.plusDays(1) return if (dueDate.isBefore(today)) { - " (Overdue)" + " (${context.getString(R.string.label_overdue)})" } else if (dueDate.isEqual(today)) { - " (Today)" + " (${context.getString(R.string.label_today)})" } else if (dueDate.isEqual(tomorrow)) { - " (Tomorrow)" + " (${context.getString(R.string.label_tomorrow)})" } else { val df = CalendarFetcher.getFormatter("MMM d") " (${dueDate.format(df)})" @@ -90,7 +90,7 @@ object TasksFetcher { context.checkSelfPermission(PERMISSION_READ_TASKS_ASTRID) == android.content.pm.PackageManager.PERMISSION_GRANTED if (!hasPerm) { - views.setTextViewText(eventViews[0], "• Tap to grant Tasks.org permission") + views.setTextViewText(eventViews[0], "• " + context.getString(R.string.widget_tap_grant_tasks)) views.setViewVisibility(eventViews[0], android.view.View.VISIBLE) views.setTextViewTextSize(eventViews[0], android.util.TypedValue.COMPLEX_UNIT_SP, textSizeSp) @@ -119,7 +119,7 @@ object TasksFetcher { val taskIntent = com.leanbitlab.lwidget.render.WidgetRenderer.getLaunchIntent(context, "org.tasks") for (i in tasks.indices) { val task = tasks[i] - val dueSuffix = formatDueSuffix(task.dueMillis) + val dueSuffix = formatDueSuffix(context, task.dueMillis) val fullText = "• ${task.title}$dueSuffix" val spannable = SpannableString(fullText) spannable.setSpan(ForegroundColorSpan(accentColor), 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index abdd742..7d41067 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -18,10 +18,8 @@ الأذونات حول التطبيق الوقت - تنسيق الوقت تطبيق الساعة التاريخ - تنسيق التاريخ البطارية الطقس درجة الحرارة @@ -33,11 +31,7 @@ الذاكرة العشوائية المهام عداد الخطوات - الإبقاء قيد التشغيل وقت الشاشة - الإطار - المظهر - الشفافية لون النص الأساسي لون النص الثانوي لون التاريخ @@ -68,11 +62,8 @@ غروب أحادي اللون تساقط الثلج - الملاحظات وسجل التغييرات الإصدار %s - يعمل Lwidget بدون خدمات خلفية. لضمان استمرار التحديث، يرجى تعطيل تحسين البطارية أو تفعيل ميزة الإبقاء قيد التشغيل. الجديد في v3.0:\n• ألوان القطعة تتبع تغييرات الخلفية والوضع الداكن (Material You)\n• عرض حالة الشحن بأيقونة برق Material ملونة\n• تطبيق تغييرات فاصل التحديث فورًا\n• إعدادات أكثر سلاسة: منزلقات محسنة، اهتزاز للمفاتيح، تخطيط للأجهزة اللوحية\n• إمكانية وصول أفضل وواجهة قابلة للترجمة بالكامل\n• إزالة إذن غير مستخدم وتحديثات خلفية أكثر موثوقية - إذا أعجبك Lwidget، يرجى تقييمنا على Google Play. المصدر (GitHub) سياسة الخصوصية يرجى منح إذن الوصول إلى بيانات الاستخدام @@ -146,4 +137,30 @@ غير معروف نقل لأعلى نقل لأسفل + + + اليوم + غدًا + اليوم %1$s + غدًا %1$s + متأخرة + لا أحداث اليوم + انقر لمنح إذن التقويم + انقر لمنح إذن Tasks.org + مطر اليوم + مطر غدًا + مطر يوم %1$s + ثلوج اليوم + ثلوج غدًا + ثلوج يوم %1$s + عاصفة اليوم + عاصفة غدًا + عاصفة يوم %1$s + تحذير + غير معروف + مئوية (°C) + فهرنهايت (°F) + %1$d س %2$d د + %1$d د + خطأ diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7e54565..a170054 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -21,10 +21,8 @@ Berechtigungen Über Uhrzeit - Zeitformat Uhr-App Datum - Datumsformat Akku Wetter Temperatur @@ -36,11 +34,7 @@ RAM Aufgaben Schrittzähler - Aktiv halten Bildschirmzeit - Umrandung - Design - Transparenz Textfarbe Sekundäre Textfarbe Datumsfarbe @@ -71,11 +65,8 @@ Sonnenuntergang Monochrom Schneefall - Hinweise & Änderungsprotokoll Version %s - Lwidget funktioniert ohne Hintergrunddienst. Deaktivieren Sie die Akku-Optimierung für zuverlässige Aktualisierungen. Neu in v3.0:\n• Widget-Farben folgen Hintergrund- und Dunkelmodus-Wechseln (Material You)\n• Ladezustand mit eingefärbtem Material-Blitzsymbol\n• Änderungen am Aktualisierungsintervall greifen sofort\n• Flüssigere Einstellungen: entprellte Schieberegler, Haptik, Tablet-Layout\n• Bessere Barrierefreiheit und vollständig übersetzbare Oberfläche\n• Ungenutzte Berechtigung entfernt; zuverlässigere Hintergrund-Updates - Wenn Ihnen Lwidget gefällt, bewerten Sie uns bitte im Google Play Store. Quellcode (GitHub) Datenschutzerklärung Bitte Nutzungszugriff für Lwidget gewähren @@ -146,4 +137,30 @@ Unbekannt Nach oben Nach unten + + + Heute + Morgen + Heute %1$s + Morgen %1$s + Überfällig + Heute keine Termine + Tippen, um Kalenderzugriff zu erlauben + Tippen, um Tasks.org-Zugriff zu erlauben + Regen heute + Regen morgen + Regen am %1$s + Schnee heute + Schnee morgen + Schnee am %1$s + Gewitter heute + Gewitter morgen + Gewitter am %1$s + Warnung + Unbekannt + Celsius (°C) + Fahrenheit (°F) + %1$d h %2$d min + %1$d min + Fehler diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9a5318e..7bd1a7e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -21,10 +21,8 @@ Permisos Acerca de Hora - Formato de hora App de reloj Fecha - Formato de fecha Batería Clima Temperatura @@ -36,11 +34,7 @@ RAM Tareas Contador de pasos - Mantener activo Tiempo en pantalla - Borde - Tema - Transparencia Color de texto Color de texto 2 Color de fecha @@ -71,11 +65,8 @@ Atardecer Monocromático Nevada - Notas y cambios Versión %s - Lwidget funciona sin servicios en segundo plano. Para solucionarlo:\n\n• Desactiva la optimización de batería para Lwidget.\n• O activa Mantener activo.\n• O activa el Contador de pasos. Novedades en v3.0:\n• Los colores del widget siguen el fondo y el modo oscuro (Material You)\n• Estado de carga con icono de rayo Material teñido\n• Los cambios del intervalo de actualización se aplican al instante\n• Ajustes más fluidos: deslizadores optimizados, háptica, diseño para tablets\n• Mejor accesibilidad e interfaz totalmente traducible\n• Eliminado un permiso sin uso; actualizaciones en segundo plano más fiables - Si disfrutas de Lwidget, califícanos en Google Play. Código fuente (GitHub) Política de privacidad Concede acceso de uso para Lwidget @@ -146,4 +137,30 @@ Desconocida Subir Bajar + + + Hoy + Mañana + Hoy %1$s + Mañana %1$s + Vencida + No hay eventos hoy + Toca para permitir el acceso al calendario + Toca para permitir el acceso a Tasks.org + Lluvia hoy + Lluvia mañana + Lluvia el %1$s + Nieve hoy + Nieve mañana + Nieve el %1$s + Tormenta hoy + Tormenta mañana + Tormenta el %1$s + Aviso + Desconocido + Celsius (°C) + Fahrenheit (°F) + %1$d h %2$d min + %1$d min + Error diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 983c56f..262f2af 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -21,10 +21,8 @@ Autorisations À propos Heure - Format de l\'heure Application Horloge Date - Format de la date Batterie Météo Température @@ -36,11 +34,7 @@ RAM Tâches Podomètre - Maintien actif Temps d\'écran - Bordure - Thème - Transparence Couleur du texte Couleur secondaire Couleur de la date @@ -71,11 +65,8 @@ Coucher de soleil Monochrome Chute de neige - Notes et changements Version %s - Lwidget fonctionne sans service en arrière-plan. Cependant, désactivez l\'optimisation de batterie pour garantir des mises à jour fiables. Nouveautés de la v3.0 :\n• Les couleurs du widget suivent le fond d\'écran et le mode sombre (Material You)\n• État de charge affiché avec une icône éclair Material teintée\n• Les changements d\'intervalle de mise à jour s\'appliquent immédiatement\n• Réglages plus fluides : curseurs optimisés, retour haptique, mise en page tablette\n• Meilleure accessibilité et interface entièrement traduisible\n• Permission inutilisée supprimée ; mises à jour en arrière-plan plus fiables - Si vous aimez Lwidget, laissez un avis sur Google Play. Code source (GitHub) Politique de confidentialité Veuillez autoriser l\'accès aux données d\'utilisation @@ -146,4 +137,30 @@ Inconnue Monter Descendre + + + Aujourd\'hui + Demain + Aujourd\'hui %1$s + Demain %1$s + En retard + Aucun événement aujourd\'hui + Appuyez pour autoriser l\'accès au calendrier + Appuyez pour autoriser l\'accès à Tasks.org + Pluie aujourd\'hui + Pluie demain + Pluie %1$s + Neige aujourd\'hui + Neige demain + Neige %1$s + Orage aujourd\'hui + Orage demain + Orage %1$s + Alerte + Inconnu + Celsius (°C) + Fahrenheit (°F) + %1$d h %2$d min + %1$d min + Erreur diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d98296a..8c6fdd6 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -18,10 +18,8 @@ अनुमतियां के बारे में समय - समय प्रारूप घड़ी ऐप दिनांक - दिनांक प्रारूप बैटरी मौसम तापमान @@ -33,11 +31,7 @@ रैम कार्य कदम गणक - सक्रिय रखें स्क्रीन समय - आउटलाइन - थीम - पारदर्शिता टेक्स्ट का रंग द्वितीयक टेक्स्ट रंग दिनांक का रंग @@ -68,11 +62,8 @@ सूर्यास्त मोनोक्रोम हिमपात - नोट और बदलाव संस्करण %s - Lwidget बिना किसी बैकग्राउंड सर्विस के काम करता है। अपडेट जारी रखने के लिए बैटरी ऑप्टिमाइज़ेशन बंद करें या कीप अलाइव सक्षम करें। v3.0 में नया:\n• विजेट रंग वॉलपेपर और डार्क मोड बदलाव का पालन करते हैं (Material You)\n• चार्जिंग स्थिति रंगीन Material बोल्ट आइकन के साथ\n• अपडेट अंतराल के बदलाव तुरंत लागू होते हैं\n• बेहतर सेटिंग्स: स्मूथ स्लाइडर, स्विच हैप्टिक्स, टैबलेट लेआउट\n• बेहतर सुलभता और पूरी तरह अनुवाद योग्य इंटरफ़ेस\n• अप्रयुक्त अनुमति हटाई गई; अधिक विश्वसनीय बैकग्राउंड अपडेट - यदि आपको Lwidget पसंद है, तो कृपया Google Play पर रेटिंग दें। सोर्स कोड (GitHub) गोपनीयता नीति कृपया Lwidget के लिए उपयोग अनुमति दें @@ -146,4 +137,30 @@ अज्ञात ऊपर ले जाएँ नीचे ले जाएँ + + + आज + कल + आज %1$s + कल %1$s + समय सीमा पार + आज कोई इवेंट नहीं + कैलेंडर अनुमति देने के लिए टैप करें + Tasks.org अनुमति देने के लिए टैप करें + आज बारिश + कल बारिश + %1$s को बारिश + आज बर्फबारी + कल बर्फबारी + %1$s को बर्फबारी + आज तूफ़ान + कल तूफ़ान + %1$s को तूफ़ान + चेतावनी + अज्ञात + सेल्सियस (°C) + फ़ारेनहाइट (°F) + %1$d घं %2$d मि + %1$d मि + त्रुटि diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index afb3bb6..7440b74 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -18,10 +18,8 @@ 権限 アプリについて 時刻 - 時刻形式 時計アプリ 日付 - 日付形式 バッテリー 天気 気温 @@ -33,11 +31,7 @@ メモリ (RAM) タスク 歩数計 - バックグラウンド維持 スクリーンタイム - 枠線 - テーマ - 透明度 文字色 セカンダリ文字色 日付の色 @@ -68,11 +62,8 @@ サンセット モノクローム スノーフォール - 注意と更新履歴 バージョン %s - Lwidgetはバックグラウンドサービスなしで動作します。更新を安定させるには、端末のバッテリー最適化を解除するか、バックグラウンド維持を有効にしてください。 v3.0の新機能:\n• ウィジェットの色が壁紙とダークモードの変更に追従(Material You)\n• 充電状態を色付きの Material 稲妻アイコンで表示\n• 更新間隔の変更がすぐに反映\n• 設定がより快適に:スライダー最適化、スイッチの触覚フィードバック、タブレットレイアウト\n• アクセシビリティ向上と完全に翻訳可能な UI\n• 未使用の権限を削除、バックグラウンド更新の信頼性向上 - Lwidgetを気に入っていただけましたら、Google Playで評価をお願いします。 ソースコード (GitHub) プライバシーポリシー 使用状況へのアクセスを許可してください @@ -146,4 +137,30 @@ 不明 上へ移動 下へ移動 + + + 今日 + 明日 + 今日 %1$s + 明日 %1$s + 期限切れ + 今日の予定はありません + タップしてカレンダーへのアクセスを許可 + タップしてTasks.orgへのアクセスを許可 + 今日は雨 + 明日は雨 + %1$sは雨 + 今日は雪 + 明日は雪 + %1$sは雪 + 今日は雷雨 + 明日は雷雨 + %1$sは雷雨 + 警告 + 不明 + 摂氏 (°C) + 華氏 (°F) + %1$d時間%2$d分 + %1$d分 + エラー diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 19af9c3..eb148c6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -21,10 +21,8 @@ Permissões Sobre Hora - Formato de hora App de relógio Data - Formato de data Bateria Clima Temperatura @@ -36,11 +34,7 @@ RAM Tarefas Contador de passos - Manter ativo Tempo de tela - Borda - Tema - Transparência Cor do texto Cor de texto 2 Cor da data @@ -71,11 +65,8 @@ Pôr do sol Monocromático Nevasca - Notas e alterações Versão %s - Lwidget funciona sem serviços em segundo plano. Para garantir atualizações contínuas, desative a otimização de bateria. Novidades na v3.0:\n• As cores do widget acompanham o papel de parede e o modo escuro (Material You)\n• Estado de carga exibido com ícone de raio Material colorido\n• Mudanças no intervalo de atualização aplicadas na hora\n• Configurações mais fluidas: controles deslizantes otimizados, háptica, layout para tablets\n• Melhor acessibilidade e interface totalmente traduzível\n• Permissão não usada removida; atualizações em segundo plano mais confiáveis - Se você gosta do Lwidget, deixe uma avaliação na Google Play. Código-fonte (GitHub) Política de privacidade Conceda acesso de uso para o Lwidget @@ -146,4 +137,30 @@ Desconhecida Mover para cima Mover para baixo + + + Hoje + Amanhã + Hoje %1$s + Amanhã %1$s + Atrasada + Nenhum evento hoje + Toque para permitir o acesso ao calendário + Toque para permitir o acesso ao Tasks.org + Chuva hoje + Chuva amanhã + Chuva: %1$s + Neve hoje + Neve amanhã + Neve: %1$s + Tempestade hoje + Tempestade amanhã + Tempestade: %1$s + Aviso + Desconhecido + Celsius (°C) + Fahrenheit (°F) + %1$d h %2$d min + %1$d min + Erro diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 42e00cc..283c2b1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -21,10 +21,8 @@ Разрешения О приложении Время - Формат времени Приложение часов Дата - Формат даты Батарея Погода Температура @@ -36,11 +34,7 @@ ОЗУ Задачи Шагомер - Фоновая работа Экранное время - Рамка - Тема - Прозрачность Цвет текста Второй цвет текста Цвет даты @@ -71,11 +65,8 @@ Закат Монохром Снегопад - Примечания и список изменений Версия %s - Lwidget работает без фоновых служб. Для надежного обновления отключите оптимизацию батареи для приложения. Что нового в v3.0:\n• Цвета виджета следуют за обоями и тёмной темой (Material You)\n• Состояние зарядки показано окрашенным значком молнии Material\n• Изменение интервала обновления применяется сразу\n• Плавнее настройки: оптимизированные ползунки, вибрация переключателей, макет для планшетов\n• Улучшенная доступность и полностью переводимый интерфейс\n• Удалено неиспользуемое разрешение; надёжнее фоновые обновления - Если вам нравится Lwidget, пожалуйста, оцените его в Google Play. Исходный код (GitHub) Политика конфиденциальности Предоставьте доступ к данным об использовании @@ -146,4 +137,30 @@ Неизвестно Переместить вверх Переместить вниз + + + Сегодня + Завтра + Сегодня %1$s + Завтра %1$s + Просрочено + Сегодня нет событий + Нажмите, чтобы разрешить доступ к календарю + Нажмите, чтобы разрешить доступ к Tasks.org + Сегодня дождь + Завтра дождь + Дождь: %1$s + Сегодня снег + Завтра снег + Снег: %1$s + Сегодня гроза + Завтра гроза + Гроза: %1$s + Предупреждение + Неизвестно + Цельсий (°C) + Фаренгейт (°F) + %1$d ч %2$d мин + %1$d мин + Ошиб. diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a6eeef7..18b138a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -21,10 +21,8 @@ İzinler Hakkında Saat - Saat Formatı Saat Uygulaması Tarih - Tarih Formatı Pil Hava Durumu Sıcaklık @@ -36,11 +34,7 @@ RAM Görevler Adımsayar - Arka Planda Tut Ekran Süresi - Kenarlık - Tema - Saydamlık Metin Rengi İkincil Metin Rengi Tarih Rengi @@ -71,11 +65,8 @@ Gün Batımı Monokrom Kar Yağışı - Not ve Değişiklik Günlüğü Sürüm %s - Lwidget herhangi bir arka plan servisi olmadan çalışır. Ancak bazı cihazlar pil tasarrufu için uygulamayı sonlandırabilir ve araç takımı güncellemelerini durdurabilir. Bunu düzeltmek için:\n\n• Cihaz ayarlarından Lwidget için pil optimizasyonunu kapatın.\n• Veya araç takımını güvenilir şekilde güncel tutan Arka Planda Tut özelliğini etkinleştirin.\n• Ya da günlük adımlarınızı sayan Adımsayar\'ı etkinleştirin. v3.0 Yenilikleri:\n• Widget renkleri duvar kağıdı ve karanlık mod değişikliklerini izler (Material You)\n• Şarj durumu renklendirilmiş Material şimşek simgesiyle gösterilir\n• Güncelleme aralığı değişiklikleri hemen uygulanır\n• Daha akıcı ayarlar: optimize kaydırıcılar, anahtar titreşimi, tablet düzeni\n• Daha iyi erişilebilirlik ve tamamen çevrilebilir arayüz\n• Kullanılmayan izin kaldırıldı; daha güvenilir arka plan güncellemeleri - Lwidget\'ı beğendiyseniz, lütfen Google Play\'de değerlendirin — başkalarının keşfetmesine yardımcı olur. Kaynak Kodu (GitHub) Gizlilik Politikası Lwidget için lütfen Kullanım Erişimi izni verin @@ -146,4 +137,30 @@ Bilinmiyor Yukarı taşı Aşağı taşı + + + Bugün + Yarın + Bugün %1$s + Yarın %1$s + Gecikmiş + Bugün etkinlik yok + Takvim izni vermek için dokunun + Tasks.org izni vermek için dokunun + Bugün yağmur + Yarın yağmur + %1$s yağmur + Bugün kar + Yarın kar + %1$s kar + Bugün fırtına + Yarın fırtına + %1$s fırtına + Uyarı + Bilinmiyor + Santigrat (°C) + Fahrenhayt (°F) + %1$d sa %2$d dk + %1$d dk + Hata diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index c8e82a6..1c33533 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -18,10 +18,8 @@ 权限管理 关于 时间 - 时间格式 时钟应用 日期 - 日期格式 电量 天气 温度 @@ -33,11 +31,7 @@ 内存 任务 计步器 - 后台保活 屏幕使用时间 - 边框 - 主题 - 透明度 文字颜色 副文字颜色 日期颜色 @@ -68,11 +62,8 @@ 日落 黑白 落雪 - 说明与更新日志 版本 %s - Lwidget 无需后台服务即可运行。但某些设备可能会杀后台以省电,导致小部件停止更新:\n\n• 请在系统设置中将 Lwidget 设为不受电池优化限制。\n• 或开启“后台保活”。\n• 或开启“计步器”。 v3.0 新特性:\n• 小部件颜色跟随壁纸和深色模式变化(Material You)\n• 充电状态以着色的 Material 闪电图标显示\n• 更新间隔更改立即生效\n• 设置更流畅:滑块防抖、开关触感反馈、平板布局\n• 无障碍改进,界面完全可翻译\n• 移除未使用的权限;后台更新更可靠 - 如果您喜欢 Lwidget,请在 Google Play 上给予好评支持! 源代码 (GitHub) 隐私政策 请授予 Lwidget 使用情况访问权限 @@ -146,4 +137,30 @@ 未知 上移 下移 + + + 今天 + 明天 + 今天 %1$s + 明天 %1$s + 已逾期 + 今天没有日程 + 点按以授予日历权限 + 点按以授予 Tasks.org 权限 + 今天有雨 + 明天有雨 + %1$s有雨 + 今天有雪 + 明天有雪 + %1$s有雪 + 今天有雷暴 + 明天有雷暴 + %1$s有雷暴 + 警告 + 未知 + 摄氏度 (°C) + 华氏度 (°F) + %1$d小时%2$d分钟 + %1$d分钟 + 错误 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 058df39..47e17f9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,10 +21,8 @@ Permissions About Time - Time Format Clock App Date - Date Format Battery Weather Temperature @@ -38,11 +36,7 @@ RAM Tasks Step Counter - Keep Alive Screen Time - Outline - Theme - Transparency Text Color Text Color 2 Date Color @@ -73,12 +67,9 @@ Sunset Monochrome Snowfall - Note & Changelog Version %s What\'s New in v3.0 • Widget colors follow wallpaper and dark mode changes (Material You)\n• Charging state shown with a tinted Material bolt icon\n• Update interval changes now apply immediately\n• Smoother settings: debounced sliders, switch haptics, tablet layout\n• Better accessibility and fully translatable UI\n• Removed an unused permission; more reliable background updates - Lwidget works without any background service. However, some devices may kill the app to save battery, which can stop widget updates. To fix this:\n\n• Mark Lwidget as non-battery-optimized in your device settings.\n• Or, enable Keep Alive — a lightweight background service that keeps the widget updating reliably.\n• Or, enable the Step Counter — it uses the same service and also counts your daily steps. - If you enjoy Lwidget, please leave a rating on Google Play — it helps others discover the app. Source Code (GitHub) Privacy Policy Please grant Usage Access for Lwidget @@ -146,4 +137,30 @@ Unknown Move up Move down + + + Today + Tomorrow + Today %1$s + Tomorrow %1$s + Overdue + No events today + Tap to grant calendar permission + Tap to grant Tasks.org permission + Rain today + Rain tomorrow + Rain on %1$s + Snow today + Snow tomorrow + Snow on %1$s + Storm today + Storm tomorrow + Storm on %1$s + Warning + Unknown + Celsius (°C) + Fahrenheit (°F) + %1$dh %2$dm + %1$dm + Err diff --git a/app/src/test/java/com/leanbitlab/lwidget/AwidgetCalendarEventsTest.kt b/app/src/test/java/com/leanbitlab/lwidget/AwidgetCalendarEventsTest.kt index 47942f9..be0ebfc 100644 --- a/app/src/test/java/com/leanbitlab/lwidget/AwidgetCalendarEventsTest.kt +++ b/app/src/test/java/com/leanbitlab/lwidget/AwidgetCalendarEventsTest.kt @@ -1,5 +1,6 @@ package com.leanbitlab.lwidget +import androidx.test.core.app.ApplicationProvider import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue @@ -37,6 +38,7 @@ class AwidgetCalendarEventsTest { // 1. On the day of the event (Sept 15), it must show "Today" val textToday = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = event, today = LocalDate.of(2026, 9, 15), showDayAbbr = true @@ -45,6 +47,7 @@ class AwidgetCalendarEventsTest { // 2. On the day before the event (Sept 14), it must show "Tomorrow" val textTomorrow = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = event, today = LocalDate.of(2026, 9, 14), showDayAbbr = true @@ -53,6 +56,7 @@ class AwidgetCalendarEventsTest { // 3. Five days before the event (Sept 10), it must show the day ("15/Tue") val textNear = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = event, today = LocalDate.of(2026, 9, 10), showDayAbbr = true @@ -84,6 +88,7 @@ class AwidgetCalendarEventsTest { ) val textToday = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = event, today = LocalDate.of(2026, 9, 15), showDayAbbr = true @@ -91,6 +96,7 @@ class AwidgetCalendarEventsTest { assertEquals("Today", textToday) val textTomorrow = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = event, today = LocalDate.of(2026, 9, 14), showDayAbbr = true @@ -119,6 +125,7 @@ class AwidgetCalendarEventsTest { // On Sept 15, event is ongoing: should show "Today" val textMidway = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = event, today = LocalDate.of(2026, 9, 15) ) @@ -201,6 +208,7 @@ class AwidgetCalendarEventsTest { // 12-hour mode val text12h = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = eveningEvent, today = today, showDayAbbr = true, @@ -210,6 +218,7 @@ class AwidgetCalendarEventsTest { // 24-hour mode val text24h = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = eveningEvent, today = today, showDayAbbr = true, @@ -220,6 +229,7 @@ class AwidgetCalendarEventsTest { // Tomorrow in 24-hour mode val tomorrow = today.minusDays(1) val textTomorrow24h = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = eveningEvent, today = tomorrow, showDayAbbr = true, @@ -230,6 +240,7 @@ class AwidgetCalendarEventsTest { // Near future (within 1 week) with day abbreviation in 24-hour mode val threeDaysEarlier = today.minusDays(3) // Saturday val textNear24h = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = eveningEvent, today = threeDaysEarlier, showDayAbbr = true, @@ -248,6 +259,7 @@ class AwidgetCalendarEventsTest { isAllDay = false ) val midnight12h = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = midnightEvent, today = today, showDayAbbr = true, @@ -256,6 +268,7 @@ class AwidgetCalendarEventsTest { assertEquals("Today 12:15", midnight12h) val midnight24h = AwidgetProvider.Companion.formatEventTimeText( + context = ApplicationProvider.getApplicationContext(), event = midnightEvent, today = today, showDayAbbr = true, diff --git a/app/src/test/java/com/leanbitlab/lwidget/tasks/TasksFetcherTest.kt b/app/src/test/java/com/leanbitlab/lwidget/tasks/TasksFetcherTest.kt index e03b3b7..3c1cbe8 100644 --- a/app/src/test/java/com/leanbitlab/lwidget/tasks/TasksFetcherTest.kt +++ b/app/src/test/java/com/leanbitlab/lwidget/tasks/TasksFetcherTest.kt @@ -1,44 +1,61 @@ package com.leanbitlab.lwidget.tasks +import android.content.Context +import androidx.test.core.app.ApplicationProvider import org.junit.Assert.assertEquals +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config import org.junit.Test import java.time.LocalDate import java.time.ZoneId +@RunWith(RobolectricTestRunner::class) class TasksFetcherTest { + private val context: Context = ApplicationProvider.getApplicationContext() + @Test fun testFormatDueSuffixZeroOrNegative() { - assertEquals("", TasksFetcher.formatDueSuffix(0L)) - assertEquals("", TasksFetcher.formatDueSuffix(-1000L)) + assertEquals("", TasksFetcher.formatDueSuffix(context, 0L)) + assertEquals("", TasksFetcher.formatDueSuffix(context, -1000L)) } @Test fun testFormatDueSuffixOverdue() { val yesterday = LocalDate.now().minusDays(1) val millis = yesterday.atTime(12, 0).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - assertEquals(" (Overdue)", TasksFetcher.formatDueSuffix(millis)) + assertEquals(" (Overdue)", TasksFetcher.formatDueSuffix(context, millis)) } @Test fun testFormatDueSuffixToday() { val today = LocalDate.now() val millis = today.atTime(23, 59).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - assertEquals(" (Today)", TasksFetcher.formatDueSuffix(millis)) + assertEquals(" (Today)", TasksFetcher.formatDueSuffix(context, millis)) + } + + @Test + @Config(qualifiers = "ru") + fun testFormatDueSuffixIsLocalized() { + val today = LocalDate.now().atTime(12, 0).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() + val tomorrow = LocalDate.now().plusDays(1).atTime(12, 0).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() + assertEquals(" (Сегодня)", TasksFetcher.formatDueSuffix(context, today)) + assertEquals(" (Завтра)", TasksFetcher.formatDueSuffix(context, tomorrow)) } @Test fun testFormatDueSuffixTomorrow() { val tomorrow = LocalDate.now().plusDays(1) val millis = tomorrow.atTime(9, 0).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - assertEquals(" (Tomorrow)", TasksFetcher.formatDueSuffix(millis)) + assertEquals(" (Tomorrow)", TasksFetcher.formatDueSuffix(context, millis)) } @Test fun testFormatDueSuffixFutureDate() { val future = LocalDate.now().plusDays(10) val millis = future.atTime(15, 0).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - val suffix = TasksFetcher.formatDueSuffix(millis) + val suffix = TasksFetcher.formatDueSuffix(context, millis) assert(suffix.startsWith(" (") && suffix.endsWith(")")) } } diff --git a/scripts/check_strings.py b/scripts/check_strings.py index 485cd81..c425eff 100644 --- a/scripts/check_strings.py +++ b/scripts/check_strings.py @@ -1,11 +1,19 @@ #!/usr/bin/env python3 -"""Verify every localized strings.xml matches the base values/strings.xml. +"""Verify string resources: locale consistency, unused keys, hardcoded UI text. -Checks, per locale: - - missing keys (present in base, absent in locale) - - extra keys (present in locale, absent in base) - - format placeholder mismatch (%s, %d, %1$s, ...) -Entries with translatable="false" in the base file are ignored. +Checks: + 1. Per locale, against the base values/strings.xml: + - missing keys (present in base, absent in locale) + - extra keys (present in locale, absent in base) + - format placeholder mismatch (%s, %d, %1$s, ...) + - untranslated values (identical to English, see SAME_AS_BASE_OK) + 2. Unused keys: base strings never referenced as R.string.x / @string/x + (or R.array / R.plurals) in code, layouts, xml or the manifest. + 3. Hardcoded UI text: English-looking string literals in Kotlin sources. + These never reach translators, so the locale checks above cannot see them. + Suppress a genuine non-UI literal with a trailing `// i18n-ignore`, or a + block with `// i18n-ignore-start` ... `// i18n-ignore-end`. +Entries with translatable="false" in the base file are skipped by 1 and 3. Usage: python3 scripts/check_strings.py [res_dir] Exit code 1 if any problem is found. @@ -16,17 +24,45 @@ from pathlib import Path RES = Path(sys.argv[1] if len(sys.argv) > 1 else "app/src/main/res") +SRC = RES.parent # app/src/main PLACEHOLDER = re.compile(r"%(?:\d+\$)?[sdfxXc%n]") +REF_TYPES = {"string": "string", "string-array": "array", "plurals": "plurals"} + +# Keys whose value may equal English in some locales (cognates, brand and unit names). +# Add a key here only after checking the word really is used as-is in that language. +SAME_AS_BASE_KEYS = { + "app_name", "category_agenda", "category_appearance", "category_system", "changelog_version", + "font_cursive", "font_monospace", "font_serif", "preset_cockpit", "preset_minimal", + "preset_monochrome", "preset_neon", "section_date", "temp_unit_celsius", "temp_unit_fahrenheit", + "duration_hours_minutes", "duration_minutes", "section_ram", "widget_title_numbered", + "widget_selector_numbered", "widget_option_numbered", +} + +# --- hardcoded literal detection ------------------------------------------- +STRING_LIT = re.compile(r'"((?:[^"\\]|\\.)*)"') +# Lines whose literals are never shown to users. +NON_UI_LINE = re.compile( + r"^\s*@[\w.:]+|Log\.[dviwe]\(|throw |Exception\(|const val|import |" + r"\.(get|put)(String|Int|Boolean|Long|Float|StringSet)\(|getSharedPreferences|" + r"ofPattern|getFormatter|setFormat(12|24)Hour|Intent\(|\.action|Uri\.parse|" + r"getMethod|setTimeZone|contentResolver|\b(selection|sortOrder|projection)\b" +) +TEMPLATE = re.compile(r"\$\{[^}]*\}|\$[A-Za-z_]\w*") +IDENTIFIER = re.compile(r"^[a-z][A-Za-z0-9]*$|^[a-z0-9_.:/-]*$") # camelCase, keys, paths +WORD = re.compile(r"[A-Za-z]{3,}|[A-Za-z]+ [A-Za-z]+") +DATE_PATTERN = re.compile(r"^[EMLdHhkKmsSayzZ ,:./'-]+$") # DateTimeFormatter patterns +COLOR = re.compile(r"^#[0-9A-Fa-f]{6,8}$") +DOTTED_NAME = re.compile(r"^\w+(\.\w+)+$") # package, permission and action names def load(path): - """Return {name: text} for , , ; skip non-translatable.""" + """Return {name: (tag, text)} for translatable , , .""" out = {} for el in ET.parse(path).getroot(): name = el.get("name") if not name or el.get("translatable") == "false": continue - out[name] = "".join(el.itertext()) + out[name] = (el.tag, "".join(el.itertext()).strip()) return out @@ -34,10 +70,7 @@ def placeholders(text): return sorted(p for p in PLACEHOLDER.findall(text) if p != "%%") -def main(): - base_file = RES / "values" / "strings.xml" - base = load(base_file) - problems = [] +def check_locales(base, problems): for loc_file in sorted(RES.glob("values-*/strings.xml")): loc = load(loc_file) name = loc_file.parent.name @@ -46,17 +79,64 @@ def main(): for key in sorted(loc.keys() - base.keys()): problems.append(f"{name}: extra '{key}' (not in base)") for key in sorted(base.keys() & loc.keys()): - if placeholders(base[key]) != placeholders(loc[key]): + b, l = base[key][1], loc[key][1] + if placeholders(b) != placeholders(l): problems.append( - f"{name}: placeholder mismatch in '{key}': " - f"{placeholders(base[key])} vs {placeholders(loc[key])}" + f"{name}: placeholder mismatch in '{key}': {placeholders(b)} vs {placeholders(l)}" ) + elif b == l and key not in SAME_AS_BASE_KEYS and re.search(r"[A-Za-z]{3,}", PLACEHOLDER.sub("", b)): + problems.append(f"{name}: untranslated '{key}' (same as English: {b!r})") + + +def check_unused(problems): + base_all = {el.get("name"): el.tag for el in ET.parse(RES / "values" / "strings.xml").getroot()} + corpus = [] + for p in SRC.rglob("*"): + if p.suffix in (".kt", ".java", ".xml") and not p.parent.name.startswith("values"): + corpus.append(p.read_text(encoding="utf-8", errors="ignore")) + corpus = "\n".join(corpus) + for name, tag in base_all.items(): + t = REF_TYPES.get(tag, tag) + if not re.search(rf"(R\.{t}\.|@{t}/){re.escape(name)}\b", corpus): + problems.append(f"values: unused '{name}' (no R.{t}.{name} / @{t}/{name} reference)") + + +def check_hardcoded(problems): + for f in sorted((SRC / "java").rglob("*.kt")): + ignoring = False + for i, line in enumerate(f.read_text(encoding="utf-8").splitlines(), 1): + if "i18n-ignore-start" in line: + ignoring = True + if "i18n-ignore-end" in line: + ignoring = False + continue + stripped = line.lstrip() + code = "" if stripped.startswith(("//", "*", "/*")) else line.split("//")[0] + if ignoring or "i18n-ignore" in line or not code.strip() or NON_UI_LINE.search(code): + continue + for m in STRING_LIT.finditer(code): + text = TEMPLATE.sub("", m.group(1)).strip() + if (not text or IDENTIFIER.match(text) or DATE_PATTERN.match(text) + or COLOR.match(text) or DOTTED_NAME.match(text) or not WORD.search(text)): + continue + if re.fullmatch(r"[A-Z0-9_ ]+", text): # SQL keywords, constants + continue + rel = f.relative_to(SRC.parent.parent) + problems.append(f"{rel}:{i}: hardcoded text \"{m.group(1)}\" (use a string resource)") + + +def main(): + base = load(RES / "values" / "strings.xml") + problems = [] + check_locales(base, problems) + check_unused(problems) + check_hardcoded(problems) if problems: print("String resource problems:") for p in problems: print(" " + p) return 1 - print(f"OK: {len(base)} base strings consistent across all locales") + print(f"OK: {len(base)} base strings consistent, used, and no hardcoded UI text") return 0