Bug 1160361 - Move gclicommands.properties to toolkit. r=bgrins
authorJ. Ryan Stinnett <jryans@gmail.com>
Wed, 06 May 2015 12:34:27 -0500
changeset 242642 3f62eb1ee3670275a858e28f0406ea755a0dfe7d
parent 242641 e92ab4bd581c9aa8884ac1f8d98bec0b7286e0a5
child 242643 d7ca7e3d5aab93dbe38b2a7f6da16ef5be415258
push id28705
push usercbook@mozilla.com
push dateThu, 07 May 2015 13:34:47 +0000
treeherdermozilla-central@6c8b6e1d328f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbgrins
bugs1160361
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1160361 - Move gclicommands.properties to toolkit. r=bgrins
browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
browser/locales/jar.mn
toolkit/devtools/gcli/commands/highlight.js
toolkit/devtools/gcli/source/docs/writing-commands.md
toolkit/devtools/gcli/source/lib/gcli/l10n.js
toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties
toolkit/locales/jar.mn
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -40,17 +40,16 @@
     locale/browser/devtools/netmonitor.properties     (%chrome/browser/devtools/netmonitor.properties)
     locale/browser/devtools/shadereditor.dtd          (%chrome/browser/devtools/shadereditor.dtd)
     locale/browser/devtools/shadereditor.properties   (%chrome/browser/devtools/shadereditor.properties)
     locale/browser/devtools/canvasdebugger.dtd        (%chrome/browser/devtools/canvasdebugger.dtd)
     locale/browser/devtools/canvasdebugger.properties (%chrome/browser/devtools/canvasdebugger.properties)
     locale/browser/devtools/webaudioeditor.dtd          (%chrome/browser/devtools/webaudioeditor.dtd)
     locale/browser/devtools/webaudioeditor.properties   (%chrome/browser/devtools/webaudioeditor.properties)
     locale/browser/devtools/gcli.properties           (%chrome/browser/devtools/gcli.properties)
-    locale/browser/devtools/gclicommands.properties   (%chrome/browser/devtools/gclicommands.properties)
     locale/browser/devtools/webconsole.properties     (%chrome/browser/devtools/webconsole.properties)
     locale/browser/devtools/inspector.properties      (%chrome/browser/devtools/inspector.properties)
     locale/browser/devtools/tilt.properties           (%chrome/browser/devtools/tilt.properties)
     locale/browser/devtools/shared.properties         (%chrome/browser/devtools/shared.properties)
     locale/browser/devtools/scratchpad.properties     (%chrome/browser/devtools/scratchpad.properties)
     locale/browser/devtools/scratchpad.dtd            (%chrome/browser/devtools/scratchpad.dtd)
     locale/browser/devtools/storage.properties        (%chrome/browser/devtools/storage.properties)
     locale/browser/devtools/styleeditor.properties    (%chrome/browser/devtools/styleeditor.properties)
--- a/toolkit/devtools/gcli/commands/highlight.js
+++ b/toolkit/devtools/gcli/commands/highlight.js
@@ -5,17 +5,17 @@
 "use strict";
 
 const {Cc, Ci, Cu} = require("chrome");
 const l10n = require("gcli/l10n");
 require("devtools/server/actors/inspector");
 const {BoxModelHighlighter} = require("devtools/server/actors/highlighter");
 
 XPCOMUtils.defineLazyGetter(this, "nodesSelected", function() {
-  return Services.strings.createBundle("chrome://browser/locale/devtools/gclicommands.properties");
+  return Services.strings.createBundle("chrome://global/locale/devtools/gclicommands.properties");
 });
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm","resource://gre/modules/PluralForm.jsm");
 const events = require("sdk/event/core");
 
 // How many maximum nodes can be highlighted in parallel
 const MAX_HIGHLIGHTED_ELEMENTS = 100;
 
 // Stores the highlighters instances so they can be destroyed later.
--- a/toolkit/devtools/gcli/source/docs/writing-commands.md
+++ b/toolkit/devtools/gcli/source/docs/writing-commands.md
@@ -83,17 +83,17 @@ when you call a function, you pass 'argu
 
 There are several ways that GCLI commands can be localized. The best method
 depends on what context you are writing your command for.
 
 ### Firefox Embedding
 
 GCLI supports Mozilla style localization. To add a command that will only ever
 be used embedded in Firefox, this is the way to go. Your strings should be
-stored in ``browser/locales/en-US/chrome/browser/devtools/gclicommands.properties``,
+stored in ``toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties``,
 And you should access them using ``let l10n = require("gcli/l10n")`` and then
 ``l10n.lookup(...)`` or ``l10n.lookupFormat()``
 
 For examples of existing commands, take a look in
 ``browser/devtools/webconsole/GcliCommands.jsm``, which contains most of the
 current GCLI commands. If you will be adding a number of new commands, then
 consider starting a new JSM.
 
@@ -750,9 +750,8 @@ types this is enough detail. There are a
                 { name: 'Yahoo', url: 'http://www.yahoo.com/' }
               ]
             }
 
 * Delegate type. It is generally best to inherit from Delegate in order to
   provide a customization of this type. See settingValue for an example.
 
 See below for more information.
-
--- a/toolkit/devtools/gcli/source/lib/gcli/l10n.js
+++ b/toolkit/devtools/gcli/source/lib/gcli/l10n.js
@@ -21,17 +21,17 @@ var Ci = require('chrome').Ci;
 var Cu = require('chrome').Cu;
 
 var prefSvc = Cc['@mozilla.org/preferences-service;1']
                         .getService(Ci.nsIPrefService);
 var prefBranch = prefSvc.getBranch(null).QueryInterface(Ci.nsIPrefBranch2);
 
 var Services = Cu.import('resource://gre/modules/Services.jsm', {}).Services;
 var stringBundle = Services.strings.createBundle(
-        'chrome://browser/locale/devtools/gclicommands.properties');
+        'chrome://global/locale/devtools/gclicommands.properties');
 
 /**
  * Lookup a string in the GCLI string bundle
  */
 exports.lookup = function(name) {
   try {
     return stringBundle.GetStringFromName(name);
   }
rename from browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
rename to toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -33,16 +33,17 @@
   locale/@AB_CD@/global/contentAreaCommands.properties  (%chrome/global/contentAreaCommands.properties)
   locale/@AB_CD@/global/customizeToolbar.dtd            (%chrome/global/customizeToolbar.dtd)
   locale/@AB_CD@/global/customizeToolbar.properties     (%chrome/global/customizeToolbar.properties)
   locale/@AB_CD@/global/datetimepicker.dtd              (%chrome/global/datetimepicker.dtd)
   locale/@AB_CD@/global/dateFormat.properties           (%chrome/global/dateFormat.properties)
   locale/@AB_CD@/global/devtools/csscoverage.properties (%chrome/global/devtools/csscoverage.properties)
   locale/@AB_CD@/global/devtools/csscoverage.dtd        (%chrome/global/devtools/csscoverage.dtd)
   locale/@AB_CD@/global/devtools/debugger.properties    (%chrome/global/devtools/debugger.properties)
+  locale/@AB_CD@/global/devtools/gclicommands.properties (%chrome/global/devtools/gclicommands.properties)
   locale/@AB_CD@/global/devtools/styleinspector.properties (%chrome/global/devtools/styleinspector.properties)
   locale/@AB_CD@/global/dialogOverlay.dtd               (%chrome/global/dialogOverlay.dtd)
   locale/@AB_CD@/global/editMenuOverlay.dtd             (%chrome/global/editMenuOverlay.dtd)
   locale/@AB_CD@/global/fallbackMenubar.properties      (%chrome/global/fallbackMenubar.properties)
   locale/@AB_CD@/global/filefield.properties            (%chrome/global/filefield.properties)
   locale/@AB_CD@/global/filepicker.dtd                  (%chrome/global/filepicker.dtd)
   locale/@AB_CD@/global/filepicker.properties           (%chrome/global/filepicker.properties)
   locale/@AB_CD@/global/findbar.dtd                     (%chrome/global/findbar.dtd)