diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js index 431328dc..fe9d5a28 100644 --- a/extensions/apps-menu/extension.js +++ b/extensions/apps-menu/extension.js @@ -12,9 +12,7 @@ const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; -const Me = ExtensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; const appSys = Shell.AppSystem.get_default(); diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js index 869cdb14..9e303dad 100644 --- a/extensions/auto-move-windows/prefs.js +++ b/extensions/auto-move-windows/prefs.js @@ -5,10 +5,8 @@ const { Gio, GLib, GObject, Gtk, Pango } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; -const Me = ExtensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; const SETTINGS_KEY = 'application-list'; diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js index 6cc91b25..cc31e777 100644 --- a/extensions/drive-menu/extension.js +++ b/extensions/drive-menu/extension.js @@ -8,9 +8,7 @@ const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; const ShellMountOperation = imports.ui.shellMountOperation; -const Me = ExtensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; var MountMenuItem = GObject.registerClass( class MountMenuItem extends PopupMenu.PopupBaseMenuItem { diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js index 07a83f4b..3fe9d9fe 100644 --- a/extensions/places-menu/extension.js +++ b/extensions/places-menu/extension.js @@ -9,13 +9,11 @@ const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; const Me = ExtensionUtils.getCurrentExtension(); - -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; -const N_ = x => x; - const PlaceDisplay = Me.imports.placeDisplay; +const _ = ExtensionUtils.gettext; +const N_ = x => x; + const PLACE_ICON_SIZE = 16; var PlaceMenuItem = GObject.registerClass( diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js index d2afc1ea..05b22804 100644 --- a/extensions/places-menu/placeDisplay.js +++ b/extensions/places-menu/placeDisplay.js @@ -7,10 +7,7 @@ const ExtensionUtils = imports.misc.extensionUtils; const Main = imports.ui.main; const ShellMountOperation = imports.ui.shellMountOperation; -const Me = ExtensionUtils.getCurrentExtension(); - -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; const N_ = x => x; const BACKGROUND_SCHEMA = 'org.gnome.desktop.background'; diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index fe0cb217..56bb8296 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -11,8 +11,7 @@ const Me = ExtensionUtils.getCurrentExtension(); const { WindowPicker, WindowPickerToggle } = Me.imports.windowPicker; const { WorkspaceIndicator } = Me.imports.workspaceIndicator; -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; const ICON_TEXTURE_SIZE = 24; const DND_ACTIVATE_TIMEOUT = 500; diff --git a/extensions/window-list/prefs.js b/extensions/window-list/prefs.js index 5f5079c1..0dbf7a6c 100644 --- a/extensions/window-list/prefs.js +++ b/extensions/window-list/prefs.js @@ -4,10 +4,8 @@ const { Gio, GLib, GObject, Gtk } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; -const Me = ExtensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; /** */ function init() { diff --git a/extensions/window-list/workspaceIndicator.js b/extensions/window-list/workspaceIndicator.js index cdfe5b61..06646cc9 100644 --- a/extensions/window-list/workspaceIndicator.js +++ b/extensions/window-list/workspaceIndicator.js @@ -7,10 +7,7 @@ const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; -const Me = ExtensionUtils.getCurrentExtension(); - -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; const TOOLTIP_OFFSET = 6; const TOOLTIP_ANIMATION_TIME = 150; diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js index d8463daf..a2c95b6a 100644 --- a/extensions/workspace-indicator/extension.js +++ b/extensions/workspace-indicator/extension.js @@ -9,10 +9,7 @@ const Main = imports.ui.main; const PanelMenu = imports.ui.panelMenu; const PopupMenu = imports.ui.popupMenu; -const Me = ExtensionUtils.getCurrentExtension(); - -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences'; const WORKSPACE_KEY = 'workspace-names'; diff --git a/extensions/workspace-indicator/prefs.js b/extensions/workspace-indicator/prefs.js index e5c5500d..807ab7bb 100644 --- a/extensions/workspace-indicator/prefs.js +++ b/extensions/workspace-indicator/prefs.js @@ -4,10 +4,8 @@ const { Gio, GLib, GObject, Gtk, Pango } = imports.gi; const ExtensionUtils = imports.misc.extensionUtils; -const Me = ExtensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; +const _ = ExtensionUtils.gettext; const N_ = e => e; const WORKSPACE_SCHEMA = 'org.gnome.desktop.wm.preferences';