Skip to content

feat: update recurrence option names [WPB-27425] #5138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saleniuk merged 1 commit into from
Aug 12, 2026
+34 −21
Merged

feat: update recurrence option names [WPB-27425] #5138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions features/meetings/src/main/java/com/wire/android/feature/meetings/model/MeetingItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,22 @@
) : MeetingListItem {
@Stable
data class RepeatingInterval(val frequency: Frequency, val interval: Int) {
val label: UIText = when (frequency) {
Frequency.DAILY -> UIText.PluralResource(R.plurals.meeting_repeating_days, interval, interval)
Frequency.WEEKLY -> UIText.PluralResource(R.plurals.meeting_repeating_weeks, interval, interval)
val label = when (frequency) {
Frequency.DAILY -> when (interval) {
2 -> UIText.StringResource(R.string.meeting_repeating_days_2)
3 -> UIText.StringResource(R.string.meeting_repeating_days_3)
4 -> UIText.StringResource(R.string.meeting_repeating_days_4)
5 -> UIText.StringResource(R.string.meeting_repeating_days_5)
6 -> UIText.StringResource(R.string.meeting_repeating_days_6)

Check warning on line 54 in features/meetings/src/main/java/com/wire/android/feature/meetings/model/MeetingItem.kt

View check run for this annotation

Codecov / codecov/patch

features/meetings/src/main/java/com/wire/android/feature/meetings/model/MeetingItem.kt#L50-L54 

Added lines #L50 - L54 were not covered by tests
else -> UIText.PluralResource(R.plurals.meeting_repeating_days, interval, interval)
}

Frequency.WEEKLY -> when (interval) {
2 -> UIText.StringResource(R.string.meeting_repeating_weeks_2)
3 -> UIText.StringResource(R.string.meeting_repeating_weeks_3)

Check warning on line 60 in features/meetings/src/main/java/com/wire/android/feature/meetings/model/MeetingItem.kt

View check run for this annotation

Codecov / codecov/patch

features/meetings/src/main/java/com/wire/android/feature/meetings/model/MeetingItem.kt#L60 

Added line #L60 was not covered by tests
4 -> UIText.StringResource(R.string.meeting_repeating_weeks_4)
else -> UIText.PluralResource(R.plurals.meeting_repeating_weeks, interval, interval)
}
}

companion object {
Expand Down
10 changes: 4 additions & 6 deletions features/meetings/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
<resources>
<string name="all_meetings_tab_next">NÄCHSTE</string>
<string name="all_meetings_tab_past">LETZTE</string>
<string name="meeting_repeating_never">Niemals</string>
<string name="meeting_repeating_daily">Täglich</string>
<string name="meeting_repeating_weekly">Wöchentlich</string>
<string name="meeting_repeating_biweekly">Alle 2 Wochen</string>
<string name="meeting_repeating_monthly">Monatlich</string>
<string name="meeting_repeating_annually">Jährlich</string>
<string name="meeting_started_at">Begann %1$s</string>
<string name="content_description_more_menu_icon">Weitere Optionen öffnen</string>
<string name="meeting_join_button">Beitreten</string>
Expand Down Expand Up @@ -83,6 +77,9 @@
<item quantity="one">+%1$d mehr</item>
<item quantity="other">+%1$d weitere</item>
</plurals>

<!-- Repeating frequency options -->
<string name="meeting_repeating_never">Niemals</string>
<plurals name="meeting_repeating_days">
<item quantity="one">Täglich</item>
<item quantity="other">Alle %d Tage</item>
Expand All @@ -99,4 +96,5 @@
<item quantity="one">Jährlich</item>
<item quantity="other">Alle %d Jahre</item>
</plurals>

</resources>
10 changes: 4 additions & 6 deletions features/meetings/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
<resources>
<string name="all_meetings_tab_next">ДАЛЕЕ</string>
<string name="all_meetings_tab_past">НАЗАД</string>
<string name="meeting_repeating_never">Никогда</string>
<string name="meeting_repeating_daily">Ежедневно</string>
<string name="meeting_repeating_weekly">Еженедельно</string>
<string name="meeting_repeating_biweekly">Каждые 2 недели</string>
<string name="meeting_repeating_monthly">Ежемесячно</string>
<string name="meeting_repeating_annually">Ежегодно</string>
<string name="meeting_started_at">Начиная с %1$s</string>
<string name="content_description_meeting_icon">Значок встречи</string>
<string name="content_description_more_menu_icon">Значок меню встречи</string>
Expand Down Expand Up @@ -90,6 +84,9 @@
<item quantity="many">Еще +%1$d</item>
<item quantity="other">Еще +%1$d</item>
</plurals>

<!-- Repeating frequency options -->
<string name="meeting_repeating_never">Никогда</string>
<plurals name="meeting_repeating_days">
<item quantity="one">Ежедневно</item>
<item quantity="few">Каждые %d дня</item>
Expand All @@ -114,4 +111,5 @@
<item quantity="many">Каждые %d лет</item>
<item quantity="other">Каждые %d года</item>
</plurals>

</resources>
16 changes: 10 additions & 6 deletions features/meetings/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@
<resources>
<string name="all_meetings_tab_next">NEXT</string>
<string name="all_meetings_tab_past">PAST</string>
<string name="meeting_repeating_never">Never</string>
<string name="meeting_repeating_daily">Daily</string>
<string name="meeting_repeating_weekly">Weekly</string>
<string name="meeting_repeating_biweekly">Every 2 weeks</string>
<string name="meeting_repeating_monthly">Monthly</string>
<string name="meeting_repeating_annually">Annually</string>
<string name="meeting_started_at">Started at %1$s</string>
<string name="content_description_meeting_icon">Meeting icon</string>
<string name="content_description_more_menu_icon">Meeting more menu icon</string>
Expand Down Expand Up @@ -97,10 +91,20 @@
<item quantity="other">+%1$d more</item>
</plurals>

<!-- Repeating frequency options -->
<string name="meeting_repeating_never">Never</string>
<string name="meeting_repeating_days_2">Every two days</string>
<string name="meeting_repeating_days_3">Every three days</string>
<string name="meeting_repeating_days_4">Every four days</string>
<string name="meeting_repeating_days_5">Every five days</string>
<string name="meeting_repeating_days_6">Every six days</string>
<plurals name="meeting_repeating_days">
<item quantity="one">Daily</item>
<item quantity="other">Every %d days</item>
</plurals>
<string name="meeting_repeating_weeks_2">Every two weeks</string>
<string name="meeting_repeating_weeks_3">Every three weeks</string>
<string name="meeting_repeating_weeks_4">Every four weeks</string>
<plurals name="meeting_repeating_weeks">
<item quantity="one">Weekly</item>
<item quantity="other">Every %d weeks</item>
Expand Down
Loading