From 75e9323429ae756774821ffb95b9bc90b0de1bb7 Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Mon, 27 May 2024 13:47:10 +0300
Subject: [PATCH] Rename the old logging system to "System Logs RS" to free up
 the name for actual systemd-journald

---
 logviewer/lang/en     | 4 ++--
 logviewer/module.info | 2 +-
 syslog-ng/index.cgi   | 5 ++++-
 syslog/index.cgi      | 5 ++++-
 syslog/lang/en        | 4 ++--
 syslog/module.info    | 2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/logviewer/lang/en b/logviewer/lang/en
index b14beedf2..df1bec0cc 100644
--- a/logviewer/lang/en
+++ b/logviewer/lang/en
@@ -1,10 +1,10 @@
-index_title=System Logs Viewer
+index_title=System Logs
 index_elogs=No logs were found to display
 index_to=Log destination
 index_rule=Messages selected
 index_file=File $1
 index_cmd=Output from $1
-index_return=system logs viewer
+index_return=system logs
 index_view=View..
 index_viewfile=View log file:
 index_viewok=View
diff --git a/logviewer/module.info b/logviewer/module.info
index 1447cd84b..e2fed8e08 100644
--- a/logviewer/module.info
+++ b/logviewer/module.info
@@ -1,7 +1,7 @@
 name=logviewer
 category=system
 os_support=*-linux
-desc=System Logs Viewer
+desc=System Logs
 depends=proc
 longdesc=View and search all logs available on system
 readonly=1
diff --git a/syslog-ng/index.cgi b/syslog-ng/index.cgi
index 9bb4d5aa0..5fb1256b2 100755
--- a/syslog-ng/index.cgi
+++ b/syslog-ng/index.cgi
@@ -9,7 +9,10 @@ $ver = &get_syslog_ng_version();
 my $index_econf2;
 if (&has_command('systemctl')) {
 	if (&foreign_available('logviewer')) {
-		$index_econf2 = &text('index_econf2', "System Logs Viewer", "@{[&get_webprefix()]}/logviewer") . "<p><br>";
+		my %logviewer_text = &load_language('logviewer');
+		$index_econf2 = &text('index_econf2',
+			$logviewer_text{'index_title'},
+			"@{[&get_webprefix()]}/logviewer") . "<p><br>";
 		}
 	}
 if (!$ver) {
diff --git a/syslog/index.cgi b/syslog/index.cgi
index afc19af4e..0a4dac99b 100755
--- a/syslog/index.cgi
+++ b/syslog/index.cgi
@@ -26,7 +26,10 @@ if (!-r $config{'syslog_conf'}) {
 	my $index_econf2;
 	if (&has_command('systemctl')) {
 		if (&foreign_available('logviewer')) {
-			$index_econf2 = &text('index_econf2', "System Logs Viewer", "@{[&get_webprefix()]}/logviewer") . "<p><br>";
+			my %logviewer_text = &load_language('logviewer');
+			$index_econf2 = &text('index_econf2',
+				$logviewer_text{'index_title'},
+				"@{[&get_webprefix()]}/logviewer") . "<p><br>";
 			}
 		}
 	# Not installed (maybe using syslog-ng)
diff --git a/syslog/lang/en b/syslog/lang/en
index 5966083c1..2be934c26 100644
--- a/syslog/lang/en
+++ b/syslog/lang/en
@@ -1,4 +1,4 @@
-index_title=System Logs
+index_title=System Logs RS
 index_m4msg=Your system log configuration file $1 appears to contain <tt>m4</tt> directives. Before it can be edited, Webmin needs to pass the file through <tt>m4</tt> to safely remove these directives.
 index_m4=Remove m4 directives from config file
 index_econf=The syslog configuration file $1 was not found on your system. Maybe syslog is not installed, or a newer version like syslog-ng is in use, or the <a href='$2'>module configuration</a> is incorrect.
@@ -16,7 +16,7 @@ index_cmd=Output from $1
 index_all=All users
 index_users=Users $1
 index_add=Add a new system log.
-index_return=system logs
+index_return=module index
 index_restart=Apply Changes
 index_restartmsg=Click this button to make the current configuration active by killing the running <tt>syslog</tt> process and restarting it.
 index_start=Start Syslog Server
diff --git a/syslog/module.info b/syslog/module.info
index 9f21b643d..103cf7623 100644
--- a/syslog/module.info
+++ b/syslog/module.info
@@ -1,7 +1,7 @@
 name=Syslog
 category=system
 os_support=solaris *-linux freebsd openbsd macos hpux irix unixware aix netbsd openserver
-desc=System Logs
+desc=System Logs RS
 depends=proc
 longdesc=Configure the syslog server on your system and view its log files.
 readonly=1