smeserver/smeserver-nutUPS
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-19.sme

Browse Source 
- Changes from JC (thanks) and also make sure descriptions fit in with Master->Primary and Slave->Secondary [SME: 13069]
  Also write descriptive paragraph as no-one else has!
  Also also, incorporate newly auditted lex file
This commit is contained in:
Brian Read 2025-07-07 09:21:35 +01:00
parent 7e4ab54b55
commit 1962b616ec
4 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Nutups/nutups_en.lex
View File

@ -1,30 +1,29 @@
#
# Generated by SM2Gen version: SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
#
'nut_UPS_Generic_Model' => 'UPS Generic Model',
'nut_UPS_Model' => 'UPS Model',
'nut_Manage_Nutups-config_settings:' => 'Manage Nutups-config settings',
'nut_Descriptive_paragraph' => 'Descriptive paragraph',
'nut_MasterUPS_UPSNAME@IP' => 'UPS name@localhost',
'nut_SlaveUPS_UPSNAME@IP' => 'Slave->Master UPSNAME@IP',
'nut_MasterUPS_Password' => 'Local server password',
'nut_SlaveUPS_Password' => 'Slaves Password ->Server',
'nut_Nut_status' => 'Nut status',
'nut_Configure_NutUPS' => 'Configure NutUPS',
'nut_APPLY' => 'Apply',
'nut_ClientUPS_Password' => 'Client UPS password',
'nut_ClientUPS_Username' => 'Client UPS username',
'nut_CONFIG_panel_action_was_successful' => 'CONFIG panel action was successful',
'nut_UPS_Generic_Type' => 'UPS Generic Type',
'nut_Status_(from_upsc)' => 'Status (from running upsc)',
'nut_Configure_NutUPS' => 'Configure NutUPS',
'nut_Descriptive_paragraph' => 'You can use your UPS connected directly to your server in a standalone mode or you can act as a Primary whereby other servers can also react to the status of your connected UPS, or you can connect to another server as a Secondary and react to the status of the UPS connected to that server.',
'nut_Error_Status_Report' => 'Error Status Report',
'nut_if_Net_Server' => 'Net Server details',
'nut_if_genericups' => 'Generic UPS details',
'nut_if_Net_Client' => 'Net Client details',
'nut_STATUS_panel_action_was_successful' => 'STATUS panel action was successful',
'nut_if_Net_Server' => 'Net Server details',
'nut_Manage_Nutups-config_settings:' => 'Manage Nutups configuration settings',
'nut_MasterUPS_Password' => 'Local server password',
'nut_MasterUPS_UPSNAME@IP' => 'UPS name@localhost',
'nut_Nut_mode' => 'Nut mode',
'nut_Status_Report' => 'Status Report',
'nut_Nut_status' => 'Nut status',
'nut_NutUPS_configuration' => 'NutUPS configuration',
'nut_APPLY' => 'Apply',
'nut_Save' => 'Save',
'nut_SlaveUPS_Password' => 'Secondary->Primary ->Server',
'nut_SlaveUPS_UPSNAME@IP' => 'Secondary->Primary UPSNAME@IP',
'nut_SlaveUPS_User' => 'Secondary UPS user',
'nut_Status_(from_upsc)' => 'Status (from running upsc)',
'nut_Status_of_the_controlled_UPS' => 'Status of the controlled UPS',
'nut_STATUS_panel_action_was_successful' => 'STATUS panel action was successful',
'nut_Status_Report' => 'Status Report',
'nut_UPS_Device' => 'UPS Device',
'nut_UPS_Generic_Manufacturer' => 'UPS Generic Manufacturer',
'nut_Status_of_the_controlled_UPS' => 'Status of the controlled UPS',
'nut_Save' => 'Save',
'nut_status_is_disabled' => 'Nut disabled',
'nut_UPS_Generic_Model' => 'UPS Generic Model',
'nut_UPS_Generic_Type' => 'UPS Generic Type',
'nut_UPS_Model' => 'UPS Model',

2
root/usr/share/smanager/themes/default/templates/partials/_nut_CONFIG.html.ep
View File

@ -39,9 +39,9 @@
<br></span> </p>
<div class=masterups>
<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2>
<div class=secondaryups>
<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2>
<p><span class=label>
%=l('nut_MasterUPS_UPSNAME@IP')
</span><span class=data>

2
root/usr/share/smanager/themes/default/templates/partials/_nut_STATUS.html.ep
View File

@ -35,6 +35,8 @@
<p class='paragraph para1'>
%=l('nut_Descriptive_paragraph')
</p>
<br />
<!--
<span class=label>

7
smeserver-nutUPS.spec
View File

@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module
%define name smeserver-nutUPS
Name: %{name}
%define version 11.0.0
%define release 18
%define release 19
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@ -26,6 +26,11 @@ A module which configures the Network UPS Tools suite for operation with
the SME server software.
%changelog
* Mon Jul 07 2025 Brian Read <brianr@koozali.org> 11.0.0-19.sme
- Changes from JC (thanks) and also make sure descriptions fit in with Master->Primary and Slave->Secondary [SME: 13069]
Also write descriptive paragraph as no-one else has!
Also also, incorporate newly auditted lex file
* Fri Jun 13 2025 Brian Read <brianr@koozali.org> 11.0.0-18.sme
- Adjust call from Custom to be emtpy hash not hashref [SME: 13042]