Bug 265871: rename JavaScript console to Error console, patch by Kurt <supernova_00@yahoo.com>, r=mconnor, ui-r=beltzner, sr=neil/bzbarsky

2006-05-25 21:22:32 +00:00 · 2006-05-25 21:22:32 +00:00 · b581167b49
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@ -478,7 +478,7 @@
                        command="Tools:Addons"/>
              <menuseparator id="devToolsSeparator"/>
              <menuitem id="javascriptConsole" 
-                        label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" 
+                        label="&errorConsoleCmd.label;" accesskey="&errorConsoleCmd.accesskey;" 
                        oncommand="toJavaScriptConsole();"/>
 #ifdef XP_WIN
              <menuitem accesskey="&pageInfoCmd.accesskey;" label="&pageInfoCmd.label;"   
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@ -129,8 +129,8 @@

 <!ENTITY javaConsoleCmd.label         "Java Console">
 <!ENTITY javaConsoleCmd.accesskey     "J">
-<!ENTITY javaScriptConsoleCmd.label   "JavaScript Console">
-<!ENTITY javaScriptConsoleCmd.accesskey "C">
+<!ENTITY errorConsoleCmd.label        "Error Console">
+<!ENTITY errorConsoleCmd.accesskey    "C">

 <!ENTITY fileMenu.label         "File"> 
 <!ENTITY fileMenu.accesskey       "F">
--- a/browser/locales/en-US/chrome/help/firebird-toc.rdf
+++ b/browser/locales/en-US/chrome/help/firebird-toc.rdf
@ -328,7 +328,7 @@
        <rdf:li> <rdf:Description ID="menu-tools-downloads" nc:name="Downloads" nc:link="menu_reference.xhtml#downloads"/> </rdf:li>
        <rdf:li> <rdf:Description ID="menu-tools-extensions" nc:name="Extensions" nc:link="menu_reference.xhtml#extensions"/> </rdf:li>
        <rdf:li> <rdf:Description ID="menu-tools-themes" nc:name="Themes" nc:link="menu_reference.xhtml#themes"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="menu-tools-javascript-console" nc:name="JavaScript Console" nc:link="menu_reference.xhtml#javascript_console"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-tools-javascript-console" nc:name="Error Console" nc:link="menu_reference.xhtml#javascript_console"/> </rdf:li>
        <rdf:li> <rdf:Description ID="menu-tools-page-info" nc:name="Page Info" nc:link="menu_reference.xhtml#page_info"/> </rdf:li>
        <rdf:li> <rdf:Description ID="menu-tools-clear-private-data" nc:name="Clear Private Data..." nc:link="menu_reference.xhtml#clear_private_data"/> </rdf:li>
        <rdf:li> <rdf:Description ID="menu-tools-options" nc:name="Options" nc:link="menu_reference.xhtml#options" nc:platform="win os2"/> </rdf:li>
--- a/browser/locales/en-US/chrome/help/menu_reference.xhtml
+++ b/browser/locales/en-US/chrome/help/menu_reference.xhtml
@ -330,8 +330,8 @@ Contributors:
    this dialog. For more information, see the
    <a href="customization.xhtml#themes">Themes</a> help topic.</p>

-  <h3 id="javascript_console">JavaScript Console</h3>
-  <p>Opens the JavaScript Console, which tracks problems with JavaScript code.
+  <h3 id="javascript_console">Error Console</h3>
+  <p>Opens the Error Console, which tracks problems with JavaScript code.
    JavaScript is a scripting language commonly used to construct web pages.
    Programmers use JavaScript to make web pages more interactive; JavaScript
    is often used to dynamically validate forms and select buttons.</p>
--- a/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/dom/src/jsurl/nsJSProtocolHandler.cpp
@ -167,7 +167,7 @@ nsresult nsJSThunk::EvaluateScript(nsIChannel *aChannel)
        return NS_ERROR_FAILURE;
    }

-    // If mURI is just "javascript:", we bring up the JavaScript console
+    // If mURI is just "javascript:", we bring up the Error console
    // and return NS_ERROR_DOM_RETVAL_UNDEFINED.
    if (script.IsEmpty()) {
        rv = BringUpConsole(domWindow);
--- a/extensions/help/resources/content/help.js
+++ b/extensions/help/resources/content/help.js
@ -675,7 +675,7 @@ function getAttribute(datasource, resource, attributeResourceName, defaultValue)
  var literal = datasource.GetTarget(resource, attributeResourceName, true);
  return literal instanceof Components.interfaces.nsIRDFLiteral ? literal.Value : defaultValue;
 }
-// Write debug string to javascript console.
+// Write debug string to error console.
 function log(aText) {
  CONSOLE_SERVICE.logStringMessage(aText);
 }
--- a/extensions/help/resources/locale/en-US/developer_tools.xhtml
+++ b/extensions/help/resources/locale/en-US/developer_tools.xhtml
@ -23,7 +23,7 @@

 <ul class="separate">
  <li id="js_console">
-    <strong>JavaScript Console</strong>: the console
+    <strong>Error Console</strong>: the console
    window displays JavaScript warnings, errors, and
    notices that occur in Web applications as well as
    the &brandShortName; application itself.</li>
--- a/extensions/help/resources/locale/en-US/help-index1.rdf
+++ b/extensions/help/resources/locale/en-US/help-index1.rdf
@ -535,6 +535,11 @@
       <rdf:Description ID="encryption"
         nc:name="encryption"
         nc:link="mail_sec_help.xhtml#signing_and_encrypting_messages"/>
+     </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="JSConsole"
+         nc:name="error console"
+         nc:link="developer_tools.xhtml#js_console"/>
     </rdf:li></rdf:Seq>
   </nc:subheadings>
 </rdf:Description>
@ -887,11 +892,6 @@
       <rdf:Description ID="JavaScript"
         nc:name="JavaScript"/>
     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="JSConsole"
-         nc:name="JavaScript Console"
-         nc:link="developer_tools.xhtml#js_console"/>
-     </rdf:li>
     <rdf:li>
       <rdf:Description ID="Venkman"
         nc:name="JavaScript Debugger"
--- a/extensions/help/resources/locale/en-US/help-toc.rdf
+++ b/extensions/help/resources/locale/en-US/help-toc.rdf
@ -1171,7 +1171,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> </rdf:li>
 <rdf:Description about="#tools">
    <nc:subheadings>
      <rdf:Seq>
-        <rdf:li><rdf:Description ID="tools-js_console" nc:name="JavaScript Console" nc:link="developer_tools.xhtml#js_console"/> </rdf:li>
+        <rdf:li><rdf:Description ID="tools-js_console" nc:name="Error Console" nc:link="developer_tools.xhtml#js_console"/> </rdf:li>
        <rdf:li><rdf:Description ID="tools-inspector" nc:name="DOM Inspector" nc:link="developer_tools.xhtml#inspector"/> </rdf:li>
        <rdf:li><rdf:Description ID="tools-venkman" nc:name="JavaScript Debugger" nc:link="developer_tools.xhtml#venkman"/> </rdf:li>
      </rdf:Seq>
--- a/extensions/inspector/resources/content/utils.js
+++ b/extensions/inspector/resources/content/utils.js
@ -143,7 +143,7 @@ function debug(aText)
  //dump(aText);
 }

-// dump text to the Javascript Console
+// dump text to the Error Console
 function consoleDump(aText)
 {
  var csClass = Components.classes['@mozilla.org/consoleservice;1'];
--- a/extensions/manticore/browser/browser-menu.xml
+++ b/extensions/manticore/browser/browser-menu.xml
@ -99,7 +99,7 @@
    <menu label="Search the Web" accesskey="s" command="tools-search" />
    <menuseparator />
    <menu label="History" accesskey="h" command="tools-history" />
-    <menu label="JavaScript Console" accesskey="j" command="tools-jsconsole" />
+    <menu label="Error Console" accesskey="E" command="tools-jsconsole" />
    <menu label="Java Console" accesskey="c" command="tools-jconsole" />
    <menuseparator />
    <menu label="Options" accesskey="o" command="tools-options" />
--- a/extensions/webservices/soap/tests/soapcall.html
+++ b/extensions/webservices/soap/tests/soapcall.html
@ -35,6 +35,6 @@ function showCall(syncCall, faultCall) {
 }
 </SCRIPT>
 <P>
-<P><CODE id=P>The SOAP call was not encoded.  Look at the Javascript console to determine why.
+<P><CODE id=P>The SOAP call was not encoded.  Look at the Error console to determine why.
 </BODY>
 </HTML>
--- a/extensions/webservices/soap/tests/soapstatistics.html
+++ b/extensions/webservices/soap/tests/soapstatistics.html
@ -58,6 +58,6 @@ function soapcall() {
 }

 </SCRIPT>
-<P id=P>SOAP call did not complete.  Look at the Javascript console to determine why.
+<P id=P>SOAP call did not complete.  Look at the Error console to determine why.
 </BODY>
 </HTML>
--- a/extensions/xforms/nsXFormsUtils.cpp
+++ b/extensions/xforms/nsXFormsUtils.cpp
@ -1579,7 +1579,7 @@ nsXFormsUtils::ReportError(const nsString& aMessageName, const PRUnichar **aPara
  }


-  // Log the message to JavaScript Console
+  // Log the message to Error Console
 #ifdef DEBUG
  printf("ERR: %s\n", NS_ConvertUTF16toUTF8(msg).get());
 #endif
--- a/extensions/xforms/nsXFormsUtils.h
+++ b/extensions/xforms/nsXFormsUtils.h
@ -433,7 +433,7 @@ public:
                                                nsAString  &aNSUri);

  /**
-   * Outputs to the JavaScript console.
+   * Outputs to the Error console.
   *
   * @param aMessageName      Name of string to output, which is loaded from
                              xforms.properties
--- a/extensions/xforms/resources/locale/en-US/xforms.dtd
+++ b/extensions/xforms/resources/locale/en-US/xforms.dtd
@ -57,7 +57,7 @@

 <!ENTITY xforms.bindingdialog.title "XForms Error">
 <!ENTITY xforms.bindingdialog.description1 "The form on this page contains an error and will not work properly">
-<!ENTITY xforms.bindingdialog.description2 "See the JavaScript Console for details">
+<!ENTITY xforms.bindingdialog.description2 "See the Error Console for details">

 <!ENTITY xforms.upload.browsetext "Browse...">
 <!ENTITY xforms.upload.cleartext "Clear">
--- a/js/rhino/docs/RhinoDebugger.html
+++ b/js/rhino/docs/RhinoDebugger.html
@ -19,7 +19,7 @@
 <OL>

 <LI><A NAME="_Toc502165109"></FONT><B><FONT FACE="Arial" COLOR="#000080">Console Window</A></LI>
-</B></FONT><FONT SIZE=2><P ALIGN="JUSTIFY">The debugger redirects the </FONT><FONT FACE="Arial" SIZE=2>System.out</FONT><FONT SIZE=2>, </FONT><FONT FACE="Arial" SIZE=2>System.in</FONT><FONT SIZE=2>, and </FONT><FONT FACE="Arial" SIZE=2>System.err</FONT><FONT SIZE=2> streams to an internal JavaScript console window which provides an editable command line for you to enter JavaScript code and view system output. The console window maintains a history of the commands you have entered. You may move backward and forward through the history list by pressing the Up/Down arrow keys on the keyboard.</P>
+</B></FONT><FONT SIZE=2><P ALIGN="JUSTIFY">The debugger redirects the </FONT><FONT FACE="Arial" SIZE=2>System.out</FONT><FONT SIZE=2>, </FONT><FONT FACE="Arial" SIZE=2>System.in</FONT><FONT SIZE=2>, and </FONT><FONT FACE="Arial" SIZE=2>System.err</FONT><FONT SIZE=2> streams to an internal Error console window which provides an editable command line for you to enter JavaScript code and view system output. The console window maintains a history of the commands you have entered. You may move backward and forward through the history list by pressing the Up/Down arrow keys on the keyboard.</P>
 <LI><A NAME="_Toc502165110"></FONT><B><FONT FACE="Arial" COLOR="#000080">Opening Scripts</A></LI>
 </B></FONT><FONT SIZE=2><P ALIGN="JUSTIFY">You may select the <B><I>File-&gt;Open</B></I> menu item on the menu bar to load JavaScript scripts contained in files. This action will display a file-selection dialog box prompting you for the location of a script to load. The selected file will be compiled and displayed in a new window.</P>
 </FONT><B><FONT FACE="Arial" COLOR="#000080"><LI>Running Scripts</LI>
--- a/js/src/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/src/xpconnect/loader/mozJSComponentLoader.cpp
@ -115,7 +115,7 @@ Reporter(JSContext *cx, const char *message, JSErrorReport *rep)
    /*
     * Make an nsIScriptError, populate it with information from this
     * error, then log it with the console service.  The UI can then
-     * poll the service to update the JavaScript console.
+     * poll the service to update the Error console.
     */
    nsCOMPtr<nsIScriptError> errorObject = 
        do_CreateInstance(NS_SCRIPTERROR_CONTRACTID);
--- a/layout/style/nsCSSScanner.cpp
+++ b/layout/style/nsCSSScanner.cpp
@ -327,7 +327,7 @@ void nsCSSScanner::OutputError()
                  NS_ConvertUTF16toUTF8(mError).get());
 #endif

-  // Log it to the JavaScript console
+  // Log it to the Error console

  if (InitGlobals() && gReportErrors) {
    nsresult rv;
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@ -1748,7 +1748,7 @@
        <menuitem label="&importCmd.label;" 
                  accesskey="&importCmd.accesskey;" 
                  oncommand="toImport();"/>
-        <menuitem id="javaScriptConsole" label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
+        <menuitem id="javaScriptConsole" label="&errorConsoleCmd.label;" accesskey="&errorConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
 #ifndef XP_UNIX
        <menuseparator id="prefSep"/>
        <menuitem id="menu_accountmgr" label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" oncommand="MsgAccountManager(null);"/>
--- a/mail/locales/en-US/chrome/messenger/mailTasksOverlay.dtd
+++ b/mail/locales/en-US/chrome/messenger/mailTasksOverlay.dtd
@ -18,8 +18,8 @@
 <!ENTITY searchMailCmd.accesskey "e">
 <!ENTITY searchMailCmd.key "f">

-<!ENTITY javaScriptConsoleCmd.label                             "JavaScript Console">
-<!ENTITY javaScriptConsoleCmd.accesskey				"S">
+<!ENTITY errorConsoleCmd.label                          "Error Console">
+<!ENTITY errorConsoleCmd.accesskey			"S">

 <!ENTITY tasksMenu.label "Tools">
 <!ENTITY tasksMenu.accesskey "T"> 
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@ -401,8 +401,8 @@
 <!ENTITY runJunkControls.accesskey "u">
 <!ENTITY deleteJunk.label "Delete Mail Marked as Junk in Folder">
 <!ENTITY deleteJunk.accesskey "l">
-<!ENTITY javaScriptConsoleCmd.label "JavaScript Console">
-<!ENTITY javaScriptConsoleCmd.accesskey "n">
+<!ENTITY errorConsoleCmd.label "Error Console">
+<!ENTITY errorConsoleCmd.accesskey "n">
 <!ENTITY filtersCmd.label "Message Filters...">
 <!ENTITY filtersCmd.accesskey "F">
 <!ENTITY filtersApply.label "Run Filters on Folder">
--- a/modules/plugin/samples/simple/SimpleScriptableTest.html
+++ b/modules/plugin/samples/simple/SimpleScriptableTest.html
@ -90,7 +90,7 @@ contents of 'it':<br>
 <p><li><b>Can't load pluign</b>:
 Copy the compiled plugin to your plugins directory 

-<p><li><b>JavaScript error in the JavaScript console talking about how 
+<p><li><b>JavaScript error in the Error console talking about how 
 XPConnect can't build a wrapper</b>: 
 Copy the type library (nsISimplePluginInstance.xpt) to the mozilla components
 directory.
--- a/themes/classic/global/mac/console.css
+++ b/themes/classic/global/mac/console.css
@ -36,7 +36,7 @@
 * ***** END LICENSE BLOCK ***** */

 /* ===== console.css ====================================================
-  == Styles used by the JavaScript Console window.
+  == Styles used by the Error Console window.
  ======================================================================= */

@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/themes/classic/global/win/console.css
+++ b/themes/classic/global/win/console.css
@ -36,7 +36,7 @@
 * ***** END LICENSE BLOCK ***** */

 /* ===== console.css ====================================================
-  == Styles used by the JavaScript Console window.
+  == Styles used by the Error Console window.
  ======================================================================= */

@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/themes/modern/global/console.css
+++ b/themes/modern/global/console.css
@ -36,7 +36,7 @@
 * ***** END LICENSE BLOCK ***** */

 /* ===== console.css ====================================================
-  == Styles used by the JavaScript Console window.
+  == Styles used by the Error Console window.
  ======================================================================= */

@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@ -48,7 +48,7 @@

 <window id="JSConsoleWindow"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&console.title;"
+        title="&errorConsole.title;"
        windowtype="global:console"
        width="640" height="480"
        screenX="10" screenY="10"
--- a/toolkit/components/console/jsconsole-clhandler.js
+++ b/toolkit/components/console/jsconsole-clhandler.js
@ -39,7 +39,7 @@
 * ***** END LICENSE BLOCK ***** */

 /*
- * -jsconsole commandline handler; starts up the JavaScript console.
+ * -jsconsole commandline handler; starts up the Error console.
 */

 const nsISupports           = Components.interfaces.nsISupports;
@ -78,7 +78,7 @@ const jsConsoleHandler = {
                          "chrome,dialog=no,all", cmdLine);
    },

-    helpInfo : "  -jsconsole           Open the JavaScript console.\n",
+    helpInfo : "  -jsconsole           Open the Error console.\n",

    /* nsIFactory */

--- a/toolkit/components/help/content/help.js
+++ b/toolkit/components/help/content/help.js
@ -758,7 +758,7 @@ function getLiteralValue(literal, defaultValue) {
    return null;
 }

-# Write debug string to javascript console.
+# Write debug string to error console.
 function log(aText) {
    CONSOLE_SERVICE.logStringMessage(aText);
 }
--- a/toolkit/locales/en-US/chrome/global/console.dtd
+++ b/toolkit/locales/en-US/chrome/global/console.dtd
@ -35,7 +35,7 @@
   -
   - ***** END LICENSE BLOCK ***** -->

-<!ENTITY console.title "JavaScript Console">
+<!ENTITY errorConsole.title "Error Console">

 <!ENTITY errFile.label   "Source File:">
 <!ENTITY errLine.label   "Line:">
--- a/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties
+++ b/toolkit/locales/en-US/chrome/global/xpinstall/xpinstall.properties
@ -102,7 +102,7 @@ ERROR=ERROR
 error0=Success
 error999=Restart to complete
 error-202=Access denied
-error-203=Unexpected installation error\nReview the JavaScript Console log for more details.
+error-203=Unexpected installation error\nReview the Error Console log for more details.
 error-204=Install script not found
 error-207=Not a valid install package
 error-208=Invalid argument
--- a/toolkit/themes/pinstripe/global/console/console.css
+++ b/toolkit/themes/pinstripe/global/console/console.css
@ -36,7 +36,7 @@
 * ***** END LICENSE BLOCK ***** */

 /* ===== console.css ====================================================
-  == Styles used by the JavaScript Console window.
+  == Styles used by the Error Console window.
  ======================================================================= */

@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
--- a/toolkit/themes/winstripe/global/console/console.css
+++ b/toolkit/themes/winstripe/global/console/console.css
@ -36,7 +36,7 @@
 * ***** END LICENSE BLOCK ***** */

 /* ===== console.css ====================================================
-   == Styles used by the JavaScript Console window.
+   == Styles used by the Error Console window.
   ====================================================================== */

@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@ -138,7 +138,7 @@ toolbarseparator {
  min-height: 1em;
 }

-/* ::::: Fix JavaScript Console toolbar button text spacing ::::: */
+/* ::::: Fix Error Console toolbar button text spacing ::::: */

 .toolbarbutton-text {
  -moz-padding-start: 0px;
--- a/xpfe/communicator/resources/content/tasksOverlay.xul
+++ b/xpfe/communicator/resources/content/tasksOverlay.xul
@ -29,7 +29,7 @@
          <menuseparator/>
          <menu label="&webDevelopment.label;" accesskey="&webDevelopment.accesskey;">
            <menupopup id="toolsPopup" onpopupshowing="javaItemEnabling();">
-              <menuitem label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
+              <menuitem label="&errorConsoleCmd.label;" accesskey="&errorConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
              <menuitem id="java" label="&javaConsoleCmd.label;" accesskey="&javaConsoleCmd.accesskey;" oncommand="toJavaConsole()"/>
            </menupopup>
          </menu>
--- a/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
+++ b/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
@ -13,8 +13,8 @@
 <!ENTITY javaConsoleCmd.label					"Java Console">
 <!ENTITY javaConsoleCmd.accesskey				"j">

-<!ENTITY javaScriptConsoleCmd.label                             "JavaScript Console">
-<!ENTITY javaScriptConsoleCmd.accesskey				"S">
+<!ENTITY errorConsoleCmd.label                                  "Error Console">
+<!ENTITY errorConsoleCmd.accesskey				"C">

 <!-- LOCALIZATION NOTE (privacyMenu.label): DONT_TRANSLATE -->
 <!ENTITY privacyMenu.label "Privacy &amp; Security">
--- a/xpfe/components/console/resources/locale/en-US/console.dtd
+++ b/xpfe/components/console/resources/locale/en-US/console.dtd
@ -35,7 +35,7 @@

 ***** END LICENSE BLOCK ***** -->

-<!ENTITY console.title "JavaScript Console">
+<!ENTITY console.title "Error Console">

 <!ENTITY menuBar.tooltip      "Menu Bar">
 <!ENTITY modeToolbar.tooltip  "Mode Toolbar">