From e4705641c6135dfbda9f4a0a30a212d21ff874d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Sun, 1 Mar 2009 02:28:49 +0100 Subject: [PATCH] Minor typos. --- modules/newsletter.php | 13 ++++++++----- modules/register.php | 2 +- templates/admin/index.tpl | 2 +- templates/axletter/edit.tpl | 2 +- templates/marketing/private.tpl | 2 +- templates/newsletter/edit.tpl | 3 +-- templates/platal/motdepasse.success.tpl | 2 +- templates/xnetgrp/annuaire.tpl | 2 +- 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/newsletter.php b/modules/newsletter.php index 62dd684..ae82c69 100644 --- 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 --- 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 --- a/templates/admin/index.tpl +++ b/templates/admin/index.tpl @@ -94,7 +94,7 @@ Ajout promotion   |   - Edition + Édition   |   Homonymes   |   diff --git a/templates/axletter/edit.tpl b/templates/axletter/edit.tpl index a7a019d..a07ea86 100644 --- a/templates/axletter/edit.tpl +++ b/templates/axletter/edit.tpl @@ -20,7 +20,7 @@ {* *} {**************************************************************************} -

Edition de message

+

Édition de message

{xsrf_token_field} diff --git a/templates/marketing/private.tpl b/templates/marketing/private.tpl index 040bfbd..1c9f5dd 100644 --- 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} - + diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl index fb3063f..6759865 100644 --- a/templates/newsletter/edit.tpl +++ b/templates/newsletter/edit.tpl @@ -100,7 +100,7 @@
Edition de l'email de relanceÉdition de l'email de relance
From :
- Créer un nouvel article ... + Créer un nouvel article... {icon name=add title="créer"} @@ -134,7 +134,6 @@ [retour]

-{if !$art->check()}

article trop long !

{/if} diff --git a/templates/platal/motdepasse.success.tpl b/templates/platal/motdepasse.success.tpl index e4f4c48..0ff8196 100644 --- a/templates/platal/motdepasse.success.tpl +++ b/templates/platal/motdepasse.success.tpl @@ -29,7 +29,7 @@ Mot de passe enregistré le {$smarty.now|date_format}

- Attention! Il est crypté irréversiblement, + Attention ! Il est crypté irréversiblement, donc non récupérable. 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 --- a/templates/xnetgrp/annuaire.tpl +++ b/templates/xnetgrp/annuaire.tpl @@ -127,7 +127,7 @@ Le groupe {$asso.nom} compte {$nb_tot} membres : {if $is_admin}

{/if} -- 2.1.4
Version texte
- {icon name=user_edit title="Edition du profil"} + {icon name=user_edit title="Édition du profil"} {icon name=delete title="Supprimer de l'annuaire"}