From a310df070450bfc84e6a785a7409cb6123c52b3e Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 4 Nov 2022 14:15:26 +0100 Subject: [PATCH] language fixes Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Traffic/ReportsCron.php | 22 ++++++++++++++-------- lng/de.lng.php | 8 ++++---- lng/en.lng.php | 18 +++++++++--------- lng/it.lng.php | 4 ++-- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/lib/Froxlor/Cron/Traffic/ReportsCron.php b/lib/Froxlor/Cron/Traffic/ReportsCron.php index fc40e5d7..553e463a 100644 --- a/lib/Froxlor/Cron/Traffic/ReportsCron.php +++ b/lib/Froxlor/Cron/Traffic/ReportsCron.php @@ -56,6 +56,10 @@ class ReportsCron extends FroxlorCron */ $mail = new Mailer(true); + // set default language before anything else to + // ensure that we can display messages + Language::setLanguage(Settings::Get('panel.standardlanguage')); + if ((int)Settings::Get('system.report_trafficmax') > 0) { // Warn the customers at xx% traffic-usage $result_stmt = Database::prepare(" @@ -83,6 +87,7 @@ class ReportsCron extends FroxlorCron 'name' => $row['name'], 'firstname' => $row['firstname'], 'company' => $row['company'], + 'loginname' => $row['loginname'], 'customernumber' => $row['customernumber'] ]; $replace_arr = [ @@ -116,11 +121,11 @@ class ReportsCron extends FroxlorCron 'varname' => 'trafficmaxpercent_subject' ]; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lng('mails.trafficmaxpercent.subject')), $replace_arr)); + $mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : Language::getTranslation('mails.trafficmaxpercent.subject')), $replace_arr)); $result2_data['varname'] = 'trafficmaxpercent_mailbody'; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_body = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lng('mails.trafficmaxpercent.mailbody')), $replace_arr)); + $mail_body = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : Language::getTranslation('mails.trafficmaxpercent.mailbody')), $replace_arr)); $_mailerror = false; $mailerr_msg = ""; @@ -199,11 +204,11 @@ class ReportsCron extends FroxlorCron 'varname' => 'trafficmaxpercent_subject' ]; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lng('mails.trafficmaxpercent.subject')), $replace_arr)); + $mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : Language::getTranslation('mails.trafficmaxpercent.subject')), $replace_arr)); $result2_data['varname'] = 'trafficmaxpercent_mailbody'; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_body = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lng('mails.trafficmaxpercent.mailbody')), $replace_arr)); + $mail_body = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : Language::getTranslation('mails.trafficmaxpercent.mailbody')), $replace_arr)); $_mailerror = false; $mailerr_msg = ""; @@ -350,6 +355,7 @@ class ReportsCron extends FroxlorCron 'name' => $row['name'], 'firstname' => $row['firstname'], 'company' => $row['company'], + 'loginname' => $row['loginname'], 'customernumber' => $row['customernumber'] ]; $replace_arr = [ @@ -383,11 +389,11 @@ class ReportsCron extends FroxlorCron 'varname' => 'diskmaxpercent_subject' ]; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lng('mails.diskmaxpercent.subject')), $replace_arr)); + $mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : Language::getTranslation('mails.diskmaxpercent.subject')), $replace_arr)); $result2_data['varname'] = 'diskmaxpercent_mailbody'; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_body = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lng('mails.diskmaxpercent.mailbody')), $replace_arr)); + $mail_body = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lLanguage::getTranslation('mails.diskmaxpercent.mailbody')), $replace_arr)); $_mailerror = false; $mailerr_msg = ""; @@ -457,11 +463,11 @@ class ReportsCron extends FroxlorCron 'varname' => 'diskmaxpercent_subject' ]; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lng('mails.diskmaxpercent.subject')), $replace_arr)); + $mail_subject = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : Language::getTranslation('mails.diskmaxpercent.subject')), $replace_arr)); $result2_data['varname'] = 'diskmaxpercent_mailbody'; $result2 = Database::pexecute_first($result2_stmt, $result2_data); - $mail_body = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : lng('mails.diskmaxpercent.mailbody')), $replace_arr)); + $mail_body = html_entity_decode(PhpHelper::replaceVariables((($result2 !== false && $result2['value'] != '') ? $result2['value'] : Language::getTranslation('mails.diskmaxpercent.mailbody')), $replace_arr)); $_mailerror = false; $mailerr_msg = ""; diff --git a/lng/de.lng.php b/lng/de.lng.php index d9fb7d06..17128482 100644 --- a/lng/de.lng.php +++ b/lng/de.lng.php @@ -997,11 +997,11 @@ return [ 'subject' => 'E-Mail-Konto erfolgreich eingerichtet', ], 'createcustomer' => [ - 'mailbody' => 'Hallo {FIRSTNAME} {NAME},\\n\\nhier Ihre Accountinformationen:\\n\\nBenutzername: {USERNAME}\\nPasswort: {PASSWORD}\\n\\nVielen Dank,\\nIhr Administrator', + 'mailbody' => 'Hallo {SALUTATION},\\n\\nhier Ihre Accountinformationen:\\n\\nBenutzername: {USERNAME}\\nPasswort: {PASSWORD}\\n\\nVielen Dank,\\nIhr Administrator', 'subject' => 'Kontoinformationen', ], 'pop_success_alternative' => [ - 'mailbody' => 'Hallo,\\n\\nihr E-Mail-Konto {USERNAME}\\nwurde erfolgreich eingerichtet.\\nIhr Passwort lautet {PASSWORD}.\\n\\nDies ist eine automatisch generierte\\neMail, bitte antworten Sie nicht auf\\ndiese Mitteilung.\\n\\nIhr Administrator', + 'mailbody' => 'Hallo {SALUTATION},\\n\\nihr E-Mail-Konto {USERNAME}\\nwurde erfolgreich eingerichtet.\\nIhr Passwort lautet {PASSWORD}.\\n\\nDies ist eine automatisch generierte\\neMail, bitte antworten Sie nicht auf\\ndiese Mitteilung.\\n\\nIhr Administrator', 'subject' => 'E-Mail-Konto erfolgreich eingerichtet', ], 'password_reset' => [ @@ -1034,11 +1034,11 @@ Pfad: {USR_PATH} Vielen Dank, Ihr Administrator', ], 'trafficmaxpercent' => [ - 'mailbody' => 'Sehr geehrte(r) {NAME},\\n\\nSie haben bereits {TRAFFICUSED} MB von Ihren insgesamt {TRAFFIC} MB Traffic verbraucht.\\nDies sind mehr als {MAX_PERCENT}%.\\n\\nVielen Dank,\\nIhr Administrator', + 'mailbody' => 'Hallo {SALUTATION},\\n\\nSie haben bereits {TRAFFICUSED} MB von Ihren insgesamt {TRAFFIC} MB Traffic verbraucht.\\nDies sind mehr als {MAX_PERCENT}%%.\\n\\nVielen Dank,\\nIhr Administrator', 'subject' => 'Sie erreichen bald Ihr Traffic-Limit', ], 'diskmaxpercent' => [ - 'mailbody' => 'Sehr geehrte(r) {NAME},\\n\\nSie haben bereits {DISKUSED} MB von Ihren insgesamt {DISKAVAILABLE} MB Speicherplatz verbraucht.\\nDies sind mehr als {MAX_PERCENT}%.\\n\\nVielen Dank,\\nIhr Administrator', + 'mailbody' => 'Hallo {SALUTATION},\\n\\nSie haben bereits {DISKUSED} MB von Ihren insgesamt {DISKAVAILABLE} MB Speicherplatz verbraucht.\\nDies sind mehr als {MAX_PERCENT}%%.\\n\\nVielen Dank,\\nIhr Administrator', 'subject' => 'Sie erreichen bald Ihr Speicherplatz-Limit', ], '2fa' => [ diff --git a/lng/en.lng.php b/lng/en.lng.php index b54196f4..8ad729ff 100644 --- a/lng/en.lng.php +++ b/lng/en.lng.php @@ -555,12 +555,12 @@ return [ ], 'crondesc' => [ 'cron_unknown_desc' => 'no description given', - 'cron_tasks' => 'generating of configfiles', + 'cron_tasks' => 'Generating of configfiles', 'cron_legacy' => 'legacy (old) cronjob', - 'cron_traffic' => 'traffic calculation', + 'cron_traffic' => 'Traffic calculation', 'cron_usage_report' => 'Web- and traffic-reports', - 'cron_mailboxsize' => 'Calculating of mailbox-sizes', - 'cron_letsencrypt' => 'updating Let\'s Encrypt certificates', + 'cron_mailboxsize' => 'Mailbox-size calculation', + 'cron_letsencrypt' => 'Let\'s Encrypt certificate updates', 'cron_backup' => 'Process backup jobs', ], 'cronjob' => [ @@ -1064,11 +1064,11 @@ return [ 'subject' => 'Mail account set up successfully', ], 'createcustomer' => [ - 'mailbody' => 'Hello {FIRSTNAME} {NAME},\\n\\nhere is your account information:\\n\\nUsername: {USERNAME}\\nPassword: {PASSWORD}\\n\\nThank you,\\nyour administrator', + 'mailbody' => 'Hello {SALUTATION},\\n\\nhere is your account information:\\n\\nUsername: {USERNAME}\\nPassword: {PASSWORD}\\n\\nThank you,\\nyour administrator', 'subject' => 'Account information', ], 'pop_success_alternative' => [ - 'mailbody' => 'Hello,\\n\\nyour Mail account {EMAIL}\\nwas set up successfully.\\nYour password is {PASSWORD}.\\n\\nThis is an automatically created\\ne-mail, please do not answer!\\n\\nYours sincerely, your administrator', + 'mailbody' => 'Hello {SALUTATION},\\n\\nyour Mail account {EMAIL}\\nwas set up successfully.\\nYour password is {PASSWORD}.\\n\\nThis is an automatically created\\ne-mail, please do not answer!\\n\\nYours sincerely, your administrator', 'subject' => 'Mail account set up successfully', ], 'password_reset' => [ @@ -1101,11 +1101,11 @@ Path: {USR_PATH} Yours sincerely, your administrator', ], 'trafficmaxpercent' => [ - 'mailbody' => 'Dear {NAME},\\n\\nyou used {TRAFFICUSED} MB of your available {TRAFFIC} MB of traffic.\\nThis is more than {MAX_PERCENT}%.\\n\\nYours sincerely, your administrator', + 'mailbody' => 'Dear {SALUTATION},\\n\\nyou used {TRAFFICUSED} MB of your available {TRAFFIC} MB of traffic.\\nThis is more than {MAX_PERCENT}%%.\\n\\nYours sincerely, your administrator', 'subject' => 'Reaching your traffic limit', ], 'diskmaxpercent' => [ - 'mailbody' => 'Dear {NAME},\\n\\nyou used {DISKUSED} MB of your available {DISKAVAILABLE} MB of diskspace.\\nThis is more than {MAX_PERCENT}%.\\n\\nYours sincerely, your administrator', + 'mailbody' => 'Dear {SALUTATION},\\n\\nyou used {DISKUSED} MB of your available {DISKAVAILABLE} MB of diskspace.\\nThis is more than {MAX_PERCENT}%%.\\n\\nYours sincerely, your administrator', 'subject' => 'Reaching your diskspace limit', ], '2fa' => [ @@ -2190,7 +2190,7 @@ Yours sincerely, your administrator', 'sent_error_report' => 'Succesfully sent error report. Thank you for your contribution.', ], 'tasks' => [ - 'outstanding_tasks' => 'Outstanding cron-tasks', + 'outstanding_tasks' => 'Pending cron-tasks', 'REBUILD_VHOST' => 'Rebuilding webserver-configuration', 'CREATE_HOME' => 'Adding new customer %s', 'REBUILD_DNS' => 'Rebuilding bind-configuration', diff --git a/lng/it.lng.php b/lng/it.lng.php index 834b6bd2..4faeebab 100644 --- a/lng/it.lng.php +++ b/lng/it.lng.php @@ -1025,11 +1025,11 @@ Percorso: {USR_PATH} Cordiali Saluti, Team Froxlor', ], 'trafficmaxpercent' => [ - 'mailbody' => 'Salve {NAME},\\n\\nhai utilizzato {TRAFFICUSED} MB di {TRAFFIC} MB traffico disponibile.\\nQuesto è più del {MAX_PERCENT}%.\\n\\nCordiali Saluti, il Team Froxlor', + 'mailbody' => 'Salve {NAME},\\n\\nhai utilizzato {TRAFFICUSED} MB di {TRAFFIC} MB traffico disponibile.\\nQuesto è più del {MAX_PERCENT}%%.\\n\\nCordiali Saluti, il Team Froxlor', 'subject' => 'Raggiunto il limite di traffico', ], 'diskmaxpercent' => [ - 'mailbody' => 'Salve {NAME},\\n\\nhai utilizzato {DISKUSED} MB di {DISKAVAILABLE} MB di spazio disponibile.\\nQuesto è più del {MAX_PERCENT}%.\\n\\nCordiali Saluti, il Team Froxlor', + 'mailbody' => 'Salve {NAME},\\n\\nhai utilizzato {DISKUSED} MB di {DISKAVAILABLE} MB di spazio disponibile.\\nQuesto è più del {MAX_PERCENT}%%.\\n\\nCordiali Saluti, il Team Froxlor', 'subject' => 'Raggiungere il limite di spazio su disco', ], ],