Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1234355 - Part 2: Remove unused EME drmContentCDMNotSupported.64bit.message. r=spohl

Browse Source
This commit is contained in:
Chris Peterson 2016-01-26 11:12:11 -08:00
parent 266e8ba667
commit 492cf2bd4b
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
browser/base/content/browser-eme.js
View File

@ -98,13 +98,11 @@ var gEMEHandler = {
let msgPrefix = "emeNotifications." + notificationId + ".";
let msgId = msgPrefix + "message";
// Specialcase Adobe's CDM on unsupported platforms to be more informative:
// Special-case Adobe's CDM message on unsupported platforms to be more informative:
if (notificationId == "drmContentCDMNotSupported" &&
keySystem.startsWith("com.adobe")) {
let os = Services.appinfo.OS.toLowerCase();
if (os.startsWith("win") && Services.appinfo.XPCOMABI.startsWith("x86_64")) {
msgId = msgPrefix + "64bit.message";
} else if (os.startsWith("linux") || os.startsWith("darwin")) {
if (os.startsWith("linux") || os.startsWith("darwin")) {
msgId = msgPrefix + "unsupportedOS.message";
labelParams.splice(1, 0, os.startsWith("linux") ? "Linux" : "Mac OS X");
}
@ -172,7 +170,6 @@ var gEMEHandler = {
document.getElementById(anchorId).removeAttribute("firstplay");
}
let mainAction = {
label: gNavigatorBundle.getString(btnLabelId),
accessKey: gNavigatorBundle.getString(btnAccessKeyId),

3
browser/locales/en-US/chrome/browser/browser.properties
View File

@ -687,8 +687,6 @@ emeNotifications.drmContentCDMInsufficientVersion.message = %S is installing upd
# LOCALIZATION NOTE(emeNotifications.drmContentCDMInstalling.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %S is brandShortName
emeNotifications.drmContentCDMInstalling.message = %S is installing components needed to play the audio or video on this page. Please try again later.
# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.64bit.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %1$S is brandShortName, %2$S will be the 'learn more' link
emeNotifications.drmContentCDMNotSupported.64bit.message = The audio or video on this page requires DRM software that this 64-bit build of %1$S does not support. %2$S
# LOCALIZATION NOTE(emeNotifications.drmContentCDMNotSupported.unsupportedOS.message): NB: inserted via innerHTML, so please don't use <, > or & in this string. %1$S is brandShortName, %2$S is the name of the user's OS (Windows, Linux, Mac OS X), %3$S will be the 'learn more' link
emeNotifications.drmContentCDMNotSupported.unsupportedOS.message = The audio or video on this page requires DRM software that %1$S does not support on %2$S. %3$S
@ -804,4 +802,3 @@ certErrorDetailsCertChain.label = Certificate chain:
# %S is the group number/ID
tabgroups.migration.anonGroup = Group %S
tabgroups.migration.tabGroupBookmarkFolderName = Bookmarked Tab Groups