Merge pull request #100 from thnilsen/issue64

Fix for translation when selecting a different language
Fixes #64 #80 #84
This commit is contained in:
Vojtěch Sajdl 2020-05-23 17:18:47 +02:00 committed by GitHub
commit 45a90aef71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions

View File

@ -163,7 +163,7 @@ class Service implements JsonSerializable
?>
<div class="item clearfix">
<div class="service"><?php echo $this->name; ?></div>
<?php if ($this->status!=-1){?><div class="status <?php echo $classes[$this->status];?>"><?php echo $statuses[$this->status];?></div><?php }?>
<?php if ($this->status!=-1){?><div class="status <?php echo $classes[$this->status];?>"><?php echo _($statuses[$this->status]);?></div><?php }?>
</div>
<?php
}

View File

@ -27,6 +27,7 @@ if (!isset($_SESSION['locale'])||isset($_GET['lang']))
$_SESSION['locale'] = $best_match;
}
putenv('LANGUAGE='.$_SESSION['locale'].'.UTF-8');
setlocale(LC_ALL, $_SESSION['locale'].".UTF-8");
setlocale(LC_MESSAGES, $_SESSION['locale'].".UTF-8");
bindtextdomain("server-status", __DIR__ . "/locale/");

View File

@ -1,13 +1,14 @@
<?php
require_once("template.php");
if (!file_exists("config.php"))
{
require_once("template.php");
require_once("install.php");
}
else{
require_once("config.php");
require_once("template.php");
require_once("classes/constellation.php");
$offset = 0;