Update localizable strings to "full screen" from "fullscreen"
authorjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Apr 2017 16:05:16 +0000 (16:05 +0000)
committerjonlee@apple.com <jonlee@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Apr 2017 16:05:16 +0000 (16:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=170675
rdar://problem/28207034

Reviewed by Antoine Quint.

Source/WebCore:

For localizable strings, it should consistently be "full screen" instead of "fullscreen".

* English.lproj/Localizable.strings:
* English.lproj/modern-media-controls-localized-strings.js:
* platform/LocalizedStrings.cpp:
(WebCore::contextMenuItemTagExitVideoFullscreen):
(WebCore::localizedMediaControlElementString):
* platform/cocoa/LocalizedStringsCocoa.mm:
(WebCore::exitFullScreenButtonAccessibilityTitle):

Source/WebInspectorUI:

* UserInterface/Models/ScriptTimelineRecord.js:
(WebInspector.ScriptTimelineRecord.EventType.displayName): For localizable strings, it should consistently be
"full screen" instead of "fullscreen".

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@215182 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/English.lproj/Localizable.strings
Source/WebCore/English.lproj/modern-media-controls-localized-strings.js
Source/WebCore/platform/LocalizedStrings.cpp
Source/WebCore/platform/cocoa/LocalizedStringsCocoa.mm
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js

index e12d89c..8bb2d84 100644 (file)
@@ -1,3 +1,21 @@
+2017-04-10  Jon Lee  <jonlee@apple.com>
+
+        Update localizable strings to "full screen" from "fullscreen"
+        https://bugs.webkit.org/show_bug.cgi?id=170675
+        rdar://problem/28207034
+
+        Reviewed by Antoine Quint.
+
+        For localizable strings, it should consistently be "full screen" instead of "fullscreen".
+
+        * English.lproj/Localizable.strings:
+        * English.lproj/modern-media-controls-localized-strings.js:
+        * platform/LocalizedStrings.cpp:
+        (WebCore::contextMenuItemTagExitVideoFullscreen):
+        (WebCore::localizedMediaControlElementString):
+        * platform/cocoa/LocalizedStringsCocoa.mm:
+        (WebCore::exitFullScreenButtonAccessibilityTitle):
+
 2017-04-10  Andreas Kling  <akling@apple.com>
 
         Don't generate extra scrolling tiles for non-visible pages.
index 1b2e198..fef00a1 100644 (file)
 /* Validation message for input form controls of type 'email' that have an invalid value */
 "Enter an email address" = "Enter an email address";
 
-/* Video Exit Fullscreen context menu item */
+/* Button for exiting full screen when in full screen media playback */
 "Exit Full Screen" = "Exit Full Screen";
 
-/* Button for exiting fullscreen when in fullscreen media playback */
-"Exit Fullscreen" = "Exit Fullscreen";
+/* Video Exit Fullscreen context menu item */
+"Exit Full Screen (context menu)" = "Exit Full Screen";
 
 /* menu item */
 "Exit Picture in Picture" = "Exit Picture in Picture";
 /* accessibility role description for an email field. */
 "email field" = "email field";
 
-/* accessibility label for enter fullscreen button */
-"enter fullscreen" = "enter fullscreen";
+/* accessibility label for enter full screen button */
+"enter full screen" = "enter full screen";
 
-/* accessibility label for exit fullscreen button */
-"exit fullscreen" = "exit fullscreen";
+/* accessibility label for exit full screen button */
+"exit full screen" = "exit full screen";
 
 /* HTTP result code string */
 "expectation failed" = "expectation failed";
index d178853..7cf2a45 100644 (file)
@@ -1,7 +1,7 @@
 const UIStrings = {
     "AirPlay": "AirPlay",
     "Audio": "Audio",
-    "Enter Fullscreen": "Enter Fullscreen",
+    "Enter Full Screen": "Enter Full Screen",
     "Enter Picture in Picture": "Enter Picture in Picture",
     "Exit Full Screen": "Exit Full Screen",
     "Error": "Error",
index 65aa6a3..59bc9c2 100644 (file)
@@ -388,7 +388,7 @@ String contextMenuItemTagEnterVideoFullscreen()
 
 String contextMenuItemTagExitVideoFullscreen()
 {
-    return WEB_UI_STRING("Exit Full Screen", "Video Exit Fullscreen context menu item");
+    return WEB_UI_STRING_KEY("Exit Full Screen", "Exit Full Screen (context menu)", "Video Exit Fullscreen context menu item");
 }
 #endif
 
@@ -712,9 +712,9 @@ String localizedMediaControlElementString(const String& name)
     if (name == "StatusDisplay")
         return WEB_UI_STRING("status", "accessibility label for movie status");
     if (name == "EnterFullscreenButton")
-        return WEB_UI_STRING("enter fullscreen", "accessibility label for enter fullscreen button");
+        return WEB_UI_STRING("enter full screen", "accessibility label for enter full screen button");
     if (name == "ExitFullscreenButton")
-        return WEB_UI_STRING("exit fullscreen", "accessibility label for exit fullscreen button");
+        return WEB_UI_STRING("exit full screen", "accessibility label for exit full screen button");
     if (name == "SeekForwardButton")
         return WEB_UI_STRING("fast forward", "accessibility label for fast forward button");
     if (name == "SeekBackButton")
index b883268..28bb1e9 100644 (file)
@@ -350,7 +350,7 @@ String insertListTypeNumberedAccessibilityTitle()
 
 String exitFullScreenButtonAccessibilityTitle()
 {
-    return WEB_UI_STRING("Exit Fullscreen", "Button for exiting fullscreen when in fullscreen media playback");
+    return WEB_UI_STRING("Exit Full Screen", "Button for exiting full screen when in full screen media playback");
 }
 #endif // PLATFORM(MAC)
 
index a85bea3..4fb3796 100644 (file)
@@ -1,3 +1,15 @@
+2017-04-10  Jon Lee  <jonlee@apple.com>
+
+        Update localizable strings to "full screen" from "fullscreen"
+        https://bugs.webkit.org/show_bug.cgi?id=170675
+        rdar://problem/28207034
+
+        Reviewed by Antoine Quint.
+
+        * UserInterface/Models/ScriptTimelineRecord.js:
+        (WebInspector.ScriptTimelineRecord.EventType.displayName): For localizable strings, it should consistently be
+        "full screen" instead of "fullscreen".
+
 2017-04-09  Devin Rousso  <webkit@devinrousso.com>
 
         Web Inspector: tabbing in Styles sidebar is broken when additional ":" and ";" are in the property value
index 4a4231d..f87ccab 100644 (file)
@@ -329,12 +329,12 @@ WebInspector.ScriptTimelineRecord.EventType.displayName = function(eventType, de
         nameMap.set("webkitEditableContentChanged", "Editable Content Changed");
         nameMap.set("webkitTransitionEnd", "Transition End");
         nameMap.set("webkitaddsourcebuffer", "Add Source Buffer");
-        nameMap.set("webkitbeginfullscreen", "Begin Fullscreen");
+        nameMap.set("webkitbeginfullscreen", "Begin Full Screen");
         nameMap.set("webkitcurrentplaybacktargetiswirelesschanged", "Current Playback Target Is Wireless Changed");
         nameMap.set("webkitdeviceproximity", "Device Proximity");
-        nameMap.set("webkitendfullscreen", "End Fullscreen");
-        nameMap.set("webkitfullscreenchange", "Fullscreen Change");
-        nameMap.set("webkitfullscreenerror", "Fullscreen Error");
+        nameMap.set("webkitendfullscreen", "End Full Screen");
+        nameMap.set("webkitfullscreenchange", "Full Screen Change");
+        nameMap.set("webkitfullscreenerror", "Full Screen Error");
         nameMap.set("webkitkeyadded", "Key Added");
         nameMap.set("webkitkeyerror", "Key Error");
         nameMap.set("webkitkeymessage", "Key Message");