Relace“nl” in drop down with translated text Dutch (Netherlands) (#1367)

Where $lang ($locale-lang)

web/add/user/index.php

@@ -123,8 +123,11 @@ unset($output);
 
 // List languages
 exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
-$languages = json_decode(implode('', $output), true);
-unset($output);
+$language = json_decode(implode('', $output), true);
+foreach($language as $lang){
+    $languages[$lang] = translate_json($lang);
+}
+asort($languages);
 
 // Render page
 render_page($user, $TAB, 'add_user');

web/edit/server/index.php

@@ -91,9 +91,13 @@ $v_php_versions = array_map(function($php_version) use ($backend_templates, $bac
     return $phpinfo;
 }, $v_php_versions);
 
-// List supported languages
+// List languages
 exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
-$languages = json_decode(implode('', $output), true);
+$language = json_decode(implode('', $output), true);
+foreach($language as $lang){
+    $languages[$lang] = translate_json($lang);
+}
+asort($languages);
 unset($output);
 
 // List themes

web/edit/user/index.php

@@ -70,7 +70,11 @@ unset($output);
 
 // List languages
 exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
-$languages = json_decode(implode('', $output), true);
+$language = json_decode(implode('', $output), true);
+foreach($language as $lang){
+    $languages[$lang] = translate_json($lang);
+}
+asort($languages);
 unset($output);
 
 // List shells

web/inc/i18n.php

@@ -25,7 +25,17 @@ function detect_user_language() {
        return 'en';
    }
 }
-
+/**
+ * Translate ISO2 to "Language" 
+ * nl = Dutch, de = German
+ * @param string iso2 code
+ * @return string Language
+ */
+function translate_json($string){
+    $json = file_get_contents($_SERVER['DOCUMENT_ROOT'].'/locale/languages.json');
+    $json_a = json_decode($json, true);
+    return $json_a[$string][0] .' ('.$json_a[$string.'_locale'][0].')';
+}
 /**
  * Detects user language .
  * @param string Fallback language (default: 'en')

web/templates/admin/add_user.html

@@ -154,13 +154,12 @@
                                     <select class="vst-list" name="v_language" tabindex="7" >
                                         <?php
                                             foreach ($languages as $key => $value) {
-                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($value)."\"";
-                                                $svalue = "'".$value."'";
-                                                if (( $value == $_SESSION['LANGUAGE'] ) && (empty($v_language))){
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
+                                                if (( $key == $_SESSION['LANGUAGE'] ) && (empty($v_language))){
                                                     echo ' selected' ;
                                                 }
                                                 if (isset($v_language)){
-                                                    if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                    if ( $key == $v_language ){
                                                         echo ' selected' ;
                                                     }
                                                 }

web/templates/admin/edit_server.html

@@ -131,14 +131,14 @@
                                                 <select class="vst-list" name="v_language">
                                                     <?php
                                                         foreach ($languages as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($_SESSION['LANGUAGE'])) && ( $value == $_SESSION['LANGUAGE'])){
-                                                                echo ' selected' ;
+                                                            echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                            if ( $key == $v_language ){
+                                                                echo 'selected' ;
                                                             }
-                                                            if ((!empty($_SESSION['LANGUAGE'])) && ( $value == $_POST['v_language'])){
-                                                                echo ' selected' ;
+                                                            if (( $key == detect_user_language() ) && (empty($v_language))){
+                                                                echo 'selected' ;
                                                             }
-                                                            echo ">".$value."</option>\n";
+                                                            echo ">".htmlentities($value)."</option>\n";
                                                         }
                                                     ?>
                                                 </select>

web/templates/admin/edit_user.html

@@ -163,12 +163,12 @@
                                     <select class="vst-list" name="v_language">
                                         <?php
                                             foreach ($languages as $key => $value) {
-                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
-                                                $svalue = "'".$value."'";
-                                                if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                $skey = "'".$key."'";
+                                                if (( $key == $v_language ) || ( $skey == $v_language)){
                                                     echo 'selected' ;
                                                 }
-                                                if (( $value == detect_user_language() ) && (empty($v_language))){
+                                                if (( $key == detect_user_language() ) && (empty($v_language))){
                                                     echo 'selected' ;
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";

web/templates/user/edit_user.html

@@ -127,12 +127,11 @@
                                     <select class="vst-list" name="v_language">
                                         <?php
                                             foreach ($languages as $key => $value) {
-                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
-                                                $svalue = "'".$value."'";
-                                                if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                if ( $key == $v_language ){
                                                     echo 'selected' ;
                                                 }
-                                                if (( $value == detect_user_language() ) && (empty($v_language))){
+                                                if (( $key == detect_user_language() ) && (empty($v_language))){
                                                     echo 'selected' ;
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";