Updating some new string keys to make them more generic

This commit is contained in:
Maxime NATUREL 2022-10-25 17:21:55 +02:00
parent 600f650256
commit 3e1c110343
3 changed files with 12 additions and 9 deletions

View File

@ -1,6 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Cross feature -->
<plurals name="x_selected">
<item quantity="one">%1$d selected</item>
<item quantity="other">%1$d selected</item>
</plurals>
<!-- Notice -->
<string name="notice_room_invite_no_invitee">%s\'s invitation</string>
<string name="notice_room_invite_no_invitee_by_you">Your invitation</string>
<string name="notice_room_created">%1$s created the room</string>
@ -407,6 +414,8 @@
<string name="action_learn_more">Learn more</string>
<string name="action_next">Next</string>
<string name="action_got_it">Got it</string>
<string name="action_select_all">Select all</string>
<string name="action_deselect_all">Deselect all</string>
<string name="copied_to_clipboard">Copied to clipboard</string>
@ -3329,12 +3338,6 @@
<string name="device_manager_other_sessions_no_inactive_sessions_found">No inactive sessions found.</string>
<string name="device_manager_other_sessions_clear_filter">Clear Filter</string>
<string name="device_manager_other_sessions_select">Select sessions</string>
<string name="device_manager_other_sessions_select_all">Select all</string>
<string name="device_manager_other_sessions_deselect_all">Deselect all</string>
<plurals name="device_manager_other_sessions_selected">
<item quantity="one">%1$d selected</item>
<item quantity="other">%1$d selected</item>
</plurals>
<string name="device_manager_session_overview_signout">Sign out of this session</string>
<string name="device_manager_session_details_title">Session details</string>
<string name="device_manager_session_details_description">Application, device, and activity information.</string>

View File

@ -173,7 +173,7 @@ class OtherSessionsFragment :
invalidateOptionsMenu()
val title = if (isSelectModeEnabled) {
val selection = devices.count { it.isSelected }
stringProvider.getQuantityString(R.plurals.device_manager_other_sessions_selected, selection, selection)
stringProvider.getQuantityString(R.plurals.x_selected, selection, selection)
} else {
getString(args.titleResourceId)
}

View File

@ -11,11 +11,11 @@
<item
android:id="@+id/otherSessionsSelectAll"
android:title="@string/device_manager_other_sessions_select_all"
android:title="@string/action_select_all"
app:showAsAction="withText|never" />
<item
android:id="@+id/otherSessionsDeselectAll"
android:title="@string/device_manager_other_sessions_deselect_all"
android:title="@string/action_deselect_all"
app:showAsAction="withText|never" />
</menu>