From cfe9aba4e84c6693fb96ba1403bac79466dee1f7 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Sun, 10 Mar 2019 11:24:07 -0400 Subject: [PATCH] Use translations domain const in prefs --- prefs.js | 7 +++---- utils.js | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/prefs.js b/prefs.js index ccd2dbc..da8bbeb 100644 --- a/prefs.js +++ b/prefs.js @@ -29,12 +29,11 @@ const Gdk = imports.gi.Gdk; const Lang = imports.lang; const Mainloop = imports.mainloop; -const Gettext = imports.gettext.domain('dash-to-panel'); -const _ = Gettext.gettext; -const N_ = function(e) { return e }; - const Me = imports.misc.extensionUtils.getCurrentExtension(); const Convenience = Me.imports.convenience; +const Gettext = imports.gettext.domain(Me.imports.utils.TRANSLATION_DOMAIN); +const _ = Gettext.gettext; +const N_ = function(e) { return e }; const SCALE_UPDATE_TIMEOUT = 500; const DEFAULT_PANEL_SIZES = [ 128, 96, 64, 48, 32, 24, 16 ]; diff --git a/utils.js b/utils.js index db8c865..8440a59 100644 --- a/utils.js +++ b/utils.js @@ -24,7 +24,6 @@ const Gi = imports._gi; const Lang = imports.lang; const Mainloop = imports.mainloop; -const Meta = imports.gi.Meta; let es6Support = imports.misc.config.PACKAGE_VERSION >= '3.31.9'; @@ -262,7 +261,7 @@ var DisplayWrapper = { }, getMonitorManager: function() { - return global.screen || Meta.MonitorManager.get(); + return global.screen || imports.gi.Meta.MonitorManager.get(); } };