From 5ba77e4526bfbe870de22aaa3071188783f5ecea Mon Sep 17 00:00:00 2001 From: Brian Read Date: Mon, 14 Jul 2025 11:44:49 +0100 Subject: [PATCH] * 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] - ditto groups panel [SME: 13078] --- .../smanager/lib/SrvMngr/Controller/Datetime-Custom.pm | 2 +- root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm | 6 +++--- .../share/smanager/lib/SrvMngr/Controller/Useraccounts.pm | 4 ++-- smeserver-manager.spec | 7 ++++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime-Custom.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime-Custom.pm index 2cd2d2b..83ac3df 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime-Custom.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime-Custom.pm @@ -255,7 +255,7 @@ sub validate_change_datetime { } if (($minute < 0) || ($minute > 59)) { - return $c->l('datINVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59'); + return $c->l('dat_INVALID_MINUTE') . " $minute. " . $c->l('dat_BETWEEN_0_AND_59'); } my $second = $c->param('second'); diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm index d859856..706d9fb 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm @@ -132,7 +132,7 @@ sub do_update { # Untaint groupName before use in system() ($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/); system("/sbin/e-smith/signal-event", "group-create", "$groupName") == 0 - or $result .= $c->l('qgp_CREATE_ERROR') . "\n"; + or $result .= $c->l('grp_CREATE_ERROR') . "\n"; } ## end if (!$result) if (!$result) { @@ -161,7 +161,7 @@ sub do_update { # Untaint groupName before use in system() ($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/); system("/sbin/e-smith/signal-event", "group-modify", "$groupName") == 0 - or $result .= $c->l('qgp_MODIFY_ERROR') . "\n"; + or $result .= $c->l('grp_MODIFY_ERROR') . "\n"; } ## end if (!$result) if (!$result) { @@ -414,4 +414,4 @@ sub validate_description { return ($c->l('FM_ERR_UNEXPECTED_DESC')); } } ## end sub validate_description -1 +1 \ No newline at end of file diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm index df8516b..ed31986 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm @@ -176,7 +176,7 @@ sub do_update { $result .= $res unless $res eq 'OK'; if (!$result) { - $result = $c->l('usrUSER_CREATED') . ' ' . $user; + $result = $c->l('usr_USER_CREATED') . ' ' . $user; $usr_datas{trt} = 'SUC'; } } ## end if (!$result) @@ -791,4 +791,4 @@ sub system_change_password { return $c->l("Error occurred while modifying password for admin.", 'First'); } } ## end sub system_change_password -1 +1 \ No newline at end of file diff --git a/smeserver-manager.spec b/smeserver-manager.spec index dc8528b..5e6d18e 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 105 +%define release 106 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -146,6 +146,11 @@ true %defattr(-,root,root) %changelog +* 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] +- ditto groups panel [SME: 13078] + * Mon Jul 14 2025 Brian Read 11.0.0-105.sme - Adjust db opening in Software install panel [SME: 13077]