From 0b0261f20dda2f9dcca95a3c7cf908ab56d40127 Mon Sep 17 00:00:00 2001
From: Franzz <francois@lutran.fr>
Date: Tue, 30 Nov 2021 19:29:49 +0100
Subject: [PATCH] Remove comment HTML entities when converting GPX

---
 inc/Converter.php | 1 +
 inc/Project.php   | 1 -
 languages/fr.lang | 6 +++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/Converter.php b/inc/Converter.php
index d32578e..a4071a1 100644
--- a/inc/Converter.php
+++ b/inc/Converter.php
@@ -264,6 +264,7 @@ class GeoJson extends Geo {
 	}
 
 	private function parseOptions($sComment){
+		$sComment = strip_tags(html_entity_decode($sComment));
 		$asOptions = array(self::OPT_SIMPLE=>'');
 		foreach(explode("\n", $sComment) as $sLine) {
 			$asOptions[mb_strtolower(trim(mb_strstr($sLine, ':', true)))] = mb_strtolower(trim(mb_substr(mb_strstr($sLine, ':'), 1)));
diff --git a/inc/Project.php b/inc/Project.php
index 624b9ac..7329207 100644
--- a/inc/Project.php
+++ b/inc/Project.php
@@ -27,7 +27,6 @@ class Project extends PhpObject {
 	private $sName;
 	private $sCodeName;
 	private $asActive;
-	private $asGeo;
 
 	public function __construct(Db &$oDb, $iProjectId=0) {
 		parent::__construct(__CLASS__, Settings::DEBUG);
diff --git a/languages/fr.lang b/languages/fr.lang
index 4d37a69..4abed56 100644
--- a/languages/fr.lang
+++ b/languages/fr.lang
@@ -65,9 +65,9 @@ new_project			= Nouveau projet
 update_project		= Mettre à jour le projet
 hikes				= Randonnées
 mode				= Mode
-mode_previz			= Project en cours de préparation
-mode_blog			= Project actif
-mode_histo			= Project archivé
+mode_previz			= Projet en cours de préparation
+mode_blog			= Projet actif
+mode_histo			= Projet archivé
 code_name			= Nom de code
 start				= Départ
 end					= Arrivée