Skip to content

Commit 1403d15

Browse files
jaapmarcusjaapmarcus
authored
Relace“nl” in drop down with translated text Dutch (Netherlands) (hestiacp#1367)
Where $lang ($locale-lang)
1 parent d323e99 commit 1403d15

File tree

9 files changed

+44
-24
lines changed

9 files changed

+44
-24
lines changed

‎web/add/user/index.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,11 @@
123123

124124
// List languages
125125
exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
126-
$languages = json_decode(implode('', $output), true);
127-
unset($output);
126+
$language = json_decode(implode('', $output), true);
127+
foreach($language as $lang){
128+
$languages[$lang] = translate_json($lang);
129+
}
130+
asort($languages);
128131

129132
// Render page
130133
render_page($user, $TAB, 'add_user');

‎web/edit/server/index.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,13 @@
9191
return $phpinfo;
9292
}, $v_php_versions);
9393

94-
// List supported languages
94+
// List languages
9595
exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
96-
$languages = json_decode(implode('', $output), true);
96+
$language = json_decode(implode('', $output), true);
97+
foreach($language as $lang){
98+
$languages[$lang] = translate_json($lang);
99+
}
100+
asort($languages);
97101
unset($output);
98102

99103
// List themes

‎web/edit/user/index.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,11 @@
7070

7171
// List languages
7272
exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
73-
$languages = json_decode(implode('', $output), true);
73+
$language = json_decode(implode('', $output), true);
74+
foreach($language as $lang){
75+
$languages[$lang] = translate_json($lang);
76+
}
77+
asort($languages);
7478
unset($output);
7579

7680
// List shells

‎web/inc/i18n.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,17 @@ function detect_user_language() {
2525
return 'en';
2626
}
2727
}
28-
28+
/**
29+
* Translate ISO2 to "Language"
30+
* nl = Dutch, de = German
31+
* @param string iso2 code
32+
* @return string Language
33+
*/
34+
function translate_json($string){
35+
$json = file_get_contents($_SERVER['DOCUMENT_ROOT'].'/locale/languages.json');
36+
$json_a = json_decode($json, true);
37+
return $json_a[$string][0] .' ('.$json_a[$string.'_locale'][0].')';
38+
}
2939
/**
3040
* Detects user language .
3141
* @param string Fallback language (default: 'en')

‎web/locale/languages.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"az_locale":["Az\u0259rbaycan dili"],"zh-tw_locale":["\u81fa\u7063\u8a71"],"zh-tw":["Chinese (Taiwan)"],"zh-cn_locale":["\u666e\u901a\u8bdd"],"zh-cn":["Chinese"],"vi_locale":["Ti\u1ebfng Vi\u1ec7t"],"vi":["Vietnamese"],"ur_locale":["\u0627\u064f\u0631\u062f\u064f\u0648"],"ur":["Urdu"],"uk_locale":["Y\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430 \u043c\u043e\u0432\u0430"],"uk":["Ukrainian"],"tr_locale":["T\u00fcrk\u00e7e"],"tr":["Turkish"],"th_locale":["\u0e44\u0e17\u0e22"],"th":["Thai"],"sv_locale":["Svenska"],"sv":["Swedish"],"sr_locale":["\u0441\u0440\u043f\u0441\u043a\u0438"],"sr":["Serbian"],"ru_locale":["\u0420\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a"],"ru":["Russian"],"ro_locale":["Rom\u00e2n\u0103"],"ro":["Romanian"],"pt-br_locale":["Portugu\u00eas (Brasil)"],"pt-br":["Portuguese (Brasil)"],"pt_locale":["Portugu\u00eas"],"pt":["Portuguese"],"pl_locale":["Polski"],"pl":["Polish"],"no_locale":["Norsk"],"no":["Norwegain"],"nl_locale":["Nederlands"],"nl":["Dutch"],"ko_locale":["\ud55c\uad6d\uc5b4"],"ko":["Korean"],"ka_locale":["\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8 \u10d4\u10dc\u10d0"],"ka":["Georgian"],"ja_locale":["\u65e5\u672c\u8a9e"],"ja":["Japanese"],"it_locale":["Italiano"],"it":["Italian"],"id_locale":["Bahasa Indonesia"],"id":["Indonesian"],"hu_locale":["Magyar"],"hu":["Hungarian"],"hr_locale":["Hravtski"],"hr":["Croatian"],"fr_locale":["Fran\u00e7ais "],"fr":["French"],"fi_locale":["Suomi"],"fi":["Finnish"],"fa_locale":["\u0641\u0627\u0631\u0633\u06cc"],"fa":["Persian"],"es_locale":["Espa\u00f1ol"],"es":["Spanish"],"en_locale":["English"],"en":["English"],"el_locale":["\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"],"el":["Greek"],"de_locale":["Deutsch"],"de":["German"],"da_locale":["Dansk"],"da":["Danish"],"cs_locale":["\u010de\u0161tina"],"cs":["Czech"],"bs_locale":["Bosanski"],"bs":["Bosnian"],"bg_locale":["\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"],"bg":["Bulgarian"],"az":["Azerbaijani"],"ar_locale":["\u0639\u0631\u0628\u0649"],"ar":["Arabic"]}

‎web/templates/admin/add_user.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,12 @@
154154
<select class="vst-list" name="v_language" tabindex="7" >
155155
<?php
156156
foreach ($languages as $key => $value) {
157-
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($value)."\"";
158-
$svalue = "'".$value."'";
159-
if (( $value == $_SESSION['LANGUAGE'] ) && (empty($v_language))){
157+
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
158+
if (( $key == $_SESSION['LANGUAGE'] ) && (empty($v_language))){
160159
echo ' selected' ;
161160
}
162161
if (isset($v_language)){
163-
if (( $value == $v_language ) || ( $svalue == $v_language)){
162+
if ( $key == $v_language ){
164163
echo ' selected' ;
165164
}
166165
}

‎web/templates/admin/edit_server.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@
131131
<select class="vst-list" name="v_language">
132132
<?php
133133
foreach ($languages as $key => $value) {
134-
echo "\t\t\t\t<option value=\"".$value."\"";
135-
if ((!empty($_SESSION['LANGUAGE'])) && ( $value == $_SESSION['LANGUAGE'])){
136-
echo ' selected' ;
134+
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
135+
if ( $key == $v_language ){
136+
echo 'selected' ;
137137
}
138-
if ((!empty($_SESSION['LANGUAGE'])) && ( $value == $_POST['v_language'])){
139-
echo ' selected' ;
138+
if (( $key == detect_user_language() ) && (empty($v_language))){
139+
echo 'selected' ;
140140
}
141-
echo ">".$value."</option>\n";
141+
echo ">".htmlentities($value)."</option>\n";
142142
}
143143
?>
144144
</select>

‎web/templates/admin/edit_user.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@
163163
<select class="vst-list" name="v_language">
164164
<?php
165165
foreach ($languages as $key => $value) {
166-
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
167-
$svalue = "'".$value."'";
168-
if (( $value == $v_language ) || ( $svalue == $v_language)){
166+
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
167+
$skey = "'".$key."'";
168+
if (( $key == $v_language ) || ( $skey == $v_language)){
169169
echo 'selected' ;
170170
}
171-
if (( $value == detect_user_language() ) && (empty($v_language))){
171+
if (( $key == detect_user_language() ) && (empty($v_language))){
172172
echo 'selected' ;
173173
}
174174
echo ">".htmlentities($value)."</option>\n";

‎web/templates/user/edit_user.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,11 @@
127127
<select class="vst-list" name="v_language">
128128
<?php
129129
foreach ($languages as $key => $value) {
130-
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
131-
$svalue = "'".$value."'";
132-
if (( $value == $v_language ) || ( $svalue == $v_language)){
130+
echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
131+
if ( $key == $v_language ){
133132
echo 'selected' ;
134133
}
135-
if (( $value == detect_user_language() ) && (empty($v_language))){
134+
if (( $key == detect_user_language() ) && (empty($v_language))){
136135
echo 'selected' ;
137136
}
138137
echo ">".htmlentities($value)."</option>\n";

0 commit comments

Comments
 (0)