diff --git a/src/extension.js b/src/extension.js index aaa253d..d475dbd 100644 --- a/src/extension.js +++ b/src/extension.js @@ -33,7 +33,7 @@ var commander = null; */ function init() { console.debug('Initializing extension...'); - extensionUtils.initTranslations(Me.metadata['gettext-domain']); + extensionUtils.initTranslations(); console.debug('Extension initialized.'); } diff --git a/src/modules/GtkThemer.js b/src/modules/GtkThemer.js index 59614ad..3d9fdc1 100644 --- a/src/modules/GtkThemer.js +++ b/src/modules/GtkThemer.js @@ -6,6 +6,7 @@ const { extensionUtils } = imports.misc; const { main } = imports.ui; const Me = extensionUtils.getCurrentExtension(); +const _ = extensionUtils.gettext; const e = Me.imports.extension; const utils = Me.imports.utils; @@ -13,9 +14,6 @@ const utils = Me.imports.utils; const { Time } = Me.imports.enums.Time; const { GtkVariants } = Me.imports.modules.GtkVariants; -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; - /** * The GTK Themer is responsible for changing the GTK theme according to the diff --git a/src/modules/ShellThemer.js b/src/modules/ShellThemer.js index 1975655..1b12f51 100644 --- a/src/modules/ShellThemer.js +++ b/src/modules/ShellThemer.js @@ -6,6 +6,7 @@ const { extensionUtils } = imports.misc; const { main } = imports.ui; const Me = extensionUtils.getCurrentExtension(); +const _ = extensionUtils.gettext; const e = Me.imports.extension; const utils = Me.imports.utils; @@ -13,9 +14,6 @@ const utils = Me.imports.utils; const { Time } = Me.imports.enums.Time; const { ShellVariants } = Me.imports.modules.ShellVariants; -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; - /** * The Shell Themer is responsible for changing the GTK theme according to the * time. It will use the User Themes extension to do so if it is enabled. diff --git a/src/modules/TimerOndemand.js b/src/modules/TimerOndemand.js index d213c00..f0ef1a4 100644 --- a/src/modules/TimerOndemand.js +++ b/src/modules/TimerOndemand.js @@ -11,15 +11,13 @@ const { Button: PanelMenuButton } = imports.ui.panelMenu; const { PopupBaseMenuItem } = imports.ui.popupMenu; const Me = extensionUtils.getCurrentExtension(); +const _ = extensionUtils.gettext; const e = Me.imports.extension; const utils = Me.imports.utils; const { Time } = Me.imports.enums.Time; -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; - /** * The On-demand Timer allows the user to manually switch between the day and * night variants with a button in the top bar and a keybinding. diff --git a/src/preferences/Schedule.js b/src/preferences/Schedule.js index 81994d7..8cf5a59 100644 --- a/src/preferences/Schedule.js +++ b/src/preferences/Schedule.js @@ -5,14 +5,12 @@ const { Gio, GLib, GObject, Gtk } = imports.gi; const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); +const _ = extensionUtils.gettext; const utils = Me.imports.utils; const { DropDownChoice } = Me.imports.preferences.DropDownChoice; -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; - var Schedule = GObject.registerClass({ GTypeName: 'Schedule', diff --git a/src/preferences/ShellPreferences.js b/src/preferences/ShellPreferences.js index 25f6609..62fcc2e 100644 --- a/src/preferences/ShellPreferences.js +++ b/src/preferences/ShellPreferences.js @@ -5,14 +5,12 @@ const { Gio, GLib, GObject, Gtk } = imports.gi; const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); +const _ = extensionUtils.gettext; const utils = Me.imports.utils; const { DropDownChoice } = Me.imports.preferences.DropDownChoice; -const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); -const _ = Gettext.gettext; - var ShellPreferences = GObject.registerClass({ GTypeName: 'ShellPreferences',