Updated a11y strings for aria-current nodes on Android

This CL updates the strings/content for aria-current nodes on
Android. In the previous CL (https://crrev.com/c/2493660), we
added a base string with a placeholder that was dynamically
populated.

This presents an issue with gendered languages and translations,
as the "current" text would need to match the gender of the
dynamically populated portion.

To fix this, we instead make each string the full content, and
removed the dynamic placeholder logic.


AX-Relnotes: N/A
Skip-Translation-Screenshots-Check: True
Bug: 1093578
Change-Id: I11ef9ae570a632176bfe9819b852f584e8f0634d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2511036Reviewed-by: danakj <danakj@chromium.org>
Reviewed-by: Mark Schillaci <mschillaci@google.com>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Mark Schillaci <mschillaci@google.com>
Cr-Commit-Position: refs/heads/master@{#823690}

content/browser/accessibility/browser_accessibility_android.cc

@@ -747,41 +747,31 @@ base::string16 BrowserAccessibilityAndroid::GetAriaCurrentStateDescription()
     const {
   content::ContentClient* content_client = content::GetContentClient();
 
-  base::string16 aria_current_state;
-
+  int message_id;
   switch (static_cast<ax::mojom::AriaCurrentState>(
       GetIntAttribute(ax::mojom::IntAttribute::kAriaCurrentState))) {
     case ax::mojom::AriaCurrentState::kPage:
-      aria_current_state =
-          content_client->GetLocalizedString(IDS_AX_ARIA_CURRENT_PAGE);
+      message_id = IDS_AX_ARIA_CURRENT_PAGE;
       break;
     case ax::mojom::AriaCurrentState::kStep:
-      aria_current_state =
-          content_client->GetLocalizedString(IDS_AX_ARIA_CURRENT_STEP);
+      message_id = IDS_AX_ARIA_CURRENT_STEP;
       break;
     case ax::mojom::AriaCurrentState::kLocation:
-      aria_current_state =
-          content_client->GetLocalizedString(IDS_AX_ARIA_CURRENT_LOCATION);
+      message_id = IDS_AX_ARIA_CURRENT_LOCATION;
       break;
     case ax::mojom::AriaCurrentState::kDate:
-      aria_current_state =
-          content_client->GetLocalizedString(IDS_AX_ARIA_CURRENT_DATE);
+      message_id = IDS_AX_ARIA_CURRENT_DATE;
       break;
     case ax::mojom::AriaCurrentState::kTime:
-      aria_current_state =
-          content_client->GetLocalizedString(IDS_AX_ARIA_CURRENT_TIME);
+      message_id = IDS_AX_ARIA_CURRENT_TIME;
       break;
     case ax::mojom::AriaCurrentState::kTrue:
     default:
-      aria_current_state =
-          content_client->GetLocalizedString(IDS_AX_ARIA_CURRENT_TRUE);
+      message_id = IDS_AX_ARIA_CURRENT_TRUE;
       break;
   }
 
-  return base::ReplaceStringPlaceholders(
-      content_client->GetLocalizedString(
-          IDS_AX_ARIA_CURRENT_STATE_DESCRIPTION_BASE),
-      aria_current_state, nullptr);
+  return content_client->GetLocalizedString(message_id);
 }
 
 std::string BrowserAccessibilityAndroid::GetRoleString() const {

third_party/blink/public/strings/blink_strings.grd

@@ -805,26 +805,23 @@ below:
         <message name="IDS_AX_LIST_BOX_ITEM_STATE_DESCRIPTION" desc="Accessibility state description for an item that is part of a list box">
           in list, item <ph name="INDEX">$1<ex>1</ex></ph> of <ph name="COUNT">$2<ex>3</ex></ph>
         </message>
-        <message name="IDS_AX_ARIA_CURRENT_STATE_DESCRIPTION_BASE" desc="Accessibility state description for a node that has aria-current value set to something other than false">
-          current <ph name="TYPE">$1<ex>page</ex></ph>
-        </message>
         <message name="IDS_AX_ARIA_CURRENT_PAGE" desc="Accessibility state description for aria-current value of page.">
-          page
+          current page
         </message>
         <message name="IDS_AX_ARIA_CURRENT_STEP" desc="Accessibility state description for aria-current value of step.">
-          step
+          current step
         </message>
         <message name="IDS_AX_ARIA_CURRENT_LOCATION" desc="Accessibility state description for aria-current value of location.">
-          location
+          current location
         </message>
         <message name="IDS_AX_ARIA_CURRENT_DATE" desc="Accessibility state description for aria-current value of date.">
-          date
+          current date
         </message>
         <message name="IDS_AX_ARIA_CURRENT_TIME" desc="Accessibility state description for aria-current value of time.">
-          time
+          current time
         </message>
         <message name="IDS_AX_ARIA_CURRENT_TRUE" desc="Accessibility state description for aria-current value of true.">
-          item
+          current item
         </message>
       </if>
 

third_party/blink/public/strings/blink_strings_grd/IDS_AX_ARIA_CURRENT_STATE_DESCRIPTION_BASE.png.sha1

-493f231daab8a46d4e2e9a1f6e82c771a9269db7
\ No newline at end of file