Skip to content

Commit 00516ea

Browse files
authored
Merge pull request #76 from ooni/month-names
Support for localized month names
2 parents 1028925 + e7992a1 commit 00516ea

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

composeApp/src/commonMain/composeResources/values/strings-common.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,18 @@
141141
<item quantity="one">%1$d measurement</item>
142142
<item quantity="other">%1$d measurements</item>
143143
</plurals>
144+
<string-array name="months">
145+
<item>January</item>
146+
<item>February</item>
147+
<item>March</item>
148+
<item>April</item>
149+
<item>May</item>
150+
<item>June</item>
151+
<item>July</item>
152+
<item>August</item>
153+
<item>September</item>
154+
<item>October</item>
155+
<item>November</item>
156+
<item>December</item>
157+
</string-array>
144158
</resources>

composeApp/src/commonMain/kotlin/org/ooni/probe/ui/results/ResultsScreen.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ import ooniprobe.composeapp.generated.resources.TestResults_Overview_Title
3030
import ooniprobe.composeapp.generated.resources.TestResults_UnknownASN
3131
import ooniprobe.composeapp.generated.resources.ic_cloud_off
3232
import ooniprobe.composeapp.generated.resources.measurements_count
33+
import ooniprobe.composeapp.generated.resources.months
3334
import org.jetbrains.compose.resources.painterResource
3435
import org.jetbrains.compose.resources.pluralStringResource
36+
import org.jetbrains.compose.resources.stringArrayResource
3537
import org.jetbrains.compose.resources.stringResource
3638
import org.ooni.probe.data.models.ResultListItem
3739
import org.ooni.probe.ui.dashboard.TestDescriptorLabel
@@ -66,10 +68,11 @@ fun ResultsScreen(
6668

6769
@Composable
6870
private fun ResultDateHeader(date: LocalDate) {
71+
val monthNames = stringArrayResource(Res.array.months)
6972
Text(
7073
date.format(
7174
Format {
72-
monthName(MonthNames.ENGLISH_FULL) // TODO: localize months
75+
monthName(MonthNames(monthNames))
7376
char(' ')
7477
year()
7578
},

0 commit comments

Comments
 (0)