Correction du [s][/s] dans TinyMCE, fix de l'auto mail lors d'un réponse, fix des apostrophes dans les sujets (encore)

This commit is contained in:
Michel Roux 2013-09-01 17:26:15 +02:00
parent 23f423af1c
commit 10f20d84ca
5 changed files with 36 additions and 26 deletions

Binary file not shown.

View File

@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Mingle Forum\n" "Project-Id-Version: Mingle Forum\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-08-24 15:04+0100\n" "POT-Creation-Date: 2013-09-01 17:11+0100\n"
"PO-Revision-Date: 2013-08-24 15:04+0100\n" "PO-Revision-Date: 2013-09-01 17:11+0100\n"
"Last-Translator: Xefir Destiny <xefir@crystalyx.net>\n" "Last-Translator: Xefir Destiny <xefir@crystalyx.net>\n"
"Language-Team: Gobiel <gobiel@gobiel.info>\n" "Language-Team: Gobiel <gobiel@gobiel.info>\n"
"Language: fr_FR\n" "Language: fr_FR\n"
@ -613,7 +613,7 @@ msgstr "Nouvelles discussions depuis votre dernière visite"
msgid "Summary" msgid "Summary"
msgstr "Sommaire" msgstr "Sommaire"
#: wpf.class.php:2417 wpf.class.php:2625 wpf.class.php:2647 wpf.class.php:2669 #: wpf.class.php:2417 wpf.class.php:2629 wpf.class.php:2654 wpf.class.php:2675
#: fs-admin/wpf-add-forum.php:14 fs-admin/wpf-edit-forum-group.php:38 #: fs-admin/wpf-add-forum.php:14 fs-admin/wpf-edit-forum-group.php:38
#: fs-admin/wpf-usergroup-edit.php:32 #: fs-admin/wpf-usergroup-edit.php:32
msgid "Name:" msgid "Name:"
@ -683,47 +683,47 @@ msgstr "Code de sécurité:"
msgid "Enter Security Code: (required)" msgid "Enter Security Code: (required)"
msgstr "Code de sécurité:" msgstr "Code de sécurité:"
#: wpf.class.php:2623 wpf.class.php:2645 #: wpf.class.php:2627 wpf.class.php:2652
msgid "Forum post - " msgid "Forum post - "
msgstr "Discussions" msgstr "Discussions - "
#: wpf.class.php:2624 wpf.class.php:2646 wpf.class.php:2668 #: wpf.class.php:2628 wpf.class.php:2653 wpf.class.php:2674
msgid "DETAILS:" msgid "DETAILS:"
msgstr "DÉTAILS:" msgstr "DÉTAILS:"
#: wpf.class.php:2626 wpf.class.php:2648 wpf.class.php:2670 #: wpf.class.php:2630 wpf.class.php:2655 wpf.class.php:2677
msgid "Email:"
msgstr "Email"
#: wpf.class.php:2627 wpf.class.php:2649 wpf.class.php:2671
msgid "Date:" msgid "Date:"
msgstr "Date" msgstr "Date"
#: wpf.class.php:2628 wpf.class.php:2650 wpf.class.php:2672 #: wpf.class.php:2631 wpf.class.php:2656 wpf.class.php:2678
msgid "Reply Content:" msgid "Reply Content:"
msgstr "Réponse:" msgstr "Réponse:"
#: wpf.class.php:2629 wpf.class.php:2651 wpf.class.php:2673 #: wpf.class.php:2632 wpf.class.php:2657 wpf.class.php:2679
msgid "View Post Here:" msgid "View Post Here:"
msgstr "Voir discussion:" msgstr "Voir discussion:"
#: wpf.class.php:2667 #: wpf.class.php:2673
msgid "New Forum content - " msgid "New Forum content - "
msgstr "Nouveau contenu sur le forum - " msgstr "Nouveau contenu sur le forum - "
#: wpf.class.php:2867 #: wpf.class.php:2676
msgid "Email:"
msgstr "Email"
#: wpf.class.php:2873
msgid "Mingle Forum Post Options" msgid "Mingle Forum Post Options"
msgstr "Mingle Forum >> Options de Skins" msgstr "Mingle Forum >> Options de Skins"
#: wpf.class.php:2873 #: wpf.class.php:2879
msgid "Add this post to" msgid "Add this post to"
msgstr "Supprimer ce message?" msgstr "Supprimer ce message?"
#: wpf.class.php:2877 #: wpf.class.php:2883
msgid "Do not check this if this post has already been linked to the forum!" msgid "Do not check this if this post has already been linked to the forum!"
msgstr "Ne cochez pas cette option si ce post a déjà été lié sur le forum !" msgstr "Ne cochez pas cette option si ce post a déjà été lié sur le forum !"
#: wpf.class.php:2909 #: wpf.class.php:2915
msgid "Join the Forum discussion on this post" msgid "Join the Forum discussion on this post"
msgstr "Rejoignez le forum de discussion sur ce post" msgstr "Rejoignez le forum de discussion sur ce post"

View File

@ -144,6 +144,8 @@
rep(/<\/(em|i)>/gi,"[/i]"); rep(/<\/(em|i)>/gi,"[/i]");
rep(/<(em|i)>/gi,"[i]"); rep(/<(em|i)>/gi,"[i]");
rep(/<\/u>/gi,"[/u]"); rep(/<\/u>/gi,"[/u]");
rep(/<\/del>/gi,"[/s]");
rep(/<del>/gi,"[s]");
rep(/<div class=\"youtube\" title=\"(.*?)\">.*?<\/div>/gi,"[video=youtube]$1[/video]"); rep(/<div class=\"youtube\" title=\"(.*?)\">.*?<\/div>/gi,"[video=youtube]$1[/video]");
rep(/<div class=\"dailymotion\" title=\"(.*?)\">.*?<\/div>/gi,"[video=dailymotion]$1[/video]"); rep(/<div class=\"dailymotion\" title=\"(.*?)\">.*?<\/div>/gi,"[video=dailymotion]$1[/video]");
rep(/<div class=\"veoh\" title=\"(.*?)\">.*?<\/div>/gi,"[video=veoh]$1[/video]"); rep(/<div class=\"veoh\" title=\"(.*?)\">.*?<\/div>/gi,"[video=veoh]$1[/video]");
@ -231,6 +233,8 @@
rep(/\[\/i\]/gi,"</em>"); rep(/\[\/i\]/gi,"</em>");
rep(/\[u\]/gi,"<u>"); rep(/\[u\]/gi,"<u>");
rep(/\[\/u\]/gi,"</u>"); rep(/\[\/u\]/gi,"</u>");
rep(/\[s\]/gi,"<del>");
rep(/\[\/s\]/gi,"</del>");
rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>"); rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>"); rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
rep(/\[link=([^\]]+)\](.*?)\[\/link\]/gi,"<a target=\"_blank\" href=\"$1\">$2</a>"); rep(/\[link=([^\]]+)\](.*?)\[\/link\]/gi,"<a target=\"_blank\" href=\"$1\">$2</a>");

View File

@ -20,9 +20,9 @@ if($_GET['mingleforumaction'] == "postreply"){
<th colspan='2'>".__("Post Reply", "mingleforum")."</th> <th colspan='2'>".__("Post Reply", "mingleforum")."</th>
</tr> </tr>
<tr> <tr>
<td>".__("Subject:", "mingleforum")."</td> <td>".__("Subject:", "mingleforum")."</td>";
<td><input size='50%' type='text' name='add_post_subject' class='wpf-input' value='".__('Re:', 'mingleforum')." ".$this->get_subject($thread)."'/></td> $out .= '<td><input size="50%" type="text" name="add_post_subject" class="wpf-input" value="'.__('Re:', 'mingleforum').' '.$this->get_subject($thread).'"/></td>';
</tr> $out .= "</tr>
<tr> <tr>
<td valign='top'>".__("Message:", "mingleforum")."</td> <td valign='top'>".__("Message:", "mingleforum")."</td>
<td>"; <td>";
@ -73,9 +73,9 @@ if($_GET['mingleforumaction'] == "editpost"){
<th colspan='2'>".__("Edit Post", "mingleforum")."</th> <th colspan='2'>".__("Edit Post", "mingleforum")."</th>
</tr> </tr>
<tr> <tr>
<td>".__("Subject:", "mingleforum")."</td> <td>".__("Subject:", "mingleforum")."</td>";
<td><input size='50%' type='text' name='edit_post_subject' class='wpf-input' value='".stripslashes($post->subject)."'/></td> $out .= '<td><input size="50%" type="text" name="edit_post_subject" class="wpf-input" value="'.stripslashes($post->subject).'"/></td>';
</tr> $out .= "</tr>
<tr> <tr>
<td valign='top'>".__("Message:", "mingleforum")."</td> <td valign='top'>".__("Message:", "mingleforum")."</td>
<td>"; <td>";

View File

@ -2620,10 +2620,13 @@ class mingleforum{
$submitter_email = (!$user_ID)?"guest@nosite.com":$this->get_userdata($user_ID, 'user_email'); $submitter_email = (!$user_ID)?"guest@nosite.com":$this->get_userdata($user_ID, 'user_email');
$sender = get_bloginfo("name"); $sender = get_bloginfo("name");
$to = get_option("mf_thread_subscribers_".$thread_id, array()); $to = get_option("mf_thread_subscribers_".$thread_id, array());
$posMailer = array_search($submitter_email, $to);
if ($posMailer !== false)
unset($to[$posMailer]);
$subject = __("Forum post - ", "mingleforum").$subject; $subject = __("Forum post - ", "mingleforum").$subject;
$message = __("DETAILS:", "mingleforum")."<br/><br/>". $message = __("DETAILS:", "mingleforum")."<br/><br/>".
__("Name:", "mingleforum")." ".$submitter_name."<br/>". __("Name:", "mingleforum")." ".$submitter_name."<br/>".
__("Email:", "mingleforum")." ".$submitter_email."<br/>".
__("Date:", "mingleforum")." ".$this->format_date($date)."<br/>". __("Date:", "mingleforum")." ".$this->format_date($date)."<br/>".
__("Reply Content:", "mingleforum")."<br/>".$content."<br/><br/>". __("Reply Content:", "mingleforum")."<br/>".$content."<br/><br/>".
__("View Post Here:", "mingleforum")." ".$this->get_threadlink($thread_id); __("View Post Here:", "mingleforum")." ".$this->get_threadlink($thread_id);
@ -2642,10 +2645,13 @@ class mingleforum{
$submitter_email = (!$user_ID)?"guest@nosite.com":$this->get_userdata($user_ID, 'user_email'); $submitter_email = (!$user_ID)?"guest@nosite.com":$this->get_userdata($user_ID, 'user_email');
$sender = get_bloginfo("name"); $sender = get_bloginfo("name");
$to = get_option("mf_forum_subscribers_".$forum_id, array()); $to = get_option("mf_forum_subscribers_".$forum_id, array());
$posMailer = array_search($submitter_email, $to);
if ($posMailer !== false)
unset($to[$posMailer]);
$subject = __("Forum post - ", "mingleforum").$subject; $subject = __("Forum post - ", "mingleforum").$subject;
$message = __("DETAILS:", "mingleforum")."<br/><br/>". $message = __("DETAILS:", "mingleforum")."<br/><br/>".
__("Name:", "mingleforum")." ".$submitter_name."<br/>". __("Name:", "mingleforum")." ".$submitter_name."<br/>".
__("Email:", "mingleforum")." ".$submitter_email."<br/>".
__("Date:", "mingleforum")." ".$this->format_date($date)."<br/>". __("Date:", "mingleforum")." ".$this->format_date($date)."<br/>".
__("Reply Content:", "mingleforum")."<br/>".$content."<br/><br/>". __("Reply Content:", "mingleforum")."<br/>".$content."<br/><br/>".
__("View Post Here:", "mingleforum")." ".$this->get_threadlink($thread_id); __("View Post Here:", "mingleforum")." ".$this->get_threadlink($thread_id);