Merge pull request hestiacp#740 from Flatta/improve-translation

Improve translation

Author: serghey-rodin

web/add/web/index.php

@@ -60,7 +60,7 @@
     $aliases = implode(",",$aliases_arr);
     $aliases = escapeshellarg($aliases);
 
-    // Define proxy extentions
+    // Define proxy extensions
     $v_proxy_ext = $_POST['v_proxy_ext'];
     $proxy_ext = preg_replace("/\n/", ",", $v_proxy_ext);
     $proxy_ext = preg_replace("/\r/", ",", $proxy_ext);
@@ -272,7 +272,7 @@
                     $fp = fopen($v_ftp_password, "w");
                     fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n");
                     fclose($fp);
-                    exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var); 
+                    exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
                     check_return_code($return_var,$output);
                     unset($output);
                     unlink($v_ftp_password);

web/edit/web/index.php

@@ -222,7 +222,7 @@
         $restart_proxy = 'yes';
     }
 
-    // Change proxy template / Update extention list
+    // Change proxy template / Update extension list
     if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) {
         $ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']);
         $ext = preg_replace("/,/", " ", $ext);

web/inc/i18n.php

@@ -10,25 +10,30 @@ function _translate() {
     global $LANG;
 
     $args = func_get_args();
+
     $l = $args[0];
+    if (empty($l)) return 'NO LANGUAGE DEFINED';
 
-    if (!$l) return 'NO LANGUAGE DEFINED';
     $key = $args[1];
+    if (empty($key)) return '';
 
-    if (!isset($LANG[$l])) {
-        require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$l.'.php');
+    // No translation needed
+    if (!preg_match('/[a-z]/i', $key)) {
+        return $key;
     }
 
-    if (!isset($LANG[$l][$key])) {
-        $text=$key;
-    } else {
-        $text=$LANG[$l][$key];
+    // Load language file (if not loaded yet)
+    if (!isset($LANG[$l])) {
+        require_once($_SERVER['DOCUMENT_ROOT']."/inc/i18n/$l.php");
     }
 
+    //if (!isset($LANG[$l][$key])) file_put_contents('/somewhere/something.log', "$key\n", FILE_APPEND);
+    $text = isset($LANG[$l][$key]) ? $LANG[$l][$key] : $key;
+
     array_shift($args);
-    if (count($args)>1) {
+    if (count($args) > 1) {
         $args[0] = $text;
-        return call_user_func_array("sprintf",$args);
+        return call_user_func_array('sprintf', $args);
     } else {
         return $text;
     }
@@ -42,8 +47,8 @@ function _translate() {
  */
 function __() {
     $args = func_get_args();
-    array_unshift($args,$_SESSION['language']);
-    return call_user_func_array("_translate",$args);
+    array_unshift($args, $_SESSION['language']);
+    return call_user_func_array('_translate', $args);
 }
 
 /**