Merge pull request #3760 from davotoula/fix/workout-combined-sessions-plurals

Make the combined-sessions count a plurals resource
This commit is contained in:
David Kaspar
2026-07-28 10:33:11 +02:00
committed by GitHub
8 changed files with 35 additions and 4 deletions
@@ -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(" · ")
}
@@ -4741,4 +4741,10 @@
<string name="buzz_persona_avatar">URL avataru (volitelné)</string>
<string name="buzz_persona_publishing">Publikování…</string>
<string name="buzz_persona_publish">Publikovat personu</string>
<plurals name="workout_suggestion_combined_sessions">
<item quantity="one">%1$d aktivita</item>
<item quantity="few">%1$d aktivity</item>
<item quantity="many">%1$d aktivity</item>
<item quantity="other">%1$d aktivit</item>
</plurals>
</resources>
@@ -4575,4 +4575,8 @@
<string name="buzz_persona_avatar">Avatar-URL (optional)</string>
<string name="buzz_persona_publishing">Wird veröffentlicht…</string>
<string name="buzz_persona_publish">Persona veröffentlichen</string>
<plurals name="workout_suggestion_combined_sessions">
<item quantity="one">%1$d Aktivität</item>
<item quantity="other">%1$d Aktivitäten</item>
</plurals>
</resources>
@@ -762,7 +762,10 @@
<string name="workout_suggestion_connect_button">संयोजन</string>
<string name="workout_suggestion_distance_km">%1$s सहस्रमीटर</string>
<string name="workout_from_health_connect">स्वास्थ्य संयोजन से</string>
<string name="workout_suggestion_combined_sessions">%1$d गतिविधियाँ</string>
<plurals name="workout_suggestion_combined_sessions">
<item quantity="one">%1$d गतिविधि</item>
<item quantity="other">%1$d गतिविधियाँ</item>
</plurals>
<string name="exercise_running">धावन</string>
<string name="exercise_walking">पैदल</string>
<string name="exercise_cycling">द्विचक्रिकाचालन</string>
@@ -4577,4 +4577,8 @@
<string name="buzz_persona_avatar">URL do avatar (opcional)</string>
<string name="buzz_persona_publishing">Publicando…</string>
<string name="buzz_persona_publish">Publicar persona</string>
<plurals name="workout_suggestion_combined_sessions">
<item quantity="one">%1$d atividade</item>
<item quantity="other">%1$d atividades</item>
</plurals>
</resources>
@@ -802,7 +802,12 @@ Za podpisovanje se je potrebno prijaviti s privatnim ključem</string>
<string name="workout_suggestion_connect_button">Poveži</string>
<string name="workout_suggestion_distance_km">%1$s km</string>
<string name="workout_from_health_connect">Iz Health Connect</string>
<string name="workout_suggestion_combined_sessions">%1$d aktivnosti</string>
<plurals name="workout_suggestion_combined_sessions">
<item quantity="one">%1$d aktivnost</item>
<item quantity="two">%1$d aktivnosti</item>
<item quantity="few">%1$d aktivnosti</item>
<item quantity="other">%1$d aktivnosti</item>
</plurals>
<string name="exercise_running">Tek</string>
<string name="exercise_walking">Hoja</string>
<string name="exercise_cycling">Kolesarjenje</string>
@@ -4578,4 +4578,8 @@
<string name="buzz_persona_avatar">Avatar-URL (valfritt)</string>
<string name="buzz_persona_publishing">Publicerar…</string>
<string name="buzz_persona_publish">Publicera persona</string>
<plurals name="workout_suggestion_combined_sessions">
<item quantity="one">%1$d aktivitet</item>
<item quantity="other">%1$d aktiviteter</item>
</plurals>
</resources>
+4 -1
View File
@@ -792,7 +792,10 @@
<string name="workout_suggestion_connect_button">Connect</string>
<string name="workout_suggestion_distance_km">%1$s km</string>
<string name="workout_from_health_connect">From Health Connect</string>
<string name="workout_suggestion_combined_sessions">%1$d activities</string>
<plurals name="workout_suggestion_combined_sessions">
<item quantity="one">%1$d activity</item>
<item quantity="other">%1$d activities</item>
</plurals>
<string name="exercise_running">Running</string>
<string name="exercise_walking">Walking</string>
<string name="exercise_cycling">Cycling</string>