From 0b89110fd407477898ec5f3147648f4ad19ff5b7 Mon Sep 17 00:00:00 2001 From: Romain Vigier Date: Fri, 25 Sep 2020 23:52:24 +0200 Subject: [PATCH] Use correct metadata for gettext domain --- src/extension.js | 2 +- src/modules/GtkThemer.js | 2 +- src/modules/ShellThemer.js | 2 +- src/modules/TimerOndemand.js | 2 +- src/preferences/Backgrounds.js | 2 +- src/preferences/Commands.js | 2 +- src/preferences/CursorTheme.js | 2 +- src/preferences/GtkTheme.js | 2 +- src/preferences/Headerbar.js | 2 +- src/preferences/IconTheme.js | 2 +- src/preferences/OndemandKeyboardShortcutDialog.js | 2 +- src/preferences/Schedule.js | 2 +- src/preferences/ShellTheme.js | 2 +- src/utils.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/extension.js b/src/extension.js index f5351b7..c7106ff 100644 --- a/src/extension.js +++ b/src/extension.js @@ -47,7 +47,7 @@ var commander = null; function init() { logDebug('Initializing extension...'); - compat.initTranslations(Me.metadata.uuid); + compat.initTranslations(Me.metadata['gettext-domain']); logDebug('Extension initialized.'); } diff --git a/src/modules/GtkThemer.js b/src/modules/GtkThemer.js index 1cf7f83..b0ef5bd 100644 --- a/src/modules/GtkThemer.js +++ b/src/modules/GtkThemer.js @@ -25,7 +25,7 @@ const e = Me.imports.extension; const { logDebug, notifyError, getInstalledGtkThemes } = Me.imports.utils; const { GtkVariants } = Me.imports.modules.GtkVariants; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; diff --git a/src/modules/ShellThemer.js b/src/modules/ShellThemer.js index 8402249..144ddc8 100644 --- a/src/modules/ShellThemer.js +++ b/src/modules/ShellThemer.js @@ -26,7 +26,7 @@ const e = Me.imports.extension; const { logDebug, notifyError, getInstalledShellThemes, getShellThemeStylesheet, applyShellStylesheet } = Me.imports.utils; const { ShellVariants } = Me.imports.modules.ShellVariants; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; /** diff --git a/src/modules/TimerOndemand.js b/src/modules/TimerOndemand.js index e50e318..747f60d 100644 --- a/src/modules/TimerOndemand.js +++ b/src/modules/TimerOndemand.js @@ -31,7 +31,7 @@ const e = Me.imports.extension; const { logDebug, findShellAggregateMenuItemPosition } = Me.imports.utils; const { keyBindingAutoRepeat, getActor } = Me.imports.compat; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; /** diff --git a/src/preferences/Backgrounds.js b/src/preferences/Backgrounds.js index 1fecd4e..d6862d7 100644 --- a/src/preferences/Backgrounds.js +++ b/src/preferences/Backgrounds.js @@ -21,7 +21,7 @@ const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; diff --git a/src/preferences/Commands.js b/src/preferences/Commands.js index 504398d..2e06ebc 100644 --- a/src/preferences/Commands.js +++ b/src/preferences/Commands.js @@ -21,7 +21,7 @@ const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; diff --git a/src/preferences/CursorTheme.js b/src/preferences/CursorTheme.js index 2126df7..edf77e7 100644 --- a/src/preferences/CursorTheme.js +++ b/src/preferences/CursorTheme.js @@ -23,7 +23,7 @@ const Me = extensionUtils.getCurrentExtension(); const utils = Me.imports.utils; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; diff --git a/src/preferences/GtkTheme.js b/src/preferences/GtkTheme.js index aedc35a..245e60b 100644 --- a/src/preferences/GtkTheme.js +++ b/src/preferences/GtkTheme.js @@ -23,7 +23,7 @@ const Me = extensionUtils.getCurrentExtension(); const utils = Me.imports.utils; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; diff --git a/src/preferences/Headerbar.js b/src/preferences/Headerbar.js index c6c1cec..9d525eb 100644 --- a/src/preferences/Headerbar.js +++ b/src/preferences/Headerbar.js @@ -21,7 +21,7 @@ const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; const utils = Me.imports.utils; diff --git a/src/preferences/IconTheme.js b/src/preferences/IconTheme.js index 5b3351c..ddffbb7 100644 --- a/src/preferences/IconTheme.js +++ b/src/preferences/IconTheme.js @@ -23,7 +23,7 @@ const Me = extensionUtils.getCurrentExtension(); const utils = Me.imports.utils; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; diff --git a/src/preferences/OndemandKeyboardShortcutDialog.js b/src/preferences/OndemandKeyboardShortcutDialog.js index 4bdc963..30c0662 100644 --- a/src/preferences/OndemandKeyboardShortcutDialog.js +++ b/src/preferences/OndemandKeyboardShortcutDialog.js @@ -21,7 +21,7 @@ const { extensionUtils } = imports.misc; const Me = extensionUtils.getCurrentExtension(); -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; const utils = Me.imports.utils; diff --git a/src/preferences/Schedule.js b/src/preferences/Schedule.js index 3453fe1..418f29a 100644 --- a/src/preferences/Schedule.js +++ b/src/preferences/Schedule.js @@ -23,7 +23,7 @@ const Me = extensionUtils.getCurrentExtension(); const { OndemandKeyboardShortcutDialog } = Me.imports.preferences.OndemandKeyboardShortcutDialog; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; diff --git a/src/preferences/ShellTheme.js b/src/preferences/ShellTheme.js index b3ed865..612773e 100644 --- a/src/preferences/ShellTheme.js +++ b/src/preferences/ShellTheme.js @@ -23,7 +23,7 @@ const Me = extensionUtils.getCurrentExtension(); const utils = Me.imports.utils; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext; diff --git a/src/utils.js b/src/utils.js index 1760b9e..445c5b2 100644 --- a/src/utils.js +++ b/src/utils.js @@ -23,7 +23,7 @@ const Me = extensionUtils.getCurrentExtension(); const compat = Me.imports.compat; const config = Me.imports.config; -const Gettext = imports.gettext.domain(Me.metadata.uuid); +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); const _ = Gettext.gettext;