From 3ddd2428f0213a9854307c737cb0b6fefc52ddcc Mon Sep 17 00:00:00 2001 From: "Carsten \"Tomcat\" Book" Date: Fri, 4 Nov 2016 09:04:07 +0100 Subject: [PATCH 1/7] Backed out changeset ea43bfeb850e (bug 1312041) --- .../animationinspector/animation-controller.js | 3 +-- .../components/animation-time-block.js | 3 +-- .../components/rate-selector.js | 3 +-- ...er_animation_animated_properties_displayed.js | 2 +- devtools/client/animationinspector/test/head.js | 2 +- devtools/client/animationinspector/utils.js | 3 +-- devtools/client/canvasdebugger/canvasdebugger.js | 4 ++-- devtools/client/debugger/debugger-controller.js | 2 +- devtools/client/debugger/new/panel.js | 2 +- devtools/client/definitions.js | 2 +- devtools/client/dom/main.js | 2 +- devtools/client/framework/attach-thread.js | 2 +- devtools/client/framework/browser-menus.js | 2 +- devtools/client/framework/connect/connect.js | 2 +- devtools/client/framework/devtools-browser.js | 2 +- devtools/client/framework/sidebar.js | 2 +- .../framework/test/browser_keybindings_02.js | 2 +- .../framework/test/browser_keybindings_03.js | 2 +- .../framework/test/browser_toolbox_options.js | 2 +- .../test/browser_toolbox_tabsswitch_shortcuts.js | 2 +- .../test/browser_toolbox_window_reload_target.js | 2 +- .../framework/test/browser_toolbox_zoom.js | 2 +- .../client/framework/toolbox-host-manager.js | 2 +- devtools/client/framework/toolbox-options.js | 2 +- devtools/client/framework/toolbox.js | 2 +- .../client/inspector/components/box-model.js | 4 ++-- devtools/client/inspector/computed/computed.js | 2 +- devtools/client/inspector/inspector.js | 5 ++--- devtools/client/inspector/inspector.xhtml | 12 ++++++------ devtools/client/inspector/layout/utils/l10n.js | 2 +- devtools/client/inspector/markup/markup.js | 3 +-- .../markup/test/browser_markup_links_04.js | 2 +- .../client/inspector/markup/views/text-editor.js | 3 +-- devtools/client/inspector/rules/models/rule.js | 2 +- devtools/client/inspector/rules/test/head.js | 2 +- .../client/inspector/rules/views/rule-editor.js | 2 +- .../client/inspector/shared/dom-node-preview.js | 2 +- .../inspector/shared/style-inspector-menu.js | 2 +- devtools/client/inspector/shared/test/head.js | 2 +- devtools/client/inspector/test/head.js | 3 +-- devtools/client/memory/utils.js | 2 +- devtools/client/netmonitor/har/har-builder.js | 2 +- devtools/client/netmonitor/l10n.js | 4 ++-- devtools/client/netmonitor/netmonitor.xul | 2 +- .../components/jit-optimizations-item.js | 2 +- .../performance/components/jit-optimizations.js | 2 +- devtools/client/performance/modules/global.js | 4 ++-- .../client/projecteditor/lib/helpers/l10n.js | 2 +- devtools/client/responsive.html/utils/l10n.js | 2 +- .../client/responsivedesign/responsivedesign.jsm | 2 +- devtools/client/shadereditor/shadereditor.js | 2 +- devtools/client/shared/components/frame.js | 4 ++-- .../client/shared/components/notification-box.js | 2 +- devtools/client/shared/components/stack-trace.js | 2 +- devtools/client/shared/developer-toolbar.js | 2 +- devtools/client/shared/devices.js | 2 +- devtools/client/shared/source-utils.js | 2 +- .../shared/test/browser_filter-editor-02.js | 2 +- .../shared/test/browser_filter-editor-06.js | 2 +- .../shared/test/browser_filter-editor-07.js | 2 +- devtools/client/shared/widgets/Chart.jsm | 2 +- devtools/client/shared/widgets/FilterWidget.js | 2 +- .../client/shared/widgets/LineGraphWidget.js | 2 +- devtools/client/shared/widgets/MdnDocsWidget.js | 2 +- .../client/shared/widgets/SideMenuWidget.jsm | 2 +- devtools/client/shared/widgets/VariablesView.jsm | 2 +- .../shared/widgets/VariablesViewController.jsm | 2 +- .../shared/widgets/tooltip/EventTooltipHelper.js | 2 +- .../shared/widgets/tooltip/ImageTooltipHelper.js | 2 +- .../widgets/tooltip/SwatchColorPickerTooltip.js | 2 +- devtools/client/shared/zoom-keys.js | 2 +- devtools/client/sourceeditor/editor.js | 2 +- .../test/browser_editor_find_again.js | 2 +- devtools/client/storage/ui.js | 2 +- devtools/client/webaudioeditor/includes.js | 2 +- devtools/client/webconsole/console-output.js | 2 +- devtools/client/webconsole/hudservice.js | 2 +- devtools/client/webconsole/jsterm.js | 2 +- devtools/client/webconsole/net/main.js | 2 +- .../new-console-output/test/mochitest/head.js | 2 +- .../new-console-output/utils/messages.js | 2 +- devtools/client/webconsole/test/head.js | 2 +- devtools/client/webconsole/webconsole.js | 2 +- devtools/shared/Loader.jsm | 7 ------- devtools/shared/fronts/csscoverage.js | 2 +- devtools/shared/gcli/commands/highlight.js | 2 +- devtools/shared/gcli/source/lib/gcli/l10n.js | 2 +- .../shared/gcli/source/lib/gcli/util/l10n.js | 2 +- devtools/shared/inspector/css-logic.js | 2 +- devtools/shared/l10n.js | 16 ++++++++-------- devtools/shared/loader-plugin-raw.jsm | 5 +++++ devtools/shared/plural-form.js | 2 +- devtools/shared/security/prompt.js | 2 +- .../tests/browser/browser_l10n_localizeMarkup.js | 8 ++++---- devtools/shared/tests/unit/test_require_raw.js | 2 +- 95 files changed, 119 insertions(+), 129 deletions(-) diff --git a/devtools/client/animationinspector/animation-controller.js b/devtools/client/animationinspector/animation-controller.js index 03c6e0e95235..19ec7e3381e7 100644 --- a/devtools/client/animationinspector/animation-controller.js +++ b/devtools/client/animationinspector/animation-controller.js @@ -22,8 +22,7 @@ loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter"); loader.lazyRequireGetter(this, "AnimationsFront", "devtools/shared/fronts/animation", true); const { LocalizationHelper } = require("devtools/shared/l10n"); -const L10N = - new LocalizationHelper("devtools/client/locales/animationinspector.properties"); +const L10N = new LocalizationHelper("devtools/locale/animationinspector.properties"); // Global toolbox/inspector, set when startup is called. var gToolbox, gInspector; diff --git a/devtools/client/animationinspector/components/animation-time-block.js b/devtools/client/animationinspector/components/animation-time-block.js index 51392da8fc4c..65c9e78aef55 100644 --- a/devtools/client/animationinspector/components/animation-time-block.js +++ b/devtools/client/animationinspector/components/animation-time-block.js @@ -10,8 +10,7 @@ const EventEmitter = require("devtools/shared/event-emitter"); const {createNode, TimeScale} = require("devtools/client/animationinspector/utils"); const { LocalizationHelper } = require("devtools/shared/l10n"); -const L10N = - new LocalizationHelper("devtools/client/locales/animationinspector.properties"); +const L10N = new LocalizationHelper("devtools/locale/animationinspector.properties"); // In the createPathSegments function, an animation duration is divided by // DURATION_RESOLUTION in order to draw the way the animation progresses. diff --git a/devtools/client/animationinspector/components/rate-selector.js b/devtools/client/animationinspector/components/rate-selector.js index e46664e6a7d8..48cefb4565cb 100644 --- a/devtools/client/animationinspector/components/rate-selector.js +++ b/devtools/client/animationinspector/components/rate-selector.js @@ -9,8 +9,7 @@ const EventEmitter = require("devtools/shared/event-emitter"); const {createNode} = require("devtools/client/animationinspector/utils"); const { LocalizationHelper } = require("devtools/shared/l10n"); -const L10N = - new LocalizationHelper("devtools/client/locales/animationinspector.properties"); +const L10N = new LocalizationHelper("devtools/locale/animationinspector.properties"); // List of playback rate presets displayed in the timeline toolbar. const PLAYBACK_RATES = [.1, .25, .5, 1, 2, 5, 10]; diff --git a/devtools/client/animationinspector/test/browser_animation_animated_properties_displayed.js b/devtools/client/animationinspector/test/browser_animation_animated_properties_displayed.js index 7e00c44c3fb3..382227b41b8a 100644 --- a/devtools/client/animationinspector/test/browser_animation_animated_properties_displayed.js +++ b/devtools/client/animationinspector/test/browser_animation_animated_properties_displayed.js @@ -5,7 +5,7 @@ "use strict"; const LAYOUT_ERRORS_L10N = - new LocalizationHelper("toolkit/locales/layout_errors.properties"); + new LocalizationHelper("global/locale/layout_errors.properties"); // Test that when an animation is selected, its list of animated properties is // displayed below it. diff --git a/devtools/client/animationinspector/test/head.js b/devtools/client/animationinspector/test/head.js index 554a36430f3b..3b250d8e7ba6 100644 --- a/devtools/client/animationinspector/test/head.js +++ b/devtools/client/animationinspector/test/head.js @@ -15,7 +15,7 @@ const FRAME_SCRIPT_URL = CHROME_URL_ROOT + "doc_frame_script.js"; const COMMON_FRAME_SCRIPT_URL = "chrome://devtools/content/shared/frame-script-utils.js"; const TAB_NAME = "animationinspector"; const ANIMATION_L10N = - new LocalizationHelper("devtools/client/locales/animationinspector.properties"); + new LocalizationHelper("devtools/locale/animationinspector.properties"); // Auto clean-up when a test ends registerCleanupFunction(function* () { diff --git a/devtools/client/animationinspector/utils.js b/devtools/client/animationinspector/utils.js index 4b6891ac15ce..45ebab00d2a3 100644 --- a/devtools/client/animationinspector/utils.js +++ b/devtools/client/animationinspector/utils.js @@ -9,8 +9,7 @@ loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter"); const { LocalizationHelper } = require("devtools/shared/l10n"); -const L10N = - new LocalizationHelper("devtools/client/locales/animationinspector.properties"); +const L10N = new LocalizationHelper("devtools/locale/animationinspector.properties"); // How many times, maximum, can we loop before we find the optimal time // interval in the timeline graph. diff --git a/devtools/client/canvasdebugger/canvasdebugger.js b/devtools/client/canvasdebugger/canvasdebugger.js index c46cc6d0c2b7..828d28e10086 100644 --- a/devtools/client/canvasdebugger/canvasdebugger.js +++ b/devtools/client/canvasdebugger/canvasdebugger.js @@ -75,8 +75,8 @@ const EVENTS = { XPCOMUtils.defineConstant(this, "EVENTS", EVENTS); const HTML_NS = "http://www.w3.org/1999/xhtml"; -const STRINGS_URI = "devtools/client/locales/canvasdebugger.properties"; -const SHARED_STRINGS_URI = "devtools/client/locales/shared.properties"; +const STRINGS_URI = "devtools/locale/canvasdebugger.properties"; +const SHARED_STRINGS_URI = "devtools/locale/shared.properties"; const SNAPSHOT_START_RECORDING_DELAY = 10; // ms const SNAPSHOT_DATA_EXPORT_MAX_BLOCK = 1000; // ms diff --git a/devtools/client/debugger/debugger-controller.js b/devtools/client/debugger/debugger-controller.js index ce6a467bce62..f4e0546b7ef7 100644 --- a/devtools/client/debugger/debugger-controller.js +++ b/devtools/client/debugger/debugger-controller.js @@ -7,7 +7,7 @@ var { classes: Cc, interfaces: Ci, utils: Cu } = Components; -const DBG_STRINGS_URI = "devtools/client/locales/debugger.properties"; +const DBG_STRINGS_URI = "devtools/locale/debugger.properties"; const NEW_SOURCE_IGNORED_URLS = ["debugger eval code", "XStringBundle"]; const NEW_SOURCE_DISPLAY_DELAY = 200; // ms const FETCH_SOURCE_RESPONSE_DELAY = 200; // ms diff --git a/devtools/client/debugger/new/panel.js b/devtools/client/debugger/new/panel.js index 28e5cac85256..8555196fc84d 100644 --- a/devtools/client/debugger/new/panel.js +++ b/devtools/client/debugger/new/panel.js @@ -6,7 +6,7 @@ const { Task } = require("devtools/shared/task"); var {LocalizationHelper} = require("devtools/shared/l10n"); -const DBG_STRINGS_URI = "devtools/client/locales/debugger.properties"; +const DBG_STRINGS_URI = "devtools/locale/debugger.properties"; var L10N = new LocalizationHelper(DBG_STRINGS_URI); function DebuggerPanel(iframeWindow, toolbox) { diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js index 6c0796095c73..e155810821e6 100644 --- a/devtools/client/definitions.js +++ b/devtools/client/definitions.js @@ -24,7 +24,7 @@ loader.lazyGetter(this, "ScratchpadPanel", () => require("devtools/client/scratc loader.lazyGetter(this, "DomPanel", () => require("devtools/client/dom/dom-panel").DomPanel); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/startup.properties"); +const L10N = new LocalizationHelper("devtools/locale/startup.properties"); var Tools = {}; exports.Tools = Tools; diff --git a/devtools/client/dom/main.js b/devtools/client/dom/main.js index 08539342855e..ab4ea9056b65 100644 --- a/devtools/client/dom/main.js +++ b/devtools/client/dom/main.js @@ -20,7 +20,7 @@ XPCOMUtils.defineConstant(this, "require", require); // Localization const { LocalizationHelper } = require("devtools/shared/l10n"); -this.l10n = new LocalizationHelper("devtools/client/locales/dom.properties"); +this.l10n = new LocalizationHelper("devtools/locale/dom.properties"); // Load DOM panel content require("./content/dom-view.js"); diff --git a/devtools/client/framework/attach-thread.js b/devtools/client/framework/attach-thread.js index db445ce23531..86c85e081010 100644 --- a/devtools/client/framework/attach-thread.js +++ b/devtools/client/framework/attach-thread.js @@ -9,7 +9,7 @@ const Services = require("Services"); const defer = require("devtools/shared/defer"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); function handleThreadState(toolbox, event, packet) { // Suppress interrupted events by default because the thread is diff --git a/devtools/client/framework/browser-menus.js b/devtools/client/framework/browser-menus.js index 3d6c4def6e75..62a35ef950a6 100644 --- a/devtools/client/framework/browser-menus.js +++ b/devtools/client/framework/browser-menus.js @@ -13,7 +13,7 @@ */ const {LocalizationHelper} = require("devtools/shared/l10n"); -const MENUS_L10N = new LocalizationHelper("devtools/client/locales/menus.properties"); +const MENUS_L10N = new LocalizationHelper("devtools/locale/menus.properties"); loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true); loader.lazyRequireGetter(this, "gDevToolsBrowser", "devtools/client/framework/devtools-browser", true); diff --git a/devtools/client/framework/connect/connect.js b/devtools/client/framework/connect/connect.js index d713231f9df2..6d7064681a59 100644 --- a/devtools/client/framework/connect/connect.js +++ b/devtools/client/framework/connect/connect.js @@ -15,7 +15,7 @@ var {Toolbox} = require("devtools/client/framework/toolbox"); var {DebuggerClient} = require("devtools/shared/client/main"); var {Task} = require("devtools/shared/task"); var {LocalizationHelper} = require("devtools/shared/l10n"); -var L10N = new LocalizationHelper("devtools/client/locales/connection-screen.properties"); +var L10N = new LocalizationHelper("devtools/locale/connection-screen.properties"); var gClient; var gConnectionTimeout; diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js index f677a4f90faf..41a4e513438e 100644 --- a/devtools/client/framework/devtools-browser.js +++ b/devtools/client/framework/devtools-browser.js @@ -31,7 +31,7 @@ loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI. loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); const TABS_OPEN_PEAK_HISTOGRAM = "DEVTOOLS_TABS_OPEN_PEAK_LINEAR"; const TABS_OPEN_AVG_HISTOGRAM = "DEVTOOLS_TABS_OPEN_AVERAGE_LINEAR"; diff --git a/devtools/client/framework/sidebar.js b/devtools/client/framework/sidebar.js index c27732b5dcdf..37174d3670bb 100644 --- a/devtools/client/framework/sidebar.js +++ b/devtools/client/framework/sidebar.js @@ -10,7 +10,7 @@ var EventEmitter = require("devtools/shared/event-emitter"); var Telemetry = require("devtools/client/shared/telemetry"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; diff --git a/devtools/client/framework/test/browser_keybindings_02.js b/devtools/client/framework/test/browser_keybindings_02.js index 551fef8732a2..64943929b97a 100644 --- a/devtools/client/framework/test/browser_keybindings_02.js +++ b/devtools/client/framework/test/browser_keybindings_02.js @@ -12,7 +12,7 @@ const URL = "data:text/html;charset=utf8,test page"; var {Toolbox} = require("devtools/client/framework/toolbox"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); function getZoomValue() { return parseFloat(Services.prefs.getCharPref("devtools.toolbox.zoomValue")); diff --git a/devtools/client/framework/test/browser_keybindings_03.js b/devtools/client/framework/test/browser_keybindings_03.js index 752087a09492..8d32533a9ddd 100644 --- a/devtools/client/framework/test/browser_keybindings_03.js +++ b/devtools/client/framework/test/browser_keybindings_03.js @@ -13,7 +13,7 @@ const URL = "data:text/html;charset=utf8,test page for toolbox switching"; var {Toolbox} = require("devtools/client/framework/toolbox"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); add_task(function* () { info("Create a test tab and open the toolbox"); diff --git a/devtools/client/framework/test/browser_toolbox_options.js b/devtools/client/framework/test/browser_toolbox_options.js index 569ed86fbba9..30234c7ad6f6 100644 --- a/devtools/client/framework/test/browser_toolbox_options.js +++ b/devtools/client/framework/test/browser_toolbox_options.js @@ -11,7 +11,7 @@ var doc = null, toolbox = null, panelWin = null, modifiedPrefs = []; const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); add_task(function* () { const URL = "data:text/html;charset=utf8,test for dynamically registering " + diff --git a/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js b/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js index b9401f768290..6cdb4692a9c1 100644 --- a/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js +++ b/devtools/client/framework/test/browser_toolbox_tabsswitch_shortcuts.js @@ -10,7 +10,7 @@ requestLongerTimeout(2); var {Toolbox} = require("devtools/client/framework/toolbox"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); add_task(function* () { let tab = yield addTab("about:blank"); diff --git a/devtools/client/framework/test/browser_toolbox_window_reload_target.js b/devtools/client/framework/test/browser_toolbox_window_reload_target.js index 9f3339728b91..ea9e2d600ff1 100644 --- a/devtools/client/framework/test/browser_toolbox_window_reload_target.js +++ b/devtools/client/framework/test/browser_toolbox_window_reload_target.js @@ -12,7 +12,7 @@ const TEST_URL = "data:text/html;charset=utf-8," + var {Toolbox} = require("devtools/client/framework/toolbox"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); var target, toolbox, description, reloadsSent, toolIDs; diff --git a/devtools/client/framework/test/browser_toolbox_zoom.js b/devtools/client/framework/test/browser_toolbox_zoom.js index d078b4bc24fc..9b69dcfb649f 100644 --- a/devtools/client/framework/test/browser_toolbox_zoom.js +++ b/devtools/client/framework/test/browser_toolbox_zoom.js @@ -8,7 +8,7 @@ var toolbox; const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); function test() { addTab("about:blank").then(openToolbox); diff --git a/devtools/client/framework/toolbox-host-manager.js b/devtools/client/framework/toolbox-host-manager.js index 1638f3a9a159..a59251176299 100644 --- a/devtools/client/framework/toolbox-host-manager.js +++ b/devtools/client/framework/toolbox-host-manager.js @@ -1,7 +1,7 @@ const Services = require("Services"); const {Ci} = require("chrome"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); const DevToolsUtils = require("devtools/shared/DevToolsUtils"); const {Task} = require("devtools/shared/task"); diff --git a/devtools/client/framework/toolbox-options.js b/devtools/client/framework/toolbox-options.js index 6362d98dd35b..c480825f1cb0 100644 --- a/devtools/client/framework/toolbox-options.js +++ b/devtools/client/framework/toolbox-options.js @@ -12,7 +12,7 @@ const {Task} = require("devtools/shared/task"); const {gDevTools} = require("devtools/client/framework/devtools"); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); exports.OptionsPanel = OptionsPanel; diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js index 34abd6020f0a..845bcc357390 100644 --- a/devtools/client/framework/toolbox.js +++ b/devtools/client/framework/toolbox.js @@ -34,7 +34,7 @@ const { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {}); const {LocalizationHelper} = require("devtools/shared/l10n"); -const L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); loader.lazyRequireGetter(this, "CommandUtils", "devtools/client/shared/developer-toolbar", true); diff --git a/devtools/client/inspector/components/box-model.js b/devtools/client/inspector/components/box-model.js index fc36fac7112a..eee647436bdb 100644 --- a/devtools/client/inspector/components/box-model.js +++ b/devtools/client/inspector/components/box-model.js @@ -13,8 +13,8 @@ const {ReflowFront} = require("devtools/shared/fronts/reflow"); const {LocalizationHelper} = require("devtools/shared/l10n"); const {getCssProperties} = require("devtools/shared/fronts/css-properties"); -const STRINGS_URI = "devtools/client/locales/shared.properties"; -const STRINGS_INSPECTOR = "devtools/shared/locales/styleinspector.properties"; +const STRINGS_URI = "devtools/locale/shared.properties"; +const STRINGS_INSPECTOR = "devtools-shared/locale/styleinspector.properties"; const SHARED_L10N = new LocalizationHelper(STRINGS_URI); const INSPECTOR_L10N = new LocalizationHelper(STRINGS_INSPECTOR); const NUMERIC = /^-?[\d\.]+$/; diff --git a/devtools/client/inspector/computed/computed.js b/devtools/client/inspector/computed/computed.js index 8e06ecec075a..86268c2d2313 100644 --- a/devtools/client/inspector/computed/computed.js +++ b/devtools/client/inspector/computed/computed.js @@ -24,7 +24,7 @@ const {KeyShortcuts} = require("devtools/client/shared/key-shortcuts"); const {BoxModelView} = require("devtools/client/inspector/components/box-model"); const clipboardHelper = require("devtools/shared/platform/clipboard"); -const STYLE_INSPECTOR_PROPERTIES = "devtools/shared/locales/styleinspector.properties"; +const STYLE_INSPECTOR_PROPERTIES = "devtools-shared/locale/styleinspector.properties"; const {LocalizationHelper} = require("devtools/shared/l10n"); const STYLE_INSPECTOR_L10N = new LocalizationHelper(STYLE_INSPECTOR_PROPERTIES); diff --git a/devtools/client/inspector/inspector.js b/devtools/client/inspector/inspector.js index a6a65cc63412..a8f1f261047d 100644 --- a/devtools/client/inspector/inspector.js +++ b/devtools/client/inspector/inspector.js @@ -37,9 +37,8 @@ const {ViewHelpers} = require("devtools/client/shared/widgets/view-helpers"); const clipboardHelper = require("devtools/shared/platform/clipboard"); const {LocalizationHelper, localizeMarkup} = require("devtools/shared/l10n"); -const INSPECTOR_L10N = - new LocalizationHelper("devtools/client/locales/inspector.properties"); -const TOOLBOX_L10N = new LocalizationHelper("devtools/client/locales/toolbox.properties"); +const INSPECTOR_L10N = new LocalizationHelper("devtools/locale/inspector.properties"); +const TOOLBOX_L10N = new LocalizationHelper("devtools/locale/toolbox.properties"); // Sidebar dimensions const INITIAL_SIDEBAR_SIZE = 350; diff --git a/devtools/client/inspector/inspector.xhtml b/devtools/client/inspector/inspector.xhtml index a68a2d08048c..350e0570d704 100644 --- a/devtools/client/inspector/inspector.xhtml +++ b/devtools/client/inspector/inspector.xhtml @@ -34,7 +34,7 @@
+ data-localization-bundle="devtools/locale/inspector.properties">
@@ -73,7 +73,7 @@