- Revision
- 238503
- Author
- [email protected]
- Date
- 2018-11-26 11:15:11 -0800 (Mon, 26 Nov 2018)
Log Message
Use Full Screen consistently in localizable strings.
https://bugs.webkit.org/show_bug.cgi?id=190363
rdar://problem/43882333
Patch by Jeremy Jones <[email protected]> on 2018-11-26
Reviewed by Jon Lee.
Source/WebCore:
No new tests because only change is to localizable strings.
Rename "Fullscreen" to "Full Screen" in localizable strings for consistency.
* English.lproj/Localizable.strings:
* platform/LocalizedStrings.cpp:
(WebCore::contextMenuItemTagEnterVideoFullscreen):
(WebCore::contextMenuItemTagExitVideoFullscreen):
(WebCore::localizedMediaControlElementHelpText):
Source/WebKit:
Rename "Fullscreen" to "Full Screen" in localizable strings for consistency.
* UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
(-[WKFullScreenViewController _showPhishingAlert]):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (238502 => 238503)
--- trunk/Source/WebCore/ChangeLog 2018-11-26 19:01:04 UTC (rev 238502)
+++ trunk/Source/WebCore/ChangeLog 2018-11-26 19:15:11 UTC (rev 238503)
@@ -1,3 +1,21 @@
+2018-11-26 Jeremy Jones <[email protected]>
+
+ Use Full Screen consistently in localizable strings.
+ https://bugs.webkit.org/show_bug.cgi?id=190363
+ rdar://problem/43882333
+
+ Reviewed by Jon Lee.
+
+ No new tests because only change is to localizable strings.
+
+ Rename "Fullscreen" to "Full Screen" in localizable strings for consistency.
+
+ * English.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::contextMenuItemTagEnterVideoFullscreen):
+ (WebCore::contextMenuItemTagExitVideoFullscreen):
+ (WebCore::localizedMediaControlElementHelpText):
+
2018-11-26 Brent Fulgham <[email protected]>
[Win] Reduce the use of WKSI library calls: CoreAnimation
Modified: trunk/Source/WebCore/en.lproj/Localizable.strings (238502 => 238503)
--- trunk/Source/WebCore/en.lproj/Localizable.strings 2018-11-26 19:01:04 UTC (rev 238502)
+++ trunk/Source/WebCore/en.lproj/Localizable.strings 2018-11-26 19:15:11 UTC (rev 238503)
@@ -259,7 +259,7 @@
/* Undo action name */
"Drag (Undo action name)" = "Drag";
-/* Video Enter Fullscreen context menu item */
+/* Video Enter Full Screen context menu item */
"Enter Full Screen" = "Enter Full Screen";
/* menu item */
@@ -283,10 +283,10 @@
/* 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";
+/* Full Screen Deceptive Website Exit Action */
+"Exit Full Screen (Element Full Screen)" = "Exit Full Screen";
-/* Video Exit Fullscreen context menu item */
+/* Video Exit Full Screen context menu item */
"Exit Full Screen (context menu)" = "Exit Full Screen";
/* menu item */
@@ -367,7 +367,7 @@
/* Validation message for input form controls with a value not matching type */
"Invalid value" = "Invalid value";
-/* Fullscreen Deceptive Website Warning Sheet Title */
+/* Full Screen Deceptive Website Warning Sheet Title */
"It looks like you are typing while in full screen" = "It looks like you are typing while in full screen";
/* Italic context menu item */
@@ -553,8 +553,8 @@
/* Media Play context menu item */
"Play" = "Play";
-/* accessibility help text for enter fullscreen button */
-"Play movie in fullscreen mode" = "Play movie in fullscreen mode";
+/* accessibility help text for enter full screen button */
+"Play movie in full screen mode" = "Play movie in full screen mode";
/* Label text to be used if plugin host process has crashed */
"Plug-in Failure" = "Plug-in Failure";
@@ -691,8 +691,8 @@
/* Start speaking context menu item */
"Start Speaking" = "Start Speaking";
-/* Fullscreen Deceptive Website Stay Action */
-"Stay in Full Screen (Element Fullscreen)" = "Stay in Full Screen";
+/* Full Screen Deceptive Website Stay Action */
+"Stay in Full Screen (Element Full Screen)" = "Stay in Full Screen";
/* Stop context menu item */
"Stop" = "Stop";
@@ -817,7 +817,7 @@
/* Undo action name */
"Typing (Undo action name)" = "Typing";
-/* Fullscreen Deceptive Website Warning Sheet Content Text */
+/* Full Screen Deceptive Website Warning Sheet Content Text */
"Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information." = "Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information.";
/* accessibility role description for a URL field. */
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (238502 => 238503)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2018-11-26 19:01:04 UTC (rev 238502)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2018-11-26 19:15:11 UTC (rev 238503)
@@ -384,12 +384,12 @@
String contextMenuItemTagEnterVideoFullscreen()
{
- return WEB_UI_STRING("Enter Full Screen", "Video Enter Fullscreen context menu item");
+ return WEB_UI_STRING("Enter Full Screen", "Video Enter Full Screen context menu item");
}
String contextMenuItemTagExitVideoFullscreen()
{
- return WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (context menu)", "Video Exit Fullscreen context menu item");
+ return WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (context menu)", "Video Exit Full Screen context menu item");
}
#endif
@@ -798,7 +798,7 @@
if (name == "SeekForwardButton")
return WEB_UI_STRING("seek quickly forward", "accessibility help text for fast forward button");
if (name == "FullscreenButton")
- return WEB_UI_STRING("Play movie in fullscreen mode", "accessibility help text for enter fullscreen button");
+ return WEB_UI_STRING("Play movie in full screen mode", "accessibility help text for enter full screen button");
if (name == "ShowClosedCaptionsButton")
return WEB_UI_STRING("start displaying closed captions", "accessibility help text for show closed captions button");
if (name == "HideClosedCaptionsButton")
Modified: trunk/Source/WebKit/ChangeLog (238502 => 238503)
--- trunk/Source/WebKit/ChangeLog 2018-11-26 19:01:04 UTC (rev 238502)
+++ trunk/Source/WebKit/ChangeLog 2018-11-26 19:15:11 UTC (rev 238503)
@@ -1,3 +1,16 @@
+2018-11-26 Jeremy Jones <[email protected]>
+
+ Use Full Screen consistently in localizable strings.
+ https://bugs.webkit.org/show_bug.cgi?id=190363
+ rdar://problem/43882333
+
+ Reviewed by Jon Lee.
+
+ Rename "Fullscreen" to "Full Screen" in localizable strings for consistency.
+
+ * UIProcess/ios/fullscreen/WKFullScreenViewController.mm:
+ (-[WKFullScreenViewController _showPhishingAlert]):
+
2018-11-26 Daniel Bates <[email protected]>
Wire up ChromeClient::takeFocus() on iOS
Modified: trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm (238502 => 238503)
--- trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm 2018-11-26 19:01:04 UTC (rev 238502)
+++ trunk/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenViewController.mm 2018-11-26 19:15:11 UTC (rev 238503)
@@ -555,20 +555,20 @@
- (void)_showPhishingAlert
{
- NSString *alertTitle = WEB_UI_STRING("It looks like you are typing while in full screen", "Fullscreen Deceptive Website Warning Sheet Title");
- NSString *alertMessage = [NSString stringWithFormat:WEB_UI_STRING("Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information.", "Fullscreen Deceptive Website Warning Sheet Content Text"), (NSString *)self.location];
+ NSString *alertTitle = WEB_UI_STRING("It looks like you are typing while in full screen", "Full Screen Deceptive Website Warning Sheet Title");
+ NSString *alertMessage = [NSString stringWithFormat:WEB_UI_STRING("Typing is not allowed in full screen websites. “%@” may be showing a fake keyboard to trick you into disclosing personal or financial information.", "Full Screen Deceptive Website Warning Sheet Content Text"), (NSString *)self.location];
UIAlertController* alert = [UIAlertController alertControllerWithTitle:alertTitle message:alertMessage preferredStyle:UIAlertControllerStyleAlert];
if (auto* page = [self._webView _page])
page->suspendActiveDOMObjectsAndAnimations();
- 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) {
+ UIAlertAction* exitAction = [UIAlertAction actionWithTitle:WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (Element Full Screen)", "Full Screen 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_KEY("Stay in Full Screen", "Stay in Full Screen (Element 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 Full Screen)", "Full Screen Deceptive Website Stay Action") style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
if (auto* page = [self._webView _page])
page->resumeActiveDOMObjectsAndAnimations();
_secheuristic.reset();
