Title: [209116] trunk
Revision
209116
Author
[email protected]
Date
2016-11-29 20:26:20 -0800 (Tue, 29 Nov 2016)

Log Message

[Modern Media Controls] Localization
https://bugs.webkit.org/show_bug.cgi?id=165176

Patch by Antoine Quint <[email protected]> on 2016-11-29
Reviewed by Dean Jackson.

Source/WebCore:

We add a new localization file for the purpose of modern media controls, since we may
require different strings than the legacy one.

* English.lproj/modern-media-controls-localized-strings.js: Added.
* Modules/modern-media-controls/controls/airplay-placard.js:
(AirplayPlacard):
* Modules/modern-media-controls/controls/pip-placard.js:
(PiPPlacard):
* Modules/modern-media-controls/main.js:
(UIString):
* Modules/modern-media-controls/media/status-support.js:
(StatusSupport.prototype.syncControl):
(StatusSupport):
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::mediaControlsScript):

LayoutTests:

Using the modern media controls module loader to ensure we pick up main.js,
and also because it's the right thing to do.

* media/modern-media-controls/airplay-placard/airplay-placard.html:
* media/modern-media-controls/pip-placard/pip-placard.html:

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (209115 => 209116)


--- trunk/LayoutTests/ChangeLog	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/LayoutTests/ChangeLog	2016-11-30 04:26:20 UTC (rev 209116)
@@ -1,3 +1,16 @@
+2016-11-29  Antoine Quint  <[email protected]>
+
+        [Modern Media Controls] Localization
+        https://bugs.webkit.org/show_bug.cgi?id=165176
+
+        Reviewed by Dean Jackson.
+
+        Using the modern media controls module loader to ensure we pick up main.js,
+        and also because it's the right thing to do.
+
+        * media/modern-media-controls/airplay-placard/airplay-placard.html:
+        * media/modern-media-controls/pip-placard/pip-placard.html:
+
 2016-11-29  Brady Eidson  <[email protected]>
 
         REGRESSION (r209104): storage/indexeddb/modern/gc-closes-database(-private).html timeout.

Modified: trunk/LayoutTests/media/modern-media-controls/airplay-placard/airplay-placard.html (209115 => 209116)


--- trunk/LayoutTests/media/modern-media-controls/airplay-placard/airplay-placard.html	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/LayoutTests/media/modern-media-controls/airplay-placard/airplay-placard.html	2016-11-30 04:26:20 UTC (rev 209116)
@@ -1,22 +1,10 @@
-<link rel="stylesheet" href="" type="text/css" media="screen">
-<link rel="stylesheet" href="" type="text/css" media="screen">
-<link rel="stylesheet" href="" type="text/css" media="screen">
 <script src=""
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
 <body>
 <script type="text/_javascript_">
 
 description("Testing the <code>AirplayPlacard</code> class.");
 
-iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
-
 debug("Placard with all parameters");
 const placard = new AirplayPlacard({ layoutTraits: LayoutTraits.macOS });
 

Modified: trunk/LayoutTests/media/modern-media-controls/pip-placard/pip-placard.html (209115 => 209116)


--- trunk/LayoutTests/media/modern-media-controls/pip-placard/pip-placard.html	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/LayoutTests/media/modern-media-controls/pip-placard/pip-placard.html	2016-11-30 04:26:20 UTC (rev 209116)
@@ -1,22 +1,10 @@
-<link rel="stylesheet" href="" type="text/css" media="screen">
-<link rel="stylesheet" href="" type="text/css" media="screen">
-<link rel="stylesheet" href="" type="text/css" media="screen">
 <script src=""
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
-<script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
 <body>
 <script type="text/_javascript_">
 
 description("Testing the <code>PiPPlacard</code> class.");
 
-iconService.directoryPath = "../../../../Source/WebCore/Modules/modern-media-controls/images";
-
 debug("Placard with all parameters");
 const placard = new PiPPlacard({ layoutTraits: LayoutTraits.macOS });
 

Modified: trunk/Source/WebCore/ChangeLog (209115 => 209116)


--- trunk/Source/WebCore/ChangeLog	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/ChangeLog	2016-11-30 04:26:20 UTC (rev 209116)
@@ -1,5 +1,29 @@
 2016-11-29  Antoine Quint  <[email protected]>
 
+        [Modern Media Controls] Localization
+        https://bugs.webkit.org/show_bug.cgi?id=165176
+
+        Reviewed by Dean Jackson.
+
+        We add a new localization file for the purpose of modern media controls, since we may
+        require different strings than the legacy one.
+
+        * English.lproj/modern-media-controls-localized-strings.js: Added.
+        * Modules/modern-media-controls/controls/airplay-placard.js:
+        (AirplayPlacard):
+        * Modules/modern-media-controls/controls/pip-placard.js:
+        (PiPPlacard):
+        * Modules/modern-media-controls/main.js:
+        (UIString):
+        * Modules/modern-media-controls/media/status-support.js:
+        (StatusSupport.prototype.syncControl):
+        (StatusSupport):
+        * WebCore.xcodeproj/project.pbxproj:
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::mediaControlsScript):
+
+2016-11-29  Antoine Quint  <[email protected]>
+
         [Modern Media Controls] Show an invalid placard when we fail to load a media file
         https://bugs.webkit.org/show_bug.cgi?id=165180
 

Added: trunk/Source/WebCore/English.lproj/modern-media-controls-localized-strings.js (0 => 209116)


--- trunk/Source/WebCore/English.lproj/modern-media-controls-localized-strings.js	                        (rev 0)
+++ trunk/Source/WebCore/English.lproj/modern-media-controls-localized-strings.js	2016-11-30 04:26:20 UTC (rev 209116)
@@ -0,0 +1,10 @@
+const UIStrings = {
+    "AirPlay": "AirPlay",
+    "Audio": "Audio",
+    "Error": "Error",
+    "Live Broadcast": "Live Broadcast",
+    "Loading": "Loading",
+    "Subtitles": "Subtitles",
+    "This video is playing in Picture in Picture": "This video is playing in Picture in Picture",
+    "This video is playing on your Apple TV": "This video is playing on your Apple TV"
+};

Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js (209115 => 209116)


--- trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/airplay-placard.js	2016-11-30 04:26:20 UTC (rev 209116)
@@ -30,8 +30,8 @@
     {
         super({
             iconName: Icons.AirplayPlacard,
-            title: "AirPlay",
-            description: "This video is playing on your Apple TV",
+            title: UIString("AirPlay"),
+            description: UIString("This video is playing on your Apple TV"),
             layoutDelegate
         });
     }

Modified: trunk/Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js (209115 => 209116)


--- trunk/Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/Modules/modern-media-controls/controls/pip-placard.js	2016-11-30 04:26:20 UTC (rev 209116)
@@ -30,7 +30,7 @@
     {
         super({
             iconName: Icons.PiPPlacard,
-            description: "This video is playing in Picture in Picture",
+            description: UIString("This video is playing in Picture in Picture"),
             layoutDelegate
         });
     }

Modified: trunk/Source/WebCore/Modules/modern-media-controls/main.js (209115 => 209116)


--- trunk/Source/WebCore/Modules/modern-media-controls/main.js	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/Modules/modern-media-controls/main.js	2016-11-30 04:26:20 UTC (rev 209116)
@@ -33,3 +33,15 @@
 
     return new MediaController(shadowRoot, media, host);
 }
+
+function UIString(string)
+{
+    if (!("UIStrings" in window))
+        return string;
+
+    if (string in UIStrings)
+        return UIStrings[string];
+
+    console.error(`Localization for "${string}" not found.`);
+    return "LOCALIZED STRING NOT FOUND";
+}

Modified: trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js (209115 => 209116)


--- trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/Modules/modern-media-controls/media/status-support.js	2016-11-30 04:26:20 UTC (rev 209116)
@@ -43,11 +43,11 @@
         const media = this.mediaController.media;
 
         if (!!media.error)
-            this.control.text = "Error";
+            this.control.text = UIString("Error");
         else if (media.duration === Number.POSITIVE_INFINITY && media.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA)
-            this.control.text = "Live Broadcast";
+            this.control.text = UIString("Live Broadcast");
         else if (media.readyState <= HTMLMediaElement.HAVE_NOTHING && media.networkState === HTMLMediaElement.NETWORK_LOADING)
-            this.control.text = "Loading";
+            this.control.text = UIString("Loading");
         else
             this.control.text = "";
     }

Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209115 => 209116)


--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2016-11-30 04:26:20 UTC (rev 209116)
@@ -2724,6 +2724,7 @@
 		7134496E146941B300720312 /* SVGLengthContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 7134496C146941B300720312 /* SVGLengthContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		71537A01146BD9D7008BD615 /* SVGPathData.h in Headers */ = {isa = PBXBuildFile; fileRef = 715379FF146BD9D6008BD615 /* SVGPathData.h */; };
 		7157F062150B6564006EAABD /* SVGAnimatedTransformList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7157F061150B6564006EAABD /* SVGAnimatedTransformList.cpp */; };
+		71A1B6081DEE5AD70073BCFB /* modern-media-controls-localized-strings.js in Resources */ = {isa = PBXBuildFile; fileRef = 71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */; };
 		71A57DF1154BE25C0009D120 /* SVGPathUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */; };
 		71A57DF2154BE25C0009D120 /* SVGPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */; };
 		71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 71B1E124164048CC00B1880A /* InspectorLayerTreeAgent.h */; };
@@ -10095,6 +10096,7 @@
 		717F90581DC4BB600006F520 /* airplay-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "airplay-support.js"; sourceTree = "<group>"; };
 		718C7F561DD385C500B733C8 /* status-label.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "status-label.css"; sourceTree = "<group>"; };
 		718C7F571DD385C500B733C8 /* status-label.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "status-label.js"; sourceTree = "<group>"; };
+		71A1B6071DEE5A820073BCFB /* English */ = {isa = PBXFileReference; lastKnownFileType = sourcecode._javascript_; name = English; path = "English.lproj/modern-media-controls-localized-strings.js"; sourceTree = SOURCE_ROOT; };
 		71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathUtilities.cpp; sourceTree = "<group>"; };
 		71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
 		71B0460A1DD3C2EE00EE19CF /* status-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode._javascript_; path = "status-support.js"; sourceTree = "<group>"; };
@@ -15561,6 +15563,7 @@
 				93153BE114195A5700FCF5BE /* missingImage.png */,
 				93153BD914181F7A00FCF5BE /* [email protected] */,
 				CDF419991AB0DA14004E64E1 /* [email protected] */,
+				71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */,
 				A11E8C011B1E28BE0003A7C7 /* moveCursor.png */,
 				A11E8C021B1E28BE0003A7C7 /* northEastSouthWestResizeCursor.png */,
 				A11E8C031B1E28BE0003A7C7 /* northSouthResizeCursor.png */,
@@ -28472,6 +28475,7 @@
 				93153BE214195A5700FCF5BE /* missingImage.png in Resources */,
 				93153BDA14181F7A00FCF5BE /* [email protected] in Resources */,
 				318891611AB7EEA100EA627B /* [email protected] in Resources */,
+				71A1B6081DEE5AD70073BCFB /* modern-media-controls-localized-strings.js in Resources */,
 				A11E8C061B1E28FA0003A7C7 /* moveCursor.png in Resources */,
 				A11E8C071B1E28FE0003A7C7 /* northEastSouthWestResizeCursor.png in Resources */,
 				A11E8C081B1E29020003A7C7 /* northSouthResizeCursor.png in Resources */,
@@ -31864,6 +31868,14 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
+		71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */ = {
+			isa = PBXVariantGroup;
+			children = (
+				71A1B6071DEE5A820073BCFB /* English */,
+			);
+			name = "modern-media-controls-localized-strings.js";
+			sourceTree = "<group>";
+		};
 		7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */ = {
 			isa = PBXVariantGroup;
 			children = (

Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (209115 => 209116)


--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2016-11-30 04:22:21 UTC (rev 209115)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2016-11-30 04:26:20 UTC (rev 209116)
@@ -252,9 +252,10 @@
     if (m_mediaControlsScript.isEmpty()) {
         StringBuilder scriptBuilder;
         NSBundle *bundle = [NSBundle bundleForClass:[WebCoreRenderThemeBundle class]];
-        if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled())
+        if (RuntimeEnabledFeatures::sharedFeatures().modernMediaControlsEnabled()) {
+            scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"modern-media-controls-localized-strings.js" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
             scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"modern-media-controls" ofType:@"js" inDirectory:@"modern-media-controls"] encoding:NSUTF8StringEncoding error:nil]);
-        else {
+        } else {
             scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsLocalizedStrings" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
             scriptBuilder.append([NSString stringWithContentsOfFile:[bundle pathForResource:@"mediaControlsApple" ofType:@"js"] encoding:NSUTF8StringEncoding error:nil]);
         }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to