Projekte/web-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

route bugfix, localization

Browse Source
This commit is contained in:
Roman
2023-01-25 14:15:34 +01:00
parent e4e2511d1c
commit 8a09fc1f2d
18 changed files with 129 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Core/Objects/DatabaseEntity/Language.class.php
View File

@@ -81,7 +81,7 @@ namespace Core\Objects\DatabaseEntity {
}
}
return new Language(1, "en_US", "American English");
return self::getPredefinedValues()[0];
}
public function getEntries(?string $module = null): ?array {
@@ -101,7 +101,7 @@ namespace Core\Objects\DatabaseEntity {
}
}
return "[$key]";
return $key ? "[$key]" : "";
}
public function addModule(string $module, array $entries) {
@@ -143,8 +143,8 @@ namespace Core\Objects\DatabaseEntity {
public static function getPredefinedValues(): array {
return [
new Language(Language::AMERICAN_ENGLISH, "en_US", 'American English'),
new Language(Language::GERMAN_STANDARD, "de_DE", 'Deutsch Standard'),
new Language(Language::AMERICAN_ENGLISH, "en_US", 'English (US)'),
new Language(Language::GERMAN_STANDARD, "de_DE", 'Deutsch (Standard)'),
];
}
}
@@ -153,7 +153,7 @@ namespace Core\Objects\DatabaseEntity {
namespace {
function L(string $key): string {
if (!array_key_exists('LANGUAGE', $GLOBALS)) {
return "[$key]";
return $key ? "[$key]" : "";
}
global $LANGUAGE;