Fix #502: aka <=> alias

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@978 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index fd38456..9a6d096 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@ Bug/Wish:
         - #473: Use 'événement' instead of 'évènement'.                    -FRU
         - #475: More understandable bug report form.                       -FRU
 
+    * Profile:
+        - #502: Use 'alias' instead of 'aka' to specify the nickname       -FRU
+
 From 0.9.11 branch:
 
     * Core:

diff --git a/include/wiki/farmconfig.php b/include/wiki/farmconfig.php
index ee13e1a..115d3c3 100644 (file)
--- a/include/wiki/farmconfig.php
+++ b/include/wiki/farmconfig.php
@@ -89,7 +89,7 @@ function doPlatalLink($link, $text)
         $row = $res->fetchOneAssoc();
         $text = $row['prenom'] . ' ' . $row['nom'] . ' X' . $row['promo'];
         if ($row['surnom']) {
-            $text .= ' (aka ' . $row['surnom'] . ')';
+            $text .= ' (alias ' . $row['surnom'] . ')';
         }
     }
     return '<a href="profile/' . $link . '" class="popup2">' . $text . '</a>';

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 78689f7..916ca5a 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -43,7 +43,7 @@ function chgMainWinLoc( strPage ) {
         {if $x.sexe}•{/if}
         {$x.prenom} {if $x.nom_usage eq ""}{$x.nom}{else}{$x.nom_usage} ({$x.nom}){/if}
         {if $logged}
-        {if $x.nickname} (aka {$x.nickname}){/if} 
+        {if $x.nickname} (alias {$x.nickname}){/if} 
         <a href="vcard/{$x.forlife}.vcf">{*
           *}{icon name=vcard title="Afficher la carte de visite"}</a>
         {if !$x.is_contact}