From 10f20d84ca06aab52c97b28c406f328c3291952a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?X=C3=A9fir=20Destiny?= Date: Sun, 1 Sep 2013 17:26:15 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20du=20[s][/s]=20dans=20TinyMCE,=20f?= =?UTF-8?q?ix=20de=20l'auto=20mail=20lors=20d'un=20r=C3=A9ponse,=20fix=20d?= =?UTF-8?q?es=20apostrophes=20dans=20les=20sujets=20(encore)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n/mingleforum-fr_FR.mo | Bin 23365 -> 23368 bytes i18n/mingleforum-fr_FR.po | 36 +++++++++++------------ js/plugins/bbcodev2/editor_plugin_src.js | 4 +++ wpf-post.php | 12 ++++---- wpf.class.php | 10 +++++-- 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/i18n/mingleforum-fr_FR.mo b/i18n/mingleforum-fr_FR.mo index 0645e434addcf211c02869857fc7a7aeb4016a59..a157514affeb87c1bc54834abe6ca6d0308348cc 100644 GIT binary patch delta 2059 zcmYk-TWC~A9LMoVR!!VoHc{6!>8i(Qv|d(rO=L~bm^Ag$s!6&@ty)pMl=#xp(%qJT z^iaV*6$M447Z9s2B0}oQKC~b$MeB_gYj1gQp=w*iMnsH6f~Mb}=l{^B&-~}infcFu z=Iox&7hTL34fIy{mCm`|Hs_|}PIE6#B0grG#TfAqI2mu_TpYnh^xB;(!Cut3EjSJP zt^WwN5+6mqU%+|zpxyay8;#hD&TYUwI3BO#R2;-8-bcMSp(9wZ4i$IeLfm2T0gMnI z$7;-3|9OiC?fG5QyrUg{u=DDdf*mCAWgaXw_hKpWRV>F}(ZieAfT5Mn&BA%8imb;O zm_-i{n|bqh98doUE-7;EsZT?hHm!E93|Cs3ZCSC*bF(%6*9u?w=c=p)>gwwWA9-1%E^>d<*q;4BPW5>w@Po)I>?t z4p-nrOk)_gU?29O7XHcn4VB;x$@*@Hh7x#!Wf)o?BoaYQScBT}Of1I+)Q%RT7TSPH zU^{Aj22=Q6~B6z;YTot0*dgIO+_WQI+Vj=ew+b4_48C5OrCPo99p^ zAH+pCgqkQWI=ElWQ3;Qs5()b~L1tB`+a1FSY{Y78N4?O4N^C1?=ew~5vp5L{ zPz!#K8g~QrS^k6iyhFWg24|r*yashNem4!B$!_%U6N^tf*_ z!i9JVx8oyRg&SYDKOM7x3HqmP48D#|Y|{7tF%A9FePjNC%6J%cyCa+U^l(1T#dX+# z8C-y$S^ovpxO*7Es?EXIP)Z#g)Gfm`bqlfCl&GAIiOQu?q$wT?n^#6sqLh7T^kQeuI+uHuF`w!@% B_&@*v delta 2055 zcmYk-TWHir6vy#N)oyNUk~L}A*d%Lg4BZ;Li5nx{h{kwJ(p_t`O$DP8DYUeZH3Xy& ze`=qkf}r9Bq}3M@L5(cLg0vKGwX|5PZ5|BRDn;5z5hIb%2GZ}(IS+mM%$fiEXU?3N z|L)D9oa;k5gI(dEz&Y2|;#?JOHv^0ie_>w4SBbCTEPQ}fH z{fBV{@d?!XBltQ#S?L1TLnFG%xh=Q{XW(so1&6T=|3-U{(xHechuK0X3tAH{PQSkq6Mgh zmth{JFdw_|ee6Xo{G)jnbxH3@)_0>cl)yh&fUeUgQiz(c6t&|jEW{erj^0EqvTp)(P7VbSpOa@rvCuyvYs?Aqe?!E z3vd*52cju|M;cIxcVZIzQq+GAjnj10<4ug>bF(<@D-%aux&-RQUQ{KHqbhLP;)|$K ze`EdEQ5(69+SnshrN>a?CeqYjXFf$o5r#JU5|*PXGY54C;`ri>aUO9BcjEx|ku zzeSC^hx#o4Kz-h>%emJehT3o&>S%&a8ak6*7{h%QpSAdw#ZN4rwb>_}G+R(5?!Y$O zi7M?G)It|fiCw~C{26EBL!8d~?kNpr{2aAY{ShcGFw2l%TUU+Cuotz!Db%0L8Jv$d za0foaHMsd5`_nN;FhPICyZ-BF$E3dh&uHkE?kn?GRK{bd+g;erJ-|Aw!}VB;efS0* zwf?K9agR}VDg2)QdMZ($ZzHl}w+MBFOEE-M-8vddAZ-Ia!YFYD`*A<&mo8_kpJ+O& wLb<4tMl7C-I@9`WwCqq#{^I(^WUQfSNg{b@sJZHYVfKFWr@7gkEsrYx15teU?EnA( 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);