brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

js: Use templates for non-translatable strings

Browse Source 
This reverts commit 9d941f8202 and replaces all additional
instances of .format() that have been added since.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2160>
This commit is contained in:
Florian Müllner
2022-02-07 15:14:06 +01:00
committed by Marge Bot
parent 29dfde5a4a
commit a1dd1b25d8
51 changed files with 254 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/notificationDaemon.js
View File

@ -412,10 +412,10 @@ class FdoNotificationDaemonSource extends MessageTray.Source {
return app;
if (appId)
app = appSys.lookup_app('%s.desktop'.format(appId));
app = appSys.lookup_app(`${appId}.desktop`);
if (!app)
app = appSys.lookup_app('%s.desktop'.format(this.initialTitle));
app = appSys.lookup_app(`${this.initialTitle}.desktop`);
return app;
}
@ -549,7 +549,7 @@ function objectPathFromAppId(appId) {
}
function getPlatformData() {
let startupId = GLib.Variant.new('s', '_TIME%s'.format(global.get_current_time()));
let startupId = GLib.Variant.new('s', `_TIME${global.get_current_time()}`);
return { "desktop-startup-id": startupId };
}
@ -562,7 +562,7 @@ class GtkNotificationDaemonAppSource extends MessageTray.Source {
if (!GLib.Variant.is_object_path(objectPath))
throw new InvalidAppError();
let app = Shell.AppSystem.get_default().lookup_app('%s.desktop'.format(appId));
let app = Shell.AppSystem.get_default().lookup_app(`${appId}.desktop`);
if (!app)
throw new InvalidAppError();
@ -738,7 +738,8 @@ var GtkNotificationDaemon = class GtkNotificationDaemon {
source = this._ensureAppSource(appId);
} catch (e) {
if (e instanceof InvalidAppError) {
invocation.return_dbus_error('org.gtk.Notifications.InvalidApp', 'The app by ID "%s" could not be found'.format(appId));
invocation.return_dbus_error('org.gtk.Notifications.InvalidApp',
`The app by ID "${appId}" could not be found`);
return;
}
throw e;