Merge tag '2.24.0' into geotrek_UX_dev_mid_2018

GeotrekCE · Apr 28, 2020 · 64a293f · 64a293f
2 parents fa2e71a + 296acbe
commit 64a293f
Show file tree

Hide file tree

Showing 20 changed files with 145 additions and 94 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,20 @@
+2.24.0 / 2020-04-28
+===================
+
+**Enhancements**
+
+* Change warning form to be GPDR compliant
+    - remove name field
+    - send to API default name "Anonymous"
+    - add a text about personal data
+* Add translation file for portugese
+* Fix some translation error
+
+**Bug fixes**
+
+* Fix open PDF from POI and detail page
+* Fix travis tests
+
 2.23.0-ux / 2020-03-05
 ======================
 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Examples: [Grand tour des Ecrins](http://www.grand-tour-ecrins.fr), [Destination
 _See [Prerequisites](docs/README.md#Prerequisites)._
 
 - Geotrek-Rando v2 can synchronize only with Geotrek-Admin v2
-- Ubuntu 14.04
+- You can deploy with any OS and web serveur but this documentation works only with Ubuntu Linux. We recommand to use the latest LTS Ubuntu distribution.
 
 ### Synchronization
 

diff --git a/docs/README.md b/docs/README.md
@@ -31,7 +31,7 @@ Building environment could be either the same as your http server, or a local ma
 
 _\* In recent versions of Geotrek-rando, you'll find the recommended version of Node JS into the `.nvmrc` file in the root directory of the project._
 
-### For developpers
+### For developpers
 
 Some npm packages used for tests may need a build environment for compiling platform specific binaries. On debian-like environments, `build-essential` should satisfy this requirements.
 

diff --git a/docs/settings.md b/docs/settings.md
@@ -90,7 +90,7 @@ You can override default translation files available in `src/app/translation/po`
 
 Create a `custom/po/` folder. Then create the files for each language you are using (`en.po`, `fr.po` as an example).
 
-Override the translations that you want in these files. 
+Override the translations that you want in these files.
 
 Example of content for `custom/po/en.po`:
 
@@ -119,6 +119,19 @@ msgid "DEFAULT_META_DESCRIPTION"
 msgstr "Discover the treks in the national park!"
 ```
 
+## GPDR compliance
+
+Two sections are involved in GPDR Compliance: Google analytics and report form.
+
+### Warning form
+
+Only email is required to submit reports, and a disclaimer should be displayed
+for users sending a report.
+
+This text can be changed by overriding `REPORT_GPDR_DISCLAIMER`
+in translations (see [Translations section](#translations)).
+
+
 <!-- Internal links -->
 
 [JSON settings]: settings-custom-json.md

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "geotrekrando",
-  "version": "2.23.0-ux",
+  "version": "2.24.0-ux",
   "description": "Geotrek rando public portal of Geotrek",
   "author": "Makina Corpus",
   "main": "src/app/app.js",

diff --git a/src/app/detail/templates/detail-content-media.html b/src/app/detail/templates/detail-content-media.html
@@ -11,7 +11,7 @@ <h3>Media</h3>
             </a>
         </li>
         <li ng-repeat="file in result.properties.files track by $index" class="detail-media media file">
-            <a href="{{::file.url}}" title="{{::file.legend}}" class="detail-media-link primary-hover-c">
+            <a href="{{::file.url}}" target="_blank" title="{{::file.legend}}" class="detail-media-link primary-hover-c">
                 <i class="fa fa-file-o"></i> {{::file.legend}}
             </a>
         </li>

diff --git a/src/app/pois/templates/pois-results.html b/src/app/pois/templates/pois-results.html
@@ -61,7 +61,8 @@
                             </a>
                         </li>
                         <li ng-repeat="file in poi.properties.files track by $index" class="poi-media media file">
-                            <a href="{{::file.url}}" title="{{::file.legend}}" class="poi-media-link primary-hover-c">
+                            <a href="{{::file.url}}" target="_blank"
+                                title="{{::file.legend}}" class="poi-media-link primary-hover-c">
                                 <i class="fa fa-file-o"></i> {{::file.legend}}
                             </a>
                         </li>

diff --git a/src/app/translation/po/ca.po b/src/app/translation/po/ca.po
@@ -1,17 +1,18 @@
 msgid ""
 msgstr ""
-"Project: Geotrek-rando\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2020-04-22 13:27+0000\n"
+"Last-Translator: Emmanuelle Helly <[email protected]>\n"
+"Language-Team: Catalan <https://weblate.makina-corpus.net/projects/"
+"geotrek-rando/geotrek-rando/ca/>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.0.1\n"
+"Project: Geotrek-rando\n"
 
 msgid "DEFAULT_META_TITLE"
 msgstr "Geotrek Rando"
@@ -227,7 +228,7 @@ msgid "ERROR_WARNING"
 msgstr "No s'ha pogut desar el missatge. Si us plau Excusi'ns per aquest inconvenient. Els nostres equips han estat  advertit i analitzen el problema."
 
 msgid "SHOW_ACTIVE_FILTERS"
-msgstr " Mostra els Filtres actius Mostra"
+msgstr "Mostra els Filtres actius Mostra"
 
 msgid "HIDE_ACTIVE_FILTERS"
 msgstr "Amagar filtres actius"
@@ -316,6 +317,9 @@ msgstr "Notificar un error o un problema"
 msgid "FORM_NAME"
 msgstr "Nom"
 
+msgid "REPORT_GPDR_DISCLAIMER"
+msgstr ""
+
 msgid "FORM_EMAIL"
 msgstr "Correu electrònic"
 

diff --git a/src/app/translation/po/de.po b/src/app/translation/po/de.po
@@ -348,6 +348,9 @@ msgstr "Problem oder Fehler signalisieren"
 msgid "FORM_NAME"
 msgstr "Name"
 
+msgid "REPORT_GPDR_DISCLAIMER"
+msgstr ""
+
 msgid "FORM_EMAIL"
 msgstr "Email"
 

diff --git a/src/app/translation/po/en.po b/src/app/translation/po/en.po
@@ -361,6 +361,13 @@ msgstr "Signal a mistake or an issue"
 msgid "FORM_NAME"
 msgstr "Name"
 
+msgid "REPORT_GPDR_DISCLAIMER"
+msgstr "These information will be used by {{ organisation }}, "
+"which commit to not sell your personnal data to thir party. "
+"You have the right to read, modify, fix or delete your personal "
+"data (art. 34 de la loi \"Informatique et Libertés\"). "
+"To apply please send a mail to {{ adresse }}."
+
 msgid "FORM_EMAIL"
 msgstr "Email"
 

diff --git a/src/app/translation/po/es.po b/src/app/translation/po/es.po
@@ -1,33 +1,31 @@
 msgid ""
 msgstr ""
-"Project: Geotrek-rando\n"
 "Project-Id-Version: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2020-04-28 12:35+0000\n"
+"Last-Translator: numahell <[email protected]>\n"
+"Language-Team: Spanish <https://weblate.makina-corpus.net/projects/"
+"geotrek-rando/geotrek-rando/es/>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"X-Generator: Poedit 1.7.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.0.1\n"
+"Project: Geotrek-rando\n"
 
 # META
 #
 #
-
 msgid "DEFAULT_META_TITLE"
 msgstr "Geotrek Rando"
 
 msgid "DEFAULT_META_DESCRIPTION"
 msgstr "Geotrek es una aplicación web para preparar con antelación sus senderismos !"
 
-
-
 # CATEGORIES
 #
 #
-
 msgid "CATEGORIES"
 msgstr "Categorías"
 
@@ -49,6 +47,9 @@ msgstr "Tiempo"
 msgid "ASCENT"
 msgstr "Desnivel positivo"
 
+msgid "ASCENT_S"
+msgstr "D+:"
+
 msgid "LENGTH"
 msgstr "Distancia"
 
@@ -61,11 +62,9 @@ msgstr "Todos"
 msgid "CLOSE"
 msgstr "Cerrar"
 
-
 # INFORMATIONS
 #
 #
-
 msgid "I_DURATION"
 msgstr "Tiempo"
 
@@ -84,11 +83,9 @@ msgstr "Desnivel positivo"
 msgid "I_NETWORK"
 msgstr "Señalización"
 
-
 # RESULTS
 #
 #
-
 msgid "RESULT"
 msgstr "Resultado"
 
@@ -98,22 +95,18 @@ msgstr "Resultados"
 msgid "NO_RESULTS"
 msgstr "No resultados correspondientes a la investigación"
 
-
 # FAVORITES
 #
 #
-
 msgid "FAVORITES"
 msgstr "Favoritos"
 
 msgid "NO_FAVORITES"
 msgstr "No favoritos !"
 
-
 # DETAILS
 #
 #
-
 msgid "CATEGORY"
 msgstr "Categorías"
 
@@ -237,11 +230,9 @@ msgstr "Mensaje fue registrado. Gracias por su ayuda !"
 msgid "ERROR_WARNING"
 msgstr "Mensaje no fue registrado. Disculpen este inconveniente mientras nosotros avisamos a nuestros informáticos."
 
-
 # FILTERS
 #
 #
-
 msgid "SHOW_ACTIVE_FILTERS"
 msgstr "Ver los filtros activos"
 
@@ -281,19 +272,15 @@ msgstr "Reiniciar"
 msgid "SELECTED"
 msgstr "Selección"
 
-
 # SOCIAL
 #
 #
-
 msgid "SHARING_DEFAULT_TEXT"
 msgstr "Geotrek es realmente perfecto para preparar su visita en la naturaleza !"
 
-
 # LAYOUT
 #
 #
-
 msgid "TOGGLE_NAV"
 msgstr "Abrir el menú desplegable"
 
@@ -333,6 +320,9 @@ msgstr "Señalar un problema"
 msgid "FORM_NAME"
 msgstr "Nombre"
 
+msgid "REPORT_GPDR_DISCLAIMER"
+msgstr ""
+
 msgid "FORM_EMAIL"
 msgstr "Correo electrónico"
 
@@ -357,11 +347,9 @@ msgstr "Descargar fichero GPX"
 msgid "3D"
 msgstr "Ver itinerario 3D"
 
-
 # MAP
 #
 #
-
 msgid "ZOOM_IN"
 msgstr "Hacer zoom (foco)"
 
@@ -386,11 +374,9 @@ msgstr "Activar / ocultar los servicios"
 msgid "VIEWPORT_FILTERING"
 msgstr "Utilizar la mapa para filtrar"
 
-
 # HOME PAGE
 #
 #
-
 msgid "ACCESS_SITE"
 msgstr "Acceder al sitio web"
 
@@ -400,19 +386,15 @@ msgstr "No exhibir más esta página"
 msgid "SUGGESTED"
 msgstr "Recomendaciones especiales :"
 
-
 # HEADER
 #
 #
-
 msgid "LOGO_ALT"
 msgstr "Logo Geotrek"
 
-
 # FOOTER
 #
 #
-
 msgid "LEGALS"
 msgstr "Avisos legales"
 
@@ -421,3 +403,6 @@ msgstr "Concepción y créditos"
 
 msgid "CONTACT"
 msgstr "Contacto"
+
+msgid "LEVELS"
+msgstr "Nivel:"