Title: [233756] trunk/Source
- Revision
- 233756
- Author
- [email protected]
- Date
- 2018-07-11 21:06:27 -0700 (Wed, 11 Jul 2018)
Log Message
Update iOS fullscreen alert text
https://bugs.webkit.org/show_bug.cgi?id=187576
rdar://problem/42052284
Reviewed by Ryosuke Niwa.
Source/WebCore:
* English.lproj/Localizable.strings:
Source/WebKit:
* UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
(-[WKFullScreenViewController _showPhishingAlert]): Update text and string keys.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (233755 => 233756)
--- trunk/Source/WebCore/ChangeLog 2018-07-12 03:37:51 UTC (rev 233755)
+++ trunk/Source/WebCore/ChangeLog 2018-07-12 04:06:27 UTC (rev 233756)
@@ -1,3 +1,13 @@
+2018-07-11 Jon Lee <[email protected]>
+
+ Update iOS fullscreen alert text
+ https://bugs.webkit.org/show_bug.cgi?id=187576
+ rdar://problem/42052284
+
+ Reviewed by Ryosuke Niwa.
+
+ * English.lproj/Localizable.strings:
+
2018-07-11 Commit Queue <[email protected]>
Unreviewed, rolling out r233742.
Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (233755 => 233756)
--- trunk/Source/WebCore/English.lproj/Localizable.strings 2018-07-12 03:37:51 UTC (rev 233755)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2018-07-12 04:06:27 UTC (rev 233756)
@@ -268,12 +268,12 @@
/* Button for exiting full screen when in full screen media playback */
"Exit Full Screen" = "Exit Full Screen";
+/* Fullscreen Deceptive Website Exit Action */
+"Exit Full Screen (Element Fullscreen)" = "Exit Full Screen";
+
/* Video Exit Fullscreen context menu item */
"Exit Full Screen (context menu)" = "Exit Full Screen";
-/* Fullscreen Deceptive Website Exit Action */
-"Exit Fullscreen" = "Exit Fullscreen";
-
/* menu item */
"Exit Picture in Picture" = "Exit Picture in Picture";
@@ -337,6 +337,9 @@
/* Validation message for input form controls with a value not matching type */
"Invalid value" = "Invalid value";
+/* Fullscreen Deceptive Website Warning Sheet Title */
+"It looks like you are typing on “%@”" = "It looks like you are typing on “%@”";
+
/* Italic context menu item */
"Italic" = "Italic";
@@ -647,7 +650,7 @@
"Start Speaking" = "Start Speaking";
/* Fullscreen Deceptive Website Stay Action */
-"Stay in Fullscreen" = "Stay in Fullscreen";
+"Stay in Full Screen (Element Fullscreen)" = "Stay in Full Screen";
/* Stop context menu item */
"Stop" = "Stop";
@@ -736,9 +739,6 @@
/* 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";
@@ -763,6 +763,9 @@
/* Undo action name */
"Typing (Undo action name)" = "Typing";
+/* Fullscreen Deceptive Website Warning Sheet Content Text */
+"Typing is not allowed in full screen. This website may be showing a fake keyboard to trick you into disclosing personal or financial information." = "Typing is not allowed in full screen. This website may be showing a fake keyboard to trick you into disclosing personal or financial information.";
+
/* accessibility role description for a URL field. */
"URL field" = "URL field";
@@ -772,9 +775,6 @@
/* 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 (233755 => 233756)
--- trunk/Source/WebKit/ChangeLog 2018-07-12 03:37:51 UTC (rev 233755)
+++ trunk/Source/WebKit/ChangeLog 2018-07-12 04:06:27 UTC (rev 233756)
@@ -1,3 +1,14 @@
+2018-07-11 Jon Lee <[email protected]>
+
+ Update iOS fullscreen alert text
+ https://bugs.webkit.org/show_bug.cgi?id=187576
+ rdar://problem/42052284
+
+ Reviewed by Ryosuke Niwa.
+
+ * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+ (-[WKFullScreenViewController _showPhishingAlert]): Update text and string keys.
+
2018-07-11 Aditya Keerthi <[email protected]>
REGRESSION (231276): Attempting to copy an image fails
Modified: trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm (233755 => 233756)
--- trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm 2018-07-12 03:37:51 UTC (rev 233755)
+++ trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm 2018-07-12 04:06:27 UTC (rev 233756)
@@ -456,20 +456,20 @@
- (void)_showPhishingAlert
{
- 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");
+ NSString *alertTitle = [NSString stringWithFormat:WEB_UI_STRING("It looks like you are typing on “%@”", "Fullscreen Deceptive Website Warning Sheet Title"), (NSString *)self.location];
+ NSString *alertMessage = WEB_UI_STRING("Typing is not allowed in full screen. This website may be showing a fake keyboard to trick you into disclosing personal or financial information.", "Fullscreen Deceptive Website Warning Sheet Content Text");
UIAlertController* alert = [UIAlertController alertControllerWithTitle:alertTitle message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
if (auto* page = [self._webView _page])
page->suspendActiveDOMObjectsAndAnimations();
- UIAlertAction* exitAction = [UIAlertAction actionWithTitle:WEB_UI_STRING("Exit Fullscreen", "Fullscreen Deceptive Website Exit Action") style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
+ UIAlertAction* exitAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (Element Fullscreen)", "Fullscreen Deceptive Website Exit Action") style:UIAlertActionStyleCancel handler:^(UIAlertAction * action) {
[self _cancelAction:action];
if (auto* page = [self._webView _page])
page->resumeActiveDOMObjectsAndAnimations();
}];
- UIAlertAction* stayAction = [UIAlertAction actionWithTitle:WEB_UI_STRING("Stay in Fullscreen", "Fullscreen Deceptive Website Stay Action") style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
+ UIAlertAction* stayAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("Stay in Full Screen", "Stay in Full Screen (Element Fullscreen)", "Fullscreen Deceptive Website Stay Action") style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
if (auto* page = [self._webView _page])
page->resumeActiveDOMObjectsAndAnimations();
_secheuristic.reset();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
