diff --git a/i18n/mingleforum-fr_FR.mo b/i18n/mingleforum-fr_FR.mo index 0645e43..a157514 100644 Binary files a/i18n/mingleforum-fr_FR.mo and b/i18n/mingleforum-fr_FR.mo differ diff --git a/i18n/mingleforum-fr_FR.po b/i18n/mingleforum-fr_FR.po index d0a30d6..f62fda4 100644 --- a/i18n/mingleforum-fr_FR.po +++ b/i18n/mingleforum-fr_FR.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: Mingle Forum\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-24 15:04+0100\n" -"PO-Revision-Date: 2013-08-24 15:04+0100\n" +"POT-Creation-Date: 2013-09-01 17:11+0100\n" +"PO-Revision-Date: 2013-09-01 17:11+0100\n" "Last-Translator: Xefir Destiny \n" "Language-Team: Gobiel \n" "Language: fr_FR\n" @@ -613,7 +613,7 @@ msgstr "Nouvelles discussions depuis votre dernière visite" msgid "Summary" 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-usergroup-edit.php:32 msgid "Name:" @@ -683,47 +683,47 @@ msgstr "Code de sécurité:" msgid "Enter Security Code: (required)" msgstr "Code de sécurité:" -#: wpf.class.php:2623 wpf.class.php:2645 +#: wpf.class.php:2627 wpf.class.php:2652 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:" msgstr "DÉTAILS:" -#: wpf.class.php:2626 wpf.class.php:2648 wpf.class.php:2670 -msgid "Email:" -msgstr "Email" - -#: wpf.class.php:2627 wpf.class.php:2649 wpf.class.php:2671 +#: wpf.class.php:2630 wpf.class.php:2655 wpf.class.php:2677 msgid "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:" 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:" msgstr "Voir discussion:" -#: wpf.class.php:2667 +#: wpf.class.php:2673 msgid "New Forum content - " 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" msgstr "Mingle Forum >> Options de Skins" -#: wpf.class.php:2873 +#: wpf.class.php:2879 msgid "Add this post to" 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!" 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" msgstr "Rejoignez le forum de discussion sur ce post" diff --git a/js/plugins/bbcodev2/editor_plugin_src.js b/js/plugins/bbcodev2/editor_plugin_src.js index 6523a5d..d634948 100644 --- a/js/plugins/bbcodev2/editor_plugin_src.js +++ b/js/plugins/bbcodev2/editor_plugin_src.js @@ -144,6 +144,8 @@ rep(/<\/(em|i)>/gi,"[/i]"); rep(/<(em|i)>/gi,"[i]"); rep(/<\/u>/gi,"[/u]"); + rep(/<\/del>/gi,"[/s]"); + rep(//gi,"[s]"); rep(/
.*?<\/div>/gi,"[video=youtube]$1[/video]"); rep(/
.*?<\/div>/gi,"[video=dailymotion]$1[/video]"); rep(/
.*?<\/div>/gi,"[video=veoh]$1[/video]"); @@ -231,6 +233,8 @@ rep(/\[\/i\]/gi,""); rep(/\[u\]/gi,""); rep(/\[\/u\]/gi,""); + rep(/\[s\]/gi,""); + rep(/\[\/s\]/gi,""); rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); rep(/\[url\](.*?)\[\/url\]/gi,"$1"); rep(/\[link=([^\]]+)\](.*?)\[\/link\]/gi,"$2"); diff --git a/wpf-post.php b/wpf-post.php index ccdb9e7..1095b39 100644 --- a/wpf-post.php +++ b/wpf-post.php @@ -20,9 +20,9 @@ if($_GET['mingleforumaction'] == "postreply"){ ".__("Post Reply", "mingleforum")." - ".__("Subject:", "mingleforum")." - get_subject($thread)."'/> - + ".__("Subject:", "mingleforum").""; + $out .= ''; + $out .= " ".__("Message:", "mingleforum")." "; @@ -73,9 +73,9 @@ if($_GET['mingleforumaction'] == "editpost"){ ".__("Edit Post", "mingleforum")." - ".__("Subject:", "mingleforum")." - - + ".__("Subject:", "mingleforum").""; + $out .= ''; + $out .= " ".__("Message:", "mingleforum")." "; diff --git a/wpf.class.php b/wpf.class.php index d2524ed..1adc592 100644 --- a/wpf.class.php +++ b/wpf.class.php @@ -2620,10 +2620,13 @@ class mingleforum{ $submitter_email = (!$user_ID)?"guest@nosite.com":$this->get_userdata($user_ID, 'user_email'); $sender = get_bloginfo("name"); $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; $message = __("DETAILS:", "mingleforum")."

". __("Name:", "mingleforum")." ".$submitter_name."
". - __("Email:", "mingleforum")." ".$submitter_email."
". __("Date:", "mingleforum")." ".$this->format_date($date)."
". __("Reply Content:", "mingleforum")."
".$content."

". __("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'); $sender = get_bloginfo("name"); $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; $message = __("DETAILS:", "mingleforum")."

". __("Name:", "mingleforum")." ".$submitter_name."
". - __("Email:", "mingleforum")." ".$submitter_email."
". __("Date:", "mingleforum")." ".$this->format_date($date)."
". __("Reply Content:", "mingleforum")."
".$content."

". __("View Post Here:", "mingleforum")." ".$this->get_threadlink($thread_id);