aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bug fix: close contacts are now really close contacts

Browse source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@307 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
mensonge 2009-03-05 09:44:20 +00:00
parent e1455c23c1
commit e036187a42
4 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
locales/fr_FR/LC_MESSAGES/messages.mo
View file

Binary file not shown.

32
locales/fr_FR/LC_MESSAGES/messages.po
View file

@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Scuttle\n" "Project-Id-Version: Scuttle\n"
"Report-Msgid-Bugs-To: \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: 2009-02-28 16:42+0100\n" "PO-Revision-Date: 2009-03-05 10:42+0100\n"
"Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n" "Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n"
"Language-Team: fr-FR <toony.sf@chezouam.net>\n" "Language-Team: fr-FR <toony.sf@chezouam.net>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1187,15 +1187,14 @@ msgid "Member Since"
msgstr "Membre depuis" msgstr "Membre depuis"
#: ../../../templates/profile.tpl.php:40 #: ../../../templates/profile.tpl.php:40
#: ../../../templates/sidebar.block.watchlist.php:29 #: ../../../templates/sidebar.block.watchlist.php:30
#, fuzzy
msgid "Watching" msgid "Watching"
msgstr "Liste des signets vus" msgstr "Mes contacts"
#: ../../../templates/profile.tpl.php:55 #: ../../../templates/profile.tpl.php:55
#, fuzzy #: ../../../templates/sidebar.block.watchlist.php:52
msgid "Watched By" msgid "Watched By"
msgstr "Consultés" msgstr "Dans les contacts de"
#: ../../../templates/profile.tpl.php:68 ../../../templates/toolbar.inc.php:8 #: ../../../templates/profile.tpl.php:68 ../../../templates/toolbar.inc.php:8
msgid "Bookmarks" msgid "Bookmarks"
@ -1306,31 +1305,26 @@ msgstr "Voir tous les utilisateurs"
msgid "All users" msgid "All users"
msgstr "Tous les utilisateurs" msgstr "Tous les utilisateurs"
#: ../../../templates/sidebar.block.watchlist.php:18 #: ../../../templates/sidebar.block.watchlist.php:19
msgid "Close contacts are mutual contacts" msgid "Close contacts are mutual contacts"
msgstr "Les contacts proches sont des contacts mutuels" msgstr "Les contacts proches sont des contacts mutuels"
#: ../../../templates/sidebar.block.watchlist.php:18 #: ../../../templates/sidebar.block.watchlist.php:19
msgid "Close contacts" msgid "Close contacts"
msgstr "Contacts proches" msgstr "Contacts proches"
#: ../../../templates/sidebar.block.watchlist.php:35 #: ../../../templates/sidebar.block.watchlist.php:36
msgid "Add a contact..." msgid "Add a contact..."
msgstr "Ajouter un 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." msgid "Type a username to add it to your contacts."
msgstr "Entrer un nom d'utilisateur pour l'ajouter à vos 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" msgid "Remove this contact"
msgstr "Enlever ce contact" msgstr "Enlever ce contact"
#: ../../../templates/sidebar.block.watchlist.php:51
#, fuzzy
msgid "Watched by"
msgstr "Consultés"
#: ../../../templates/sidebar.block.watchstatus.php:11 #: ../../../templates/sidebar.block.watchstatus.php:11
msgid "Remove from Watchlist" msgid "Remove from Watchlist"
msgstr "Enlever des contacts" msgstr "Enlever des contacts"
@ -1421,6 +1415,10 @@ msgstr "Profil"
msgid "created in" msgid "created in"
msgstr "Créé en " msgstr "Créé en "
#, fuzzy
#~ msgid "Watched by"
#~ msgstr "Consultés"
#~ msgid "URL" #~ msgid "URL"
#~ msgstr "URL" #~ msgstr "URL"

19
locales/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1129,11 +1129,12 @@ msgid "Member Since"
msgstr "" msgstr ""
#: ../../../templates/profile.tpl.php:40 #: ../../../templates/profile.tpl.php:40
#: ../../../templates/sidebar.block.watchlist.php:29 #: ../../../templates/sidebar.block.watchlist.php:30
msgid "Watching" msgid "Watching"
msgstr "" msgstr ""
#: ../../../templates/profile.tpl.php:55 #: ../../../templates/profile.tpl.php:55
#: ../../../templates/sidebar.block.watchlist.php:52
msgid "Watched By" msgid "Watched By"
msgstr "" msgstr ""
@ -1244,30 +1245,26 @@ msgstr ""
msgid "All users" msgid "All users"
msgstr "" msgstr ""
#: ../../../templates/sidebar.block.watchlist.php:18 #: ../../../templates/sidebar.block.watchlist.php:19
msgid "Close contacts are mutual contacts" msgid "Close contacts are mutual contacts"
msgstr "" msgstr ""
#: ../../../templates/sidebar.block.watchlist.php:18 #: ../../../templates/sidebar.block.watchlist.php:19
msgid "Close contacts" msgid "Close contacts"
msgstr "" msgstr ""
#: ../../../templates/sidebar.block.watchlist.php:35 #: ../../../templates/sidebar.block.watchlist.php:36
msgid "Add a contact..." msgid "Add a contact..."
msgstr "" msgstr ""
#: ../../../templates/sidebar.block.watchlist.php:35 #: ../../../templates/sidebar.block.watchlist.php:36
msgid "Type a username to add it to your contacts." msgid "Type a username to add it to your contacts."
msgstr "" msgstr ""
#: ../../../templates/sidebar.block.watchlist.php:43 #: ../../../templates/sidebar.block.watchlist.php:44
msgid "Remove this contact" msgid "Remove this contact"
msgstr "" msgstr ""
#: ../../../templates/sidebar.block.watchlist.php:51
msgid "Watched by"
msgstr ""
#: ../../../templates/sidebar.block.watchstatus.php:11 #: ../../../templates/sidebar.block.watchstatus.php:11
msgid "Remove from Watchlist" msgid "Remove from Watchlist"
msgstr "" msgstr ""

7
templates/sidebar.block.watchlist.php
View file

@ -5,7 +5,8 @@
$watching = $userservice->getWatchNames($userid); $watching = $userservice->getWatchNames($userid);
$watchedBy = $userservice->getWatchNames($userid, true); $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) { foreach($watching as $watchuser) {
if(in_array($watchuser, $watchedBy)) { if(in_array($watchuser, $watchedBy)) {
$closeContacts[] = $watchuser; $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> <h2 title="<?php echo T_('Close contacts are mutual contacts');?>"><?php echo ' &harr '. T_('Close contacts'); ?></h2>
<div id="watching"> <div id="watching">
<ul> <ul>
<?php foreach($watching as $watchuser): ?> <?php foreach($closeContacts as $watchuser): ?>
<li><a href="<?php echo createURL('bookmarks', $watchuser); ?>"><?php echo $watchuser; ?></a> </li> <li><a href="<?php echo createURL('bookmarks', $watchuser); ?>"><?php echo $watchuser; ?></a> </li>
<?php endforeach; ?> <?php endforeach; ?>
</ul> </ul>
@ -48,7 +49,7 @@ foreach($watching as $watchuser) {
</ul> </ul>
</div> </div>
<h2><?php echo ' &larr '. T_('Watched by'); ?></h2> <h2><?php echo ' &larr '. T_('Watched By'); ?></h2>
<div id="watching"> <div id="watching">
<ul> <ul>
<?php foreach($watchedBy as $watchuser): ?> <?php foreach($watchedBy as $watchuser): ?>