Minor typos.

diff --git a/modules/newsletter.php b/modules/newsletter.php
index 62dd684..ae82c69 100644 (file)
--- a/modules/newsletter.php
+++ b/modules/newsletter.php
@@ -118,8 +118,8 @@ class NewsletterModule extends PLModule
     function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') {
         $page->changeTpl('newsletter/edit.tpl');
         $page->addCssLink('nl.css');
-        $page->setTitle('Administration - Newsletter : Edition');
-        require_once("newsletter.inc.php");
+        $page->setTitle('Administration - Newsletter : Édition');
+        require_once 'newsletter.inc.php';
 
         $nl  = new NewsLetter($nid);
 
@@ -151,11 +151,14 @@ class NewsletterModule extends PLModule
 
         if($action == 'edit' && $aid != 'update') {
             $eaid = $aid;
-            if(Post::has('title')) {
+            if (Post::has('title')) {
                 $art  = new NLArticle(Post::v('title'), Post::v('body'), Post::v('append'),
-                        $eaid, Post::v('cid'), Post::v('pos'));
+                                      $eaid, Post::v('cid'), Post::v('pos'));
             } else {
-                  $art = ($eaid == 'new') ? new NLArticle() : $nl->getArt($eaid);
+                $art = ($eaid == 'new') ? new NLArticle() : $nl->getArt($eaid);
+            }
+            if ($art && !$art->check()) {
+                $page->trigError("Cet article est trop long.");
             }
             $page->assign('art', $art);
         }

diff --git a/modules/register.php b/modules/register.php
index 59af771..41055b6 100644 (file)
--- a/modules/register.php
+++ b/modules/register.php
@@ -352,7 +352,7 @@ class RegisterModule extends PLModule
         $res = XDB::iterRow(
                 "SELECT  sa.alias, IF(s.nom_usage,s.nom_usage,s.nom) AS nom,
                          s.prenom, FIND_IN_SET('femme', s.flags) AS femme,
-                         GROUP_CONCAT(m.email) AS mails, MAX(m.last) AS dateDernier
+                         GROUP_CONCAT(m.email SEPARATOR ', ') AS mails, MAX(m.last) AS dateDernier
                    FROM  register_marketing AS m
              INNER JOIN  auth_user_md5      AS s  ON ( m.sender = s.user_id )
              INNER JOIN  aliases            AS sa ON ( sa.id = m.sender

diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl
index 4fa3591..35aab21 100644 (file)
--- a/templates/admin/index.tpl
+++ b/templates/admin/index.tpl
@@ -94,7 +94,7 @@
     <td>
       <a href="admin/promo">Ajout promotion</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
-      <a href="admin/user">Edition</a>
+      <a href="admin/user">Édition</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
       <a href="admin/homonyms">Homonymes</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;

diff --git a/templates/axletter/edit.tpl b/templates/axletter/edit.tpl
index a7a019d..a07ea86 100644 (file)
--- a/templates/axletter/edit.tpl
+++ b/templates/axletter/edit.tpl
@@ -20,7 +20,7 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<h1>Edition de message</h1>
+<h1>Édition de message</h1>
 
 <form action="{$platal->pl_self()}" method="post">
   {xsrf_token_field}

diff --git a/templates/marketing/private.tpl b/templates/marketing/private.tpl
index 040bfbd..1c9f5dd 100644 (file)
--- a/templates/marketing/private.tpl
+++ b/templates/marketing/private.tpl
@@ -103,7 +103,7 @@ sa dernière relance date du {$relance|date_format}
   {xsrf_token_field}
   <table class="bicol">
     <tr class="pair">
-      <th colspan="2">Edition de l'email de relance</th>
+      <th colspan="2">Édition de l'email de relance</th>
     </tr>
     <tr class="pair">
       <td align="right"><strong>From&nbsp;:</strong></td>

diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl
index fb3063f..6759865 100644 (file)
--- a/templates/newsletter/edit.tpl
+++ b/templates/newsletter/edit.tpl
@@ -100,7 +100,7 @@
 <table class="bicol" cellpadding="3" cellspacing="0">
   <tr>
     <td>
-      Créer un nouvel article ...
+      Créer un nouvel article...
     </td>
     <td style='vertical-align:middle; border-left: 1px gray solid' class="center">
       <a href="admin/newsletter/edit/{$nl->_id}/new#edit">{icon name=add title="créer"}</a>
@@ -134,7 +134,6 @@
 [<a href="admin/newsletter/edit/{$nl->_id}">retour</a>]
 </p>
 
-{if !$art->check()}<p class='erreur'>article trop long !</p>{/if}
 <table class='bicol'>
   <tr><th>Version texte</th></tr>
   <tr id='text'>

diff --git a/templates/platal/motdepasse.success.tpl b/templates/platal/motdepasse.success.tpl
index e4f4c48..0ff8196 100644 (file)
--- a/templates/platal/motdepasse.success.tpl
+++ b/templates/platal/motdepasse.success.tpl
@@ -29,7 +29,7 @@
 <strong>Mot de passe enregistré le {$smarty.now|date_format}</strong>
 </p>
 <p>
-  <strong>Attention!</strong> Il est crypté irréversiblement,
+  <strong>Attention&nbsp;!</strong> Il est crypté irréversiblement,
   donc <strong>non récupérable</strong>. Pour retrouver un accès au site
   consécutivement à une perte de mot de passe, la procédure
   est longue et laborieuse...

diff --git a/templates/xnetgrp/annuaire.tpl b/templates/xnetgrp/annuaire.tpl
index d462aa5..4d73f52 100644 (file)
--- a/templates/xnetgrp/annuaire.tpl
+++ b/templates/xnetgrp/annuaire.tpl
@@ -127,7 +127,7 @@ Le groupe {$asso.nom} compte {$nb_tot} membres :
     </td>
     {if $is_admin}
     <td class="center">
-      <a href="{$platal->ns}member/{if $m.x}{$m.email}{else}{$m.uid}{/if}">{icon name=user_edit title="Edition du profil"}</a>
+      <a href="{$platal->ns}member/{if $m.x}{$m.email}{else}{$m.uid}{/if}">{icon name=user_edit title="Édition du profil"}</a>
       <a href="{$platal->ns}member/del/{if $m.x}{$m.email}{else}{$m.uid}{/if}">{icon name=delete title="Supprimer de l'annuaire"}</a>
     </td>
     {/if}