From 88491806c38ef9c3f9bde06e3c6ac7e0244a5a3c Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Thu, 24 May 2012 13:45:03 +0000
Subject: new, _lang_return() function

---
 langs.inc.php | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'langs.inc.php')

diff --git a/langs.inc.php b/langs.inc.php
index 23103f051..6d6d2aa4e 100644
--- a/langs.inc.php
+++ b/langs.inc.php
@@ -181,6 +181,26 @@ function _h($s, $args = null, $tag = 'p') {
     echo sprintf('<%s>%s</%s>', $tag, _t($s), $tag);
 }
 
+/**
+*/
+function _lang_return($file)
+{
+    $strings = array();
+    $f       = file($file);
+
+    foreach ($f as $k => $v) {
+
+        $C = substr($v, 0, 1);
+        if ($C === '#') continue;
+
+        if ($C === ';' && !empty($f[$k+1])) {
+            $strings[trim(substr($v, 1))] = trim($f[$k+1]);
+        }
+    }
+
+    return $strings;
+}
+
 /**
  * @param string $locale
  * @param string $domain
@@ -195,25 +215,15 @@ function _lang_load($locale, $domain)
         return true;
 
     $lang_file = sprintf('%s/langs/%s/%s.%s.lang', G_APP_ROOT, $locale, $domain, $locale);
-
     if (file_exists($lang_file)) {
 
         global $_t;
 
-        $f = file($lang_file);
+        $_t = array_merge($_t, _lang_return($lang_file));
 
-        foreach ($f as $k => $v) {
-
-            $C = substr($v, 0, 1);
-            if ($C === '#') continue;
-
-            if ($C === ';' && !empty($f[$k+1])) {
-                $_t[trim(substr($v, 1))] = trim($f[$k+1]);
-            }
-        }
         return true;
     }
-    error_log(sprintf('Could not find %s', $lang_file));
+    
     return false;
 }
 
-- 
cgit v1.2.1