cleanup: Stop using string concatenation

It's unfortunate that we cannot fully embrace template strings, but
we aren't limited to "legacy" formatting either; replace the last
remaining places where we still use string concatenation to reduce
the difference between regular and legacy style a bit.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2200>
This commit is contained in:
Florian Müllner 2020-03-24 05:02:20 +01:00 committed by Marge Bot
parent 3d3ed850fe
commit 696965c9f7
5 changed files with 15 additions and 14 deletions

View file

@ -359,9 +359,10 @@ var PadDiagram = GObject.registerClass({
}
_wrappingSvgFooter() {
return '</style>' +
'<xi:include href="' + this._imagePath + '" />' +
'</svg>';
return '%s%s%s'.format(
'</style>',
'<xi:include href="%s" />'.format(this._imagePath),
'</svg>');
}
_cssString() {
@ -885,7 +886,7 @@ var PadOsd = GObject.registerClass({
this._endActionEdition();
this._editedAction = { type, number, dir, mode };
let settingsPath = this._settings.path + key + '/';
const settingsPath = `${this._settings.path}${key}/`;
this._editedActionSettings = Gio.Settings.new_with_path('org.gnome.desktop.peripherals.tablet.pad-button',
settingsPath);
this._actionEditor.setSettings(this._editedActionSettings, type);