diff --git a/gulpfile.js b/gulpfile.js
index 48b6e9d..aa43e87 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -75,6 +75,7 @@ function clean(cb) {
     plugin.public + '/**',
     '!' + plugin.public,
     '!' + plugin.public + '/galette_maps.css',
+    '!' + plugin.public + '/galette_maps.js',
     plugin.public + '/images/**',
     '!' + plugin.public + '/images',
     '!' + plugin.public + '/images/marker-galette.png',
diff --git a/lang/ar.utf8/LC_MESSAGES/maps.mo b/lang/ar.utf8/LC_MESSAGES/maps.mo
index 657e28f..42628cf 100644
Binary files a/lang/ar.utf8/LC_MESSAGES/maps.mo and b/lang/ar.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/de_DE.utf8/LC_MESSAGES/maps.mo b/lang/de_DE.utf8/LC_MESSAGES/maps.mo
index 2540269..210ff47 100644
Binary files a/lang/de_DE.utf8/LC_MESSAGES/maps.mo and b/lang/de_DE.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/en_US/LC_MESSAGES/maps.mo b/lang/en_US/LC_MESSAGES/maps.mo
index 7fa875b..f923b00 100644
Binary files a/lang/en_US/LC_MESSAGES/maps.mo and b/lang/en_US/LC_MESSAGES/maps.mo differ
diff --git a/lang/es.utf8/LC_MESSAGES/maps.mo b/lang/es.utf8/LC_MESSAGES/maps.mo
index bcc5a79..2e3840d 100644
Binary files a/lang/es.utf8/LC_MESSAGES/maps.mo and b/lang/es.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/fr_FR.utf8/LC_MESSAGES/maps.mo b/lang/fr_FR.utf8/LC_MESSAGES/maps.mo
index b7e9d34..9da5984 100644
Binary files a/lang/fr_FR.utf8/LC_MESSAGES/maps.mo and b/lang/fr_FR.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/it_IT.utf8/LC_MESSAGES/maps.mo b/lang/it_IT.utf8/LC_MESSAGES/maps.mo
index 406bd95..9d26c6d 100644
Binary files a/lang/it_IT.utf8/LC_MESSAGES/maps.mo and b/lang/it_IT.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/maps.pot b/lang/maps.pot
index 32bcf25..f4ffd5b 100644
--- a/lang/maps.pot
+++ b/lang/maps.pot
@@ -33,8 +33,10 @@ msgid ""
 "database?"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
 msgstr ""
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -117,8 +119,10 @@ msgstr ""
 msgid "Geolocalize"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
 msgstr ""
 
 #: ../templates/default/maps.html.twig:28
@@ -209,7 +213,8 @@ msgid "Choose your location"
 msgstr ""
 
 #: ../templates/default/mymap.html.twig:18
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../templates/default/mymap.html.twig:23
@@ -217,11 +222,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../templates/default/mymap.html.twig:24
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../templates/default/mymap.html.twig:80
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../templates/default/mymap.html.twig:80 ../templates/default/mymap.html.twig:153
diff --git a/lang/maps_ar.utf8.po b/lang/maps_ar.utf8.po
index da69739..38a5cc4 100644
--- a/lang/maps_ar.utf8.po
+++ b/lang/maps_ar.utf8.po
@@ -33,8 +33,10 @@ msgid ""
 "database?"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
 msgstr ""
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -125,9 +127,11 @@ msgstr "موضعي"
 msgid "Geolocalize"
 msgstr "تحديد الموقع"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "تحديد موقع %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "تحديد موقع %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -219,7 +223,8 @@ msgid "Choose your location"
 msgstr "اختر موقعك"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:89
@@ -227,11 +232,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
diff --git a/lang/maps_br.utf8.po b/lang/maps_br.utf8.po
index a779283..0f1d3d3 100644
--- a/lang/maps_br.utf8.po
+++ b/lang/maps_br.utf8.po
@@ -28,8 +28,10 @@ msgid ""
 "database?"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
 msgstr ""
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -112,8 +114,10 @@ msgstr ""
 msgid "Geolocalize"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
 msgstr ""
 
 #: ../tempcache/maps.html.twig:115
@@ -204,7 +208,8 @@ msgid "Choose your location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:89
@@ -212,11 +217,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
diff --git a/lang/maps_ca.utf8.po b/lang/maps_ca.utf8.po
index d2efcf8..f53c448 100644
--- a/lang/maps_ca.utf8.po
+++ b/lang/maps_ca.utf8.po
@@ -32,8 +32,10 @@ msgid ""
 "database?"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
 msgstr ""
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -124,8 +126,10 @@ msgstr "La meva localització"
 msgid "Geolocalize"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
 msgstr ""
 
 #: ../tempcache/maps.html.twig:115
@@ -216,7 +220,8 @@ msgid "Choose your location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:89
@@ -224,11 +229,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
diff --git a/lang/maps_de_DE.utf8.po b/lang/maps_de_DE.utf8.po
index 56ce080..79413aa 100644
--- a/lang/maps_de_DE.utf8.po
+++ b/lang/maps_de_DE.utf8.po
@@ -38,9 +38,11 @@ msgstr ""
 "Die Koordinaten konnten nicht geladen werden, vielleicht existieren die "
 "Plugin-Tabellen in der Datenbank noch nicht?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "%member geographische Position"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "%1$s geographische Position"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -130,9 +132,11 @@ msgstr "Meine Lokalisierung"
 msgid "Geolocalize"
 msgstr "Geolokalisieren"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Geolokalisiere %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Geolokalisiere %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -224,20 +228,23 @@ msgid "Choose your location"
 msgstr "Wähle deinen Standort"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "Wählen Sie %member Standort"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Wählen Sie %1$s Standort"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "Wählen Sie Ihre Stadt aus."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "In der Datenbank ist Stadt auf: '%town' eingestellt"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "In der Datenbank ist Stadt auf: '%1$s' eingestellt"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Sie haben auf %p geklickt"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Sie haben auf %1$s geklickt"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_en_US.po b/lang/maps_en_US.po
index c72d408..c2320a5 100644
--- a/lang/maps_en_US.po
+++ b/lang/maps_en_US.po
@@ -35,9 +35,11 @@ msgstr ""
 "Coordinates has not been loaded. Maybe plugin tables does not exists in the "
 "database?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "%1$s geographic position"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -119,9 +121,11 @@ msgstr "My localization"
 msgid "Geolocalize"
 msgstr "Geolocalize"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Geolocalize %1$s"
 
 #: ../templates/default/maps.html.twig:28
 msgid "aka"
@@ -215,20 +219,23 @@ msgid "Choose your location"
 msgstr "Choose your location"
 
 #: ../templates/default/mymap.html.twig:18
-msgid "Choose %member location"
-msgstr "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Choose %1$s location"
 
 #: ../templates/default/mymap.html.twig:23
 msgid "Select your town."
 msgstr "Select your town."
 
 #: ../templates/default/mymap.html.twig:24
-msgid "In the database, town is set to: '%town'"
-msgstr "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "In the database, town is set to: '%1$s'"
 
 #: ../templates/default/mymap.html.twig:80
-msgid "You clicked at %p"
-msgstr "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "You clicked at %1$s"
 
 #: ../templates/default/mymap.html.twig:80
 #: ../templates/default/mymap.html.twig:153
diff --git a/lang/maps_es.utf8.po b/lang/maps_es.utf8.po
index 9a144f6..0758848 100644
--- a/lang/maps_es.utf8.po
+++ b/lang/maps_es.utf8.po
@@ -39,9 +39,11 @@ msgstr ""
 "No se han cargado las coordenadas. ¿Quizá las tablas del complemento no "
 "existen en la base de datos?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "Posición geográfica de %member"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "Posición geográfica de %1$s"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -131,9 +133,11 @@ msgstr "Mi localización"
 msgid "Geolocalize"
 msgstr "Geolocalizar"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Geolocalizar %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Geolocalizar %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -223,20 +227,23 @@ msgid "Choose your location"
 msgstr "Escoge tu ubicación"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "Escoge la ubicación de %member"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Escoge la ubicación de %1$s"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "Escoge tu población."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "En la base de datos, la población está indicada como: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "En la base de datos, la población está indicada como: '%1$s'"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Has pulsado en %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Has pulsado en %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_fr_FR.utf8.po b/lang/maps_fr_FR.utf8.po
index 57a5ce2..3c284a3 100644
--- a/lang/maps_fr_FR.utf8.po
+++ b/lang/maps_fr_FR.utf8.po
@@ -36,9 +36,11 @@ msgstr ""
 "Les coordonnées n'ont pas été chargées. Peut-être les tables du plugin "
 "n'existent-elles pas dans la base de données ?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "Position géographique de %member"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "Position géographique de %1$s"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -120,9 +122,11 @@ msgstr "Ma localisation"
 msgid "Geolocalize"
 msgstr "Géolocaliser"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Géolocaliser %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Géolocaliser %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -219,20 +223,23 @@ msgid "Choose your location"
 msgstr "Choisissez votre localisation"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "Choisissez la localisation de %member"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Choisissez la localisation de %1$s"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "Sélectionnez votre ville."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "Dans la base, la ville définie est « %town »"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "Dans la base, la ville définie est « %1$s »"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Vous avez cliqué à %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Vous avez cliqué à %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_it_IT.utf8.po b/lang/maps_it_IT.utf8.po
index 6fd6f3b..53d65d8 100644
--- a/lang/maps_it_IT.utf8.po
+++ b/lang/maps_it_IT.utf8.po
@@ -37,9 +37,11 @@ msgstr ""
 "Le coordinate non sono state caricate. Forse le tabelle dei plugin non "
 "esistono nel database?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "Posizione geografica del %member"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "Posizione geografica del %1$s"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -129,9 +131,11 @@ msgstr "La mia localizzazione"
 msgid "Geolocalize"
 msgstr "Geolocalizza"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Geolocalizza %nomeutente"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Geolocalizza %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -221,20 +225,23 @@ msgid "Choose your location"
 msgstr "Scegli la tua posizione"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "Scegli posizione del %member"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Scegli posizione del %1$s"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "Seleziona la tua città."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "Nel database, la città è impostata su: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "Nel database, la città è impostata su: '%1$s'"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Hai fatto clic su %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Hai fatto clic su %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_nb_NO.utf8.po b/lang/maps_nb_NO.utf8.po
index 827f426..aeccd8f 100644
--- a/lang/maps_nb_NO.utf8.po
+++ b/lang/maps_nb_NO.utf8.po
@@ -28,8 +28,10 @@ msgid ""
 "database?"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
 msgstr ""
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -112,8 +114,10 @@ msgstr ""
 msgid "Geolocalize"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
 msgstr ""
 
 #: ../tempcache/maps.html.twig:115
@@ -204,7 +208,8 @@ msgid "Choose your location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:89
@@ -212,11 +217,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
diff --git a/lang/maps_oc.utf8.po b/lang/maps_oc.utf8.po
index f129c22..3e49383 100644
--- a/lang/maps_oc.utf8.po
+++ b/lang/maps_oc.utf8.po
@@ -32,8 +32,10 @@ msgid ""
 "database?"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
 msgstr ""
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -116,8 +118,10 @@ msgstr ""
 msgid "Geolocalize"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
 msgstr ""
 
 #: ../tempcache/maps.html.twig:115
@@ -208,7 +212,8 @@ msgid "Choose your location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:89
@@ -216,11 +221,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
diff --git a/lang/maps_ota.utf8.po b/lang/maps_ota.utf8.po
index 8bc5ee6..b1d9733 100644
--- a/lang/maps_ota.utf8.po
+++ b/lang/maps_ota.utf8.po
@@ -28,8 +28,10 @@ msgid ""
 "database?"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
 msgstr ""
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -112,8 +114,10 @@ msgstr ""
 msgid "Geolocalize"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
 msgstr ""
 
 #: ../tempcache/maps.html.twig:115
@@ -204,7 +208,8 @@ msgid "Choose your location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:89
@@ -212,11 +217,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
diff --git a/lang/maps_pt.utf8.po b/lang/maps_pt.utf8.po
index ac4c271..56c64ec 100644
--- a/lang/maps_pt.utf8.po
+++ b/lang/maps_pt.utf8.po
@@ -39,9 +39,11 @@ msgstr ""
 "As coordenadas não foram carregadas. Talvez as tabelas do plugin não existam "
 "na base de dados ?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "%member geográfica do membro"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "%1$s geográfica do membro"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -131,9 +133,11 @@ msgstr "Minha localização"
 msgid "Geolocalize"
 msgstr "Geolocalizar"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Geolocalizar %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Geolocalizar %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -223,7 +227,8 @@ msgid "Choose your location"
 msgstr "Escolha sua localização"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, fuzzy, php-format
+msgid "Choose %1$s location"
 msgstr "Selecione a localização do membro"
 
 #: ../tempcache/mymap.html.twig:89
@@ -231,12 +236,14 @@ msgid "Select your town."
 msgstr "Selecione sua cidade."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "No banco de dados, a cidade está definida como: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "No banco de dados, a cidade está definida como: '%1$s'"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Você clicou em %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Você clicou em %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_pt_BR.utf8.po b/lang/maps_pt_BR.utf8.po
index f375650..54c8f7d 100644
--- a/lang/maps_pt_BR.utf8.po
+++ b/lang/maps_pt_BR.utf8.po
@@ -36,9 +36,11 @@ msgstr ""
 "As coordenadas não foram carregadas. Talvez as tabelas do plugin não existam "
 "no banco de dados?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "%member geográfica do membro"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "%1$s geográfica do membro"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -128,9 +130,11 @@ msgstr "Minha localização"
 msgid "Geolocalize"
 msgstr "Geolocalização"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Geolocalização do %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Geolocalização do %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -220,20 +224,23 @@ msgid "Choose your location"
 msgstr "Escolha sua localização"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "Selecione a localização do %member"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Selecione a localização do %1$s"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "Selecione sua cidade."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "No banco de dados, a cidade está definida como: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "No banco de dados, a cidade está definida como: '%1$s'"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Você clicou em %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Você clicou em %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_ru.utf8.po b/lang/maps_ru.utf8.po
index f610b56..68e122b 100644
--- a/lang/maps_ru.utf8.po
+++ b/lang/maps_ru.utf8.po
@@ -37,9 +37,11 @@ msgstr ""
 "Координаты не были загружены. Возможно, таблицы плагина не существует в базе "
 "данных?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "%member географическое положение"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "%1$s географическое положение"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -129,9 +131,11 @@ msgstr "Моя локализация"
 msgid "Geolocalize"
 msgstr "Геолокализация"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Геолокализация %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Геолокализация %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -223,20 +227,23 @@ msgid "Choose your location"
 msgstr "Выберите местоположение"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "Выберите местоположение %member"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Выберите местоположение %1$s"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "Выберите свой город."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "В базе данных город имеет значение: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "В базе данных город имеет значение: '%1$s'"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Вы нажали на %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Вы нажали на %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_si.utf8.po b/lang/maps_si.utf8.po
index 8f759c3..3fb3292 100644
--- a/lang/maps_si.utf8.po
+++ b/lang/maps_si.utf8.po
@@ -28,8 +28,10 @@ msgid ""
 "database?"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, php-format
+msgid "%1$s geographic position"
 msgstr ""
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -112,8 +114,10 @@ msgstr ""
 msgid "Geolocalize"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
 msgstr ""
 
 #: ../tempcache/maps.html.twig:115
@@ -204,7 +208,8 @@ msgid "Choose your location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:89
@@ -212,11 +217,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
diff --git a/lang/maps_sl.utf8.po b/lang/maps_sl.utf8.po
index de7b95b..4cfc8ff 100644
--- a/lang/maps_sl.utf8.po
+++ b/lang/maps_sl.utf8.po
@@ -37,8 +37,10 @@ msgstr ""
 "Koordinate niso bile naložene. Morda tabele vtičnikov ne obstajajo v zbirki "
 "podatkov?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
+#, fuzzy, php-format
+msgid "%1$s geographic position"
 msgstr "% geografski položaj člana"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
@@ -121,9 +123,11 @@ msgstr "Moja lokalizacija"
 msgid "Geolocalize"
 msgstr "Geolokaliziraj"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Geolokaliziraj %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Geolokaliziraj %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -216,20 +220,23 @@ msgid "Choose your location"
 msgstr "Izberite svojo lokacijo"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "Izberite lokacijo %member"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Izberite lokacijo %1$s"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "Izberite svoje mesto."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "V podatkovni bazi je mesto nastavljeno na: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "V podatkovni bazi je mesto nastavljeno na: '%1$s'"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Kliknili ste ob %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Kliknili ste ob %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_ta.utf8.po b/lang/maps_ta.utf8.po
index 82d0d68..703304d 100644
--- a/lang/maps_ta.utf8.po
+++ b/lang/maps_ta.utf8.po
@@ -36,9 +36,11 @@ msgid ""
 "database?"
 msgstr "ஒருங்கிணைப்புகள் ஏற்றப்படவில்லை. தரவுத்தளத்தில் சொருகி அட்டவணைகள் இல்லை?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "%உறுப்பினர் புவியியல் நிலை"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "%1$s புவியியல் நிலை"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -128,9 +130,11 @@ msgstr "எனது உள்ளூராக்கல்"
 msgid "Geolocalize"
 msgstr "சியோலோகலைச்"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Jeolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Jeolocalize %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -220,20 +224,23 @@ msgid "Choose your location"
 msgstr "உங்கள் இருப்பிடத்தைத் தேர்வுசெய்க"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "%உறுப்பினர் இருப்பிடத்தைத் தேர்வுசெய்க"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "%1$s இருப்பிடத்தைத் தேர்வுசெய்க"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "உங்கள் ஊரைத் தேர்ந்தெடுக்கவும்."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "தரவுத்தளத்தில், நகரம் இதற்கு அமைக்கப்பட்டுள்ளது: '%நகரம்'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "தரவுத்தளத்தில், நகரம் இதற்கு அமைக்கப்பட்டுள்ளது: '%1$s'"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "நீங்கள் %ப"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "நீங்கள் %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/maps_tr.utf8.po b/lang/maps_tr.utf8.po
index 90bde6e..5863fc0 100644
--- a/lang/maps_tr.utf8.po
+++ b/lang/maps_tr.utf8.po
@@ -33,9 +33,11 @@ msgid ""
 "database?"
 msgstr "Koordinatlar yüklenmedi. Plugin tabloları veritabanında olmayabilir."
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "%member coğrafi posizyon"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "%1$s coğrafi posizyon"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -117,8 +119,10 @@ msgstr "Benim lokalizasyonum"
 msgid "Geolocalize"
 msgstr ""
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
+#, php-format
+msgid "Geolocalize %1$s"
 msgstr ""
 
 #: ../tempcache/maps.html.twig:115
@@ -211,7 +215,8 @@ msgid "Choose your location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
+#, php-format
+msgid "Choose %1$s location"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:89
@@ -219,11 +224,13 @@ msgid "Select your town."
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
+#, php-format
+msgid "You clicked at %1$s"
 msgstr ""
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
diff --git a/lang/maps_uk.utf8.po b/lang/maps_uk.utf8.po
index 0f7dbbf..e650f7c 100644
--- a/lang/maps_uk.utf8.po
+++ b/lang/maps_uk.utf8.po
@@ -35,9 +35,11 @@ msgid ""
 msgstr ""
 "Координати не завантажено. Можливо, таблиць додатків не існує в базі даних?"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/Controllers/MapsController.php:133
-msgid "%member geographic position"
-msgstr "Географічне положення %member"
+#, php-format
+msgid "%1$s geographic position"
+msgstr "Географічне положення %1$s"
 
 #: ../lib/GaletteMaps/Controllers/MapsController.php:170
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:60
@@ -127,9 +129,11 @@ msgstr "Моя локалізація"
 msgid "Geolocalize"
 msgstr "Геолокалізувати"
 
+#. TRANS: parameter is the member name
 #: ../lib/GaletteMaps/PluginGaletteMaps.php:154
-msgid "Geolocalize %membername"
-msgstr "Геолокалізувати %membername"
+#, php-format
+msgid "Geolocalize %1$s"
+msgstr "Геолокалізувати %1$s"
 
 #: ../tempcache/maps.html.twig:115
 msgid "aka"
@@ -219,20 +223,23 @@ msgid "Choose your location"
 msgstr "Виберіть своє місцеперебування"
 
 #: ../tempcache/mymap.html.twig:79
-msgid "Choose %member location"
-msgstr "Оберіть розташування %member"
+#, php-format
+msgid "Choose %1$s location"
+msgstr "Оберіть розташування %1$s"
 
 #: ../tempcache/mymap.html.twig:89
 msgid "Select your town."
 msgstr "Виберіть своє місто."
 
 #: ../tempcache/mymap.html.twig:93
-msgid "In the database, town is set to: '%town'"
-msgstr "У базі даних установлено місто: '%town'"
+#, php-format
+msgid "In the database, town is set to: '%1$s'"
+msgstr "У базі даних установлено місто: '%1$s'"
 
 #: ../tempcache/mymap.html.twig:188
-msgid "You clicked at %p"
-msgstr "Ви натиснули на %p"
+#, php-format
+msgid "You clicked at %1$s"
+msgstr "Ви натиснули на %1$s"
 
 #: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
 #: ../tempcache/mymap.html.twig:341
diff --git a/lang/pt.utf8/LC_MESSAGES/maps.mo b/lang/pt.utf8/LC_MESSAGES/maps.mo
index 186ec81..78aa68c 100644
Binary files a/lang/pt.utf8/LC_MESSAGES/maps.mo and b/lang/pt.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/pt_BR.utf8/LC_MESSAGES/maps.mo b/lang/pt_BR.utf8/LC_MESSAGES/maps.mo
index 4fb6e17..928759b 100644
Binary files a/lang/pt_BR.utf8/LC_MESSAGES/maps.mo and b/lang/pt_BR.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/ru.utf8/LC_MESSAGES/maps.mo b/lang/ru.utf8/LC_MESSAGES/maps.mo
index da8d3cc..cf52501 100644
Binary files a/lang/ru.utf8/LC_MESSAGES/maps.mo and b/lang/ru.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/sl.utf8/LC_MESSAGES/maps.mo b/lang/sl.utf8/LC_MESSAGES/maps.mo
index 3f9b74d..2684772 100644
Binary files a/lang/sl.utf8/LC_MESSAGES/maps.mo and b/lang/sl.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/ta.utf8/LC_MESSAGES/maps.mo b/lang/ta.utf8/LC_MESSAGES/maps.mo
index 193c315..5027cc2 100644
Binary files a/lang/ta.utf8/LC_MESSAGES/maps.mo and b/lang/ta.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/tr.utf8/LC_MESSAGES/maps.mo b/lang/tr.utf8/LC_MESSAGES/maps.mo
index c2706f9..0864e20 100644
Binary files a/lang/tr.utf8/LC_MESSAGES/maps.mo and b/lang/tr.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lang/uk.utf8/LC_MESSAGES/maps.mo b/lang/uk.utf8/LC_MESSAGES/maps.mo
index a3ca83d..8824d7e 100644
Binary files a/lang/uk.utf8/LC_MESSAGES/maps.mo and b/lang/uk.utf8/LC_MESSAGES/maps.mo differ
diff --git a/lib/GaletteMaps/Controllers/MapsController.php b/lib/GaletteMaps/Controllers/MapsController.php
index 1f6f1f3..7fe2096 100644
--- a/lib/GaletteMaps/Controllers/MapsController.php
+++ b/lib/GaletteMaps/Controllers/MapsController.php
@@ -166,10 +166,10 @@ public function localizeMember(Request $request, Response $response, ?int $id =
         }
 
         $params = [
-            'page_title'        => _T('Maps', 'maps') . ' - ' . str_replace(
-                '%member',
-                $member->sfullname,
-                _T('%member geographic position', 'maps')
+            'page_title'        => _T('Maps', 'maps') . ' - ' . sprintf(
+                //TRANS: parameter is the member name
+                _T('%1$s geographic position', 'maps'),
+                $member->sfullname
             ),
             'member'            => $member,
             'can_edit'          => $can_edit,
diff --git a/lib/GaletteMaps/PluginGaletteMaps.php b/lib/GaletteMaps/PluginGaletteMaps.php
index c6970f1..3b9d441 100644
--- a/lib/GaletteMaps/PluginGaletteMaps.php
+++ b/lib/GaletteMaps/PluginGaletteMaps.php
@@ -145,10 +145,10 @@ public function getListActions(Adherent $member): array
         return [
             [
                 'label' => _T("Geolocalize", "maps"),
-                'title' => str_replace(
-                    '%membername',
-                    $member->sname,
-                    _T("Geolocalize %membername", "maps")
+                'title' => sprintf(
+                    //TRANS: parameter is the member name
+                    _T('Geolocalize %1$s', 'maps'),
+                    $member->sname
                 ),
                 'route' => [
                     'name' => 'maps_localize_member',
diff --git a/templates/default/common_html.html.twig b/templates/default/common_html.html.twig
index f1b21f8..c62bee3 100644
--- a/templates/default/common_html.html.twig
+++ b/templates/default/common_html.html.twig
@@ -4,31 +4,20 @@
  # SPDX-License-Identifier: GPL-3.0-or-later
  #}
 
+{# images are decorative: each one comes with its text #}
 <div id="legend">
-    <table>
-        <tr>
-            <th>
-                <img src="{{ url_for("plugin_res", {"plugin": module_id, "path": "images/marker-galette.png"}) }}" alt="{{ _T("Member") }}"/>
-            </th>
-            <td>
-                {{ _T("Member") }}
-            </td>
-        </tr>
-        <tr>
-            <th>
-                <img src="{{ url_for("plugin_res", {"plugin": module_id, "path": "images/marker-galette-pro.png"}) }}" alt="{{ _T("Member (company)", "maps") }}"/>
-            </th>
-            <td>
-                {{ _T("Member (company)", "maps") }}
-            </td>
-        </tr>
-        <tr>
-            <th>
-                <img src="{{ url_for("plugin_res", {"plugin": module_id, "path": "images/marker-icon.png"}) }}" alt="{{ _T("Search result", "maps") }}"/>
-            </th>
-            <td>
-                {{ _T("Search result", "maps") }}
-            </td>
-        </tr>
-    </table>
+    <ul class="maps-legend">
+        <li>
+            <img src="{{ url_for("plugin_res", {"plugin": module_id, "path": "images/marker-galette.png"}) }}" alt=""/>
+            {{ _T("Member") }}
+        </li>
+        <li>
+            <img src="{{ url_for("plugin_res", {"plugin": module_id, "path": "images/marker-galette-pro.png"}) }}" alt=""/>
+            {{ _T("Member (company)", "maps") }}
+        </li>
+        <li>
+            <img src="{{ url_for("plugin_res", {"plugin": module_id, "path": "images/marker-icon.png"}) }}" alt=""/>
+            {{ _T("Search result", "maps") }}
+        </li>
+    </ul>
 </div>
diff --git a/templates/default/common_scripts.html.twig b/templates/default/common_scripts.html.twig
index d13b7db..4f2b24a 100644
--- a/templates/default/common_scripts.html.twig
+++ b/templates/default/common_scripts.html.twig
@@ -15,157 +15,35 @@
     <script type="text/javascript" src="{{ url_for("plugin_res", {"plugin": module_id, "path": "maps-locate.bundle.min.js"}) }}"></script>
 {% endif %}
 
-<script type="text/javascript">
-    /**
-     * Galette specific marker icon
-     */
-    const galetteIcon = L.icon({
-        iconUrl: '{{ url_for("plugin_res", {"plugin": module_id, "path": "images/marker-galette.png"}) }}',
-        iconSize: [25, 41],
-        iconAnchor: [12, 41],
-        popupAnchor: [1, -34],
-        shadowSize: [41, 41]
-    });
-    const galetteProIcon = L.icon({
-        iconUrl: '{{ url_for("plugin_res", {"plugin": module_id, "path": "images/marker-galette-pro.png"}) }}',
-        iconSize: [25, 41],
-        iconAnchor: [12, 41],
-        popupAnchor: [1, -34],
-        shadowSize: [41, 41]
-    });
-
-{% if tiles.vector %}
-    /**
-     * Vector tiles need WebGL 2; without it we fall back to raster tiles
-     */
-    function _hasWebGL2(){
-        try {
-            return !!(window.WebGL2RenderingContext && document.createElement('canvas').getContext('webgl2'));
-        } catch (err) {
-            return false;
-        }
+{% set is_member_page = cur_route == 'maps_localize_member' or cur_route == 'maps_mymap' %}
+{% set maps_config = {
+    icons: {
+        member: url_for("plugin_res", {"plugin": module_id, "path": "images/marker-galette.png"}),
+        company: url_for("plugin_res", {"plugin": module_id, "path": "images/marker-galette-pro.png"})
+    },
+    tiles: tiles,
+    center: town is defined ? {lat: town['latitude'], lng: town['longitude'], zoom: 12} : {lat: 46.830133640447386, lng: 2.4609375, zoom: 6},
+    locate: is_member_page,
+    strings: {
+        close: _T("Close"),
+        legend: _T("Legend"),
+        remove: _T("Remove"),
+        fullscreen: _T("Display map in full screen", "maps"),
+        fullscreen_exit: _T("Exit full screen", "maps"),
+        search_placeholder: (cur_route == 'maps_localize_member' and town is not defined) ? _T("Search your town...", "maps") : _T("Search a town...", "maps"),
+        search_error: _T("Sorry, that town could not be found.", "maps"),
+        search: _T("Search", "maps"),
+        locate: _T("Show me where I am", "maps"),
+        locate_outside: _T("You seem located outside the boundaries of the map", "maps"),
+        aka: _T("aka", "maps"),
+        clicked_at: _T("You clicked at %1$s", "maps"),
+        lives_here: mymap is defined ? _T("I live here!", "maps") : _T("Member lives here!", "maps"),
+        remove_title: mymap is defined ? _T("Remove my coordinates", "maps") : _T("Remove member coordinates", "maps"),
+        remove_confirm: _T("Are you sure you want to remove coordinates from the database?", "maps"),
+        store_error: _T("An error occurred during 'I live here' process :(", "maps"),
+        remove_error: _T("An error occurred removing coordinates :(", "maps")
     }
-{% endif %}
-
-{% if cur_route != 'maps_map' %}
-    function _iLiveHere(_id){
-        $('#' + _id).click(function(e, f,g){
-            var _a = $(this);
-            //a click on a copy of the world gives a longitude beyond 180
-            var _latlng = _a.data('latlng').wrap();
-            $.ajax({
-                url: '{% if mymap is defined %}{{ url_for("maps_ilivehere") }}{% else %}{{ url_for("maps_ilivehere", {"id": member.id}) }}{% endif %}',
-                type: 'POST',
-                data: {
-                    latitude: _latlng.lat,
-                    longitude: _latlng.lng
-                },
-                {% include "elements/js/loader.js.twig" with {
-                    selector: '#coords',
-                    loader: 'button'
-                } %},
-                success: function(res){
-                    $('body').modal({
-                        class: 'tiny',
-                        content: res.message,
-                        actions: [{
-                            text    : '{{ _T("Close")|e('js') }}',
-                            click   : function() {
-                                window.location.reload();
-                            }
-                        }],
-                        className: {
-                            'title': 'center aligned header',
-                            'content': 'center aligned content',
-                            'actions': 'center aligned actions'
-                        },
-                    }).modal('show');
-                },
-                error: function(xhr){
-                    alert(xhr.responseJSON && xhr.responseJSON.message ? xhr.responseJSON.message : "{{ _T("An error occurred during 'I live here' process :(", "maps")|e("js") }}");
-                }
-            });
-            return false;
-        });
-    }
-{% endif %}
-
-    $(function(){
-        var _lat = {% if town is defined %}{{ town['latitude'] }}{% else %}46.830133640447386{% endif %};
-        var _lon = {% if town is defined %}{{ town['longitude'] }}{% else %}2.4609375{% endif %};
-        var map = L.map(
-            'map', {
-                gestureHandling: true,
-                maxZoom: {{ tiles.maxzoom }}
-            }
-        ).setView([_lat, _lon], {% if town is defined %}12{% else %}6{% endif %});
-
-        new L.Control.FullScreen({
-            position: 'topleft',
-            title: "{{ _T("Display map in full screen", "maps")|e("js") }}",
-            titleCancel:"{{ _T("Exit full screen", "maps")|e("js") }}",
-            forceSeparateButton: true
-        }).addTo(map);
-
-        var _geocoder = {
-            collapsed: false,
-{% if cur_route == 'maps_localize_member' and town is not defined %}
-            placeholder: '{{ _T("Search your town...", "maps")|e("js") }}',
-{% else %}
-            placeholder: '{{ _T("Search a town...", "maps")|e("js") }}',
-{% endif %}
-            errorMessage: '{{ _T("Sorry, that town could not be found.", "maps")|e("js") }}',
-            iconLabel: '{{ _T("Search", "maps")|e("js") }}',
-        };
-        L.Control.geocoder(_geocoder).addTo(map);
-
-        var _legend =  new L.Control.Legend({
-            position: 'topright',
-        });
-        map.addControl(_legend);
-
-        $('.legend-container').append( $('#legend') );
-        $('.legend-toggle').append( '<span class="legend-toggle-icon"><i class="big info circle blue icon"></i> {{ _T("Legend") }}</span>' );
-
-{% if cur_route == 'maps_localize_member' or cur_route == 'maps_mymap' %}
-        L.control.locate({
-            strings: {
-                title: '{{ _T("Show me where I am", "maps")|e("js") }}',
-                popup: 'SELECTPOPUP',
-                outsideMapBoundsMsg: '{{ _T("You seem located outside the boundaries of the map", "maps")|e("js") }}'
-            }
-        }).addTo(map);
-{% endif %}
-
-{% if tiles.vector %}
-        if (_hasWebGL2()) {
-            L.maplibreGL({
-                style: '{{ tiles.url|e("js") }}'{% if tiles.attribution != '' %},
-                {# given one, it wins; otherwise the bridge reads it off the style sources #}
-                attributionControl: {customAttribution: '{{ tiles.attribution|e("js") }}'}{% endif %}
-            }).addTo(map);
-        } else {
-            L.tileLayer('{{ tiles.fallback.url|e("js") }}', {
-                maxZoom: {{ tiles.fallback.maxzoom }},
-                attribution: '{{ tiles.fallback.attribution|e("js") }}'
-            }).addTo(map);
-        }
-{% else %}
-        L.tileLayer('{{ tiles.url|e("js") }}', {
-            maxZoom: {{ tiles.maxzoom }},
-{% if tiles.subdomains != '' %}
-            subdomains: '{{ tiles.subdomains|e("js") }}',
-{% endif %}
-            attribution: '{{ tiles.attribution|e("js") }}'
-        }).addTo(map);
-{% endif %}
-
-        try {
-            _mapsBinded(map);
-        } catch (err) {
-            //fortunately, nothing to do here.
-            //_mapsBinded function can be missing
-        }
-    });
-</script>
-
+}|merge(page_config ?? {}) %}
+{# HEX flags keep "</script>" and friends harmless inside the script element #}
+<script type="application/json" id="maps-config">{{ maps_config|json_encode(constant('JSON_HEX_TAG') b-or constant('JSON_HEX_AMP') b-or constant('JSON_HEX_APOS') b-or constant('JSON_HEX_QUOT'))|raw }}</script>
+<script type="text/javascript" src="{{ url_for("plugin_res", {"plugin": module_id, "path": "galette_maps.js"}) }}"></script>
diff --git a/templates/default/maps.html.twig b/templates/default/maps.html.twig
index 2fa6b15..969c921 100644
--- a/templates/default/maps.html.twig
+++ b/templates/default/maps.html.twig
@@ -14,35 +14,9 @@
 {% endblock %}
 
 {% block javascripts %}
-    {% include '@PluginGaletteMaps/common_scripts.html.twig' %}
-<script type="text/javascript">
-    var _mapsBinded = function(map)
-    {
-        var _markers = [];
-{% for l in list %}
-    {% if l.company is defined and l.company != '' %}
-        {% set icon = 'galetteProIcon' %}
-    {% else %}
-        {% set icon = 'galetteIcon' %}
-    {% endif %}
-        _member = [{{ l.lat }}, {{ l.lng }}, {{ icon }}, '<p><strong>{{ l.name|e|e("js") }}</strong>{% if l.nickname != '' %} {{ _T("aka", "maps")|e("js") }} <em>{{ l.nickname|e|e("js") }}</em>{% endif %}{% if l.company is defined %}<br/>{{ l.company|e|e("js") }}{% endif %}</p>'];
-        _markers.push(_member);
-{% endfor %}
-        var _group = L.markerClusterGroup();
-        for (var i = 0; i < _markers.length; i++) {
-            var _a = _markers[i];
-            var _title = _a[3];
-            var _icon = _a[2];
-            var _marker = L.marker(new L.LatLng(_a[0], _a[1]), { icon: _icon });
-            _marker.bindPopup(_title);
-            _group.addLayer(_marker);
+    {% include '@PluginGaletteMaps/common_scripts.html.twig' with {
+        page_config: {
+            markers: list|map(l => {lat: l.lat, lng: l.lng, name: l.name, nickname: l.nickname, company: l.company ?? null})
         }
-        map.addLayer(_group).fitBounds(
-            _group.getBounds(), {
-                padding: [50, 50],
-                maxZoom: 12
-            }
-        );
-    }
-</script>
+    } %}
 {% endblock %}
diff --git a/templates/default/maps_preferences.html.twig b/templates/default/maps_preferences.html.twig
index 3bbe2d5..08cfb11 100644
--- a/templates/default/maps_preferences.html.twig
+++ b/templates/default/maps_preferences.html.twig
@@ -18,7 +18,7 @@
             } %}
         </div>
 
-        <div class="ui segment{% if provider != custom %} displaynone{% endif %}" id="maps_custom_tiles">
+        <div class="ui segment{% if provider != custom %} displaynone{% endif %}" id="maps_custom_tiles" data-custom="{{ custom }}">
             <h3 class="ui header">{{ _T("Your own values", "maps") }}</h3>
 
             {% include "components/forms/checkbox.html.twig" with {
@@ -70,12 +70,5 @@
 {% endblock %}
 
 {% block javascripts %}
-<script type="text/javascript">
-    $(function(){
-        var _custom = $('#maps_custom_tiles');
-        $('#pref_maps_tiles_provider').on('change', function(){
-            _custom.toggleClass('displaynone', this.value !== '{{ custom|e("js") }}');
-        });
-    });
-</script>
+    <script type="text/javascript" src="{{ url_for("plugin_res", {"plugin": module_id, "path": "galette_maps.js"}) }}"></script>
 {% endblock %}
diff --git a/templates/default/mymap.html.twig b/templates/default/mymap.html.twig
index 75f16be..c147357 100644
--- a/templates/default/mymap.html.twig
+++ b/templates/default/mymap.html.twig
@@ -10,38 +10,32 @@
 <section class="map-container">
     <div id="map"></div>
 {% if towns is defined and towns|length > 0 %}
-    <div id="possible_towns" class="ui tiny modal">
-        <div class="header">
+    <div id="possible_towns" class="ui tiny modal" role="dialog" aria-modal="true" aria-labelledby="possible_towns_title">
+        <div class="header" id="possible_towns_title">
         {% if mymap is defined %}
             {{ _T("Choose your location", "maps") }}
         {% else %}
-            {{ _T("Choose %member location", "maps")|replace({'%member': member.sname}) }}
+            {{ _T("Choose %1$s location", "maps")|format(member.sname) }}
         {% endif %}
         </div>
         <div class="content">
             <div class="description">
                 <p>{{ _T("Select your town.", "maps") }}<br/>
-                {{ _T("In the database, town is set to: '%town'", "maps")|replace({'%town': member.town}) }}</p>
-                <ul>
-                </ul>
+                {{ _T("In the database, town is set to: '%1$s'", "maps")|format(member.town) }}</p>
             </div>
         </div>
         <div class="actions">
             <ul>
         {% for t in towns %}
                 <li>
-                    <div class="ui labeled fluid button">
-                        <div class="ui green button city">
-                            {{ t.full_name }}
-                        </div>
-                        <a class="ui basic label">
-                            <span class="lat">{{ t.latitude }}</span>/<span class="lon">{{ t.longitude }}</span>
-                        </a>
-                    </div>
+                    <button type="button" class="ui labeled button maps-town" data-name="{{ t.full_name }}" data-lat="{{ t.latitude }}" data-lng="{{ t.longitude }}">
+                        <span class="ui green button city">{{ t.full_name }}</span>
+                        <span class="ui basic label">{{ t.latitude }}/{{ t.longitude }}</span>
+                    </button>
                 </li>
         {% endfor %}
             </ul>
-            <div class="ui button cancel">{{ _T("Close") }}</div>
+            <button type="button" class="ui button cancel">{{ _T("Close") }}</button>
         </div>
     </div>
 {% endif %}
@@ -50,129 +44,14 @@
 {% endblock %}
 
 {% block javascripts %}
-{% include '@PluginGaletteMaps/common_scripts.html.twig' %}
-{% if cur_route != 'maps_map' %}
-<script type="text/javascript">
-    var _mapsBinded = function(map)
-    {
-
-{% if can_edit %}
-        function onMapClick(e) {
-            var popup = L.popup();
-            popup
-                .setLatLng(e.latlng)
-                .setContent('SELECTPOPUP')
-                .openOn(map);
-        }
-
-        map.on('click', onMapClick);
-
-        //bind "I live here" event on popupopen
-        map.on('popupopen', function(e){
-            var _popup = e.popup;
-            var _container = $(_popup._container);
-            if ( _container.find('#removecoords').length > 0 ) {
-                _bind_removecoords();
-            } else if ( _container.find('.leaflet-popup-content').html() == 'SELECTPOPUP' ) {
-                var _clat = _popup._latlng.lat.toString();
-                var _clng = _popup._latlng.lng.toString();
-                var _id = 'coords';
-
-                _popup.setContent('<p>' + '{{ _T("You clicked at %p", "maps")|e("js") }}'.replace('%p', '<em>' + _clat + '/' + _clng + '</em>') + '</p><p><a class="ilivehere ui button" id="' + _id + '" href="#">{% if mymap is defined %}{{ _T("I live here!", "maps")|e("js") }}{% else %}{{ _T("Member lives here!", "maps")|e("js") }}{% endif %}</a></p>');
+    {% include '@PluginGaletteMaps/common_scripts.html.twig' with {
+        page_config: {
+            member: {
+                name: member.sfullname,
+                can_edit: can_edit,
+                position: town ?? null,
+                store_url: mymap is defined ? url_for("maps_ilivehere") : url_for("maps_ilivehere", {"id": member.id})
             }
-
-            var _links = $(_container).find('a.ilivehere');
-            _a = $(_links[0]);
-            _a.data('latlng', e.popup._latlng);
-            _iLiveHere(_a.attr('id'));
-        });
-{% endif %}
-
-
-{% if town is defined %}
-        {# Town is known, just display #}
-        var _lat = {{ town['latitude'] }};
-        var _lon = {{ town['longitude'] }};
-
-        var _bind_removecoords = function(){
-            $('#removecoords').click(function(){
-                $('body').modal({
-                    title: '{% if mymap is defined %}{{ _T("Remove my coordinates", "maps")|e("js") }}{% else %}{{ _T("Remove member coordinates", "maps")|e("js") }}{% endif %}',
-                    class: 'tiny',
-                    content: '{{ _T("Are you sure you want to remove coordinates from the database?", "maps")|e("js") }}',
-                    actions: [{
-                        text    : '{{ _T("Remove")|e('js') }}',
-                        class   : 'red confirm_remove',
-                        icon    : 'trash alt',
-                        click   : function() {
-                            $.ajax({
-                                url: '{% if mymap is defined %}{{ url_for("maps_ilivehere") }}{% else %}{{ url_for("maps_ilivehere", {"id": member.id}) }}{% endif %}',
-                                type: 'POST',
-                                data: {
-                                    remove: true
-                                },
-                                {% include "elements/js/loader.js.twig" with {
-                                        selector: '.confirm_remove',
-                                        loader: 'button'
-                                } %},
-                                success: function(res){
-                                    setTimeout(function() {
-                                        $('body').modal({
-                                            class: 'tiny',
-                                            content: res.message,
-                                            actions: [{
-                                                text    : '{{ _T("Close")|e('js') }}',
-                                                click   : function() {
-                                                    window.location.reload();
-                                                }
-                                            }],
-                                            className: {
-                                                'title': 'center aligned header',
-                                                'content': 'center aligned content',
-                                                'actions': 'center aligned actions'
-                                            },
-                                        }).modal('show');
-                                    }, "500")
-                                },
-                                error: function(xhr) {
-                                    window.alert(xhr.responseJSON && xhr.responseJSON.message ? xhr.responseJSON.message : "{{ _T("An error occurred removing coordinates :(", "maps")|e('js') }}");
-                                }
-                            });
-                        }
-                    }, {
-                        text    : '{{ _T("Close")|e('js') }}'
-                    }],
-                    className: {
-                        'title': 'center aligned header',
-                        'content': 'center aligned content',
-                        'actions': 'center aligned actions'
-                    },
-                }).modal('show');
-            });
-        };
-
-        L.marker([_lat, _lon], {icon: galetteIcon}).addTo(map)
-            .bindPopup('<strong>{{ member.sfullname|e|e("js") }}</strong><br/>{% if mymap is defined %}{{ _T("I live here!", "maps")|e("js") }}{% else %}{{ _T("Member lives here!", "maps")|e("js") }}{% endif %}{% if can_edit %}<br/><span id="removecoords" class="ui button">{{ _T("Remove")|e("js") }}</span>{% endif %}').openPopup();
-{% else %}
-        {# Town is not known. Show possibilities #}
-        var _towns = $('#possible_towns');
-
-        _towns.modal('show');
-
-        _towns.find('.button').click(function(e){
-            var _elt = $(this);
-            var _name = _elt.find('.city')[0].innerHTML;
-            var _slat = _elt.find('.lat')[0].innerHTML;
-            var _slon = _elt.find('.lon')[0].innerHTML;
-
-            map.setView([parseFloat(_slat), parseFloat(_slon)], 13);
-            var _id = 'coords';
-            _towns.modal('hide');
-            L.marker([_slat, _slon]).addTo(map)
-                .bindPopup('<p><strong>' + _name  + '</strong><br/><em>' + _slat + '/' + _slon + '</em></p><p><a class="ilivehere ui button" id="' + _id + '" href="#">{% if mymap is defined %}{{ _T("I live here!", "maps")|e("js") }}{% else %}{{ _T("Member lives here!", "maps")|e("js") }}{% endif %}</a></p>').openPopup();
-        });
-{% endif %}
-    }
-</script>
-{% endif %}
+        }
+    } %}
 {% endblock %}
diff --git a/tests/GaletteMaps/Controllers/tests/units/MapsController.php b/tests/GaletteMaps/Controllers/tests/units/MapsController.php
index eea4eb6..4819ad2 100644
--- a/tests/GaletteMaps/Controllers/tests/units/MapsController.php
+++ b/tests/GaletteMaps/Controllers/tests/units/MapsController.php
@@ -62,6 +62,24 @@ private function makeMemberTwoManager(array $members): void
         $this->assertTrue($group->setMembers($members));
     }
 
+    /**
+     * Get maps configuration the page gives to its script
+     *
+     * @param string $body Page body
+     *
+     * @return array<string, mixed>
+     */
+    private function getMapsConfig(string $body): array
+    {
+        $this->assertSame(
+            1,
+            preg_match('@<script type="application/json" id="maps-config">(.*?)</script>@s', $body, $matches)
+        );
+        $config = json_decode($matches[1], true, flags: JSON_THROW_ON_ERROR);
+        $this->assertIsArray($config);
+        return $config;
+    }
+
     /**
      * Post coordinates for a member
      *
@@ -230,7 +248,8 @@ public function testTownsProposed(): void
         $this->assertSame(200, $test_response->getStatusCode());
         $body = (string)$test_response->getBody();
         $this->assertStringContainsString('id="possible_towns"', $body);
-        $this->assertStringContainsString('<span class="lat">50.3620</span>/<span class="lon">3.4729</span>', $body);
+        $this->assertStringContainsString('In the database, town is set to: &#039;Valenciennes&#039;', $body);
+        $this->assertStringContainsString('data-lat="50.3620" data-lng="3.4729"', $body);
         $this->assertStringContainsString('&lt;b&gt;Petit&lt;/b&gt; Valenciennes', $body);
         $this->assertStringNotContainsString('<b>Petit</b>', $body);
     }
@@ -299,24 +318,26 @@ public function testManagerShowsCoords(): void
         $request = $this->createRequest('maps_localize_member', ['id' => (string)$member_one->id]);
         $test_response = $this->app->handle($request);
         $this->assertSame(200, $test_response->getStatusCode());
-        $body = (string)$test_response->getBody();
-        $this->assertStringContainsString('48.850000', $body);
-        $this->assertStringNotContainsString('id="removecoords"', $body);
-        $this->assertStringNotContainsString('onMapClick', $body);
+        $member = $this->getMapsConfig((string)$test_response->getBody())['member'];
+        $this->assertSame(['latitude' => '48.850000', 'longitude' => '2.350000'], $member['position']);
+        $this->assertFalse($member['can_edit']);
 
         $this->preferences->pref_bool_groupsmanagers_edit_member = true;
         $test_response = $this->app->handle($request);
         $this->assertSame(200, $test_response->getStatusCode());
-        $body = (string)$test_response->getBody();
-        $this->assertStringContainsString('id="removecoords"', $body);
-        $this->assertStringContainsString('onMapClick', $body);
+        $member = $this->getMapsConfig((string)$test_response->getBody())['member'];
+        $this->assertTrue($member['can_edit']);
+        $this->assertSame(
+            $this->routeparser->urlFor('maps_ilivehere', ['id' => (string)$member_one->id]),
+            $member['store_url']
+        );
     }
 
     /**
-     * Nicknames and company names in map popups are not interpreted as HTML
+     * Nicknames and company names reach the script as data, never as markup
      *
      * Member form strips tags, stored values may not have been through it.
-     * Names are safe anyway: Adherent::getNameWithCase() strips tags.
+     * The script shows them as text; the page must not hold them as HTML.
      */
     public function testMapEscapesNames(): void
     {
@@ -333,11 +354,14 @@ public function testMapEscapesNames(): void
         $test_response = $this->app->handle($this->createRequest('maps_map'));
         $this->assertSame(200, $test_response->getStatusCode());
         $body = (string)$test_response->getBody();
-        //a JS escaped "<" would be turned back into markup by the popup
-        $this->assertStringNotContainsString('\u003Cb\u003E', $body);
-        $this->assertStringNotContainsString('\u003Cimg', $body);
-        $this->assertStringContainsString('\u0026lt\u003Bb\u0026gt\u003Bnick', $body);
-        $this->assertStringContainsString('\u0026lt\u003Bimg\u0020src', $body);
+        $this->assertStringNotContainsString('<b>', $body);
+        $this->assertStringNotContainsString('<img src=x', $body);
+        $markers = $this->getMapsConfig($body)['markers'];
+        $this->assertCount(1, $markers);
+        $this->assertSame('<b>nick</b>', $markers[0]['nickname']);
+        $this->assertSame('<img src=x onerror=alert(1)>', $markers[0]['company']);
+        //member IDs are not published
+        $this->assertArrayNotHasKey('id_adh', $markers[0]);
     }
 
     /**
@@ -362,10 +386,8 @@ public function testPublicMap(): void
         $this->preferences->pref_publicpages_visibility_generic = \Galette\Core\Preferences::PUBLIC_PAGES_VISIBILITY_PUBLIC;
         $test_response = $this->app->handle($request);
         $this->assertSame(200, $test_response->getStatusCode());
-        $body = (string)$test_response->getBody();
-        $this->assertStringContainsString('_mapsBinded', $body);
         //member one does not display its information
-        $this->assertStringNotContainsString('48.850000', $body);
+        $this->assertSame([], $this->getMapsConfig((string)$test_response->getBody())['markers']);
     }
 
     /**
@@ -385,16 +407,22 @@ public function testOwnPage(): void
         $this->assertSame(200, $test_response->getStatusCode());
         $body = (string)$test_response->getBody();
         $this->assertStringNotContainsString('id="possible_towns"', $body);
-        $this->assertStringNotContainsString('id="removecoords"', $body);
-        $this->assertStringContainsString('onMapClick', $body);
+        $config = $this->getMapsConfig($body);
+        $this->assertNull($config['member']['position']);
+        $this->assertTrue($config['member']['can_edit']);
+        $this->assertSame($this->routeparser->urlFor('maps_ilivehere'), $config['member']['store_url']);
+        $this->assertTrue($config['locate']);
 
         (new Coordinates($this->zdb, $this->login))->set($member_one->id, 48.85, 2.35);
         $test_response = $this->app->handle($request);
         $this->assertSame(200, $test_response->getStatusCode());
         $body = (string)$test_response->getBody();
-        $this->assertStringContainsString('var _lat = 48.850000;', $body);
-        $this->assertStringContainsString('id="removecoords"', $body);
-        $this->assertStringContainsString('I\\u0020live\\u0020here\\u0021', $body);
+        $this->assertStringContainsString('Maps - ' . $member_one->sfullname . ' geographic position', $body);
+        $config = $this->getMapsConfig($body);
+        $this->assertSame(['lat' => '48.850000', 'lng' => '2.350000', 'zoom' => 12], $config['center']);
+        $this->assertSame('You clicked at %1$s', $config['strings']['clicked_at']);
+        $this->assertSame(['latitude' => '48.850000', 'longitude' => '2.350000'], $config['member']['position']);
+        $this->assertSame('I live here!', $config['strings']['lives_here']);
     }
 
     /**
diff --git a/tests/GaletteMaps/tests/units/PluginGaletteMaps.php b/tests/GaletteMaps/tests/units/PluginGaletteMaps.php
index 7315d9f..37047da 100644
--- a/tests/GaletteMaps/tests/units/PluginGaletteMaps.php
+++ b/tests/GaletteMaps/tests/units/PluginGaletteMaps.php
@@ -109,6 +109,7 @@ public function testDashboardsAndActions(): void
             ['name' => 'maps_localize_member', 'args' => ['id' => $member->id]],
             $actions[0]['route']
         );
+        $this->assertSame('Geolocalize ' . $member->sname, $actions[0]['title']);
         $this->assertSame($actions, $plugin->getDetailedActions($member));
     }
 
diff --git a/webroot/galette_maps.css b/webroot/galette_maps.css
index b4e8dfd..a052629 100644
--- a/webroot/galette_maps.css
+++ b/webroot/galette_maps.css
@@ -10,10 +10,28 @@
     min-height: 100%;
 }
 
+#possible_towns ul,
+#map .maps-legend {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
+
 #possible_towns li {
     margin-bottom: .5em;
 }
 
+#map .maps-legend li {
+    display: flex;
+    align-items: center;
+    gap: .5em;
+    margin: .2em 0;
+}
+
+#map .maps-legend img {
+    height: 25px;
+}
+
 .leaflet-control-legend a {
     background-image: url(images/legend.png);
     background-position: -2px -2px;
diff --git a/webroot/galette_maps.js b/webroot/galette_maps.js
new file mode 100644
index 0000000..3219647
--- /dev/null
+++ b/webroot/galette_maps.js
@@ -0,0 +1,372 @@
+/**
+ * This file is part of Galette Maps plugin (https://galette.eu).
+ * SPDX-FileCopyrightText: Copyright © 2012-2026 The Galette Team
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+/*
+ * Maps pages behaviour.
+ *
+ * Templates only provide data, as JSON in #maps-config; every text shown in
+ * the map goes through the DOM (textContent), never through HTML strings.
+ */
+(function ($) {
+    'use strict';
+
+    /** content the locate control popup is created with, replaced on opening */
+    const LOCATE_POPUP = 'maps-locate-popup';
+
+    /**
+     * Build an element
+     *
+     * @param {string} tag      Tag name
+     * @param {string} [text]   Text content
+     * @param {string} [classes] CSS classes
+     */
+    function el(tag, text, classes) {
+        const elt = document.createElement(tag);
+        if (text !== undefined && text !== null) {
+            elt.textContent = text;
+        }
+        if (classes) {
+            elt.className = classes;
+        }
+        return elt;
+    }
+
+    /**
+     * Display a message in a modal
+     *
+     * @param {string}  message Message, displayed as text
+     * @param {boolean} reload  Reload page on close
+     */
+    function showMessage(message, reload) {
+        $('body').modal({
+            class: 'tiny',
+            content: $('<div>').text(message).html(),
+            actions: [{
+                text: config.strings.close,
+                click: function () {
+                    if (reload) {
+                        window.location.reload();
+                    }
+                }
+            }],
+            className: {
+                title: 'center aligned header',
+                content: 'center aligned content',
+                actions: 'center aligned actions'
+            }
+        }).modal('show');
+    }
+
+    /**
+     * Post a coordinates change
+     *
+     * @param {Object}      data     Posted data
+     * @param {HTMLElement} button   Button to show as loading
+     * @param {string}      fallback Error message when server gave none
+     */
+    function postCoords(data, button, fallback) {
+        $.ajax({
+            url: config.member.store_url,
+            type: 'POST',
+            data: data,
+            beforeSend: function () {
+                $(button).addClass('loading');
+            },
+            complete: function () {
+                $(button).removeClass('loading');
+            },
+            success: function (res) {
+                showMessage(res.message, true);
+            },
+            error: function (xhr) {
+                showMessage(xhr.responseJSON && xhr.responseJSON.message ? xhr.responseJSON.message : fallback, false);
+            }
+        });
+    }
+
+    /**
+     * Build the "I live here" popup content for a position
+     *
+     * @param {L.LatLng} latlng Position
+     * @param {string}   [name] Place name
+     */
+    function livesHereContent(latlng, name) {
+        //a click on a copy of the world gives a longitude beyond 180
+        const position = latlng.wrap();
+        //the precision coordinates are stored with
+        const shown = position.lat.toFixed(6) + '/' + position.lng.toFixed(6);
+        const content = el('div');
+        const where = el('p');
+        if (name) {
+            where.appendChild(el('strong', name));
+            where.appendChild(el('br'));
+            where.appendChild(el('em', shown));
+        } else {
+            //"You clicked at %1$s", the position in italics
+            const parts = config.strings.clicked_at.split('%1$s');
+            where.appendChild(document.createTextNode(parts[0]));
+            where.appendChild(el('em', shown));
+            where.appendChild(document.createTextNode(parts.slice(1).join('%1$s')));
+        }
+        content.appendChild(where);
+
+        const button = el('button', config.strings.lives_here, 'ui button');
+        button.type = 'button';
+        button.addEventListener('click', function () {
+            postCoords(
+                {latitude: position.lat, longitude: position.lng},
+                button,
+                config.strings.store_error
+            );
+        });
+        const actions = el('p');
+        actions.appendChild(button);
+        content.appendChild(actions);
+
+        return content;
+    }
+
+    /**
+     * Build the known position popup content
+     */
+    function knownPositionContent() {
+        const content = el('div');
+        content.appendChild(el('strong', config.member.name));
+        content.appendChild(el('br'));
+        content.appendChild(document.createTextNode(config.strings.lives_here));
+
+        if (config.member.can_edit) {
+            content.appendChild(el('br'));
+            const button = el('button', config.strings.remove, 'ui button');
+            button.type = 'button';
+            button.addEventListener('click', function () {
+                $('body').modal({
+                    title: config.strings.remove_title,
+                    class: 'tiny',
+                    content: $('<div>').text(config.strings.remove_confirm).html(),
+                    actions: [{
+                        text: config.strings.remove,
+                        class: 'red confirm_remove',
+                        icon: 'trash alt',
+                        click: function () {
+                            postCoords({remove: true}, $('.confirm_remove'), config.strings.remove_error);
+                        }
+                    }, {
+                        text: config.strings.close
+                    }],
+                    className: {
+                        title: 'center aligned header',
+                        content: 'center aligned content',
+                        actions: 'center aligned actions'
+                    }
+                }).modal('show');
+            });
+            content.appendChild(button);
+        }
+
+        return content;
+    }
+
+    /**
+     * Does the browser render vector tiles? They need WebGL 2
+     */
+    function hasWebGL2() {
+        try {
+            return !!(window.WebGL2RenderingContext && document.createElement('canvas').getContext('webgl2'));
+        } catch (err) {
+            return false;
+        }
+    }
+
+    /**
+     * Add background map
+     *
+     * @param {L.Map} map Map
+     */
+    function addTiles(map) {
+        const tiles = config.tiles;
+        if (tiles.vector && hasWebGL2()) {
+            const options = {style: tiles.url};
+            if (tiles.attribution !== '') {
+                //given one, it wins; otherwise the bridge reads it off the style sources
+                options.attributionControl = {customAttribution: tiles.attribution};
+            }
+            L.maplibreGL(options).addTo(map);
+            return;
+        }
+
+        const raster = tiles.vector ? tiles.fallback : tiles;
+        const options = {
+            maxZoom: raster.maxzoom,
+            attribution: raster.attribution
+        };
+        if (raster.subdomains) {
+            options.subdomains = raster.subdomains;
+        }
+        L.tileLayer(raster.url, options).addTo(map);
+    }
+
+    /**
+     * Build the map and its controls
+     */
+    function buildMap() {
+        const map = L.map('map', {
+            gestureHandling: true,
+            maxZoom: config.tiles.maxzoom
+        }).setView([config.center.lat, config.center.lng], config.center.zoom);
+
+        new L.Control.FullScreen({
+            position: 'topleft',
+            title: config.strings.fullscreen,
+            titleCancel: config.strings.fullscreen_exit,
+            forceSeparateButton: true
+        }).addTo(map);
+
+        L.Control.geocoder({
+            collapsed: false,
+            placeholder: config.strings.search_placeholder,
+            errorMessage: config.strings.search_error,
+            iconLabel: config.strings.search
+        }).addTo(map);
+
+        map.addControl(new L.Control.Legend({position: 'topright'}));
+        $('.legend-container').append($('#legend'));
+        const toggle = el('span', null, 'legend-toggle-icon');
+        const icon = el('i', null, 'big info circle blue icon');
+        icon.setAttribute('aria-hidden', 'true');
+        toggle.appendChild(icon);
+        toggle.appendChild(document.createTextNode(' ' + config.strings.legend));
+        $('.legend-toggle').append(toggle);
+
+        if (config.locate) {
+            L.control.locate({
+                strings: {
+                    title: config.strings.locate,
+                    popup: LOCATE_POPUP,
+                    outsideMapBoundsMsg: config.strings.locate_outside
+                }
+            }).addTo(map);
+        }
+
+        addTiles(map);
+        return map;
+    }
+
+    /**
+     * Members map
+     *
+     * @param {L.Map} map Map
+     */
+    function showMembers(map) {
+        const group = L.markerClusterGroup();
+        config.markers.forEach(function (m) {
+            const content = el('p');
+            content.appendChild(el('strong', m.name));
+            if (m.nickname) {
+                content.appendChild(document.createTextNode(' ' + config.strings.aka + ' '));
+                content.appendChild(el('em', m.nickname));
+            }
+            if (m.company) {
+                content.appendChild(el('br'));
+                content.appendChild(document.createTextNode(m.company));
+            }
+            const marker = L.marker(
+                [parseFloat(m.lat), parseFloat(m.lng)],
+                {icon: m.company ? icons.company : icons.member}
+            );
+            marker.bindPopup(content);
+            group.addLayer(marker);
+        });
+        map.addLayer(group);
+        if (config.markers.length > 0) {
+            map.fitBounds(group.getBounds(), {padding: [50, 50], maxZoom: 12});
+        }
+    }
+
+    /**
+     * Member localization
+     *
+     * @param {L.Map} map Map
+     */
+    function localizeMember(map) {
+        if (config.member.can_edit) {
+            map.on('click', function (e) {
+                L.popup().setLatLng(e.latlng).setContent(livesHereContent(e.latlng)).openOn(map);
+            });
+            map.on('popupopen', function (e) {
+                if (e.popup.getContent() === LOCATE_POPUP) {
+                    e.popup.setContent(livesHereContent(e.popup.getLatLng()));
+                }
+            });
+        }
+
+        if (config.member.position) {
+            L.marker(
+                [parseFloat(config.member.position.latitude), parseFloat(config.member.position.longitude)],
+                {icon: icons.member}
+            ).addTo(map).bindPopup(knownPositionContent()).openPopup();
+            return;
+        }
+
+        const towns = $('#possible_towns');
+        if (towns.length === 0) {
+            return;
+        }
+        towns.modal('show');
+        towns.find('.maps-town').on('click', function () {
+            const town = $(this);
+            const latlng = L.latLng(parseFloat(town.data('lat')), parseFloat(town.data('lng')));
+            towns.modal('hide');
+            map.setView(latlng, 13);
+            L.marker(latlng).addTo(map)
+                .bindPopup(livesHereContent(latlng, String(town.data('name'))))
+                .openPopup();
+        });
+    }
+
+    /**
+     * Preferences page: own values are only meaningful with the custom provider
+     */
+    function preferences() {
+        const custom = $('#maps_custom_tiles');
+        $('#pref_maps_tiles_provider').on('change', function () {
+            custom.toggleClass('displaynone', this.value !== custom.data('custom'));
+        });
+    }
+
+    let config = null;
+    let icons = null;
+
+    $(function () {
+        if ($('#maps_custom_tiles').length > 0) {
+            preferences();
+        }
+
+        const source = document.getElementById('maps-config');
+        if (source === null) {
+            return;
+        }
+        config = JSON.parse(source.textContent);
+
+        const icon_options = {
+            iconSize: [25, 41],
+            iconAnchor: [12, 41],
+            popupAnchor: [1, -34],
+            shadowSize: [41, 41]
+        };
+        icons = {
+            member: L.icon($.extend({iconUrl: config.icons.member}, icon_options)),
+            company: L.icon($.extend({iconUrl: config.icons.company}, icon_options))
+        };
+
+        const map = buildMap();
+        if (config.markers) {
+            showMembers(map);
+        } else if (config.member) {
+            localizeMember(map);
+        }
+    });
+})(jQuery);