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

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 5addd44..a7db72b 100644
--- a/locales/fr_FR/LC_MESSAGES/messages.mo
+++ b/locales/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locales/fr_FR/LC_MESSAGES/messages.po b/locales/fr_FR/LC_MESSAGES/messages.po
index 2b01e37..6622b9e 100644
--- a/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/locales/fr_FR/LC_MESSAGES/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-28 16:43+0100\n"
-"PO-Revision-Date: 2009-02-28 16:42+0100\n"
+"POT-Creation-Date: 2009-03-05 10:42+0100\n"
+"PO-Revision-Date: 2009-03-05 10:42+0100\n"
 "Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n"
 "Language-Team: fr-FR <toony.sf@chezouam.net>\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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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) {
 <h2 title="<?php echo T_('Close contacts are mutual contacts');?>"><?php echo ' &harr '. T_('Close contacts'); ?></h2>
 <div id="watching">
     <ul>
-    <?php foreach($watching as $watchuser): ?>
+    <?php foreach($closeContacts as $watchuser): ?>
         <li><a href="<?php echo createURL('bookmarks', $watchuser); ?>"><?php echo $watchuser; ?></a> </li>
     <?php endforeach; ?>
     </ul>
@@ -48,7 +49,7 @@ foreach($watching as $watchuser) {
     </ul>
 </div>
 
-<h2><?php echo ' &larr '. T_('Watched by'); ?></h2>
+<h2><?php echo ' &larr '. T_('Watched By'); ?></h2>
 <div id="watching">
     <ul>
     <?php foreach($watchedBy as $watchuser): ?>