From b74b099f85ffe2856fc76ffb6012e2d61d069ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 13 Sep 2018 09:44:28 +0200
Subject: [PATCH] general: add javascript catalog to translate map tooltips
 (#26266)

---
 combo/apps/maps/models.py               |  3 ++-
 combo/apps/maps/static/js/combo.map.js  |  6 +++++-
 combo/locale/fr/LC_MESSAGES/djangojs.po | 25 +++++++++++++++++++++++++
 combo/urls.py                           |  2 ++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 combo/locale/fr/LC_MESSAGES/djangojs.po

diff --git a/combo/apps/maps/models.py b/combo/apps/maps/models.py
index a3ee88f9..9a54c795 100644
--- a/combo/apps/maps/models.py
+++ b/combo/apps/maps/models.py
@@ -274,7 +274,8 @@ class Map(CellBase):
         verbose_name = _('Map')
 
     class Media:
-        js = ('xstatic/leaflet.js', 'js/leaflet-gps.js', 'js/combo.map.js',
+        js = ('/jsi18n',
+              'xstatic/leaflet.js', 'js/leaflet-gps.js', 'js/combo.map.js',
               'xstatic/leaflet.markercluster.js')
         css = {'all': ('xstatic/leaflet.css', 'css/combo.map.css')}
 
diff --git a/combo/apps/maps/static/js/combo.map.js b/combo/apps/maps/static/js/combo.map.js
index ec9b2db6..f2cec109 100644
--- a/combo/apps/maps/static/js/combo.map.js
+++ b/combo/apps/maps/static/js/combo.map.js
@@ -137,7 +137,11 @@ $(function() {
         }
         var map_controls_position = $('body').data('map-controls-position') || 'topleft';
         if (map_options.maxZoom != map_options.minZoom) {
-          new L.Control.Zoom({position: map_controls_position}).addTo(map);
+          new L.Control.Zoom({
+            position: map_controls_position,
+            zoomInTitle: gettext('Zoom in'),
+            zoomOutTitle: gettext('Zoom out')
+          }).addTo(map);
         }
         if (L.Control.Gps && $map_widget.data('include-geoloc-button')) {
           var gps_control = new L.Control.Gps({position: map_controls_position});
diff --git a/combo/locale/fr/LC_MESSAGES/djangojs.po b/combo/locale/fr/LC_MESSAGES/djangojs.po
new file mode 100644
index 00000000..c950bdb7
--- /dev/null
+++ b/combo/locale/fr/LC_MESSAGES/djangojs.po
@@ -0,0 +1,25 @@
+# Combo French Translation.
+# Copyright (C) 2018 Entr'ouvert
+# This file is distributed under the same license as the Combo package.
+# Frederic Peters <fpeters@entrouvert.com>, 2018.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: combo(js) 0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-09-13 07:22+0000\n"
+"PO-Revision-Date: 2018-09-13 09:29+0200\n"
+"Last-Translator: Frederic Peters <<fpeters@entrouvert.com>\n"
+"Language: French\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: apps/maps/static/js/combo.map.js:142
+msgid "Zoom in"
+msgstr "Zoomer"
+
+#: apps/maps/static/js/combo.map.js:143
+msgid "Zoom out"
+msgstr "Dézoomer"
diff --git a/combo/urls.py b/combo/urls.py
index ab15c5b7..3b3fdc0d 100644
--- a/combo/urls.py
+++ b/combo/urls.py
@@ -19,6 +19,7 @@ from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.views.i18n import javascript_catalog
 
 from .urls_utils import decorated_includes, manager_required
 
@@ -34,6 +35,7 @@ urlpatterns = [
     url(r'^logout/$', logout, name='auth_logout'),
     url(r'^login/$', login, name='auth_login'),
     url(r'^404$', error404),
+    url(r'^jsi18n$', javascript_catalog, name='javascript-catalog'),
 ]
 
 handler404 = error404