AX: Loading progress percentage used for WebAre title is not localized.

https://bugs.webkit.org/show_bug.cgi?id=270670 <rdar://problem/124238656> Reviewed by Tyler Wilcock. Added COCOA helper function localizedPercentage and modified AXProcessingPage to return the entire localized string including the percentage. * Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp: (WebCore::AXIsolatedTree::reportLoadingProgress): * Source/WebCore/en.lproj/Localizable.strings: * Source/WebCore/platform/LocalizedStrings.cpp: (WebCore::AXProcessingPage): Deleted. * Source/WebCore/platform/LocalizedStrings.h: * Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm: (WebCore::localizedPercentage): (WebCore::AXProcessingPage): Canonical link: https://commits.webkit.org/275834@main
WebKit · Mar 8, 2024 · bd1508d · bd1508d
1 parent 0268a59
commit bd1508d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp b/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp
@@ -193,8 +193,7 @@ void AXIsolatedTree::reportLoadingProgress(double processingProgress)
     }
 
     m_processingProgress = processingProgress;
-    String percent = String::number(std::ceil(loadingProgress() * 100)) + "%"_s;
-    String title = AXProcessingPage() + " "_s + percent;
+    String title = AXProcessingPage(loadingProgress());
     AXLOG(title);
 
     WeakPtr cache = axObjectCache();

diff --git a/Source/WebCore/en.lproj/Localizable.strings b/Source/WebCore/en.lproj/Localizable.strings
@@ -1169,7 +1169,7 @@
 "Previous Page" = "Previous Page";
 
 /* Title for the webarea while the accessibility tree is being built. */
-"Processing page" = "Processing page";
+"Processing page %@" = "Processing page %@";
 
 /* Codec Strings */
 "Professional Profile (AV1 Codec Profile)" = "Professional Profile, ";

diff --git a/Source/WebCore/platform/LocalizedStrings.cpp b/Source/WebCore/platform/LocalizedStrings.cpp
@@ -990,11 +990,6 @@ String autoFillStrongPasswordLabel()
     return WEB_UI_STRING("Strong Password", "Label for strong password.");
 }
 
-String AXProcessingPage()
-{
-    return WEB_UI_STRING("Processing page", "Title for the webarea while the accessibility tree is being built.");
-}
-
 String missingPluginText()
 {
     return WEB_UI_STRING("Missing Plug-in", "Label text to be used when a plugin is missing");

diff --git a/Source/WebCore/platform/LocalizedStrings.h b/Source/WebCore/platform/LocalizedStrings.h
@@ -285,7 +285,7 @@ namespace WebCore {
     String AXAutoFillLoadingLabel();
     String autoFillStrongPasswordLabel();
 
-    String AXProcessingPage();
+    String AXProcessingPage(double);
 
     String missingPluginText();
     String crashedPluginText();

diff --git a/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm b/Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm
@@ -35,6 +35,21 @@
 
 namespace WebCore {
 
+static NSString *localizedPercentage(double percent)
+{
+    RetainPtr numberFormatter = adoptNS([[NSNumberFormatter alloc] init]);
+    [numberFormatter setLocale:[NSLocale currentLocale]];
+    [numberFormatter setNumberStyle:NSNumberFormatterPercentStyle];
+    [numberFormatter setMinimumFractionDigits:0];
+    [numberFormatter setMaximumFractionDigits:0];
+    return [numberFormatter stringFromNumber:@(percent)];
+}
+
+String AXProcessingPage(double percent)
+{
+    return WEB_UI_FORMAT_STRING("Processing page %@", "Title for the webarea while the accessibility tree is being built.", localizedPercentage(percent));
+}
+
 String copyImageUnknownFileLabel()
 {
     return WEB_UI_STRING("unknown", "Unknown filename");