diff --git a/Source/WebCore/en.lproj/Localizable.strings b/Source/WebCore/en.lproj/Localizable.strings index 262119e210034..adee1406bd2c0 100644 --- a/Source/WebCore/en.lproj/Localizable.strings +++ b/Source/WebCore/en.lproj/Localizable.strings @@ -697,12 +697,12 @@ /* Option in segmented control for inserting a numbered list in text editing */ "Numbered list" = "Numbered list"; +/* Label for OK button in alerts */ +"OK" = "OK"; + /* Title of the OK button for the number pad in zoomed form controls. */ "OK (OK button title in extra zoomed number pad)" = "OK"; -/* OK button label in document password failure alert */ -"OK (document password failure alert)" = "OK"; - /* Menu item label for the track that represents disabling closed captions. */ "Off (text track)" = "Off"; diff --git a/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm b/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm index 0efe83b3b008d..4f1b8373772f0 100644 --- a/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm +++ b/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm @@ -3039,9 +3039,9 @@ - (void)_presentCaptivePortalMode alertControllerWithTitle:[NSString stringWithFormat:WEB_UI_NSSTRING(@"Lockdown Mode is Turned On For “%@“", "Lockdown Mode alert title"), appDisplayName] message:message preferredStyle:UIAlertControllerStyleAlert]; - - [alert addAction:[UIAlertAction actionWithTitle:WEB_UI_NSSTRING(@"OK", "Captive Portal Mode alert OK button") style:UIAlertActionStyleDefault handler:nil]]; - + + [alert addAction:[UIAlertAction actionWithTitle:WEB_UI_NSSTRING(@"OK", "Lockdown Mode alert OK button") style:UIAlertActionStyleDefault handler:nil]]; + UIViewController *presentationViewController = [UIViewController _viewControllerForFullScreenPresentationFromView:protectedSelf.get()]; [presentationViewController presentViewController:alert animated:YES completion:nil]; [[NSUserDefaults standardUserDefaults] setBool:YES forKey:WebKitCaptivePortalModeAlertShownKey]; diff --git a/Source/WebKit/UIProcess/ios/WKPasswordView.mm b/Source/WebKit/UIProcess/ios/WKPasswordView.mm index e75be2d66193d..37ad58f571f10 100644 --- a/Source/WebKit/UIProcess/ios/WKPasswordView.mm +++ b/Source/WebKit/UIProcess/ios/WKPasswordView.mm @@ -131,7 +131,7 @@ - (void)showPasswordFailureAlert [[_passwordView passwordField] setText:@""]; UIAlertController *alert = [UIAlertController alertControllerWithTitle:WEB_UI_STRING("The document could not be opened with that password.", "document password failure alert message") message:@"" preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("OK", "OK (document password failure alert)", "OK button label in document password failure alert") style:UIAlertActionStyleDefault handler:[](UIAlertAction *) { }]; + UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:WEB_UI_STRING("OK", "OK button label in document password failure alert") style:UIAlertActionStyleDefault handler:[](UIAlertAction *) { }]; [alert addAction:defaultAction];