From 753c6c768852cb9eafdcd729367e0f48ae79ea03 Mon Sep 17 00:00:00 2001
From: Wruczek <wruczekk@gmail.com>
Date: Thu, 8 Oct 2020 06:29:13 +0200
Subject: [PATCH] Minor improvements

---
 src/private/php/Auth.php                         |  2 +-
 src/private/php/Utils/Language/LanguageUtils.php | 11 -----------
 src/private/php/load.php                         |  6 +++++-
 src/private/templates/body.latte                 |  4 ++--
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/private/php/Auth.php b/src/private/php/Auth.php
index 20eb898..3d4ac2b 100644
--- a/src/private/php/Auth.php
+++ b/src/private/php/Auth.php
@@ -93,7 +93,7 @@ class Auth {
             try {
                 $client = TeamSpeakUtils::i()->getTSNodeServer()->clientGetByDbid($cldbid);
                 $code = (string) Utils::getSecureRandomInt(100000, 999999);
-                $msg = LanguageUtils::tl("LOGIN_CONFIRMATION_CODE", $code);
+                $msg = __get("LOGIN_CONFIRMATION_CODE", $code);
 
                 if ($poke) {
                     $client->poke(mb_substr($msg, 0, 100)); // Max 100 characters for pokes
diff --git a/src/private/php/Utils/Language/LanguageUtils.php b/src/private/php/Utils/Language/LanguageUtils.php
index 791086c..5b1920b 100644
--- a/src/private/php/Utils/Language/LanguageUtils.php
+++ b/src/private/php/Utils/Language/LanguageUtils.php
@@ -19,17 +19,6 @@ class LanguageUtils {
     private $cache;
     private $languages;
 
-    /**
-     * Short function for translate
-     * @param string $identifier
-     * @param array|string $args
-     * @return string
-     * @throws \Exception
-     */
-    public static function tl(string $identifier, $args = []): string {
-        return self::i()->translate($identifier, $args);
-    }
-
     private function __construct() {
         $this->cache = new PhpFileCache(__CACHE_DIR, "translations");
 
diff --git a/src/private/php/load.php b/src/private/php/load.php
index 737267b..2130177 100644
--- a/src/private/php/load.php
+++ b/src/private/php/load.php
@@ -76,7 +76,11 @@ if(!isset($_SESSION["userlanguageid"])) {
         try {
             return LanguageUtils::i()->translate($identifier, $args);
         } catch (\Exception $e) {
-            return "(unknown translation for " . Utils::escape($identifier) . ")";
+            if ($nullOnError) {
+                return null;
+            } else {
+                return "(unknown translation for " . Utils::escape($identifier) . ")";
+            }
         }
     }
 }
diff --git a/src/private/templates/body.latte b/src/private/templates/body.latte
index b1354ad..4a61d0a 100644
--- a/src/private/templates/body.latte
+++ b/src/private/templates/body.latte
@@ -191,8 +191,8 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0;
 <!-- Moment.js 2.22.2 -->
 {$tplutils::includeScript("{cdnjs}/moment.js/2.24.0/moment.min.js", "sha256-4iQZ6BVL4qNKlQ27TExEhBN1HFPvAvAMbFavKKosSWQ=")}
 
-{var momentjslang = Wruczek\TSWebsite\Utils\Language\LanguageUtils::tl("MOMENTJS_LANG")}
-{if $momentjslang !== "en-us"}
+{var momentjslang = __get("MOMENTJS_LANG", [], true)}
+{if $momentjslang !== null && $momentjslang !== "en-us"}
     {$tplutils::includeScript("{cdnjs}/moment.js/2.24.0/locale/$momentjslang.js")}
     <script>
         moment.locale({$momentjslang} || navigator.languages || navigator.language)