Skip to content

Commit a9d8332

Browse files
committed
manually mergin PR hestiacp#551
2 parents b2771bb + 79cf515 commit a9d8332

File tree

2 files changed

+263
-725
lines changed

2 files changed

+263
-725
lines changed

web/inc/i18n.php

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
<?php
2-
// Functions for internationalization
3-
4-
/**
5-
* Translates string to given language in first parameter, key given in second parameter (dynamically loads required language). Works like spritf from second parameter
6-
* @global array $LANG Associative array of language pharses
7-
* @return string Translated string
8-
*/
9-
function _translate() {
10-
global $LANG;
11-
12-
$args = func_get_args();
13-
$l = $args[0];
14-
15-
if (!$l) return 'NO LANGUAGE DEFINED';
16-
$key = $args[1];
17-
18-
if (!isset($LANG[$l])) {
19-
require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$l.'.php');
20-
}
21-
22-
if (!isset($LANG[$l][$key])) {
23-
$text=$key;
24-
} else {
25-
$text=$LANG[$l][$key];
26-
}
27-
28-
array_shift($args);
29-
if (count($args)>1) {
30-
$args[0] = $text;
31-
return call_user_func_array("sprintf",$args);
32-
} else {
33-
return $text;
34-
}
35-
}
36-
37-
/**
38-
* Translates string by a given key in first parameter to current session language. Works like sprintf
39-
* @global array $LANG Associative array of language pharses
40-
* @return string Translated string
41-
* @see _translate()
42-
*/
43-
function __() {
44-
$args = func_get_args();
45-
array_unshift($args,$_SESSION['language']);
46-
return call_user_func_array("_translate",$args);
1+
<?php
2+
// Functions for internationalization
3+
4+
/**
5+
* Translates string to given language in first parameter, key given in second parameter (dynamically loads required language). Works like spritf from second parameter
6+
* @global array $LANG Associative array of language pharses
7+
* @return string Translated string
8+
*/
9+
function _translate() {
10+
global $LANG;
11+
12+
$args = func_get_args();
13+
$l = $args[0];
14+
15+
if (!$l) return 'NO LANGUAGE DEFINED';
16+
$key = $args[1];
17+
18+
if (!isset($LANG[$l])) {
19+
require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$l.'.php');
20+
}
21+
22+
if (!isset($LANG[$l][$key])) {
23+
$text=$key;
24+
} else {
25+
$text=$LANG[$l][$key];
26+
}
27+
28+
array_shift($args);
29+
if (count($args)>1) {
30+
$args[0] = $text;
31+
return call_user_func_array("sprintf",$args);
32+
} else {
33+
return $text;
34+
}
35+
}
36+
37+
/**
38+
* Translates string by a given key in first parameter to current session language. Works like sprintf
39+
* @global array $LANG Associative array of language pharses
40+
* @return string Translated string
41+
* @see _translate()
42+
*/
43+
function __() {
44+
$args = func_get_args();
45+
array_unshift($args,$_SESSION['language']);
46+
return call_user_func_array("_translate",$args);
4747
}
4848

4949
/**
@@ -120,4 +120,4 @@ function detect_user_language($fallback='en') {
120120

121121
function detect_login_language(){
122122

123-
}
123+
}

0 commit comments

Comments
 (0)