Displays country name instead of country code as flag title.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/classes/profile.php b/classes/profile.php
index 0b22460..095d1ef 100644 (file)
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -371,14 +371,15 @@ class Profile
     public function nationalities()
     {
         $nats = array();
+        $countries = DirEnum::getOptions(DirEnum::COUNTRIES);
         if ($this->nationality1) {
-            $nats[] = $this->nationality1;
+            $nats[$this->nationality1] = $countries[$this->nationality1];
         }
         if ($this->nationality2) {
-            $nats[] = $this->nationality2;
+            $nats[$this->nationality2] = $countries[$this->nationality2];
         }
         if ($this->nationality3) {
-            $nats[] = $this->nationality3;
+            $nats[$this->nationality3] = $countries[$this->nationality3];
         }
         return $nats;
     }

diff --git a/templates/gadgets/ig-minifiche.tpl b/templates/gadgets/ig-minifiche.tpl
index c5e8069..b88b872 100644 (file)
--- a/templates/gadgets/ig-minifiche.tpl
+++ b/templates/gadgets/ig-minifiche.tpl
@@ -51,8 +51,8 @@
     {if !$dead && $registered}</a>{/if}
   </div>
   <div class="autre">
-    {foreach from=$profile->nationalities() item=nat}
-    <img src='images/flags/{$nat}.gif' alt='{$nat}' height='11' title='{$nat}' />&nbsp;
+    {foreach from=$profile->nationalities() item=country key=code}
+    <img src='images/flags/{$code}.gif' alt='{$code}' height='11' title='{$country}' />&nbsp;
     {/foreach}
     {$profile->promo()}{*
     *}{if $dead}, {"décédé"|sex:"décédée":$profile} le {$profile->deathdate|date_format}{/if}

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 21fc745..6146791 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -60,8 +60,8 @@
     </div>
 
     <div class="edu">
-      {foreach from=$profile->nationalities() item=nat}
-      <img src='images/flags/{$nat}.gif' alt='{$nat}' height='11' title='{$nat}' />&nbsp;
+      {foreach from=$profile->nationalities() item=country key=code}
+      <img src='images/flags/{$code}.gif' alt='{$code}' height='11' title='{$country}' />&nbsp;
       {/foreach}
       {$profile->promo()}{*
       *}{foreach from=$profile->getExtraEducations(4) item=edu}, {display_education edu=$edu profile=$profile}{/foreach}{*

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index 79abc50..19bd26a 100644 (file)
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -154,8 +154,8 @@ function chgMainWinLoc(strPage)
     {/if}
 
     <div class='formation'>
-      {foreach from=$profile->nationalities() item=nat}
-        <img src='images/flags/{$nat}.gif' alt='{$nat}' height='11' title='{$nat}' />&nbsp;
+      {foreach from=$profile->nationalities() item=country key=code}
+      <img src='images/flags/{$code}.gif' alt='{$code}' height='11' title='{$country}' />&nbsp;
       {/foreach}
 
       {$profile->promo()}