From 416ac20f304a90da890386c63cf32a4bf3baa21f Mon Sep 17 00:00:00 2001 From: davotoula Date: Tue, 28 Jul 2026 10:16:19 +0200 Subject: [PATCH] fix(workouts): make the combined-sessions count a plurals resource --- .../workouts/suggestion/DetectedWorkoutCarousel.kt | 4 +++- amethyst/src/main/res/values-cs/strings.xml | 6 ++++++ amethyst/src/main/res/values-de-rDE/strings.xml | 4 ++++ amethyst/src/main/res/values-hi-rIN/strings.xml | 5 ++++- amethyst/src/main/res/values-pt-rBR/strings.xml | 4 ++++ amethyst/src/main/res/values-sl-rSI/strings.xml | 7 ++++++- amethyst/src/main/res/values-sv-rSE/strings.xml | 4 ++++ amethyst/src/main/res/values/strings.xml | 5 ++++- 8 files changed, 35 insertions(+), 4 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/suggestion/DetectedWorkoutCarousel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/suggestion/DetectedWorkoutCarousel.kt index a64f15d1bf..6e9aec2daa 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/suggestion/DetectedWorkoutCarousel.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/workouts/suggestion/DetectedWorkoutCarousel.kt @@ -48,6 +48,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.health.connect.client.PermissionController @@ -211,7 +212,8 @@ private fun summaryLine(workout: DetectedWorkout): String { } parts.add(formatWorkoutDuration(workout.durationSeconds)) if (workout.sessionCount > 1) { - parts.add(stringRes(R.string.workout_suggestion_combined_sessions, workout.sessionCount)) + val sessions = workout.sessionCount + parts.add(pluralStringResource(R.plurals.workout_suggestion_combined_sessions, sessions, sessions)) } return parts.joinToString(" · ") } diff --git a/amethyst/src/main/res/values-cs/strings.xml b/amethyst/src/main/res/values-cs/strings.xml index 904b63f64b..72774a739d 100644 --- a/amethyst/src/main/res/values-cs/strings.xml +++ b/amethyst/src/main/res/values-cs/strings.xml @@ -4741,4 +4741,10 @@ URL avataru (volitelné) Publikování… Publikovat personu + + %1$d aktivita + %1$d aktivity + %1$d aktivity + %1$d aktivit + diff --git a/amethyst/src/main/res/values-de-rDE/strings.xml b/amethyst/src/main/res/values-de-rDE/strings.xml index fb213d202c..18a3176eb7 100644 --- a/amethyst/src/main/res/values-de-rDE/strings.xml +++ b/amethyst/src/main/res/values-de-rDE/strings.xml @@ -4575,4 +4575,8 @@ Avatar-URL (optional) Wird veröffentlicht… Persona veröffentlichen + + %1$d Aktivität + %1$d Aktivitäten + diff --git a/amethyst/src/main/res/values-hi-rIN/strings.xml b/amethyst/src/main/res/values-hi-rIN/strings.xml index 4e776b9d11..95808e10df 100644 --- a/amethyst/src/main/res/values-hi-rIN/strings.xml +++ b/amethyst/src/main/res/values-hi-rIN/strings.xml @@ -762,7 +762,10 @@ संयोजन %1$s सहस्रमीटर स्वास्थ्य संयोजन से - %1$d गतिविधियाँ + + %1$d गतिविधि + %1$d गतिविधियाँ + धावन पैदल द्विचक्रिकाचालन diff --git a/amethyst/src/main/res/values-pt-rBR/strings.xml b/amethyst/src/main/res/values-pt-rBR/strings.xml index 92c63533d9..9b3bef69f0 100644 --- a/amethyst/src/main/res/values-pt-rBR/strings.xml +++ b/amethyst/src/main/res/values-pt-rBR/strings.xml @@ -4577,4 +4577,8 @@ URL do avatar (opcional) Publicando… Publicar persona + + %1$d atividade + %1$d atividades + diff --git a/amethyst/src/main/res/values-sl-rSI/strings.xml b/amethyst/src/main/res/values-sl-rSI/strings.xml index 6528d461f4..4dae3ff817 100644 --- a/amethyst/src/main/res/values-sl-rSI/strings.xml +++ b/amethyst/src/main/res/values-sl-rSI/strings.xml @@ -802,7 +802,12 @@ Za podpisovanje se je potrebno prijaviti s privatnim ključem Poveži %1$s km Iz Health Connect - %1$d aktivnosti + + %1$d aktivnost + %1$d aktivnosti + %1$d aktivnosti + %1$d aktivnosti + Tek Hoja Kolesarjenje diff --git a/amethyst/src/main/res/values-sv-rSE/strings.xml b/amethyst/src/main/res/values-sv-rSE/strings.xml index 3d5a01816c..33e36056e3 100644 --- a/amethyst/src/main/res/values-sv-rSE/strings.xml +++ b/amethyst/src/main/res/values-sv-rSE/strings.xml @@ -4578,4 +4578,8 @@ Avatar-URL (valfritt) Publicerar… Publicera persona + + %1$d aktivitet + %1$d aktiviteter + diff --git a/amethyst/src/main/res/values/strings.xml b/amethyst/src/main/res/values/strings.xml index c4ac22857a..04405d49b9 100644 --- a/amethyst/src/main/res/values/strings.xml +++ b/amethyst/src/main/res/values/strings.xml @@ -792,7 +792,10 @@ Connect %1$s km From Health Connect - %1$d activities + + %1$d activity + %1$d activities + Running Walking Cycling