From e036187a42ff78e093ded5287b9c23efd222e686 Mon Sep 17 00:00:00 2001 From: mensonge Date: Thu, 5 Mar 2009 09:44:20 +0000 Subject: [PATCH] Bug fix: close contacts are now really close contacts git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@307 b3834d28-1941-0410-a4f8-b48e95affb8f --- locales/fr_FR/LC_MESSAGES/messages.mo | Bin 24680 -> 24790 bytes locales/fr_FR/LC_MESSAGES/messages.po | 32 ++++++++++++-------------- locales/messages.po | 19 +++++++-------- templates/sidebar.block.watchlist.php | 7 +++--- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/locales/fr_FR/LC_MESSAGES/messages.mo index 5addd44edc54ddd856be674f2ac0da74bd7a519b..a7db72b7d2c5c35c1b149606ca851222ff9430a5 100644 GIT binary patch delta 6369 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 M|8G}rANR7~pJ-yHfB*mh delta 6272 zcmY+|34Bdg0>|+avhN|0kVGO>G?92B31W-AYN^mhiV|%JZ86qXYh2RRRvp@Cr!`fy z)iEu#m0>JZrIzYSO*LK7g@!Vg(&hJm=lFcg{rJD{IrqJHwtMb}lbF{zM% ziQ&X(48aF55@%v4&Uf`HjHbREHITLL{4S(V^MO16BdVP% zn1HpJ6&;!S7=>x5c5^U{{!O7fQH*M+7pjB1usKdf&Fm$N!w*pneTyuXIg6UW6>N+V zOk0cB0yW?+cmtMT1m2JO-oqG2|7JdgOnecwbbBx#k6|#zHM9*Sp*qOK$=Dl5;STJl z^J%OePDOQGgBkccmSCfFJJ3m}2|kQoAcdzXa2d^Ws1Da6lQEl7Gdqm>!UU(*pcDtZHHw3i;qul!w8?pX6QOOA{(UVw->roB0X80ONN6f_` zsE+2KF2Mp!$0evuxDC1N=2O%F&!Uz(m}S$Yj76<<2h75ejXk?Lp5jD0C#p~*e+xC^ zJ=hXIL+y?5Ce|j-j;I-yIVYfx`W(#0EyzD}k{9iXNM;#`X&8h}JPLXv3)N5u)KZnA zW;g;hlkup{_Xui$RjALug4*rdQI}>9YIh&Tjrb*MC99g+y|4sXT(bi;LGK$1OwOEh zZzQrlx+HB;w_$f|fdjA)R-y)W2x;4Vftpe6X7+q2Y6A686KjNOFCX=}Vps2u!MguT zD1`7v8R`L1j_P=mb2sW5euUb^$K3hc8*NAJP@nIC>R=%D#xkspE8P1lQ7g6qHSqT_ zQ1}0N3bi8!y> z>KBnmiV4iI1Ia*7AN08sZIEkXdY~SieK7*>LVa;Os)PBc2CI;5W0t%6KGgS)pf=fQ z)WBl6chzoV)Cy;z+UcCj`fDj~=7bu&6^G&o)EBm)R$w79jd#d zKI-$?*b&>KI(!HmXG!4a+?UB9cclogI>r})eJM85oOI&R0?I zZ$fRpcQ6g#!yx=;k2V#4ikE3uOs==16 z_@%_w$o?@)QJd`mYQ<_$Ps|ILj&<|x=FLaVxD5H_H6u{%dDAJxQm91Dd=ct4S%O;P zji_Dx5fEkNRG0hF_xgT4)=|^-rLn zyC4HKfGpIEi%|pXhOY$}GYJ!^rxw{qZ~^LCcgH7jBx>o;Bm2w5wX=`z&ZtXNig)8Q zEX8W{=-(7@p*52Y7>C?{qqDe80WktH>~F&@XD+L?j6 z9Unto^OdOf-at>c&vpuG=pbs7e2aSGokDdO%e|y)mW>SBOhyf04XUBHQA__Zs^et8s*@^nxADDt6#r9{p2|hx- z)cHA1q+Z_H{`!548sMBR_EJ8N<<$3~CYIgRv%lv(y4u^P9MgHD!quN}^#!O+w8psy z)o?XxMm4Aj1a-5|fh5!=O+`&46V+im)b~nJD_G&V!Zg&9%thTMi*Y0FN8Q(z-R;WE z#$xIlQ0Fh88vG42F}jDHP$4#<-XFDMQ&4+kA@X}=UP67|J3t|q!g&nF#y#y{Fj=S( z4nbYhvBH%z!Waqf(`K#48n65 zOaJCFg-8tVYj=4f4x^ridf?2!D6B$tumbPIH!uR@`q`PMqS|SOwXpyPV_OWtr%@~X z0%`@{L{C39``rhEZn0mCLS4%^RD(HKhDDf#i!d6up$2de%ke03$C;x3tO`y?t>``s z#tU<`hR8ps*c0FnpT70N{2rUj_; zeNY{jp;llxYC;vL+i~&$)?W=Sa36dTHL_Pwn`Hy)+HFG(^ayGb9(VPSf%g3b%;tP9 z#^PYqQs0Z(oHMZwE=9Gw4%N<9kAg;6jp2A4Q}GPmgVDFzFHA!X$I;X`c4xfsX!QqWCjW0y>IbBl5pK>jHOG^BdesZY1;Fxkb)vL@Fl9&A@`@3*~atm^r1n@l_LF6QP zf_y}DbR%_ne;KYJcM%=0ljFoI;zbXM-DDEkN!pU@k6;>D&WZn#%j8)yp48|30=%0P zl55943h$AwWUx;1xgD^PB$M9c0O7Fn52e(>U+3wCx04~{A7m5RMs!4xG5(T$nd{1( zF^W!nt{zIcf^rr)N-mLD5>IqABGqJt>)-#AsW&3^!jVh^ui2t$NI8bwM7=KwCLg%> z%J3m_mGmNiAqUCLWDC*pyT!bMk+f6n>J2DAqWO;`XUXFvg_G;BHnzd*k5R5tio?lz zSFgoqb@Z|P-|J9n$H-=q%IEID6C{vwJ{H7L=tp5K$s^Z}uU#Pre\n" "Language-Team: fr-FR \n" "MIME-Version: 1.0\n" @@ -1187,15 +1187,14 @@ msgid "Member Since" msgstr "Membre depuis" #: ../../../templates/profile.tpl.php:40 -#: ../../../templates/sidebar.block.watchlist.php:29 -#, fuzzy +#: ../../../templates/sidebar.block.watchlist.php:30 msgid "Watching" -msgstr "Liste des signets vus" +msgstr "Mes contacts" #: ../../../templates/profile.tpl.php:55 -#, fuzzy +#: ../../../templates/sidebar.block.watchlist.php:52 msgid "Watched By" -msgstr "Consultés" +msgstr "Dans les contacts de" #: ../../../templates/profile.tpl.php:68 ../../../templates/toolbar.inc.php:8 msgid "Bookmarks" @@ -1306,31 +1305,26 @@ msgstr "Voir tous les utilisateurs" msgid "All users" msgstr "Tous les utilisateurs" -#: ../../../templates/sidebar.block.watchlist.php:18 +#: ../../../templates/sidebar.block.watchlist.php:19 msgid "Close contacts are mutual contacts" msgstr "Les contacts proches sont des contacts mutuels" -#: ../../../templates/sidebar.block.watchlist.php:18 +#: ../../../templates/sidebar.block.watchlist.php:19 msgid "Close contacts" msgstr "Contacts proches" -#: ../../../templates/sidebar.block.watchlist.php:35 +#: ../../../templates/sidebar.block.watchlist.php:36 msgid "Add a contact..." msgstr "Ajouter un contact..." -#: ../../../templates/sidebar.block.watchlist.php:35 +#: ../../../templates/sidebar.block.watchlist.php:36 msgid "Type a username to add it to your contacts." msgstr "Entrer un nom d'utilisateur pour l'ajouter à vos contacts." -#: ../../../templates/sidebar.block.watchlist.php:43 +#: ../../../templates/sidebar.block.watchlist.php:44 msgid "Remove this contact" msgstr "Enlever ce contact" -#: ../../../templates/sidebar.block.watchlist.php:51 -#, fuzzy -msgid "Watched by" -msgstr "Consultés" - #: ../../../templates/sidebar.block.watchstatus.php:11 msgid "Remove from Watchlist" msgstr "Enlever des contacts" @@ -1421,6 +1415,10 @@ msgstr "Profil" msgid "created in" msgstr "Créé en " +#, fuzzy +#~ msgid "Watched by" +#~ msgstr "Consultés" + #~ msgid "URL" #~ msgstr "URL" diff --git a/locales/messages.po b/locales/messages.po index 3680e34..944a74f 100644 --- a/locales/messages.po +++ b/locales/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-28 16:43+0100\n" +"POT-Creation-Date: 2009-03-05 10:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1129,11 +1129,12 @@ msgid "Member Since" msgstr "" #: ../../../templates/profile.tpl.php:40 -#: ../../../templates/sidebar.block.watchlist.php:29 +#: ../../../templates/sidebar.block.watchlist.php:30 msgid "Watching" msgstr "" #: ../../../templates/profile.tpl.php:55 +#: ../../../templates/sidebar.block.watchlist.php:52 msgid "Watched By" msgstr "" @@ -1244,30 +1245,26 @@ msgstr "" msgid "All users" msgstr "" -#: ../../../templates/sidebar.block.watchlist.php:18 +#: ../../../templates/sidebar.block.watchlist.php:19 msgid "Close contacts are mutual contacts" msgstr "" -#: ../../../templates/sidebar.block.watchlist.php:18 +#: ../../../templates/sidebar.block.watchlist.php:19 msgid "Close contacts" msgstr "" -#: ../../../templates/sidebar.block.watchlist.php:35 +#: ../../../templates/sidebar.block.watchlist.php:36 msgid "Add a contact..." msgstr "" -#: ../../../templates/sidebar.block.watchlist.php:35 +#: ../../../templates/sidebar.block.watchlist.php:36 msgid "Type a username to add it to your contacts." msgstr "" -#: ../../../templates/sidebar.block.watchlist.php:43 +#: ../../../templates/sidebar.block.watchlist.php:44 msgid "Remove this contact" msgstr "" -#: ../../../templates/sidebar.block.watchlist.php:51 -msgid "Watched by" -msgstr "" - #: ../../../templates/sidebar.block.watchstatus.php:11 msgid "Remove from Watchlist" msgstr "" diff --git a/templates/sidebar.block.watchlist.php b/templates/sidebar.block.watchlist.php index 686550b..b759d70 100644 --- a/templates/sidebar.block.watchlist.php +++ b/templates/sidebar.block.watchlist.php @@ -5,7 +5,8 @@ $watching = $userservice->getWatchNames($userid); $watchedBy = $userservice->getWatchNames($userid, true); -$closeContacts = array(); // people in my contacts list and whose I am also in the contacts list + +$closeContacts = array(); // people in my contacts list and who I am also in the contacts list foreach($watching as $watchuser) { if(in_array($watchuser, $watchedBy)) { $closeContacts[] = $watchuser; @@ -18,7 +19,7 @@ foreach($watching as $watchuser) {

    - +
@@ -48,7 +49,7 @@ foreach($watching as $watchuser) {
-

+