From 68a2105900b89415cec40ad47fb93e408b91e065 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Wed, 6 May 2020 17:48:49 +0200
Subject: [PATCH] Replace generate_lang_file.php by LScli command
 generate_lang_file

---
 debian/ldapsaisie.links                       |   1 -
 src/includes/class/class.LSlang.php           | 659 ++++++++++++++++++
 src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo | Bin 56542 -> 55276 bytes
 src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po | 246 +++----
 src/lang/generate_lang_file.php               | 630 -----------------
 src/lang/generate_ldapsaisie.pot.sh           |   7 +-
 src/lang/ldapsaisie.pot                       | 107 +--
 7 files changed, 822 insertions(+), 828 deletions(-)
 delete mode 100755 src/lang/generate_lang_file.php

diff --git a/debian/ldapsaisie.links b/debian/ldapsaisie.links
index ce6d4fed..84d27a80 100644
--- a/debian/ldapsaisie.links
+++ b/debian/ldapsaisie.links
@@ -1,5 +1,4 @@
 var/cache/ldapsaisie usr/share/ldapsaisie/tmp
 usr/local/share/ldapsaisie usr/share/ldapsaisie/local
 usr/local/share/ldapsaisie etc/ldapsaisie/local
-usr/share/ldapsaisie/lang/generate_lang_file.php usr/bin/ldapsaisie-generate-lang-file
 usr/share/ldapsaisie/bin/ldapsaisie.php usr/sbin/ldapsaisie
diff --git a/src/includes/class/class.LSlang.php b/src/includes/class/class.LSlang.php
index 4e3a867f..59790907 100644
--- a/src/includes/class/class.LSlang.php
+++ b/src/includes/class/class.LSlang.php
@@ -190,3 +190,662 @@ class LSlang {
    }
 
 }
+
+/*
+ ***********************************************
+ * Generate translation file CLI methods
+ *
+ * Only load in CLI context
+ ***********************************************
+ */
+if (php_sapi_name() != "cli") return;
+
+/**
+ * CLI generate_lang_file command
+ *
+ * @param[in] $command_args array Command arguments
+ *
+ * @retval boolean True on succes, false otherwise
+ **/
+ global $available_onlys, $available_withouts;
+ $available_onlys = array("config", "templates", "addons");
+ $available_withouts = array_merge($available_onlys, array("select-list"));
+function cli_generate_lang_file($command_args) {
+  // Use global variables to share it with sub-functions
+  global $available_onlys, $available_withouts, $data, $translations, $interactive,
+  $copyoriginalvalue, $format, $curdir, $additionalfileformat, $copyoriginalvalue;
+
+  // Store existing translations
+  $translations = array();
+  // Store output translations
+  $data = array();
+
+  // Parameters
+  $only = null;
+  $withouts = array();
+  $copyoriginalvalue = False;
+  $interactive = False;
+  $output = False;
+  $additionalfileformat = False;
+  $lang = null;
+  $encoding = null;
+  $available_formats = array('php', 'pot');
+  $format=$available_formats[0];
+
+  $debug = false;
+  $load_files = array();
+
+  // Change directory
+  $curdir = getcwd();
+  chdir(dirname(__FILE__).'/../');
+
+  function relative2absolute_path($path) {
+    if ($path[0] == '/')
+      return $path;
+    global $curdir;
+    return realpath($curdir)."/".$path;
+  }
+
+  function absolute2relative_path($path) {
+    if ($path[0] == '/')
+      $path = realpath($path);
+    if (substr($path, 0, strlen(LS_ROOT_DIR)) == LS_ROOT_DIR)
+      return substr($path, strlen(LS_ROOT_DIR)+1);
+    return $path;
+  }
+
+  for ($i=0; $i < count($command_args); $i++) {
+    switch ($command_args[$i]) {
+      case '--without':
+      case '-W':
+        $i++;
+        $without = strtolower($command_args[$i]);
+        if (!in_array($without, $available_withouts))
+          LScli :: usage("Invalid -W/--without parameter. Must be one of the following values : '".implode("','", $available_withouts)."'.");
+        elseif ($only)
+          LScli :: usage("You could not use only -W/--without parameter combined with -O/--only parameter.");
+        $withouts[] = $without;
+        break;
+
+      case '--only':
+      case '-O':
+        $i++;
+        if ($only)
+          LScli :: usage("You could specify only on -O/--only parameter.");
+        $only = strtolower($command_args[$i]);
+        if (!in_array($only, $available_onlys))
+          LScli :: usage("Invalid -O/--only parameter. Must be one of the following values : '".implode("','", $available_onlys)."'.");
+        elseif ($without)
+          LScli :: usage("You could not use only -O/--only parameter combined with -W/--without parameter.");
+        break;
+
+      case '--copy-original-value':
+      case '-c':
+        $copyoriginalvalue=True;
+        break;
+
+      case '--interactive':
+      case '-i':
+        $interactive=True;
+        break;
+
+      case '--additional-file-format':
+      case '-a':
+        $additionalfileformat=True;
+        break;
+
+      case '--lang':
+      case '-l':
+        $i++;
+        $parse_lang = explode('.', $command_args[$i]);
+        if (count($parse_lang) == 2) {
+          $lang = $parse_lang[0];
+          $encoding = $parse_lang[1];
+        }
+        else {
+          LScli :: usage("Invalid --lang parameter. Must be compose in format : [lang].[encoding]");
+        }
+        break;
+
+      case '--output':
+      case '-o':
+        $i++;
+        $output = $command_args[$i];
+        break;
+
+      case '--format':
+      case '-f':
+        $i++;
+        $format = strtolower($command_args[$i]);
+        if (!in_array($format, $available_formats)) {
+          LScli :: usage("Invalid -f/--format parameter. Must be one of the following values : '".implode("','", $available_formats)."'.");
+        }
+        break;
+
+      case '--debug':
+      case '-d':
+        $debug = true;
+        break;
+
+      default:
+        $path = relative2absolute_path($command_args[$i]);
+        if (is_file($path))
+          $load_files[] = $path;
+        else
+          LScli :: usage($command_args[$i]." : Invalid parameter or lang file to load.");
+    }
+  }
+
+
+
+  function debug($msg) {
+    LSlog :: debug("generate_lang_file() : $msg");
+  }
+
+  function add($msg, $context=null) {
+    global $lang, $data, $translations, $interactive, $copyoriginalvalue, $format;
+    debug("add($msg, $context)");
+    if ($msg == '')
+      return;
+    if (!is_null($lang) && _($msg) != "$msg")
+      return;
+
+    // Message already exists ?
+    if (array_key_exists($msg, $data)) {
+      if ($context && !in_array($context, $data[$msg]['contexts']))
+        $data[$msg]['contexts'][] = $context;
+      return True;
+    }
+
+    // Handle translation
+    $translation = "";
+    if (array_key_exists($msg, $translations)) {
+      $translation = $translations[$msg];
+    }
+    elseif (!is_null($lang) && _($msg) != $msg) {
+      $translation = _($msg);
+    }
+    elseif ($interactive && $format != 'pot') {
+      if ($context)
+        fwrite(STDERR, "\n# $context\n");
+      if ($copyoriginalvalue) {
+        fwrite(STDERR, "\"$msg\"\n\n => Please enter translated string (or leave empty to copy original string) : ");
+        $in = trim(fgets(STDIN));
+        if ($in)
+          $translation = $in;
+        else
+          $translation = $msg;
+      }
+      else {
+        fwrite(STDERR, "\"$msg\"\n\n => Please enter translated string (or 'c' to copy original message, 'i' to ignore this message, leave empty to pass) : ");
+        $in = trim(fgets(STDIN));
+        if ($in) {
+          if ($in=="i")
+            return True;
+          if ($in=="c")
+            $translation = $msg;
+          else
+            $translation = $in;
+        }
+      }
+    }
+    $data[$msg] = array (
+      'translation' => $translation,
+      'contexts' => ($context?array($context):array()),
+    );
+  }
+
+  function addFromLSconfig($pattern, $value='value', $excludes=array()) {
+    debug("addFromLSconfig($pattern, array(".implode(',', $excludes)."))");
+    $keys = LSconfig :: getMatchingKeys($pattern);
+    debug("addFromLSconfig : ".count($keys)." matching key(s)");
+    foreach ($keys as $key => $value) {
+      debug("addFromLSconfig : $key = $value");
+      if ($value == 'key') {
+        // Get the last key parts as value and all other as key
+        $key_parts = explode('.', $key);
+        $value = $key_parts[count($key_parts)-1];
+        $key = implode('.', array_slice($key_parts, 0, count($key_parts)-1));
+      }
+      if (!in_array($value, $excludes) && is_string($value))
+        add($value, $key);
+    }
+  }
+
+  // Load translation files
+  foreach($load_files as $path) {
+    debug("Load $path lang file");
+    @include($path);
+    foreach($GLOBALS['LSlang'] as $msg => $trans) {
+      $translations[$msg]=$trans;
+    }
+  }
+
+  // Initialize session
+  LSlang :: setLocale($lang, $encoding);
+
+  // Load lang string if lang was specify
+  if ($lang && $encoding && isset($GLOBALS['LSlang']) && is_array($GLOBALS['LSlang'])) {
+    foreach($GLOBALS['LSlang'] as $msg => $trans) {
+      $translations[$msg] = $trans;
+    }
+  }
+
+  /*
+   * Manage configuration parameters
+   */
+  if (!in_array('config', $withouts) && (!$only || $only == 'config')) {
+    // LDAP Servers
+    $objects = array();
+    foreach(LSconfig :: keys('ldap_servers') as $ldap_server_id) {
+      addFromLSconfig("ldap_servers.$ldap_server_id.name");
+      addFromLSconfig("ldap_servers.$ldap_server_id.subDnLabel");
+      addFromLSconfig("ldap_servers.$ldap_server_id.recoverPassword.recoveryHashMail.subject");
+      addFromLSconfig("ldap_servers.$ldap_server_id.recoverPassword.recoveryHashMail.msg");
+      addFromLSconfig("ldap_servers.$ldap_server_id.recoverPassword.newPasswordMail.subject");
+      addFromLSconfig("ldap_servers.$ldap_server_id.recoverPassword.newPasswordMail.msg");
+      addFromLSconfig("ldap_servers.$ldap_server_id.subDn.*", 'key', array("LSobject"));
+      addFromLSconfig("ldap_servers.$ldap_server_id.LSprofiles.*.label");
+
+      // LSaccess
+      foreach (LSconfig :: get("ldap_servers.$ldap_server_id.LSaccess", array()) as $LSobject) {
+        if (is_string($LSobject) && !in_array($LSobject, $objects) && LSsession :: loadLSobject($LSobject)) {
+          $objects[] = $LSobject;
+        }
+      }
+
+      // Sub DN LSobjects
+      foreach (LSconfig :: getMatchingKeys("ldap_servers.$ldap_server_id.subDn.*.LSobjects.*") as $LSobject)
+        if (is_string($LSobject) && !in_array($LSobject, $objects) && LSsession :: loadLSobject($LSobject))
+          $objects[] = $LSobject;
+
+    }
+
+    debug('LSobjects list : '.implode(', ', $objects));
+
+    // LSobject
+    foreach($objects as $obj) {
+      addFromLSconfig("LSobjects.$obj.label");
+
+      // LSrelation
+      addFromLSconfig("LSobjects.$obj.LSrelation.*.label");
+      addFromLSconfig("LSobjects.$obj.LSrelation.*.emptyText");
+
+      // Custom Actions
+      addFromLSconfig("LSobjects.$obj.customActions.*.label");
+      addFromLSconfig("LSobjects.$obj.customActions.*.helpInfo");
+      addFromLSconfig("LSobjects.$obj.customActions.*.question_format");
+      addFromLSconfig("LSobjects.$obj.customActions.*.onSuccessMsgFormat");
+
+      // LSform
+      addFromLSconfig("LSobjects.$obj.LSform.layout.*.label");
+      addFromLSconfig("LSobjects.$obj.LSform.dataEntryForm.*.label");
+
+      // LSsearch
+      addFromLSconfig("LSobjects.$obj.LSsearch.predefinedFilters.*");
+      addFromLSconfig("LSobjects.$obj.LSsearch.extraDisplayedColumns.*.label");
+      addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.label");
+      addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.question_format");
+      addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.onSuccessMsgFormat");
+
+      // Attributes
+      foreach(LSconfig :: keys("LSobjects.$obj.attrs") as $attr) {
+        addFromLSconfig("LSobjects.$obj.attrs.$attr.label");
+        addFromLSconfig("LSobjects.$obj.attrs.$attr.help_info");
+        addFromLSconfig("LSobjects.$obj.attrs.$attr.no_value_label");
+        addFromLSconfig("LSobjects.$obj.attrs.$attr.check_data.*.msg");
+        addFromLSconfig("LSobjects.$obj.attrs.$attr.validation.*.msg");
+
+        // HTML Options
+        $html_type = LSconfig :: get("LSobjects.$obj.attrs.$attr.html_type");
+        switch($html_type) {
+          case 'boolean':
+            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.true_label");
+            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.false_label");
+            break;
+          case 'jsonCompositeAttribute':
+            $components = LSconfig :: keys("LSobjects.$obj.attrs.$attr.html_options.components");
+            foreach($components as $c) {
+              addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.label");
+              addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.help_info");
+              addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.check_data.*.msg");
+
+              if (
+                    LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.components.$c.type") == 'select_list' &&
+                    LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.translate_labels", "True", "bool") &&
+                    !in_array('select-list', $withouts)
+                 )
+              {
+                foreach(LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values", array()) as $pkey => $plabel) {
+                  if (is_string($pkey)) {
+                    if ($pkey == 'OTHER_OBJECT')
+                      continue;
+                    elseif ($pkey == 'OTHER_ATTRIBUTE') {
+                      if (is_string($plabel))
+                        continue;
+                      elseif (is_array($plabel)) {
+                        if (isset($plabel['json_component_key']))
+                          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.OTHER_ATTRIBUTE.json_component_label");
+                        else
+                          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.OTHER_ATTRIBUTE.*");
+                      }
+                    }
+                    else
+                      add($plabel, "LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.$pkey");
+                  }
+                  elseif (is_int($pkey) && is_array($plabel)) {
+                    // Sub possible values
+                    addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.$pkey.label");
+                    foreach(LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.$pkey.possible_values", array()) as $ppkey => $pplabel) {
+                      if ($ppkey == 'OTHER_OBJECT')
+                        continue;
+                      elseif ($ppkey == 'OTHER_ATTRIBUTE') {
+                        if (is_string($pplabel))
+                          continue;
+                        elseif (is_array($pplabel)) {
+                          if (isset($pplabel['json_component_key']))
+                            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.OTHER_ATTRIBUTE.json_component_label");
+                          else
+                            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.OTHER_ATTRIBUTE.*");
+                        }
+                      }
+                      elseif(is_string($pplabel)) {
+                        add($pplabel, "LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.$pkey.possible_values.$ppkey");
+                      }
+                    }
+                  }
+                }
+              }
+            }
+            break;
+          case 'labeledValue':
+            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.labels.*");
+            break;
+          case 'password':
+            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.mail.subject");
+            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.mail.msg");
+            break;
+          case 'select_list':
+          case 'select_box':
+            if (LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.translate_labels", "True", "bool") && !in_array('select-list', $withouts)) {
+              foreach(LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.possible_values", array()) as $pkey => $plabel) {
+                if (is_string($pkey)) {
+                  if ($pkey == 'OTHER_OBJECT')
+                    continue;
+                  elseif ($pkey == 'OTHER_ATTRIBUTE') {
+                    if (is_string($plabel))
+                      continue;
+                    elseif (is_array($plabel)) {
+                      if (isset($plabel['json_component_key']))
+                        addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.OTHER_ATTRIBUTE.json_component_label");
+                      else
+                        addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.OTHER_ATTRIBUTE.*");
+                    }
+                  }
+                  else
+                    add($plabel, "LSobjects.$obj.attrs.$attr.html_options.possible_values.$pkey");
+                }
+                elseif (is_int($pkey) && is_array($plabel)) {
+                  // Sub possible values
+                  addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.$pkey.label");
+                  foreach(LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.possible_values.$pkey.possible_values", array()) as $ppkey => $pplabel) {
+                    if ($ppkey == 'OTHER_OBJECT')
+                      continue;
+                    elseif ($ppkey == 'OTHER_ATTRIBUTE') {
+                      if (is_string($pplabel))
+                        continue;
+                      elseif (is_array($pplabel)) {
+                        if (isset($pplabel['json_component_key']))
+                          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.OTHER_ATTRIBUTE.json_component_label");
+                        else
+                          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.OTHER_ATTRIBUTE.*");
+                      }
+                    }
+                    elseif(is_string($pplabel)) {
+                      add($pplabel, "LSobjects.$obj.attrs.$attr.html_options.possible_values.$pkey.possible_values.$ppkey");
+                    }
+                  }
+                }
+              }
+            }
+            break;
+          case 'valueWithUnit':
+            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.units.*");
+            break;
+        }
+      }
+    }
+  }
+
+  /*
+   * Manage template file
+   */
+  if (!in_array('templates', $withouts) && (!$only || $only == 'templates')) {
+    function parse_template_file($file) {
+      debug("parse_template_file($file) : start ...");
+      $count = 0;
+      foreach(file($file) as $line) {
+        $count ++;
+        if (preg_match_all('/\{ *tr +msg=["\']([^\}]+)["\'] *\}/',$line,$matches)) {
+          foreach($matches[1] as $t) {
+            debug("  - \"$t\" # Line $count");
+            add($t, absolute2relative_path($file).":$count");
+          }
+        }
+      }
+      debug("parse_template_file($file) : done.");
+    }
+
+    function find_and_parse_template_file($dir) {
+      if (is_dir($dir)) {
+        if ($dh = opendir($dir)) {
+          while (($file = readdir($dh)) !== false) {
+            if ($file=='.' || $file=='..') continue;
+            if (is_dir($dir.'/'.$file)) {
+              find_and_parse_template_file($dir.'/'.$file);
+            }
+            elseif (is_file($dir."/".$file) && preg_match('/\.tpl$/',$file)) {
+              parse_template_file($dir.'/'.$file);
+            }
+          }
+          closedir($dh);
+        }
+      }
+    }
+    find_and_parse_template_file(LS_ROOT_DIR.'/'.LS_TEMPLATES_DIR);
+    find_and_parse_template_file(LS_ROOT_DIR.'/'.LS_LOCAL_DIR.LS_TEMPLATES_DIR);
+  }
+
+  /*
+   * Manage addons files
+   */
+
+  if (!in_array('addons', $withouts) && (!$only || $only == 'addons')) {
+    function parse_addon_file($file) {
+      $count = 0;
+      foreach(file($file) as $line) {
+        $count++;
+        $offset=0;
+        while ($pos = strpos($line,'__(',$offset)) {
+          $quote='';
+          $res='';
+          for ($i=$pos+3;$i<strlen($line);$i++) {
+            if (empty($quote)) {
+              // Quote char not detected : try to detect it
+              if ($line[$i]=='\\' || $line[$i]==" " || $line[$i]=="\t") {
+                // Space or escape char : pass
+                $i++;
+              }
+              elseif ($line[$i]=='"' || $line[$i]=="'") {
+                // Quote detected
+                $quote=$line[$i];
+              }
+              elseif ($line[$i]=='$' || $line[$i]==')') {
+                // Variable translation not possible or end function call detected
+                $offset=$i;
+                break;
+              }
+              else {
+                // Unknown case : continue
+                $i++;
+              }
+            }
+            elseif (!empty($quote)) {
+              // Quote char already detected : try to detect end quote char
+              if ($line[$i]=='\\') {
+                // Escape char detected : pass this char and the following one
+                $res.=$line[$i];
+                $i++;
+                $res.=$line[$i];
+              }
+              elseif ($line[$i]==$quote) {
+                // End quote char detected : set offset for next detection and break this one
+                $offset=$i;
+                break;
+              }
+              else {
+                // End quote char not detected : append current char to result
+                $res.=$line[$i];
+              }
+            }
+          }
+          if (!empty($res)) add($res, absolute2relative_path($file).":$count");
+        }
+      }
+    }
+
+    function find_and_parse_addon_file($dir) {
+      if (is_dir($dir)) {
+        if ($dh = opendir($dir)) {
+          while (($file = readdir($dh)) !== false) {
+            if (preg_match('/^LSaddons\.(.+)\.php$/',$file)) {
+              parse_addon_file($dir.'/'.$file);
+            }
+          }
+          closedir($dh);
+        }
+      }
+    }
+
+    find_and_parse_addon_file(LS_ROOT_DIR.'/'.LS_ADDONS_DIR);
+    find_and_parse_addon_file(LS_ROOT_DIR.'/'.LS_LOCAL_DIR.LS_ADDONS_DIR);
+  }
+
+  // Sort resulting strings
+  ksort($data);
+
+  /*
+   * Handle output file format
+   */
+  function output_php($fd) {
+    global $additionalfileformat, $data, $copyoriginalvalue;
+    fwrite($fd, "<?php\n\n");
+
+    if (!$additionalfileformat) fwrite($fd, "\$GLOBALS['LSlang'] = array (\n");
+
+    foreach($data as $key => $key_data) {
+      if ($copyoriginalvalue && $key_data['translation'] == "") {
+        $val = $key;
+      }
+      else
+        $val = $key_data['translation'];
+      $key=str_replace('"','\\"',$key);
+      $val=str_replace('"','\\"',$val);
+      foreach ($key_data['contexts'] as $context)
+        fwrite($fd, "\n# $context");
+      if ($additionalfileformat) {
+        fwrite($fd, "\n\$GLOBALS['LSlang'][\"$key\"] = \"$val\";\n");
+      }
+      else {
+        fwrite($fd, "\n\"$key\" =>\n  \"$val\",\n");
+      }
+    }
+
+    if (!$additionalfileformat) fwrite($fd, "\n);\n");
+  }
+
+  function clean_for_pot_file($val) {
+    $val = str_replace('"', '\\"', $val);
+    return str_replace("\n", "\\n", $val);
+  }
+
+  function output_pot($fd) {
+    global $data, $copyoriginalvalue;
+    foreach($data as $key => $key_data) {
+      if ($copyoriginalvalue && $key_data['translation'] == "") {
+        $val = $key;
+      }
+      else
+        $val = $key_data['translation'];
+      foreach ($key_data['contexts'] as $context)
+        fwrite($fd, "#: $context\n");
+      $key = clean_for_pot_file($key);
+      $val = clean_for_pot_file($val);
+      fwrite($fd, "msgid \"$key\"\nmsgstr \"$val\"\n\n");
+    }
+  }
+
+  // Determine where to write result
+  if ($output) {
+    $output = relative2absolute_path($output);
+    try {
+      debug("Open output file ($output)");
+      $fd = fopen($output, 'w');
+    }
+    catch(Exception $e) {
+      LSlog :: error('Error occured opening output file : '.$e->getMessage(), "\n");
+    }
+    if (!$fd) {
+      LSlog :: error("Use stdout out instead.\n");
+      $fd = STDOUT;
+      $output = false;
+    }
+  }
+  else
+    $fd = STDOUT;
+
+  // Generate output
+  debug("Output format : $format");
+  switch($format) {
+    case 'pot':
+      output_pot($fd);
+      break;
+    case 'php':
+    default:
+      output_php($fd);
+      break;
+  }
+
+  // Close output file (is specified)
+  if ($output && $fd != STDOUT) {
+    debug("Close output file ($output)");
+    fclose($fd);
+  }
+
+  exit(0);
+
+}
+LScli :: add_command(
+  'generate_lang_file',
+  'cli_generate_lang_file',
+  'Generate lang.php file',
+  'l [lang] [-o output.file] [file1] [file2] [-h] [options]',
+  array(
+    "  -W/--without                Disable specified messages. Must be one of",
+    "                              the following values :",
+    "                               - ".implode("\n                               - ", $available_withouts),
+    "  -O/--only                   Only handle specified messages. Must be one",
+    "                              of the following values :",
+    "                               - ".implode("\n                               - ", $available_onlys),
+    "  -c/--copy-original-value    Copy original value as translated value when",
+    "                              no translated value exists",
+    "  -i/--interactive            Interactive mode : ask user to enter",
+    "                              translated on each translation needed",
+    "  -a/--additional-file-format Additional file format output",
+    "  -l/--lang                   Load the specify lang",
+    "                              Format: [lang].[encoding]",
+    "  -o/--output                 Output file (default: stdout)",
+    "  -f/--format                 Output file format : php or pot",
+    "                              (default: php)",
+  )
+);
diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo
index 9746d288c62809e87aa4c7df630584b3385443e5..1f20da82aa861a78f14ecf1d642e803f950af0b7 100644
GIT binary patch
delta 8827
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
E0}|TblK=n!

delta 10002
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

diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po
index 4f5fef75..53efcb33 100644
--- a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po
+++ b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: LdapSaisie\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2020-05-06 12:10+0200\n"
+"PO-Revision-Date: 2020-05-06 17:36+0200\n"
 "Last-Translator: Benjamin Renard <brenard@zionetrix.net>\n"
 "Language-Team: LdapSaisie <ldapsaisie-users@lists.labs.libre-entreprise."
 "org>\n"
@@ -458,7 +458,7 @@ msgstr "Confirmez-vous votre choix ?"
 
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSconfirmBox.php:37
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsmoothbox.php:39
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1378
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1246
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:68
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:568
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1148
@@ -485,7 +485,6 @@ msgstr "Attribut"
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformElement_mailQuota.php:80
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformElement_valueWithUnit.php:108
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSformElement_quota.php:80
-#: templates/default/LSformElement_mailQuota_field.tpl:17
 msgid "Incorrect value"
 msgstr "Valeur incorrecte"
 
@@ -799,81 +798,77 @@ msgstr ""
 msgid "Clear"
 msgstr "Nettoyer"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1318
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1186
 msgid "Connection"
 msgstr "Connexion"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1328
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1367
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1196
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1235
 msgid "LDAP server"
 msgstr "Serveur LDAP"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1338
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2489
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1206
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2356
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:669
 msgid "Level"
 msgstr "Niveau"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1339
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1377
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1207
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1245
 msgid "Identifier"
 msgstr "Identifiant"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1340
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1208
 msgid "Password"
 msgstr "Mot de passe"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1341
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1209
 msgid "Connect"
 msgstr "Se connecter"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1342
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1210
 msgid "Forgot your password ?"
 msgstr "Mot de passe perdu ?"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1360
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1228
 msgid "Recovery of your credentials"
 msgstr "Récupération de votre mot de passe"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1379
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1247
 msgid "Back"
 msgstr "Retour"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1382
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1250
 msgid "Please fill the identifier field to proceed recovery procedure"
 msgstr ""
 "Merci d'entrer votre identifiant pour poursuivre la procédure de récupération"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1387
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1255
 msgid ""
 "An email has been sent to  %{mail}. Please follow the instructions on it."
 msgstr ""
 "Un e-mail vient de vous être envoyé à l'adresse %{mail}. Merci de suivre les "
 "indications qu'il contient."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1396
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1264
 msgid "Your new password has been sent to %{mail}."
 msgstr "Votre nouveau mot de passe vous a été envoyé à l'adresse %{mail}."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1547
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1415
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:146
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:423
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1563
-msgid "Language"
-msgstr "Langue"
-
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1585
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1452
 msgid "Connected as"
 msgstr "Connecté en tant que"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2635
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2502
 msgid "LSsession : The constant %{const} is not defined."
 msgstr "LSsession : La constante %{const} n'est pas définie."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2638
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2505
 msgid ""
 "LSsession : The %{addon} support is uncertain. Verify system compatibility "
 "and the add-on configuration."
@@ -881,52 +876,52 @@ msgstr ""
 "LSsession : Le support %{addon} est incertain. Vérifiez la compatibilité du "
 "système et la configuration de l'add-on."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2641
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2508
 msgid ""
 "LSsession : LDAP server's configuration data are invalid. Can't connect."
 msgstr ""
 "LSsession : Les données de configuration du serveur LDAP sont invalide. "
 "Impossible de s'y connecter."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2644
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2511
 msgid "LSsession : Failed to load LSobject type %{type} : unknon type."
 msgstr ""
 "LSsession : Impossible de charger le type d'LSobject %{type} : type inconnu."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2647
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2514
 msgid "LSsession : Failed to load LSclass %{class}."
 msgstr "LSsession : Impossible de charger la LSclass %{class}."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2650
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2517
 msgid "LSsession : Login or password incorrect."
 msgstr "LSsession : Identifiant ou mot de passe incorrects."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2653
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2520
 msgid "LSsession : Impossible to identify you : Duplication of identities."
 msgstr "LSsession : Impossible de vous identifier : Duplication d'identité."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2656
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2523
 msgid "LSsession : Can't load class of authentification (%{class})."
 msgstr ""
 "LSsession : Impossible de charger la classe d'authentification (%{class})."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2659
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2526
 msgid "LSsession : Can't connect to LDAP server."
 msgstr "LSsession : Impossible de se connecter au serveur LDAP."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2662
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2529
 msgid "LSsession : Impossible to authenticate you."
 msgstr "LSsession : Impossible de vous identifier."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2665
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2532
 msgid "LSsession : Your are not authorized to do this action."
 msgstr "LSsession : Vous n'êtes pas autorisé à faire cette action."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2668
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2535
 msgid "LSsession : Some informations are missing to display this page."
 msgstr "LSsession : Des informations sont manquant pour afficher cette page."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2671
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2538
 msgid ""
 "LSsession : The function of the custom action %{name} does not exists or is "
 "not configured."
@@ -934,24 +929,24 @@ msgstr ""
 "LSsearch : La fonction de l'action personnalisée %{name} n'existe pas ou "
 "n'est pas configurée."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2674
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2541
 msgid "LSsession : Fail to retreive user's LDAP credentials from LSauth."
 msgstr ""
 "LSsession : Erreur en récupérant les identifiants LDAP de l'utilisateur "
 "depuis LSauth."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2677
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2544
 msgid ""
 "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials."
 msgstr ""
 "LSsession : Impossible de se reconnecter au serveur LDAP avec les "
 "identifiants de l'utilisateur."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2680
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2547
 msgid "LSsession : No import/export format define for this object type."
 msgstr "LSsession : Aucun format d'entrée/sortie définie pour ce type d'objet."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2683
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2550
 msgid ""
 "LSsession : Error during creation of list of levels. Contact administrators. "
 "(Code : %{code})"
@@ -959,13 +954,13 @@ msgstr ""
 "LSsession : Erreur durant la création de la liste des niveaux. Contacter les "
 "administrateurs. (Code : %{type})"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2686
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2553
 msgid "LSsession : The password recovery is disabled for this LDAP server."
 msgstr ""
 "LSsession : La récupération de mot de passe est désactivée pour ce serveur "
 "LDAP."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2689
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2556
 msgid ""
 "LSsession : Some informations are missing to recover your password. Contact "
 "administrators."
@@ -973,7 +968,7 @@ msgstr ""
 "LSsession : Des informations sont manques pour pouvoir récupérer votre mot "
 "de passe. Contacter les administrateurs."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2692
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2559
 msgid ""
 "LSsession : Error during password recovery. Contact administrators.(Step : "
 "%{step})"
@@ -981,26 +976,26 @@ msgstr ""
 "LSsession : Erreur durant la récupération de votre mot de passe. Contacter "
 "les administrateurs. (Etape : %{step})"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2695
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2562
 msgid ""
 "LSsession : call function %{func} do not provided from LSaddon %{addon}."
 msgstr ""
 "LSsession : la fonction %{func} n'est pas fournie par le LSaddon %{addon}."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2698
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2565
 msgid "LSsession : problem during initialisation."
 msgstr "LSsession : Problème durant l'initialisation."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2701
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2568
 msgid "LSsession : view function %{func} for LSaddon %{addon} doet not exist."
 msgstr ""
 "LSsession : la fonction de vue %{func} du LSaddon %{addon} n'existe pas."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2704
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2571
 msgid "LSsession : invalid related object's DN pass in parameter."
 msgstr "LSsession : DN d'objet en relation incorrect dans les paramètres."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2707
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2574
 msgid ""
 "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please "
 "upgrade it."
@@ -1008,7 +1003,7 @@ msgstr ""
 "LSsession : le LSaddon %{addon} utilise toujours l'ancien type d'URL de "
 "vues. Merci de le mettre à jour."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2710
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2577
 msgid ""
 "LSsession : You have been redirect from an old-style URL %{url}. Please "
 "upgrade this link."
@@ -1016,7 +1011,7 @@ msgstr ""
 "LSsession : Vous avez été redirigé depuis une ancienne URL %{url}. Merci de "
 "le mettre à jour ce lien."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2713
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2580
 msgid ""
 "LSsession : You still seen use LSsession :: redirect() in your custom code. "
 "Please upgrade it and use LSurl :: redirect()."
@@ -1779,7 +1774,6 @@ msgid "Actions"
 msgstr "Actions"
 
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsearch.php:1086
-#: templates/default/global_search.tpl:25
 msgid "This search didn't get any result."
 msgstr "Cette recherche n'a retournée aucun résultat."
 
@@ -2006,11 +2000,11 @@ msgstr "Rôle"
 msgid "Entity type"
 msgstr "Type d'entité"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:122
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:127
 msgid "Only one command could be executed !"
 msgstr "Une seule commande peut-être exécutée !"
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:168
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:173
 msgid ""
 "Invalid parameter \"%{parameter}\".\n"
 "Note: Command's parameter/argument must be place after the command."
@@ -2019,11 +2013,11 @@ msgstr ""
 "Note: Les paramètres/arguments de la commande doivent être placés après "
 "celle-ci."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:207
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:212
 msgid "LScli : The CLI command '%{command}' already exists."
 msgstr "LScli : La commande CLI '%{command}' existe déjà."
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:210
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:215
 msgid "LScli : The CLI command '%{command}' handler is not callable."
 msgstr ""
 "LScli : La fonction de prise en charge de la commande CLI '%{command}' n'est "
@@ -2034,7 +2028,6 @@ msgid "LSlog : Fail to load logging handler %{handler}."
 msgstr "LSlog : Impossible de charger l'handler %{handler}."
 
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSerror.php:102
-#: templates/default/import.tpl:28
 msgid "Errors"
 msgstr "Erreurs"
 
@@ -2093,7 +2086,6 @@ msgstr "Réinitialiser"
 
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:466
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:666
-#: templates/default/global_search.tpl:7
 msgid "Search"
 msgstr "Rechercher"
 
@@ -2167,113 +2159,85 @@ msgstr "[pas une chaîne de caractères]"
 msgid "Folder not found"
 msgstr "Dossier introuvable"
 
-#: templates/default/LSaccessRightsMatrixView.tpl:17
-msgid "Attributes / Profiles"
-msgstr "Attributs / Profils"
-
-#: templates/default/error.tpl:22
-msgid "Details"
-msgstr "Détails"
-
-#: templates/default/import.tpl:9
-msgid "File"
-msgstr "Fichier"
-
 #: templates/default/import.tpl:12
 msgid "Format"
 msgstr "Format"
 
-#: templates/default/top.tpl:36 templates/default/top.tpl:37
-#: templates/default/global_search.tpl:10
-msgid "Global search"
-msgstr "Recherche globale"
-
-#: templates/default/import.tpl:70
-msgid "Imported objects"
-msgstr "Objets importés"
-
-#: templates/default/LSaccessRightsMatrixView.tpl:19
-#: templates/default/LSaccessRightsMatrixView.tpl:55
-msgid "Legend:"
-msgstr "Légende :"
-
 #: templates/default/viewSearch.tpl:133
 msgid "Nb / page :"
 msgstr "Nb / page :"
 
-#: templates/default/import.tpl:75
-msgid "No imported object"
-msgstr "Aucun objet importé"
+#~ msgid "Language"
+#~ msgstr "Langue"
 
-#: templates/default/import.tpl:43
-msgid "No value"
-msgstr "Aucune valeur"
+#~ msgid "Attributes / Profiles"
+#~ msgstr "Attributs / Profils"
 
-#: templates/default/import.tpl:18
-msgid "Only validate data"
-msgstr "Validation des données uniquement"
+#~ msgid "Details"
+#~ msgstr "Détails"
 
-#: templates/default/LSaccessRightsMatrixView.tpl:20
-#: templates/default/LSaccessRightsMatrixView.tpl:37
-#: templates/default/LSaccessRightsMatrixView.tpl:72
-msgid "R"
-msgstr "L"
+#~ msgid "File"
+#~ msgstr "Fichier"
 
-#: templates/default/LSaccessRightsMatrixView.tpl:22
-#: templates/default/LSaccessRightsMatrixView.tpl:39
-#: templates/default/LSaccessRightsMatrixView.tpl:74
-msgid "R/W"
-msgstr "L/É"
+#~ msgid "Global search"
+#~ msgstr "Recherche globale"
 
-#: templates/default/LSaccessRightsMatrixView.tpl:20
-#: templates/default/LSaccessRightsMatrixView.tpl:56
-msgid "Readable"
-msgstr "Lecture"
+#~ msgid "Imported objects"
+#~ msgstr "Objets importés"
 
-#: templates/default/LSaccessRightsMatrixView.tpl:22
-#: templates/default/LSaccessRightsMatrixView.tpl:58
-msgid "Readable / Writable"
-msgstr "Lecture / Écriture"
+#~ msgid "Legend:"
+#~ msgstr "Légende :"
 
-#: templates/default/top.tpl:63
-msgid "Refresh my access rights"
-msgstr "Rafraîchir mes droits d'accès"
+#~ msgid "No imported object"
+#~ msgstr "Aucun objet importé"
 
-#: templates/default/LSaccessRightsMatrixView.tpl:53
-msgid "Relations / Profiles"
-msgstr "Relations / Profils"
+#~ msgid "No value"
+#~ msgstr "Aucune valeur"
 
-#: templates/default/import.tpl:26
-msgid "Result"
-msgstr "Résultat"
+#~ msgid "Only validate data"
+#~ msgstr "Validation des données uniquement"
 
-#: templates/default/LSaccessRightsMatrixView.tpl:48
-msgid "Their relations with other objects"
-msgstr "Leurs relations avec les autres objets"
+#~ msgid "R"
+#~ msgstr "L"
 
-#: templates/default/LSaccessRightsMatrixView.tpl:83
-msgid "This object type has no configured relation."
-msgstr "Ce type d'objet n'a aucune relation de configurée."
+#~ msgid "R/W"
+#~ msgstr "L/É"
 
-#: templates/default/import.tpl:15
-msgid "Update objects if exists"
-msgstr "Mise à jour des objets existants"
+#~ msgid "Readable"
+#~ msgstr "Lecture"
 
-#: templates/default/import.tpl:80
-msgid "Updated objects"
-msgstr "Objets mis à jour"
+#~ msgid "Readable / Writable"
+#~ msgstr "Lecture / Écriture"
 
-#: templates/default/import.tpl:21
-msgid "Valid"
-msgstr "Valider"
+#~ msgid "Refresh my access rights"
+#~ msgstr "Rafraîchir mes droits d'accès"
 
-#: templates/default/import.tpl:16 templates/default/import.tpl:19
-msgid "no"
-msgstr "non"
+#~ msgid "Relations / Profiles"
+#~ msgstr "Relations / Profils"
 
-#: templates/default/import.tpl:16 templates/default/import.tpl:19
-msgid "yes"
-msgstr "oui"
+#~ msgid "Result"
+#~ msgstr "Résultat"
+
+#~ msgid "Their relations with other objects"
+#~ msgstr "Leurs relations avec les autres objets"
+
+#~ msgid "This object type has no configured relation."
+#~ msgstr "Ce type d'objet n'a aucune relation de configurée."
+
+#~ msgid "Update objects if exists"
+#~ msgstr "Mise à jour des objets existants"
+
+#~ msgid "Updated objects"
+#~ msgstr "Objets mis à jour"
+
+#~ msgid "Valid"
+#~ msgstr "Valider"
+
+#~ msgid "no"
+#~ msgstr "non"
+
+#~ msgid "yes"
+#~ msgstr "oui"
 
 #~ msgid "Deleting"
 #~ msgstr "Suppression"
diff --git a/src/lang/generate_lang_file.php b/src/lang/generate_lang_file.php
deleted file mode 100755
index 28277617..00000000
--- a/src/lang/generate_lang_file.php
+++ /dev/null
@@ -1,630 +0,0 @@
-#!/usr/bin/php
-<?php
-/*******************************************************************************
- * Copyright (C) 2007 Easter-eggs
- * http://ldapsaisie.labs.libre-entreprise.org
- *
- * Author: See AUTHORS file in top-level directory.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-******************************************************************************/
-
-error_reporting(E_ERROR);
-
-// Change directory
-$curdir=getcwd();
-chdir(dirname(__FILE__).'/../');
-
-require_once('includes/core.php');
-require_once('conf/config.inc.php');
-
-$available_onlys = array("config", "templates", "addons");
-$only = null;
-$available_withouts = array_merge($available_onlys, array("select-list"));
-$withouts = array();
-$copyoriginalvalue=False;
-$interactive=False;
-$output=False;
-$additionalfileformat=False;
-$lang=False;
-$encoding=False;
-$available_formats=array('php', 'pot');
-$format=$available_formats[0];
-$translations=array();
-$debug = false;
-$load_files = array();
-function usage($error=false, $exit_code=0) {
-  global $argv, $available_withouts, $available_onlys;
-  if ($error)
-    echo "$error\n\n";
-  echo "Usage : ".$argv[0]." [file1] [file2] [-h] [options]\n";
-  echo "  -W/--without                Disable specified messages. Must be one of the following values :\n";
-  echo "                              '".implode("','", $available_withouts)."'\n";
-  echo "  -O/--only                   Only handle specified messages. Must be one of the following values :\n";
-  echo "                              '".implode("','", $available_onlys)."'\n";
-  echo "  -c/--copy-original-value    Copy original value as translated value when no translated value exists\n";
-  echo "  -i/--interactive            Interactive mode : ask user to enter translated on each translation needed\n";
-  echo "  -a/--additional-file-format Additional file format output\n";
-  echo "  -l/--lang                   Load this specify lang (format : [lang].[encoding])\n";
-  echo "  -o/--output                 Output file (default : stdout)\n";
-  echo "  -f/--format                 Output file format : php or pot (default : php)\n";
-  echo "  -d/--debug                  Enable debug mode\n";
-  exit($exit_code);
-}
-
-function realtive_path($path) {
-  if ($path[0] == '/')
-    return $path;
-  global $curdir;
-  return realpath($curdir)."/".$path;
-}
-
-if ($argc > 1) {
-  for ($i=1;$i<$argc;$i++) {
-    if($argv[$i]=='--without' || $argv[$i]=='-W') {
-      $i++;
-      $without = strtolower($argv[$i]);
-      if (!in_array($without, $available_withouts))
-        die("Invalid -W/--without parameter. Must be one of the following values : '".implode("','", $available_withouts)."'.\n");
-      elseif ($only)
-        die("You could not use only -W/--without parameter combined with -O/--only parameter.\n");
-      $withouts[] = $without;
-    }
-    elseif($argv[$i]=='--only' || $argv[$i]=='-O') {
-      $i++;
-      if ($only)
-        die("You could specify only on -O/--only parameter.\n");
-      $only = strtolower($argv[$i]);
-      if (!in_array($only, $available_onlys))
-        die("Invalid -O/--only parameter. Must be one of the following values : '".implode("','", $available_onlys)."'.\n");
-      elseif ($without)
-        die("You could not use only -O/--only parameter combined with -W/--without parameter.\n");
-    }
-    elseif($argv[$i]=='--copy-original-value' || $argv[$i]=='-c') {
-      $copyoriginalvalue=True;
-    }
-    elseif($argv[$i]=='--interactive' || $argv[$i]=='-i') {
-      $interactive=True;
-    }
-    elseif($argv[$i]=='--additional-file-format' || $argv[$i]=='-a') {
-      $additionalfileformat=True;
-    }
-    elseif($argv[$i]=='--lang' || $argv[$i]=='-l') {
-      $i++;
-      $parse_lang=explode('.',$argv[$i]);
-      if (count($parse_lang)==2) {
-        $lang=$parse_lang[0];
-        $encoding=$parse_lang[1];
-      }
-      else {
-        die("Invalid --lang parameter. Must be compose in format : [lang].[encoding]\n");
-      }
-    }
-    elseif($argv[$i]=='--output' || $argv[$i]=='-o') {
-      $i++;
-      $output = $argv[$i];
-    }
-    elseif($argv[$i]=='--format' || $argv[$i]=='-f') {
-      $i++;
-      $format = strtolower($argv[$i]);
-      if (!in_array($format, $available_formats)) {
-        die("Invalid -f/--format parameter. Must be one of the following values : '".implode("','", $available_formats)."'.\n");
-      }
-    }
-    elseif($argv[$i]=='--debug' || $argv[$i]=='-d') {
-      $debug = true;
-    }
-    elseif($argv[$i]=='-h') {
-      usage();
-    }
-    else {
-      $path = realtive_path($argv[$i]);
-      if (is_file($path))
-        $load_files[] = $path;
-      else
-        usage($argv[$i]." : Invalid lang file to load.", 1);
-    }
-  }
-}
-
-$data=array();
-
-function debug($msg) {
-  global $debug, $output;
-  if (!$debug) return true;
-  $fd = ($output?STDOUT: STDERR);
-  fwrite($fd, "$msg\n");
-}
-
-function add($msg, $context=null) {
-  debug("add($msg, $context)");
-  if ($msg!='' && _($msg) == "$msg") {
-    global $data, $translations, $interactive, $copyoriginalvalue, $format;
-
-    // Message already exists ?
-    if (array_key_exists($msg, $data)) {
-      if ($context && !in_array($context, $data[$msg]['contexts']))
-        $data[$msg]['contexts'][] = $context;
-      return True;
-    }
-
-    // Handle translation
-    $translation = "";
-    if (array_key_exists($msg, $translations)) {
-      $translation = $translations[$msg];
-    }
-    elseif (_($msg) != $msg) {
-      $translation = _($msg);
-    }
-    elseif ($interactive && $format != 'pot') {
-      if ($context)
-        fwrite(STDERR, "\n# $context\n");
-      if ($copyoriginalvalue) {
-        fwrite(STDERR, "\"$msg\"\n\n => Please enter translated string (or leave empty to copy original string) : ");
-        $in = trim(fgets(STDIN));
-        if ($in)
-          $translation = $in;
-        else
-          $translation = $msg;
-      }
-      else {
-        fwrite(STDERR, "\"$msg\"\n\n => Please enter translated string (or 'c' to copy original message, 'i' to ignore this message, leave empty to pass) : ");
-        $in = trim(fgets(STDIN));
-        if ($in) {
-          if ($in=="i")
-            return True;
-          if ($in=="c")
-            $translation = $msg;
-          else
-            $translation = $in;
-        }
-      }
-    }
-    $data[$msg] = array (
-      'translation' => $translation,
-      'contexts' => ($context?array($context):array()),
-    );
-  }
-}
-
-function addFromLSconfig($pattern, $value='value', $excludes=array()) {
-  debug("addFromLSconfig($pattern, array(".implode(',', $excludes)."))");
-  $keys = LSconfig :: getMatchingKeys($pattern);
-  debug("addFromLSconfig : ".count($keys)." matching key(s)");
-  foreach ($keys as $key => $value) {
-    debug("addFromLSconfig : $key = $value");
-    if ($value == 'key') {
-      // Get the last key parts as value and all other as key
-      $key_parts = explode('.', $key);
-      $value = $key_parts[count($key_parts)-1];
-      $key = implode('.', array_slice($key_parts, 0, count($key_parts)-1));
-    }
-    if (!in_array($value, $excludes) && is_string($value))
-      add($value, $key);
-  }
-}
-
-// Load translation files
-foreach($load_files as $path) {
-  debug("Load $path lang file");
-  @include($path);
-  foreach($GLOBALS['LSlang'] as $msg => $trans) {
-    $translations[$msg]=$trans;
-  }
-}
-
-// Initialize session
-LSsession :: initialize($lang,$encoding);
-
-// Load lang string if lang was specify
-if ($lang && $encoding) {
-  foreach($GLOBALS['LSlang'] as $msg => $trans) {
-    $translations[$msg]=$trans;
-  }
-}
-
-/*
- * Manage configuration parameters
- */
-if (!in_array('config', $withouts) && (!$only || $only == 'config')) {
-  // LDAP Servers
-  $objects = array();
-  foreach(LSconfig :: keys('ldap_servers') as $ldap_server_id) {
-    addFromLSconfig("ldap_servers.$ldap_server_id.name");
-    addFromLSconfig("ldap_servers.$ldap_server_id.subDnLabel");
-    addFromLSconfig("ldap_servers.$ldap_server_id.recoverPassword.recoveryHashMail.subject");
-    addFromLSconfig("ldap_servers.$ldap_server_id.recoverPassword.recoveryHashMail.msg");
-    addFromLSconfig("ldap_servers.$ldap_server_id.recoverPassword.newPasswordMail.subject");
-    addFromLSconfig("ldap_servers.$ldap_server_id.recoverPassword.newPasswordMail.msg");
-    addFromLSconfig("ldap_servers.$ldap_server_id.subDn.*", 'key', array("LSobject"));
-    addFromLSconfig("ldap_servers.$ldap_server_id.LSprofiles.*.label");
-
-    // LSaccess
-    foreach (LSconfig :: get("ldap_servers.$ldap_server_id.LSaccess", array()) as $LSobject) {
-      if (is_string($LSobject) && !in_array($LSobject, $objects) && LSsession :: loadLSobject($LSobject)) {
-        $objects[] = $LSobject;
-      }
-    }
-
-    // Sub DN LSobjects
-    foreach (LSconfig :: getMatchingKeys("ldap_servers.$ldap_server_id.subDn.*.LSobjects.*") as $LSobject)
-      if (is_string($LSobject) && !in_array($LSobject, $objects) && LSsession :: loadLSobject($LSobject))
-        $objects[] = $LSobject;
-
-  }
-
-  debug('LSobjects list : '.implode(', ', $objects));
-
-  // LSobject
-  foreach($objects as $obj) {
-    addFromLSconfig("LSobjects.$obj.label");
-
-    // LSrelation
-    addFromLSconfig("LSobjects.$obj.LSrelation.*.label");
-    addFromLSconfig("LSobjects.$obj.LSrelation.*.emptyText");
-
-    // Custom Actions
-    addFromLSconfig("LSobjects.$obj.customActions.*.label");
-    addFromLSconfig("LSobjects.$obj.customActions.*.helpInfo");
-    addFromLSconfig("LSobjects.$obj.customActions.*.question_format");
-    addFromLSconfig("LSobjects.$obj.customActions.*.onSuccessMsgFormat");
-
-    // LSform
-    addFromLSconfig("LSobjects.$obj.LSform.layout.*.label");
-    addFromLSconfig("LSobjects.$obj.LSform.dataEntryForm.*.label");
-
-    // LSsearch
-    addFromLSconfig("LSobjects.$obj.LSsearch.predefinedFilters.*");
-    addFromLSconfig("LSobjects.$obj.LSsearch.extraDisplayedColumns.*.label");
-    addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.label");
-    addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.question_format");
-    addFromLSconfig("LSobjects.$obj.LSsearch.customActions.*.onSuccessMsgFormat");
-
-    // Attributes
-    foreach(LSconfig :: keys("LSobjects.$obj.attrs") as $attr) {
-      addFromLSconfig("LSobjects.$obj.attrs.$attr.label");
-      addFromLSconfig("LSobjects.$obj.attrs.$attr.help_info");
-      addFromLSconfig("LSobjects.$obj.attrs.$attr.no_value_label");
-      addFromLSconfig("LSobjects.$obj.attrs.$attr.check_data.*.msg");
-      addFromLSconfig("LSobjects.$obj.attrs.$attr.validation.*.msg");
-
-      // HTML Options
-      $html_type = LSconfig :: get("LSobjects.$obj.attrs.$attr.html_type");
-      switch($html_type) {
-        case 'boolean':
-          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.true_label");
-          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.false_label");
-          break;
-        case 'jsonCompositeAttribute':
-          $components = LSconfig :: keys("LSobjects.$obj.attrs.$attr.html_options.components");
-          foreach($components as $c) {
-            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.label");
-            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.help_info");
-            addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.check_data.*.msg");
-
-            if (
-                  LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.components.$c.type") == 'select_list' &&
-                  LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.translate_labels", "True", "bool") &&
-                  !in_array('select-list', $withouts)
-               )
-            {
-              foreach(LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values", array()) as $pkey => $plabel) {
-                if (is_string($pkey)) {
-                  if ($pkey == 'OTHER_OBJECT')
-                    continue;
-                  elseif ($pkey == 'OTHER_ATTRIBUTE') {
-                    if (is_string($plabel))
-                      continue;
-                    elseif (is_array($plabel)) {
-                      if (isset($plabel['json_component_key']))
-                        addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.OTHER_ATTRIBUTE.json_component_label");
-                      else
-                        addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.OTHER_ATTRIBUTE.*");
-                    }
-                  }
-                  else
-                    add($plabel, "LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.$pkey");
-                }
-                elseif (is_int($pkey) && is_array($plabel)) {
-                  // Sub possible values
-                  addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.$pkey.label");
-                  foreach(LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.$pkey.possible_values", array()) as $ppkey => $pplabel) {
-                    if ($ppkey == 'OTHER_OBJECT')
-                      continue;
-                    elseif ($ppkey == 'OTHER_ATTRIBUTE') {
-                      if (is_string($pplabel))
-                        continue;
-                      elseif (is_array($pplabel)) {
-                        if (isset($pplabel['json_component_key']))
-                          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.OTHER_ATTRIBUTE.json_component_label");
-                        else
-                          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.OTHER_ATTRIBUTE.*");
-                      }
-                    }
-                    elseif(is_string($pplabel)) {
-                      add($pplabel, "LSobjects.$obj.attrs.$attr.html_options.components.$c.options.possible_values.$pkey.possible_values.$ppkey");
-                    }
-                  }
-                }
-              }
-            }
-          }
-          break;
-        case 'labeledValue':
-          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.labels.*");
-          break;
-        case 'password':
-          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.mail.subject");
-          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.mail.msg");
-          break;
-        case 'select_list':
-        case 'select_box':
-          if (LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.translate_labels", "True", "bool") && !in_array('select-list', $withouts)) {
-            foreach(LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.possible_values", array()) as $pkey => $plabel) {
-              if (is_string($pkey)) {
-                if ($pkey == 'OTHER_OBJECT')
-                  continue;
-                elseif ($pkey == 'OTHER_ATTRIBUTE') {
-                  if (is_string($plabel))
-                    continue;
-                  elseif (is_array($plabel)) {
-                    if (isset($plabel['json_component_key']))
-                      addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.OTHER_ATTRIBUTE.json_component_label");
-                    else
-                      addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.OTHER_ATTRIBUTE.*");
-                  }
-                }
-                else
-                  add($plabel, "LSobjects.$obj.attrs.$attr.html_options.possible_values.$pkey");
-              }
-              elseif (is_int($pkey) && is_array($plabel)) {
-                // Sub possible values
-                addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.$pkey.label");
-                foreach(LSconfig :: get("LSobjects.$obj.attrs.$attr.html_options.possible_values.$pkey.possible_values", array()) as $ppkey => $pplabel) {
-                  if ($ppkey == 'OTHER_OBJECT')
-                    continue;
-                  elseif ($ppkey == 'OTHER_ATTRIBUTE') {
-                    if (is_string($pplabel))
-                      continue;
-                    elseif (is_array($pplabel)) {
-                      if (isset($pplabel['json_component_key']))
-                        addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.OTHER_ATTRIBUTE.json_component_label");
-                      else
-                        addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.possible_values.OTHER_ATTRIBUTE.*");
-                    }
-                  }
-                  elseif(is_string($pplabel)) {
-                    add($pplabel, "LSobjects.$obj.attrs.$attr.html_options.possible_values.$pkey.possible_values.$ppkey");
-                  }
-                }
-              }
-            }
-          }
-          break;
-        case 'valueWithUnit':
-          addFromLSconfig("LSobjects.$obj.attrs.$attr.html_options.units.*");
-          break;
-      }
-    }
-  }
-}
-
-/*
- * Manage template file
- */
-if (!in_array('templates', $withouts) && (!$only || $only == 'templates')) {
-  function parse_template_file($file) {
-    debug("parse_template_file($file) : start ...");
-    $count = 0;
-    foreach(file($file) as $line) {
-      $count ++;
-      if (preg_match_all('/\{ *tr +msg=["\']([^\}]+)["\'] *\}/',$line,$matches)) {
-        foreach($matches[1] as $t) {
-          debug("  - \"$t\" # Line $count");
-          add($t, "$file:$count");
-        }
-      }
-    }
-    debug("parse_template_file($file) : done.");
-  }
-
-  function find_and_parse_template_file($dir) {
-    if (is_dir($dir)) {
-      if ($dh = opendir($dir)) {
-        while (($file = readdir($dh)) !== false) {
-          if ($file=='.' || $file=='..') continue;
-          if (is_dir($dir.'/'.$file)) {
-            find_and_parse_template_file($dir.'/'.$file);
-          }
-          elseif (is_file($dir."/".$file) && preg_match('/\.tpl$/',$file)) {
-            parse_template_file($dir.'/'.$file);
-          }
-        }
-        closedir($dh);
-      }
-    }
-  }
-
-  find_and_parse_template_file(LS_TEMPLATES_DIR);
-  find_and_parse_template_file(LS_LOCAL_DIR.LS_TEMPLATES_DIR);
-}
-
-/*
- * Manage addons files
- */
-
-if (!in_array('addons', $withouts) && (!$only || $only == 'addons')) {
-  function parse_addon_file($file) {
-    $count = 0;
-    foreach(file($file) as $line) {
-      $count++;
-      $offset=0;
-      while ($pos = strpos($line,'__(',$offset)) {
-        $quote='';
-        $res='';
-        for ($i=$pos+3;$i<strlen($line);$i++) {
-          if (empty($quote)) {
-            // Quote char not detected : try to detect it
-            if ($line[$i]=='\\' || $line[$i]==" " || $line[$i]=="\t") {
-              // Space or escape char : pass
-              $i++;
-            }
-            elseif ($line[$i]=='"' || $line[$i]=="'") {
-              // Quote detected
-              $quote=$line[$i];
-            }
-            elseif ($line[$i]=='$' || $line[$i]==')') {
-              // Variable translation not possible or end function call detected
-              $offset=$i;
-              break;
-            }
-            else {
-              // Unknown case : continue
-              $i++;
-            }
-          }
-          elseif (!empty($quote)) {
-            // Quote char already detected : try to detect end quote char
-            if ($line[$i]=='\\') {
-              // Escape char detected : pass this char and the following one
-              $res.=$line[$i];
-              $i++;
-              $res.=$line[$i];
-            }
-            elseif ($line[$i]==$quote) {
-              // End quote char detected : set offset for next detection and break this one
-              $offset=$i;
-              break;
-            }
-            else {
-              // End quote char not detected : append current char to result
-              $res.=$line[$i];
-            }
-          }
-        }
-        if (!empty($res)) add($res, "$file:$count");
-      }
-    }
-  }
-
-  function find_and_parse_addon_file($dir) {
-    if (is_dir($dir)) {
-      if ($dh = opendir($dir)) {
-        while (($file = readdir($dh)) !== false) {
-          if (preg_match('/^LSaddons\.(.+)\.php$/',$file)) {
-            parse_addon_file($dir.'/'.$file);
-          }
-        }
-        closedir($dh);
-      }
-    }
-  }
-
-  find_and_parse_addon_file(LS_ADDONS_DIR);
-  find_and_parse_addon_file(LS_LOCAL_DIR.LS_ADDONS_DIR);
-}
-
-// Sort resulting strings
-ksort($data);
-
-/*
- * Handle output file format
- */
-function output_php($fd) {
-  global $additionalfileformat, $data, $copyoriginalvalue;
-  fwrite($fd, "<?php\n\n");
-
-  if (!$additionalfileformat) fwrite($fd, "\$GLOBALS['LSlang'] = array (\n");
-
-  foreach($data as $key => $key_data) {
-    if ($copyoriginalvalue && $key_data['translation'] == "") {
-      $val = $key;
-    }
-    else
-      $val = $key_data['translation'];
-    $key=str_replace('"','\\"',$key);
-    $val=str_replace('"','\\"',$val);
-    foreach ($key_data['contexts'] as $context)
-      fwrite($fd, "\n# $context");
-    if ($additionalfileformat) {
-      fwrite($fd, "\n\$GLOBALS['LSlang'][\"$key\"] = \"$val\";\n");
-    }
-    else {
-      fwrite($fd, "\n\"$key\" =>\n  \"$val\",\n");
-    }
-  }
-
-  if (!$additionalfileformat) fwrite($fd, "\n);\n");
-}
-
-function clean_for_pot_file($val) {
-  $val = str_replace('"', '\\"', $val);
-  return str_replace("\n", "\\n", $val);
-}
-
-function output_pot($fd) {
-  global $data, $copyoriginalvalue;
-  foreach($data as $key => $key_data) {
-    if ($copyoriginalvalue && $key_data['translation'] == "") {
-      $val = $key;
-    }
-    else
-      $val = $key_data['translation'];
-    foreach ($key_data['contexts'] as $context)
-      fwrite($fd, "#: $context\n");
-    $key = clean_for_pot_file($key);
-    $val = clean_for_pot_file($val);
-    fwrite($fd, "msgid \"$key\"\nmsgstr \"$val\"\n\n");
-  }
-}
-
-// Determine where to write result
-if ($output) {
-  $output = realtive_path($output);
-  try {
-    debug("Open output file ($output)");
-    $fd = fopen($output, 'w');
-  }
-  catch(Exception $e) {
-    fwrite(STDERR, 'Error occured opening output file : '.$e->getMessage(), "\n");
-  }
-  if (!$fd) {
-    fwrite(STDERR, "Use stdout out instead.\n");
-    $fd = STDOUT;
-    $output = false;
-  }
-}
-else
-  $fd = STDOUT;
-
-// Generate output
-debug("Output format : $format");
-switch($format) {
-  case 'pot':
-    output_pot($fd);
-    break;
-  case 'php':
-  default:
-    output_php($fd);
-    break;
-}
-
-// Close output file (is specified)
-if ($output) {
-  debug("Close output file ($output)");
-  fclose($fd);
-}
-
-exit(0);
diff --git a/src/lang/generate_ldapsaisie.pot.sh b/src/lang/generate_ldapsaisie.pot.sh
index 40c2bbbc..e5fa299b 100755
--- a/src/lang/generate_ldapsaisie.pot.sh
+++ b/src/lang/generate_ldapsaisie.pot.sh
@@ -16,9 +16,10 @@ xgettext	--from-code utf-8 \
 		$( find "$SRC" -name "*.php" )
 
 # Extract other messages from LdapSaisie templates files
-$SRC/lang/generate_lang_file.php	-o "$SRC/lang/ldapsaisie-templates.pot" \
-						-f pot \
-						--only templates
+$SRC/bin/ldapsaisie.php generate_lang_file \
+		-o "$SRC/lang/ldapsaisie-templates.pot" \
+		-f pot \
+		--only templates
 
 # Merge previous results in ldapsaisie.pot file
 msgcat $SRC/lang/ldapsaisie-main.pot $SRC/lang/ldapsaisie-templates.pot -o $SRC/lang/ldapsaisie.pot
diff --git a/src/lang/ldapsaisie.pot b/src/lang/ldapsaisie.pot
index 607b7744..e15a1e87 100644
--- a/src/lang/ldapsaisie.pot
+++ b/src/lang/ldapsaisie.pot
@@ -379,7 +379,7 @@ msgstr ""
 
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSconfirmBox.php:37
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsmoothbox.php:39
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1378
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1246
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSform.php:68
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:568
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:1148
@@ -667,195 +667,191 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1318
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1186
 msgid "Connection"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1328
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1367
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1196
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1235
 msgid "LDAP server"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1338
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2489
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1206
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2356
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:669
 msgid "Level"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1339
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1377
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1207
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1245
 msgid "Identifier"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1340
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1208
 msgid "Password"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1341
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1209
 msgid "Connect"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1342
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1210
 msgid "Forgot your password ?"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1360
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1228
 msgid "Recovery of your credentials"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1379
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1247
 msgid "Back"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1382
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1250
 msgid "Please fill the identifier field to proceed recovery procedure"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1387
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1255
 msgid ""
 "An email has been sent to  %{mail}. Please follow the instructions on it."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1396
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1264
 msgid "Your new password has been sent to %{mail}."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1547
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1415
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:146
 #: /home/brenard/dev/ldapsaisie_clean3/src/includes/routes.php:423
 msgid "Refresh"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1563
-msgid "Language"
-msgstr ""
-
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1585
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:1452
 msgid "Connected as"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2635
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2502
 msgid "LSsession : The constant %{const} is not defined."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2638
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2505
 msgid ""
 "LSsession : The %{addon} support is uncertain. Verify system compatibility "
 "and the add-on configuration."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2641
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2508
 msgid ""
 "LSsession : LDAP server's configuration data are invalid. Can't connect."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2644
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2511
 msgid "LSsession : Failed to load LSobject type %{type} : unknon type."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2647
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2514
 msgid "LSsession : Failed to load LSclass %{class}."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2650
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2517
 msgid "LSsession : Login or password incorrect."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2653
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2520
 msgid "LSsession : Impossible to identify you : Duplication of identities."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2656
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2523
 msgid "LSsession : Can't load class of authentification (%{class})."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2659
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2526
 msgid "LSsession : Can't connect to LDAP server."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2662
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2529
 msgid "LSsession : Impossible to authenticate you."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2665
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2532
 msgid "LSsession : Your are not authorized to do this action."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2668
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2535
 msgid "LSsession : Some informations are missing to display this page."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2671
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2538
 msgid ""
 "LSsession : The function of the custom action %{name} does not exists or is "
 "not configured."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2674
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2541
 msgid "LSsession : Fail to retreive user's LDAP credentials from LSauth."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2677
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2544
 msgid ""
 "LSsession : Fail to reconnect to LDAP server with user's LDAP credentials."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2680
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2547
 msgid "LSsession : No import/export format define for this object type."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2683
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2550
 msgid ""
 "LSsession : Error during creation of list of levels. Contact administrators. "
 "(Code : %{code})"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2686
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2553
 msgid "LSsession : The password recovery is disabled for this LDAP server."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2689
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2556
 msgid ""
 "LSsession : Some informations are missing to recover your password. Contact "
 "administrators."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2692
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2559
 msgid ""
 "LSsession : Error during password recovery. Contact administrators.(Step : "
 "%{step})"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2695
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2562
 msgid ""
 "LSsession : call function %{func} do not provided from LSaddon %{addon}."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2698
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2565
 msgid "LSsession : problem during initialisation."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2701
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2568
 msgid "LSsession : view function %{func} for LSaddon %{addon} doet not exist."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2704
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2571
 msgid "LSsession : invalid related object's DN pass in parameter."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2707
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2574
 msgid ""
 "LSsession : the LSaddon %{addon} keep using old-style addon view URL. Please "
 "upgrade it."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2710
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2577
 msgid ""
 "LSsession : You have been redirect from an old-style URL %{url}. Please "
 "upgrade this link."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2713
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LSsession.php:2580
 msgid ""
 "LSsession : You still seen use LSsession :: redirect() in your custom code. "
 "Please upgrade it and use LSurl :: redirect()."
@@ -1701,21 +1697,21 @@ msgstr ""
 msgid "Entity type"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:122
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:127
 msgid "Only one command could be executed !"
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:168
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:173
 msgid ""
 "Invalid parameter \"%{parameter}\".\n"
 "Note: Command's parameter/argument must be place after the command."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:207
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:212
 msgid "LScli : The CLI command '%{command}' already exists."
 msgstr ""
 
-#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:210
+#: /home/brenard/dev/ldapsaisie_clean3/src/includes/class/class.LScli.php:215
 msgid "LScli : The CLI command '%{command}' handler is not callable."
 msgstr ""
 
@@ -1874,6 +1870,11 @@ msgstr ""
 msgid "Imported objects"
 msgstr ""
 
+#: templates/default/top.tpl:53 templates/default/recoverpassword.tpl:33
+#: templates/default/login.tpl:31 templates/default/login.tpl:42
+msgid "Language"
+msgstr ""
+
 #: templates/default/LSaccessRightsMatrixView.tpl:19
 #: templates/default/LSaccessRightsMatrixView.tpl:55
 msgid "Legend:"