[6.x] Fix listing translations (#12263)

Author: duncanmcclean

resources/js/components/ui/Listing/TableBody.vue

@@ -30,32 +30,24 @@ function isSelected(id) {
 function getCheckboxLabel(row) {
     const rowTitle = getRowTitle(row);
     return isSelected(row.id)
-        ? __('deselect_title', { title: rowTitle })
-        : __('select_title', { title: rowTitle });
-}
-
-function getCheckboxAriaLabel(row) {
-    const rowTitle = getRowTitle(row);
-    return isSelected(row.id)
-        ? __('deselect_title', { title: rowTitle })
-        : __('select_title', { title: rowTitle });
+        ? __('Deselect :title', { title: rowTitle })
+        : __('Select :title', { title: rowTitle });
 }
 
 function getCheckboxDescription(row) {
     const rowTitle = getRowTitle(row);
     const isDisabled = hasReachedSelectionLimit.value && allowsMultipleSelections.value && !isSelected(row.id);
 
     if (isDisabled) {
-        return __('selection_limit_reached', { title: rowTitle });
+        return __('messages.selections_limit_reached', { title: rowTitle });
     }
 
     return isSelected(row.id)
-        ? __('item_selected_description', { title: rowTitle })
-        : __('item_not_selected_description', { title: rowTitle });
+        ? __('messages.selections_item_selected', { title: rowTitle })
+        : __('messages.selections_item_unselected', { title: rowTitle });
 }
 
 function getRowTitle(row) {
-    // Try to get a meaningful title from common fields
     return row.title || row.name || row.label || row.id || __('item');
 }
 

resources/js/components/ui/Listing/ToggleAll.vue

@@ -19,24 +19,25 @@ function checkMaximumAmountOfItems() {
 
 function getAriaLabel() {
     if (indeterminate.value) {
-        return __('select_all_items');
+        return __('Select all items');
     }
-    return anyItemsChecked.value ? __('deselect_all_items') : __('select_all_items');
+
+    return anyItemsChecked.value ? __('Deselect all items') : __('Select all items');
 }
 
 function getScreenReaderText() {
     const totalItems = items.value.length;
     const selectedItems = selections.value.length;
 
     if (indeterminate.value) {
-        return __('items_selected_count', { selected: selectedItems, total: totalItems });
+        return __('messages.selections_select_all', { selected: selectedItems, total: totalItems });
     }
 
     if (anyItemsChecked.value) {
-        return __('all_items_selected', { total: totalItems });
+        return __('messages.selections_click_to_deselect_all', { total: totalItems });
     }
 
-    return __('no_items_selected', { total: totalItems });
+    return __('messages.selections_click_to_select_all', { total: totalItems });
 }
 </script>
 

resources/lang/en/messages.php

@@ -224,17 +224,12 @@
     'role_title_instructions' => 'Use a singular noun, such as \'Editor\' or \'Admin\'',
     'search_utility_description' => 'Manage and view important information about Statamic\'s search indexes.',
     'search_with_count_filters_applied' => 'Search (1 filter applied)|Search (:count filters applied)',
-    'select_all_items' => 'Select all items',
-    'deselect_all_items' => 'Deselect all items',
-    'items_selected_count' => ':selected of :total items selected. Check to select all items.',
-    'all_items_selected' => 'All :total items selected. Uncheck to deselect all items.',
-    'no_items_selected' => 'No items selected. Check to select all :total items.',
-    'select_title' => 'Select :title',
-    'deselect_title' => 'Deselect :title',
-    'selection_limit_reached' => 'Selection limit reached. Cannot select :title',
-    'item_selected_description' => ':title is currently selected. Click to deselect.',
-    'item_not_selected_description' => ':title is not selected. Click to select.',
-    'item' => 'item',
+    'selections_click_to_deselect_all' => 'All :total items selected. Uncheck to deselect all items.',
+    'selections_click_to_select_all' => 'No items selected. Check to select all :total items.',
+    'selections_item_selected' => ':title is currently selected. Click to deselect.',
+    'selections_item_unselected' => ':title is not selected. Click to select.',
+    'selections_limit_reached' => 'Selection limit reached. Cannot select :title',
+    'selections_select_all' => ':selected of :total items selected. Check to select all items.',
     'session_expiry_enter_password' => 'Enter your password to continue.',
     'session_expiry_enter_two_factor_code' => 'Enter your authenticator code to continue.',
     'session_expiry_enter_two_factor_recovery_code' => 'Enter a recovery code to continue.',