[gnome-shell] cleanup: Stop using string concatenation

[Marge Bot <marge-bot src gnome org>]

commit 696965c9f7c3b3857e7d7eff51db4a6a9e388562
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Mar 24 05:02:20 2020 +0100

    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>

 js/gdm/vmware.js                    | 14 +++++++-------
 js/ui/components/telepathyClient.js |  3 ++-
 js/ui/notificationDaemon.js         |  2 +-
 js/ui/padOsd.js                     |  9 +++++----
 lint/eslintrc-legacy.yml            |  1 -
 5 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/js/gdm/vmware.js b/js/gdm/vmware.js
index 20d57e8a28..fb80a78a22 100644
--- a/js/gdm/vmware.js
+++ b/js/gdm/vmware.js
@@ -10,13 +10,13 @@ const dbusInterface = 'org.vmware.viewagent.Credentials';
 
 var SERVICE_NAME = 'gdm-vmwcred';
 
-const VmwareCredentialsIface = '<node> \
-<interface name="' + dbusInterface + '"> \
-<signal name="UserAuthenticated"> \
-    <arg type="s" name="token"/> \
-</signal> \
-</interface> \
-</node>';
+const VmwareCredentialsIface = `<node>
+<interface name="${dbusInterface}">
+<signal name="UserAuthenticated">
+    <arg type="s" name="token"/>
+</signal>
+</interface>
+</node>`;
 
 
 const VmwareCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(VmwareCredentialsIface);
diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index 90c0cbdf42..335f32a9ad 100644
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -816,7 +816,8 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({
 
         /* Translators: this is the other person changing their old IM name to their new
            IM name. */
-        let message = '<i>' + _("%s is now known as %s").format(oldAlias, newAlias) + '</i>';
+        const message = `<i>${
+            _('%s is now known as %s').format(oldAlias, newAlias)}</i>`;
 
         this._append({ body: message,
                        group: 'meta',
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index c2645586f9..4058ebdc39 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -545,7 +545,7 @@ const FdoApplicationIface = loadInterfaceXML('org.freedesktop.Application');
 const FdoApplicationProxy = Gio.DBusProxy.makeProxyWrapper(FdoApplicationIface);
 
 function objectPathFromAppId(appId) {
-    return '/' + appId.replace(/\./g, '/').replace(/-/g, '_');
+    return `/${appId.replace(/\./g, '/').replace(/-/g, '_')}`;
 }
 
 function getPlatformData() {
diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index b58e4eeb46..98a028f667 100644
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -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);
diff --git a/lint/eslintrc-legacy.yml b/lint/eslintrc-legacy.yml
index 8441f7c2d5..e8a0e2935c 100644
--- a/lint/eslintrc-legacy.yml
+++ b/lint/eslintrc-legacy.yml
@@ -24,5 +24,4 @@ rules:
   object-curly-newline:
     - error
     - consistent: true
-  prefer-template: off
   quotes: off