зеркало из https://github.com/mozilla/pjs.git
bug 279768: move dom.properties, MediaDocument.properties to global; r=bsmedberg
This commit is contained in:
Родитель
663e838f85
Коммит
82d3ed5f0a
|
@ -2215,7 +2215,7 @@ static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = {
|
|||
"chrome://global/locale/layout_errors.properties",
|
||||
"chrome://global/locale/layout/HtmlForm.properties",
|
||||
"chrome://global/locale/printing.properties",
|
||||
"chrome://communicator/locale/dom/dom.properties"
|
||||
"chrome://global/locale/dom/dom.properties"
|
||||
};
|
||||
|
||||
/* static */ nsresult
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
#include "nsAutoPtr.h"
|
||||
#include "nsIStringBundle.h"
|
||||
|
||||
#define NSMEDIADOCUMENT_PROPERTIES_URI "chrome://communicator/locale/layout/MediaDocument.properties"
|
||||
#define NSMEDIADOCUMENT_PROPERTIES_URI "chrome://global/locale/layout/MediaDocument.properties"
|
||||
|
||||
class nsMediaDocument : public nsHTMLDocument
|
||||
{
|
||||
|
|
|
@ -1,15 +1,11 @@
|
|||
#filter substitution
|
||||
|
||||
@AB_CD@.jar:
|
||||
locale/@AB_CD@/communicator/dom/dom.properties (%chrome/dom/dom.properties)
|
||||
locale/@AB_CD@/communicator/layout/MediaDocument.properties (%chrome/layout/MediaDocument.properties)
|
||||
locale/@AB_CD@/global/css.properties (%chrome/layout/css.properties)
|
||||
locale/@AB_CD@/global/xbl.properties (%chrome/layout/xbl.properties)
|
||||
locale/@AB_CD@/global/xul.properties (%chrome/layout/xul.properties)
|
||||
locale/@AB_CD@/global/printing.properties (%chrome/layout/printing.properties)
|
||||
locale/@AB_CD@/global/layout_errors.properties (%chrome/layout/layout_errors.properties)
|
||||
locale/@AB_CD@/global/layout/HtmlForm.properties (%chrome/layout/HtmlForm.properties)
|
||||
locale/@AB_CD@/global/xslt/xslt.properties (%chrome/xslt/xslt.properties)
|
||||
locale/@AB_CD@/global/netError.dtd (%chrome/netError.dtd)
|
||||
locale/@AB_CD@/global/appstrings.properties (%chrome/appstrings.properties)
|
||||
locale/@AB_CD@/global/charsetTitles.properties (%chrome/charsetTitles.properties)
|
||||
|
@ -17,3 +13,7 @@
|
|||
locale/@AB_CD@/global/plugins.properties (%chrome/plugins.properties)
|
||||
locale/@AB_CD@/global/nsWebBrowserPersist.properties (%chrome/nsWebBrowserPersist.properties)
|
||||
locale/@AB_CD@/global/printdialog.properties (%chrome/printdialog.properties)
|
||||
locale/@AB_CD@/global/layout/HtmlForm.properties (%chrome/layout/HtmlForm.properties)
|
||||
locale/@AB_CD@/global/xslt/xslt.properties (%chrome/xslt/xslt.properties)
|
||||
locale/@AB_CD@/global/dom/dom.properties (%chrome/dom/dom.properties)
|
||||
locale/@AB_CD@/global/layout/MediaDocument.properties (%chrome/layout/MediaDocument.properties)
|
||||
|
|
|
@ -374,7 +374,7 @@ static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID);
|
|||
static NS_DEFINE_CID(kDOMSOF_CID, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
|
||||
|
||||
static const char kDOMStringBundleURL[] =
|
||||
"chrome://communicator/locale/dom/dom.properties";
|
||||
"chrome://global/locale/dom/dom.properties";
|
||||
|
||||
// NOTE: DEFAULT_SCRIPTABLE_FLAGS and DOM_DEFAULT_SCRIPTABLE_FLAGS
|
||||
// are defined in nsIDOMClassInfo.h.
|
||||
|
|
|
@ -188,7 +188,7 @@ static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
|
|||
static const char sJSStackContractID[] = "@mozilla.org/js/xpc/ContextStack;1";
|
||||
|
||||
static const char kDOMBundleURL[] = "chrome://global/locale/commonDialogs.properties";
|
||||
static const char kDOMSecurityWarningsBundleURL[] = "chrome://communicator/locale/dom/dom.properties";
|
||||
static const char kDOMSecurityWarningsBundleURL[] = "chrome://global/locale/dom/dom.properties";
|
||||
|
||||
static const char kCryptoContractID[] = NS_CRYPTO_CONTRACTID;
|
||||
static const char kPkcs11ContractID[] = NS_PKCS11_CONTRACTID;
|
||||
|
|
|
@ -131,7 +131,7 @@ static const char kJSRuntimeServiceContractID[] =
|
|||
"@mozilla.org/js/xpc/RuntimeService;1";
|
||||
|
||||
static const char kDOMStringBundleURL[] =
|
||||
"chrome://communicator/locale/dom/dom.properties";
|
||||
"chrome://global/locale/dom/dom.properties";
|
||||
|
||||
static PRThread *gDOMThread;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче