From 9f6e45d98cb496cf2de2357e07e5bf963b1f3ea4 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Tue, 15 Jul 2025 15:43:30 +0100 Subject: [PATCH] * Tue Jul 15 2025 Brian Read 11.0.0-107.sme - Email Settings panel: Fix lex strings with long names and no prefix [SME: 13080] --- .../I18N/Modules/Emailsettings/emailsettings_en.lex | 9 ++++++++- .../themes/default/templates/partials/_mai_FRONT.html.ep | 6 +++--- .../themes/default/templates/partials/_mai_REC.html.ep | 8 ++++---- smeserver-manager.spec | 5 ++++- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Emailsettings/emailsettings_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Emailsettings/emailsettings_en.lex index 43e3a61..b10dea3 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Emailsettings/emailsettings_en.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Emailsettings/emailsettings_en.lex @@ -153,4 +153,11 @@ enabled.', 'mai_ACC_panel_action_was_successful' => 'Email access settings saved sucessfully', 'mai_DEL_panel_action_was_successful' => 'Email delivery settings saved sucessfully', 'mai_FIL_panel_action_was_successful' => 'Email filtering settings saved sucessfully', -'mai_REC_panel_action_was_successful' => 'Email receive settings saved sucessfully', \ No newline at end of file +'mai_REC_panel_action_was_successful' => 'Email receive settings saved sucessfully', + +'mai_SMTP_port_authenticate' => 'Smtp port %u allow client to authenticate:', +'mai_SMTP_port_(25)' => 'Smtp port (25) main purpose is to receive emails from another server, starttls is always offered, but auth if offered is only if starttls is also used by client.', +'mai_SMTP_Submission' => 'Smtp submission port (587) will require starttls, then authenticate to send.', +'mai_SMTPS_port_(465)' => 'Smtps port (465) will require implicit ssl/tls then authenticate to send.', +'mai_SMTPS_SSL/TLS' => 'Smtps ssl/tls auth: port %u status:', +'mai_Submission_port' => 'Submission port %u status:' \ No newline at end of file diff --git a/root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep index 94e82d6..35ea23e 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_FRONT.html.ep @@ -89,21 +89,21 @@ % my $smtp_mesg; - % $smtp_mesg=l('SMTP port %u allow client to authenticate:'); + % $smtp_mesg=l('mai_SMTP_port_authenticate');

%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %= $c->get_current_smtp_auth( TRUE )

- % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:'); + % $smtp_mesg=l('mai_SMTPS_SSL/TLS');

%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE )

- % $smtp_mesg=l 'Submission port %u status:'; + % $smtp_mesg=l 'mai_Submission_port';

%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); diff --git a/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep index 093dfa5..dbc7db2 100644 --- a/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep +++ b/root/usr/share/smanager/themes/default/templates/partials/_mai_REC.html.ep @@ -38,14 +38,14 @@ %#=l 'mai_DESC_SMTP_AUTH_CONTROL'
- %= l "SMTP port (25) main purpose is to receive emails from another server, STARTTLS is always offered, but auth if offered is only if STARTTLS is also used by client." + %= l "mai_SMTP_port_(25)"
- %= l "SMTPS port (465) will require implicit SSL/TLS then authenticate to send." + %= l "mai_SMTPS_port_(465)"
- %= l "SMTP Submission port (587) will require STARTTLS, then authenticate to send." + %= l "mai_SMTP_Submission"
- % my $smtp_mesg=l('SMTP port %u allow client to authenticate:'); + % my $smtp_mesg=l('mai_SMTP_port_authenticate');

%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 5e6d18e..200fcef 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 106 +%define release 107 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -146,6 +146,9 @@ true %defattr(-,root,root) %changelog +* Tue Jul 15 2025 Brian Read 11.0.0-107.sme +- Email Settings panel: Fix lex strings with long names and no prefix [SME: 13080] + * Mon Jul 14 2025 Brian Read 11.0.0-106.sme - Datetime panel: Typo in error message - missing _ [SME: 13078] - ditto user accounts panel [SME: 13078]