From 514fe6b82c65d14bdc60b07e7cc7b3e678c4f4de Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Wed, 15 Jul 2020 15:15:38 +0200
Subject: [PATCH] orthographe connection en connexion (ref #186)

---
 .../Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig | 2 +-
 .../CoreBundle/Resources/views/Registration/edit.html.twig      | 2 +-
 .../src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig  | 2 +-
 tmpl/ninegate-init-01.sql                                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig
index 35e3b377..41c5877f 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Core/reconnect.html.twig
@@ -41,7 +41,7 @@
     <div style="width: 400px;margin: auto;text-align: center;margin-top: 50px;">
         <img id="logo" src="/{{ alias }}/{{ app.session.get('logo') }}">
         <h1>{{ app.session.get('appname') }}</h1>
-        <h2>Vous avez perdu votre connection</h2>
+        <h2>Vous avez perdu votre connexion</h2>
         ou
         <h2>Vous n'avez plus accès à cette page</h2>
         <br><br>
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig
index 5526446b..d131a30f 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/edit.html.twig
@@ -59,7 +59,7 @@
             <div class="col-sm-6">
                 <div class="panel panel-primary">
                     <div class="panel-heading">
-                        <i class="fa fa-key fa-fw"></i> Connection
+                        <i class="fa fa-key fa-fw"></i> Connexion
                     </div>
 
                     <div class="panel-body">
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig
index 462dfe89..43885036 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/edit.html.twig
@@ -66,7 +66,7 @@
         <div class="col-sm-6">
             <div class="panel panel-primary">
                 <div class="panel-heading">
-                    <i class="fa fa-key fa-fw"></i> Connection
+                    <i class="fa fa-key fa-fw"></i> Connexion
                 </div>
 
                 <div class="panel-body">
diff --git a/tmpl/ninegate-init-01.sql b/tmpl/ninegate-init-01.sql
index 5907fa28..b39d9bd9 100644
--- a/tmpl/ninegate-init-01.sql
+++ b/tmpl/ninegate-init-01.sql
@@ -97,7 +97,7 @@ INSERT IGNORE INTO `config` (`order`, `visible`, `changeable`, `required`, `type
 ('006', 0, 1, 0, 'datauser',     	'datauser',		    '',		    			                                    '',				'Parametrage des champs utilisateurs : obligatoire / facultatif / caché'),
 ('007', 0, 1, 0, 'datausers',     	'datausers',	    '',		    			                                    '',				'Parametrage des colonnes visible dans la liste des utilisateurs'),
 
-('010', 1, 1, 1, 'boolean',  		'fgforceconnect',	'0',										                '',				'Forcer la connection afin de rendre votre site privé'),
+('010', 1, 1, 1, 'boolean',  		'fgforceconnect',	'0',										                '',				'Forcer la connexion afin de rendre votre site privé'),
 
 ('040', 1, 1, 1, 'boolean',         'fgheader',	        '1',		    			                                '',				'Utiliser une image en bannière du site'),
 ('041', 1, 1, 1, 'header',          'header',	        'uploads/header/header.png',                                'fgheader',		'Image en bannière du site'),