Merge pull request hestiacp#1170 from hestiacp/fix/1166-emals-not-translated

hestiacp#1166 Issues with emails not translated

Author: ScIT-Raphael

web/inc/i18n.php

@@ -2,7 +2,7 @@
 // Functions for internationalization
 // I18N support information here
 
-putenv("LANGUAGE=".$_SESSION['language']);
+putenv("LANGUAGE=".detect_user_language());
 setlocale( LC_ALL, 'C.UTF-8' );
 
 $domain = 'hestiacp';
@@ -16,8 +16,14 @@
  * @param string Fallback language (default: 'en')
  * @return string Language code (such as 'en' and 'ja')
  */
-function detect_user_language($fallback='en') {
-    
+function detect_user_language() {
+   if (!empty($_SESSION['language'])) {
+        return $_SESSION['language'];   
+   }elseif (!empty($_SESSION['LANGUAGE'])){
+       return $_SESSION['LANGUAGE'];
+   }else{
+       return 'en';
+   }
 }
 
 /**

web/templates/admin/list_backup_detail.html

@@ -75,7 +75,7 @@
               <div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
                 <div class="actions-panel clearfix">
                   <div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
-                    <a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?php print __('Restore');?>">
+                    <a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?php print _('Restore');?>">
                       <i class="fas fa-undo status-icon green status-icon dim"></i>
                     </a>
                   </div>