maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

even more language migration/fixing

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-04-29 10:23:45 +02:00
parent 6116dda9bb
commit 9ab185a71c
8 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actions/admin/settings/100.panel.php
View File

@@ -37,9 +37,9 @@ return [
'settinggroup' => 'panel', 'settinggroup' => 'panel',
'varname' => 'standardlanguage', 'varname' => 'standardlanguage',
'type' => 'select', 'type' => 'select',
'default' => 'English', 'default' => 'en',
'option_options_method' => [ 'option_options_method' => [
'\\Froxlor\\User', '\\Froxlor\\Language',
'getLanguages' 'getLanguages'
], ],
'save_method' => 'storeSettingField' 'save_method' => 'storeSettingField'

2
actions/admin/settings/180.dkim.php
View File

@@ -108,7 +108,7 @@ return [
'dkim_keylength' => [ 'dkim_keylength' => [
'label' => [ 'label' => [
'title' => lng('dkim.dkim_keylength.title'), 'title' => lng('dkim.dkim_keylength.title'),
'description' => sprintf(lng('dkim.dkim_keylength.description'), Settings::Get('dkim.dkim_prefix')) 'description' => lng('dkim.dkim_keylength.description', [Settings::Get('dkim.dkim_prefix')])
], ],
'settinggroup' => 'dkim', 'settinggroup' => 'dkim',
'varname' => 'dkim_keylength', 'varname' => 'dkim_keylength',

1
lib/Froxlor/Ajax/Ajax.php
View File

@@ -39,7 +39,6 @@ use Froxlor\UI\Panel\UI;
use Froxlor\UI\Request; use Froxlor\UI\Request;
use Froxlor\UI\Response; use Froxlor\UI\Response;
use Froxlor\Validate\Validate; use Froxlor\Validate\Validate;
use PDO;
class Ajax class Ajax
{ {

7
lib/Froxlor/Language.php
View File

@@ -70,6 +70,13 @@ class Language
} }
} }
// shortcut for identifier with => [title, description]
if (!isset(self::$lng[$identifier]) && isset(self::$lng[$identifier . '.title'])) {
return [
'title' => vsprintf(self::$lng[$identifier . '.title'] ?? $identifier, $arguments),
'description' => vsprintf(self::$lng[$identifier . '.description'] ?? $identifier, $arguments),
];
}
// search by identifier // search by identifier
return vsprintf(self::$lng[$identifier] ?? $identifier, $arguments); return vsprintf(self::$lng[$identifier] ?? $identifier, $arguments);
} }

14
lib/Froxlor/User.php
View File

@@ -84,20 +84,6 @@ class User
return $returnval; return $returnval;
} }
public static function getLanguages()
{
$result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_LANGUAGE . "` ");
$languages_array = [];
while ($row = $result_stmt->fetch(PDO::FETCH_ASSOC)) {
if (!isset($languages_array[$row['language']]) && !in_array($row['language'], $languages_array)) {
$languages_array[$row['language']] = html_entity_decode($row['language']);
}
}
return $languages_array;
}
/** /**
* Function which updates all counters of used resources in panel_admins and panel_customers * Function which updates all counters of used resources in panel_admins and panel_customers
* *

1
lib/ajax.php
View File

@@ -35,6 +35,7 @@ if (!file_exists('./userdata.inc.php')) {
die(); die();
} }
require_once dirname(__DIR__) . '/lib/userdata.inc.php'; require_once dirname(__DIR__) . '/lib/userdata.inc.php';
require_once dirname(__DIR__) . '/lib/functions.php';
require_once dirname(__DIR__) . '/lib/tables.inc.php'; require_once dirname(__DIR__) . '/lib/tables.inc.php';
// Return response // Return response

3
lng/de.lng.php
View File

@@ -1011,9 +1011,6 @@ Vielen Dank, Ihr Administrator',
'subject' => 'Froxlor - 2FA Code', 'subject' => 'Froxlor - 2FA Code',
], ],
], ],
'menu' => [
'message' => 'Nachrichten',
],
'menue' => [ 'menue' => [
'main' => [ 'main' => [
'main' => 'Allgemein', 'main' => 'Allgemein',

3
lng/en.lng.php
View File

@@ -1308,9 +1308,6 @@ Yours sincerely, your administrator',
'subject' => 'Froxlor - 2FA Code', 'subject' => 'Froxlor - 2FA Code',
], ],
], ],
'menu' => [
'message' => 'Messages',
],
'menue' => [ 'menue' => [
'main' => [ 'main' => [
'main' => 'Main', 'main' => 'Main',