Bug 1135237 - update message for EME notification, r+a=dolske
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Sun, 22 Feb 2015 12:00:47 +0100
changeset 250251 0e44d113855f
parent 250250 529b83aa2c7b
child 250252 f9f0120c1adf
push id4526
push usergijskruitbosch@gmail.com
push date2015-03-05 00:08 +0000
treeherdermozilla-beta@0e44d113855f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1135237
milestone37.0
Bug 1135237 - update message for EME notification, r+a=dolske
browser/base/content/browser-eme.js
browser/base/content/browser-eme.properties
--- a/browser/base/content/browser-eme.js
+++ b/browser/base/content/browser-eme.js
@@ -24,25 +24,16 @@ let gEMEHandler = {
     browser.reload();
   },
   getLearnMoreLink: function(msgId) {
     let text = gEMEBundle.getString("emeNotifications." + msgId + ".learnMoreLabel");
     let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
     return "<label class='text-link' href='" + baseURL + "drm-content'>" +
            text + "</label>";
   },
-  getDRMLabel: function(keySystem) {
-    if (keySystem.startsWith("com.adobe")) {
-      return "Adobe Primetime";
-    }
-    if (keySystem == "org.w3.clearkey") {
-      return "ClearKey";
-    }
-    return gEMEBundle.getString("emeNotifications.unknownDRMSoftware");
-  },
   onDontAskAgain: function(menuPopupItem) {
     let button = menuPopupItem.parentNode.anchorNode;
     let bar = button.parentNode;
     Services.prefs.setBoolPref("browser.eme.ui." + bar.value + ".disabled", true);
     bar.close();
   },
   onNotNow: function(menuPopupItem) {
     let button = menuPopupItem.parentNode.anchorNode;
@@ -169,22 +160,21 @@ let gEMEHandler = {
   },
   showPopupNotificationForSuccess: function(browser, keySystem) {
     // Don't bother creating it if it's already there:
     if (PopupNotifications.getNotification("drmContentPlaying", browser)) {
       return;
     }
 
     let msgPrefix = "emeNotifications.drmContentPlaying.";
-    let msgId = msgPrefix + "message";
+    let msgId = msgPrefix + "message2";
     let btnLabelId = msgPrefix + "button.label";
     let btnAccessKeyId = msgPrefix + "button.accesskey";
 
-    let drmProvider = this.getDRMLabel(keySystem);
-    let message = gEMEBundle.getFormattedString(msgId, [drmProvider, this._brandShortName]);
+    let message = gEMEBundle.getFormattedString(msgId, [this._brandShortName]);
     let anchorId = "eme-notification-icon";
 
     let mainAction = {
       label: gEMEBundle.getString(btnLabelId),
       accessKey: gEMEBundle.getString(btnAccessKeyId),
       callback: function() { openPreferences("paneContent"); },
       dismiss: true
     };
--- a/browser/base/content/browser-eme.properties
+++ b/browser/base/content/browser-eme.properties
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This is a temporary file and not meant for localization; later versions
 # of Firefox include these strings in browser.properties
 
-emeNotifications.drmContentPlaying.message = Some audio or video on this site uses %1$S DRM software, which may limit what %2$S can let you do with it.
+emeNotifications.drmContentPlaying.message2 = Some audio or video on this site uses DRM software, which may limit what %S can let you do with it.
 emeNotifications.drmContentPlaying.button.label = Configureā€¦
 emeNotifications.drmContentPlaying.button.accesskey = C
 
 emeNotifications.drmContentDisabled.message = You must enable DRM to play some audio or video on this page. %S
 emeNotifications.drmContentDisabled.button.label = Enable DRM
 emeNotifications.drmContentDisabled.button.accesskey = E
 emeNotifications.drmContentDisabled.learnMoreLabel = Learn More