From 84a730d3c19d70fb7af1754390f6dcdd056c70ce Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Wed, 31 Oct 2012 11:42:32 +0000
Subject: [PATCH] fixing language display in menu

---
 bureau/admin/index.php     | 2 +-
 bureau/admin/menu_lang.php | 2 +-
 bureau/class/lang_env.php  | 8 ++++++++
 install/alternc.install    | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bureau/admin/index.php b/bureau/admin/index.php
index c6383a07..dbc46d1e 100644
--- a/bureau/admin/index.php
+++ b/bureau/admin/index.php
@@ -115,7 +115,7 @@ if (isset($url) && $url)  {
 	    <?php 
 		foreach($locales as $l) {
 	    ?>
-	    <a href="?setlang=<?php echo $l; ?>"><?php __($l); ?></a>
+	    <a href="?setlang=<?php echo $l; ?>"><?php if (isset($lang_translation[$l])) echo $lang_translation[$l]; else echo $l;  ?></a>
 	    <?php } ?>
 <br />
 <?php
diff --git a/bureau/admin/menu_lang.php b/bureau/admin/menu_lang.php
index 21b53189..09673f70 100644
--- a/bureau/admin/menu_lang.php
+++ b/bureau/admin/menu_lang.php
@@ -6,7 +6,7 @@
   <div class="menu-content" id="menu-lang">
   <ul>
    <?php foreach($locales as $l) { ?>
-    <li><a href="/login.php?setlang=<?php echo $l; ?>" target="_top"><?php __($l); ?></a></li>
+    <li><a href="/login.php?setlang=<?php echo $l; ?>" target="_top"><?php if (isset($lang_translation[$l])) echo $lang_translation[$l]; else echo $l; ?></a></li>
    <?php } ?>
   </ul>
  </div>
diff --git a/bureau/class/lang_env.php b/bureau/class/lang_env.php
index 42398392..5702f154 100644
--- a/bureau/class/lang_env.php
+++ b/bureau/class/lang_env.php
@@ -1,5 +1,13 @@
 <?php
 
+$lang_translation=array(
+			"fr_FR" => "Français",
+			"en_US" => "English",
+			"es_ES" => "Español",
+			"it_IT" => "Italiano",
+			"de_DE" => "Deutsch",
+			);
+
 function update_locale($langpath) {
   $locales=array();
   $file=file("/etc/locale.gen", FILE_SKIP_EMPTY_LINES);
diff --git a/install/alternc.install b/install/alternc.install
index cae9ece5..4dd6863a 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -383,6 +383,10 @@ if [ -x /usr/sbin/locale-gen ] ; then
 	echo "en_US.UTF-8 UTF-8" >>/etc/locale.gen
 	LOCALECHANGED=1
     fi
+    if ! grep -q "^it_IT.UTF-8 UTF-8$" /etc/locale.gen ; then
+	echo "it_IT.UTF-8 UTF-8" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
     if [ "$LOCALECHANGED" ] ; then
 	locale-gen
     fi