[gnome-maps/wip/mlundblad/es6-modules: 1/15] placeView: Use string templates instead of imports.format




commit 8b4e6bb68d5b8f1cc3c5ad7353d882bc77fd24ee
Author: Marcus Lundblad <ml dfupdate se>
Date:   Mon May 23 23:15:54 2022 +0200

    placeView: Use string templates instead of imports.format
    
    imports.format is deprecated. Use ES string templates instead.
    
    Keep using format with gettext, see also:
    https://gitlab.gnome.org/GNOME/gjs/-/issues/374

 src/placeView.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/placeView.js b/src/placeView.js
index d752a8bd..b15abfd7 100644
--- a/src/placeView.js
+++ b/src/placeView.js
@@ -247,7 +247,7 @@ export class PlaceView extends Gtk.Box {
         let lang = Wikipedia.getLanguage(wiki);
         let article = Wikipedia.getArticle(wiki);
 
-        return Format.vprintf('https://%s.wikipedia.org/wiki/%s', [ lang, article ]);
+        return `https://${lang}.wikipedia.org/wiki/${article}`;
     }
 
     _createContent(place) {
@@ -292,7 +292,7 @@ export class PlaceView extends Gtk.Box {
             if (Utils.uriSchemeSupported('tel')) {
                 /* RFC3966 only allows "-", '.", "(", and ")" as visual
                  * separator characters in a global phone number, no space */
-                phone.linkUrl = 'tel:%s'.format(place.phone.replace(/\s+/g, ''));
+                phone.linkUrl = `tel:${place.phone.replace(/\s+/g, '')}`;
             }
 
             content.push(phone);
@@ -302,7 +302,7 @@ export class PlaceView extends Gtk.Box {
             content.push({ label: _("E-mail"),
                            icon: 'mail-unread-symbolic',
                            info: GLib.markup_escape_text(place.email, -1),
-                           linkUrl: 'mailto:%s'.format(place.email) });
+                           linkUrl: `mailto:${place.email}` });
         }
 
         if (place.isEatingAndDrinking) {
@@ -535,9 +535,7 @@ export class PlaceView extends Gtk.Box {
                 let uri = GLib.markup_escape_text(linkUrl, -1);
                 /* double-escape the tooltip text, as GTK treats it as markup */
                 let tooltipText = GLib.markup_escape_text(uri, -1);
-                info = '<a href="%s" title="%s">%s</a>'.format(uri,
-                                                               tooltipText,
-                                                               info);
+                info = `<a href="${uri}" title="${tooltipText}">${info}</a>`;
             }
 
             let widget;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]