Bug 1135237 - update message for EME notification, r=dolske
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Sun, 22 Feb 2015 12:00:47 +0100
changeset 247727 3538fc10da63fa9333f2de1be4f90043345e94df
parent 247726 e73203a690fe1b08e0f7b907fa5904589ad75312
child 247728 fc5e585fbbd9866a8254408a7a6f19cd9f338d00
push id7677
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 18:11:24 +0000
treeherdermozilla-aurora@f531d838c055 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdolske
bugs1135237
milestone38.0a1
Bug 1135237 - update message for EME notification, r=dolske
browser/base/content/browser-eme.js
browser/locales/en-US/chrome/browser/browser.properties
--- a/browser/base/content/browser-eme.js
+++ b/browser/base/content/browser-eme.js
@@ -20,25 +20,16 @@ let gEMEHandler = {
     browser.reload();
   },
   getLearnMoreLink: function(msgId) {
     let text = gNavigatorBundle.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 gNavigatorBundle.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;
@@ -153,22 +144,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 = gNavigatorBundle.getFormattedString(msgId, [drmProvider, this._brandShortName]);
+    let message = gNavigatorBundle.getFormattedString(msgId, [this._brandShortName]);
     let anchorId = "eme-notification-icon";
 
     let mainAction = {
       label: gNavigatorBundle.getString(btnLabelId),
       accessKey: gNavigatorBundle.getString(btnAccessKeyId),
       callback: function() { openPreferences("paneContent"); },
       dismiss: true
     };
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -586,18 +586,18 @@ getUserMedia.sharingMenuCameraScreen = %
 getUserMedia.sharingMenuCameraWindow = %S (camera and window)
 getUserMedia.sharingMenuMicrophoneApplication = %S (microphone and application)
 getUserMedia.sharingMenuMicrophoneScreen = %S (microphone and screen)
 getUserMedia.sharingMenuMicrophoneWindow = %S (microphone and window)
 # LOCALIZATION NOTE(getUserMedia.sharingMenuUnknownHost): this is used for the website
 # origin for the sharing menu if no readable origin could be deduced from the URL.
 getUserMedia.sharingMenuUnknownHost = Unknown origin
 
-# LOCALIZATION NOTE(emeNotifications.drmContentPlaying.message): %1$S is the vendor name of the DRM that's in use, %2$S is brandShortName.
-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.
+# LOCALIZATION NOTE(emeNotifications.drmContentPlaying.message2): %S is brandShortName.
+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
 
 # LOCALIZATION NOTE(emeNotifications.drmContentDisabled.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S will be the 'learn more' link
 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
 # LOCALIZATION NOTE(emeNotifications.drmContentDisabled.learnMoreLabel): NB: inserted via innerHTML, so please don't use <, > or & in this string.