github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Issues 287 added to the default English language" 

This reverts commit 6ba2e6023b.
pull/304/head
Pavel Dvořák 2016-05-15 19:32:42 +02:00
parent fb131b843a
commit b365b1edb7
1 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/includes/functions.inc.php
View File

@ -43,24 +43,15 @@ function psm_get_lang() {
if(empty($args)) return $GLOBALS['sm_lang']; if(empty($args)) return $GLOBALS['sm_lang'];
$result = null; $result = null;
$resultDefault = null;
$node = null; $node = null;
$nodeDefault = null;
if($args) { if($args) {
$node = '$GLOBALS[\'sm_lang\'][\'' . implode('\'][\'', $args) . '\']'; $node = '$GLOBALS[\'sm_lang\'][\'' . implode('\'][\'', $args) . '\']';
$nodeDefault = '$GLOBALS[\'sm_lang_default\'][\'' . implode('\'][\'', $args) . '\']';
} }
eval('if (isset('.$node.')) $result = '.$node.';'); eval('if (isset('.$node.')) $result = '.$node.';');
eval('if (isset(' . $nodeDefault . ')) $resultDefault = ' . $nodeDefault . ';');
if (empty($result)) {
return $resultDefault;
} else {
return $result; return $result;
} }
}
/** /**
* Load language from the language file to the $GLOBALS['sm_lang'] variable * Load language from the language file to the $GLOBALS['sm_lang'] variable
@ -69,19 +60,6 @@ function psm_get_lang() {
* @see psm_get_lang() * @see psm_get_lang()
*/ */
function psm_load_lang($lang) { function psm_load_lang($lang) {
// if not in the language translation must always be available starting translation - English
$default_lang_file = PSM_PATH_LANG . 'en_US.lang.php';
if (file_exists($default_lang_file)) {
require $default_lang_file;
if (isset($sm_lang)) {
$GLOBALS['sm_lang_default'] = $sm_lang;
unset($sm_lang);
}
}
// translated language
$lang_file = PSM_PATH_LANG . $lang . '.lang.php'; $lang_file = PSM_PATH_LANG . $lang . '.lang.php';
if(!file_exists($lang_file)) { if(!file_exists($lang_file)) {