Diff
Modified: trunk/Source/WebCore/ChangeLog (233463 => 233464)
--- trunk/Source/WebCore/ChangeLog 2018-07-03 15:21:07 UTC (rev 233463)
+++ trunk/Source/WebCore/ChangeLog 2018-07-03 16:15:55 UTC (rev 233464)
@@ -1,3 +1,13 @@
+2018-07-03 Jer Noble <[email protected]>
+
+ Update Fullscreen anti-phishing alert text
+ https://bugs.webkit.org/show_bug.cgi?id=187199
+ <rdar://problem/41162543>
+
+ Reviewed by Brent Fulgham.
+
+ * English.lproj/Localizable.strings:
+
2018-07-03 Frederic Wang <[email protected]>
REGRESSION (r232186): Hardware-accelerated CSS animations using steps() timing function no longer work
Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (233463 => 233464)
--- trunk/Source/WebCore/English.lproj/Localizable.strings 2018-07-03 15:21:07 UTC (rev 233463)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2018-07-03 16:15:55 UTC (rev 233464)
@@ -214,9 +214,6 @@
/* Day label in date picker */
"DAY (Date picker for extra zoom mode)" = "DAY";
-/* Fullscreen Deceptive Website Warning Sheet Title */
-"Deceptive Website Warning" = "Deceptive Website Warning";
-
/* Default writing direction context menu item */
"Default" = "Default";
@@ -736,12 +733,12 @@
/* prompt string in authentication panel */
"The user name or password you entered for this area on %@ was incorrect. Make sure you’re entering them correctly, and then try again." = "The user name or password you entered for this area on %@ was incorrect. Make sure you’re entering them correctly, and then try again.";
-/* Fullscreen Deceptive Website Warning Sheet Content Text */
-"The website “%@” may try to trick you into doing something dangerous, like installing software or disclosing personal or financial information, like passwords, phone numbers, or credit cards." = "The website “%@” may try to trick you into doing something dangerous, like installing software or disclosing personal or financial information, like passwords, phone numbers, or credit cards.";
-
/* text that appears at the start of nearly-obsolete web pages in the form of a 'searchable index' */
"This is a searchable index. Enter search keywords: " = "This is a searchable index. Enter search keywords: ";
+/* Fullscreen Deceptive Website Warning Sheet Content Text */
+"This website may be trying to trick you into disclosing personal or financial information, like passwords, phone number, or credit cards." = "This website may be trying to trick you into disclosing personal or financial information, like passwords, phone number, or credit cards.";
+
/* Undo action name */
"Tighten Kerning (Undo action name)" = "Tighten Kerning";
@@ -775,6 +772,9 @@
/* Undo action name */
"Underline (Undo action name)" = "Underline";
+/* Fullscreen Deceptive Website Warning Sheet Title */
+"Unexpected typing detected on “%@”" = "Unexpected typing detected on “%@”";
+
/* Menu item label for an audio track that has no other name */
"Unknown (audio track)" = "Unknown";
Modified: trunk/Source/WebKit/ChangeLog (233463 => 233464)
--- trunk/Source/WebKit/ChangeLog 2018-07-03 15:21:07 UTC (rev 233463)
+++ trunk/Source/WebKit/ChangeLog 2018-07-03 16:15:55 UTC (rev 233464)
@@ -1,3 +1,14 @@
+2018-07-03 Jer Noble <[email protected]>
+
+ Update Fullscreen anti-phishing alert text
+ https://bugs.webkit.org/show_bug.cgi?id=187199
+ <rdar://problem/41162543>
+
+ Reviewed by Brent Fulgham.
+
+ * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+ (-[WKFullScreenViewController _showPhishingAlert]):
+
2018-07-03 David Kilzer <[email protected]>
[iOS] Add assert to catch improper use of WebCore::Timer in UI Process
Modified: trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm (233463 => 233464)
--- trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm 2018-07-03 15:21:07 UTC (rev 233463)
+++ trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm 2018-07-03 16:15:55 UTC (rev 233464)
@@ -456,8 +456,8 @@
- (void)_showPhishingAlert
{
- NSString *alertTitle = WEB_UI_STRING("Deceptive Website Warning", "Fullscreen Deceptive Website Warning Sheet Title");
- NSString *alertMessage = [NSString stringWithFormat:WEB_UI_STRING("The website “%@” may try to trick you into doing something dangerous, like installing software or disclosing personal or financial information, like passwords, phone numbers, or credit cards.", "Fullscreen Deceptive Website Warning Sheet Content Text") , (NSString *)self.location];
+ NSString *alertTitle = [NSString stringWithFormat:WEB_UI_STRING("Unexpected typing detected on “%@”", "Fullscreen Deceptive Website Warning Sheet Title"), (NSString *)self.location];
+ NSString *alertMessage = WEB_UI_STRING("This website may be trying to trick you into disclosing personal or financial information, like passwords, phone number, or credit cards.", "Fullscreen Deceptive Website Warning Sheet Content Text");
UIAlertController* alert = [UIAlertController alertControllerWithTitle:alertTitle message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
if (auto* page = [self._webView _page])
