From: Duck (Jakob Munih) <duck@obala.net>
Date: Fri, 30 Jan 2009 16:26:17 +0000 (+0100)
Subject: Update templates and slovenian translation
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=17a0514dd368edf644c835e2da0ae6c68a4b5f3f;p=horde.git

Update templates and slovenian translation
---

diff --git a/folks/locale/sl_SI/LC_MESSAGES/folks.mo b/folks/locale/sl_SI/LC_MESSAGES/folks.mo
index 9f2f8de78..603a1280e 100644
Binary files a/folks/locale/sl_SI/LC_MESSAGES/folks.mo and b/folks/locale/sl_SI/LC_MESSAGES/folks.mo differ
diff --git a/folks/scripts/mail-filter.php b/folks/scripts/mail-filter.php
index 2b15abfb4..10de438c0 100644
--- a/folks/scripts/mail-filter.php
+++ b/folks/scripts/mail-filter.php
@@ -3,7 +3,7 @@
 /**
  * This script parses MIME messages and deactivates users with returned emails.
  *
- * $Id: mail-filter.php 1020 2008-10-31 09:25:56Z duck $
+ * $Id: mail-filter.php 1234 2009-01-28 18:44:02Z duck $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
diff --git a/folks/templates/edit/blacklist.php b/folks/templates/edit/blacklist.php
index 326fa2b69..055a699c9 100644
--- a/folks/templates/edit/blacklist.php
+++ b/folks/templates/edit/blacklist.php
@@ -2,7 +2,7 @@
 if (empty($blacklist)) {
     echo '<ul class="notices"><li>';
     echo _("There are no users in your blacklist.");
-    echo '</li>';
+    echo '</li></ul>';
 } else  {
 ?>
 <h1 class="header"><?php echo $title ?></h1>
@@ -17,10 +17,7 @@ if (empty($blacklist)) {
 <?php foreach ($blacklist as $user) { ?>
 <tr>
     <td><?php echo '<img src="' . Folks::getImageUrl($user) . '" class="userMiniIcon" /> ' . $user ?></td>
-    <td>
-        <a href="<?php echo Util::addParameter($remove_url, 'user', $user) ?>"><?php echo $remove_img  . ' ' . _("Remove") ?></a>
-        <a href="<?php echo Folks::getUrlFor('user', $user) ?>"><?php echo $profile_img  . ' ' . _("View profile") ?></a>
-    </td>
+    <td><a href="<?php $remove_url . $user ?>"><?php echo _("Remove") ?></a></td>
 </tr>
 <?php } ?>
 </tbody>
diff --git a/folks/templates/user/user.php b/folks/templates/user/user.php
index 697aed361..378205d30 100644
--- a/folks/templates/user/user.php
+++ b/folks/templates/user/user.php
@@ -106,7 +106,15 @@ foreach ($profile['activity_log'] as $item) {
 
 <tr>
     <td><strong><?php echo _("Age") ?></strong></td>
-    <td><?php $age = Folks::calcAge($profile['user_birthday']); echo $age['age'] . ' (' . $age['sign'] . ')'?></td>
+    <td>
+        <?php
+            $age = Folks::calcAge($profile['user_birthday']);
+            echo $age['age'];
+            if ($age['sign']) {
+                echo ' (' . $age['sign'] . ')';
+            }
+        ?>
+    </td>
 </tr>
 <tr>
     <td><strong><?php echo _("Gender") ?></strong></td>