From 1b1bcc26f5f48fce5a98e2d5c075944f07c37578 Mon Sep 17 00:00:00 2001 From: Brian Read Date: Wed, 5 Mar 2025 16:14:57 +0000 Subject: [PATCH] * Tue Mar 04 2025 Brian Read 11.0.0-6.sme - Fix a few errors in the lex files stopping it compiling [SME: 12900] - Add createlinks to provide smeserver-manager-locale-update action so that re-configure/reboot not required --- createlinks | 28 +++++++++++++++++++ root/etc/e-smith/events/actions/.gitignore | 0 .../SrvMngr/I18N/Modules/Backup/backup_de.lex | 10 +++---- .../I18N/Modules/General/general_fr.lex | 5 ++-- .../I18N/Modules/General/general_pt-br.lex | 6 ++-- .../I18N/Modules/General/general_sv.lex | 6 ++-- smeserver-manager-locale.spec | 25 +++++++++++++---- 7 files changed, 62 insertions(+), 18 deletions(-) create mode 100644 createlinks create mode 100644 root/etc/e-smith/events/actions/.gitignore diff --git a/createlinks b/createlinks new file mode 100644 index 0000000..cd596b0 --- /dev/null +++ b/createlinks @@ -0,0 +1,28 @@ +#!/usr/bin/perl -w + +use esmith::Build::CreateLinks qw(:all); +use esmith::Build::Backup qw(:all); + +#-------------------------------------------------- +# functions for manager-locale +#-------------------------------------------------- +my $mngrdir = '/usr/share/smanager'; +my @languages = qw(___LANGUAGES___); #Editted in by the spec file. + +foreach $lang (@languages){ + $event = "smeserver-manager-locale-$lang-update"; + + # Services to restart + safe_symlink("restart", + "root/etc/e-smith/events/$event/services2adjust/smanager"); + safe_symlink("reload", + "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); + + # actions to perform + event_link('navigation2-conf', "$event", '80'); + event_link('routes2-conf', "$event", '80'); + event_link('locales2-conf', "$event", '80'); + + event_link('systemd-default', $event, '88'); + event_link('systemd-reload', $event, '89'); +} \ No newline at end of file diff --git a/root/etc/e-smith/events/actions/.gitignore b/root/etc/e-smith/events/actions/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_de.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_de.lex index a4f3fa2..ba8c993 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_de.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_de.lex @@ -219,8 +219,8 @@ 'bac_TESTED_BACKUP' => 'Überprüfe die Integrität der Sicherung', 'bac_RESTORE_VERIFY_FAILED' => 'Prüfung der Integrität ist fehlgeschlagen', 'bac_CHECK_INTEGRITY_WARNING' => 'Warnung: Bei großen Sicherungen kann die Überprüfung der Integrität eine langwierige Sache werden und sollte bei täglichem Workstation Backup deaktiviert sein.', -'bac_cifs' => ' 'CIFS', -'bac_nfs' => ' 'NFS', -'bac_local removable disk' => ' 'Lokaler Wechseldatenträger', -'bac_Mounted disk' => ' 'Eingebunder Datenträger', -'bac_ERROR_WHEN_TESTING_REMOTE_SERVER' => 'Die Parameter wurden gespeichert, aber der entfernte Host ist nicht erreichbar, bitte überprüfen Sie die Einstellungen.', +'bac_cifs' => 'CIFS', +'bac_nfs' => 'NFS', +'bac_local removable disk' => 'Lokaler Wechseldatenträger', +'bac_Mounted disk' => 'Eingebunder Datenträger', +'bac_ERROR_WHEN_TESTING_REMOTE_SERVER' => 'Die Parameter wurden gespeichert, aber der entfernte Host ist nicht erreichbar, bitte überprüfen Sie die Einstellungen.', \ No newline at end of file diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_fr.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_fr.lex index 9afc506..dc7127a 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_fr.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_fr.lex @@ -1,4 +1,5 @@ -_AUTO => '1, YES => 'Oui', +_AUTO => '1', +YES => 'Oui', NO => 'Non', edit => 'Modifier', del => 'Effacer', @@ -140,4 +141,4 @@ acs_ADMIN => 'Droits d\'administration requis', 'User password' => 'Mot de passe utilisateur', Logout => 'Déconnexion', Home => 'Accueil', -CSRF_VALIDATION_FAILURE => 'Erreur: le jeton CSRF est invalide ou expiré.', +CSRF_VALIDATION_FAILURE => 'Erreur: le jeton CSRF est invalide ou expiré.', \ No newline at end of file diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_pt-br.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_pt-br.lex index e87f77b..bd01450 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_pt-br.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_pt-br.lex @@ -25,8 +25,8 @@ 'OPERATION_STATUS_REPORT' => 'Relatório de status da operação', 'ACCOUNT' => 'Conta', 'GROUP' => 'Grupo', -'DESC_SECTIONBAR' => ', -'NO_PIPES_ALLOWED' => 'Símbolos pipe (|) não são permitidos neste campo', +'DESC_SECTIONBAR' => '', +'NO_PIPES_ALLOWED' => 'Símbolos pipe (\|) não são permitidos neste campo', 'ERROR_BELOW' => 'ERRO: Existiu um erro na validação desta página. Favor rolar para baixo para encontrar o problema detectado.', 'ACCESS' => 'Acesso', 'ACCOUNT_LOCKED' => 'Conta bloqueada', @@ -126,4 +126,4 @@ 'FM_MAC_ADDRESS1' => 'Você precisa fornecer um endereço MAC.', 'FM_MAC_ADDRESS2' => 'O endereço MAC fornecido não é válido.', 'FM_ERR_UNEXPECTED_DESC' => 'Erro: caracter inesperado ou faltando na descrição', -'CSRF_VALIDATION_FAILURE' => 'Error: CSRF token is invalid or outdated.', +'CSRF_VALIDATION_FAILURE' => 'Error: CSRF token is invalid or outdated.', \ No newline at end of file diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_sv.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_sv.lex index 34135c3..2ec1154 100644 --- a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_sv.lex +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/General/general_sv.lex @@ -25,8 +25,8 @@ 'OPERATION_STATUS_REPORT' => 'Statusrapport över operationerna', 'ACCOUNT' => 'Konto', 'GROUP' => 'Grupp', -'DESC_SECTIONBAR' => ', -'NO_PIPES_ALLOWED' => 'Pipe symboler (|) är inte tillåtna i detta fält', +'DESC_SECTIONBAR' => '', +'NO_PIPES_ALLOWED' => 'Pipe symboler (\|) är inte tillåtna i detta fält', 'ERROR_BELOW' => 'FEL: Det blev ett fel vid valideringen av denna sida. Skrolla ner på sidan och sök efter problemet.', 'ACCESS' => 'Åtkomst', 'ACCOUNT_LOCKED' => 'Kontot är låst', @@ -126,4 +126,4 @@ 'FM_MAC_ADDRESS1' => 'Du måste ange en MAC-adress.', 'FM_MAC_ADDRESS2' => 'MAC-adressen som du angav var inte giltig.', 'FM_ERR_UNEXPECTED_DESC' => 'Fel: oväntade eller saknade tecken i beskrivningen', -'CSRF_VALIDATION_FAILURE' => 'Error: CSRF token is invalid or outdated.', +'CSRF_VALIDATION_FAILURE' => 'Error: CSRF token is invalid or outdated.', \ No newline at end of file diff --git a/smeserver-manager-locale.spec b/smeserver-manager-locale.spec index 01ff7af..37982a3 100644 --- a/smeserver-manager-locale.spec +++ b/smeserver-manager-locale.spec @@ -2,7 +2,7 @@ Summary: SME Server Manager localisation module (manager 2) %define name smeserver-manager-locale Name: %{name} %define version 11.0.0 -%define release 5 +%define release 6 %define package_summary SME Server Manager localisation module %define group Applications/System %define package_locales bg da de el es et fr he hu id it ja nb nl pl pt pt_BR ro ru sl sv th tr zh_CN zh_TW @@ -21,10 +21,14 @@ AutoReqProv: no SME Server Manager 2 localisation module (smeserver-manager) %changelog +* Tue Mar 04 2025 Brian Read 11.0.0-6.sme +- Fix a few errors in the lex files stopping it compiling [SME: 12900] +- Add createlinks to provide smeserver-manager-locale-update action so that re-configure/reboot not required + * Fri Feb 28 2025 Brian Read 11.0.0-5.sme -- Remove html from most of the lex lines, except where it is an intial para needing formating [SME: 12900] +- Remove html from most of the lex lines, except where it is an initial para needing formatting [SME: 12900] - Also map embedded vars to mojo lexical parameters -- Fix link to support page in intial panel. +- Fix link to support page in initial panel. - Make sure all html tags are lowercase * Tue Jul 23 2024 Brian Read 11.0.0-4.sme @@ -58,20 +62,31 @@ SME Server Manager 2 localisation module (smeserver-manager) #do # /sbin/e-smith/validate-lexicon-sm2 $file #done +# Pass the lanuage list to createlinks. +sed -i 's/___LANGUAGES___/%{package_locales}/' createlinks +perl createlinks + %install rm -rf $RPM_BUILD_ROOT (cd root ; find . -not -name "*.po" -depth -print | cpio -dump $RPM_BUILD_ROOT) -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT | grep -v pofiles \ +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + | grep -v pofiles \ + | grep -v "*.\.pm" \ > %{name}-%{version}-%{release}-filelist + for locale in %{package_locales} do echo "%defattr(-,root,root)" > \ %{name}-%{version}-%{release}-filelist-$locale grep -e "_$locale.lex" -e "_$(echo $locale | tr '[:upper:]_' '[:lower:]-').lex" \ %{name}-%{version}-%{release}-filelist >> %{name}-%{version}-%{release}-filelist-$locale + grep -e "\-locale\-$locale\-update" \ + %{name}-%{version}-%{release}-filelist >> %{name}-%{version}-%{release}-filelist-$locale + + cat %{name}-%{version}-%{release}-filelist-$locale done %clean @@ -276,4 +291,4 @@ Group: %{group} Requires: smeserver-manager >= 0.1.2-13 %description zh_TW %{summary} -%files zh_TW -f %{name}-%{version}-%{release}-filelist-zh_TW +%files zh_TW -f %{name}-%{version}-%{release}-filelist-zh_TW \ No newline at end of file