Skip to content

Commit 3e1c110

Browse files
author
Maxime NATUREL
committed
Updating some new string keys to make them more generic
1 parent 600f650 commit 3e1c110

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

library/ui-strings/src/main/res/values/strings.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources xmlns:tools="http://schemas.android.com/tools">
33

4+
<!-- Cross feature -->
5+
<plurals name="x_selected">
6+
<item quantity="one">%1$d selected</item>
7+
<item quantity="other">%1$d selected</item>
8+
</plurals>
9+
10+
<!-- Notice -->
411
<string name="notice_room_invite_no_invitee">%s\'s invitation</string>
512
<string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
613
<string name="notice_room_created">%1$s created the room</string>
@@ -407,6 +414,8 @@
407414
<string name="action_learn_more">Learn more</string>
408415
<string name="action_next">Next</string>
409416
<string name="action_got_it">Got it</string>
417+
<string name="action_select_all">Select all</string>
418+
<string name="action_deselect_all">Deselect all</string>
410419

411420
<string name="copied_to_clipboard">Copied to clipboard</string>
412421

@@ -3329,12 +3338,6 @@
33293338
<string name="device_manager_other_sessions_no_inactive_sessions_found">No inactive sessions found.</string>
33303339
<string name="device_manager_other_sessions_clear_filter">Clear Filter</string>
33313340
<string name="device_manager_other_sessions_select">Select sessions</string>
3332-
<string name="device_manager_other_sessions_select_all">Select all</string>
3333-
<string name="device_manager_other_sessions_deselect_all">Deselect all</string>
3334-
<plurals name="device_manager_other_sessions_selected">
3335-
<item quantity="one">%1$d selected</item>
3336-
<item quantity="other">%1$d selected</item>
3337-
</plurals>
33383341
<string name="device_manager_session_overview_signout">Sign out of this session</string>
33393342
<string name="device_manager_session_details_title">Session details</string>
33403343
<string name="device_manager_session_details_description">Application, device, and activity information.</string>

vector/src/main/java/im/vector/app/features/settings/devices/v2/othersessions/OtherSessionsFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ class OtherSessionsFragment :
173173
invalidateOptionsMenu()
174174
val title = if (isSelectModeEnabled) {
175175
val selection = devices.count { it.isSelected }
176-
stringProvider.getQuantityString(R.plurals.device_manager_other_sessions_selected, selection, selection)
176+
stringProvider.getQuantityString(R.plurals.x_selected, selection, selection)
177177
} else {
178178
getString(args.titleResourceId)
179179
}

vector/src/main/res/menu/menu_other_sessions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
<item
1313
android:id="@+id/otherSessionsSelectAll"
14-
android:title="@string/device_manager_other_sessions_select_all"
14+
android:title="@string/action_select_all"
1515
app:showAsAction="withText|never" />
1616

1717
<item
1818
android:id="@+id/otherSessionsDeselectAll"
19-
android:title="@string/device_manager_other_sessions_deselect_all"
19+
android:title="@string/action_deselect_all"
2020
app:showAsAction="withText|never" />
2121
</menu>

0 commit comments

Comments
 (0)