From 1a2d91ad5e260e0d8ad44a1f79720d7880d90ed3 Mon Sep 17 00:00:00 2001 From: Simon Lydell Date: Tue, 7 Jun 2016 08:49:29 +0200 Subject: [PATCH] Rename l10n.coffee into translate.coffee --- extension/lib/button.coffee | 2 +- extension/lib/commands-frame.coffee | 2 +- extension/lib/commands.coffee | 2 +- extension/lib/defaults.coffee | 2 +- extension/lib/help.coffee | 2 +- extension/lib/modes.coffee | 2 +- extension/lib/options.coffee | 2 +- extension/lib/{l10n.coffee => translate.coffee} | 4 +++- 8 files changed, 10 insertions(+), 8 deletions(-) rename extension/lib/{l10n.coffee => translate.coffee} (95%) diff --git a/extension/lib/button.coffee b/extension/lib/button.coffee index 02fa466..9ec29d4 100644 --- a/extension/lib/button.coffee +++ b/extension/lib/button.coffee @@ -20,7 +20,7 @@ # This file creates VimFx’s toolbar button. help = require('./help') -translate = require('./l10n') +translate = require('./translate') utils = require('./utils') cui = Cu.import('resource:///modules/CustomizableUI.jsm', {}).CustomizableUI diff --git a/extension/lib/commands-frame.coffee b/extension/lib/commands-frame.coffee index 8a1752a..3bfa986 100644 --- a/extension/lib/commands-frame.coffee +++ b/extension/lib/commands-frame.coffee @@ -25,7 +25,7 @@ markableElements = require('./markable-elements') prefs = require('./prefs') SelectionManager = require('./selection') -translate = require('./l10n') +translate = require('./translate') utils = require('./utils') viewportUtils = require('./viewport') diff --git a/extension/lib/commands.coffee b/extension/lib/commands.coffee index fc62c9c..7c62e16 100644 --- a/extension/lib/commands.coffee +++ b/extension/lib/commands.coffee @@ -31,7 +31,7 @@ help = require('./help') MarkerContainer = require('./marker-container') markableElements = require('./markable-elements') prefs = require('./prefs') -translate = require('./l10n') +translate = require('./translate') utils = require('./utils') SelectionManager = require('./selection') viewportUtils = require('./viewport') diff --git a/extension/lib/defaults.coffee b/extension/lib/defaults.coffee index 985a40b..add8da9 100644 --- a/extension/lib/defaults.coffee +++ b/extension/lib/defaults.coffee @@ -206,7 +206,7 @@ parsed_options = # coffeelint: enable=colon_assignment_spacing # coffeelint: enable=no_implicit_braces -translate = require('./l10n') +translate = require('./translate') utils = require('./utils') addCategory = (category, order) -> diff --git a/extension/lib/help.coffee b/extension/lib/help.coffee index d377d50..e36b5ed 100644 --- a/extension/lib/help.coffee +++ b/extension/lib/help.coffee @@ -19,7 +19,7 @@ # This file creates VimFx’s Keyboard Shortcuts help screen. -translate = require('./l10n') +translate = require('./translate') utils = require('./utils') CONTAINER_ID = 'VimFxHelpDialogContainer' diff --git a/extension/lib/modes.coffee b/extension/lib/modes.coffee index 6ffa48f..4968b07 100644 --- a/extension/lib/modes.coffee +++ b/extension/lib/modes.coffee @@ -25,9 +25,9 @@ {commands, findStorage} = require('./commands') defaults = require('./defaults') help = require('./help') -translate = require('./l10n') prefs = require('./prefs') SelectionManager = require('./selection') +translate = require('./translate') utils = require('./utils') {FORWARD, BACKWARD} = SelectionManager diff --git a/extension/lib/options.coffee b/extension/lib/options.coffee index 7712745..d95415c 100644 --- a/extension/lib/options.coffee +++ b/extension/lib/options.coffee @@ -20,8 +20,8 @@ # This file constructs VimFx’s options UI in the Add-ons Manager. defaults = require('./defaults') -translate = require('./l10n') prefs = require('./prefs') +translate = require('./translate') utils = require('./utils') TYPE_MAP = { diff --git a/extension/lib/l10n.coffee b/extension/lib/translate.coffee similarity index 95% rename from extension/lib/l10n.coffee rename to extension/lib/translate.coffee index fcca949..c9ece2a 100644 --- a/extension/lib/l10n.coffee +++ b/extension/lib/translate.coffee @@ -27,7 +27,7 @@ stringBundle = Services.strings.createBundle( "#{ADDON_PATH}/locale/#{PROPERTIES_FILE}?#{Math.random()}" ) -module.exports = (name, values...) -> +translate = (name, values...) -> try return stringBundle.formatStringFromName(name, values, values.length) catch error @@ -35,3 +35,5 @@ module.exports = (name, values...) -> # file the thrown error is terrible. It only tells you that an error # occurred, but not why. Wrap in a try-catch to fix that. console.error('VimFx: Translation error', name, values, error) + +module.exports = translate -- 2.39.3