From: eldy <>
Date: Sun, 24 Oct 2004 13:51:36 +0000 (+0000)
Subject: Trad: Traduction of update page.
X-Git-Tag: AWSTATS_6_3_RELEASE~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbb0fbb80680375133b111fd2a2e0d0b65aba86c;p=thirdparty%2FAWStats.git

Trad: Traduction of update page.
Fix: Back link on update page and scheduled page return to awstats main page.
---

diff --git a/tools/webmin/awstats/index.cgi b/tools/webmin/awstats/index.cgi
index a4429c9f..1b2c41ff 100644
--- a/tools/webmin/awstats/index.cgi
+++ b/tools/webmin/awstats/index.cgi
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 # index.cgi
 # Display available config files
+# $Revision$ - $Author$ - $Date$
 
 require './awstats-lib.pl';
 
@@ -121,10 +122,12 @@ if (@config) {
 		next if (!&can_edit_config($l));
 		$nbofallowedconffound++;
 
+		# Head of config file's table list
 		if ($nbofallowedconffound == 1) {
 			print "<a href='edit_config.cgi?new=1'>$text{'index_add'}</a>\n" if ($access{'add'});
 			print "<table border width=100%>\n";
-			print "<tr $tb> <td rowspan=2><b>$text{'index_path'}</b></td> ";
+			print "<tr $tb>";
+			print "<td rowspan=2 colspan=2><b>$text{'index_path'}</b></td> ";
 			print "<td rowspan=2 align=center><b>$text{'index_create'}</b></td> ";
 			#print "<td rowspan=2 align=center><b>$text{'index_databasesize'}</b></td> ";
 		 	print "<td colspan=2 align=center><b>$text{'index_update'}</b></td> ";
@@ -132,6 +135,7 @@ if (@config) {
 			print "<tr $tb><td align=center>$text{'index_scheduled'}</td><td align=center>$text{'index_now'}</td></tr>\n";
 		}
 
+		# Config file line
 		local @files = &all_config_files($l);
 		next if (!@files);
 		local $lconf = &get_config($l);
@@ -141,6 +145,8 @@ if (@config) {
 
 		print "<tr $cb>\n";
 
+		print "<td width=\"40\" align=\"center\">$nbofallowedconffound</td>";
+		
 		local ($size, $latest);
 		print "<td>";
 		print "$l";
diff --git a/tools/webmin/awstats/lang/en b/tools/webmin/awstats/lang/en
index 18f8dbb2..6ed2c40d 100644
--- a/tools/webmin/awstats/lang/en
+++ b/tools/webmin/awstats/lang/en
@@ -59,6 +59,9 @@ save_dirnotexists=Directory does not exists
 
 update_title=Update statistics
 update_ecannot=You are not allowed to update statistics
+update_run=Run update process with command
+update_finished=Update process finished
+update_wait=Please wait
 
 scheduled_title=Schedule statistic's update
 scheduled_ecannot=You are not allowed to update or schedule update process
diff --git a/tools/webmin/awstats/lang/fr b/tools/webmin/awstats/lang/fr
index 52957609..fac7981d 100644
--- a/tools/webmin/awstats/lang/fr
+++ b/tools/webmin/awstats/lang/fr
@@ -58,6 +58,9 @@ save_dirnotexists=R
 
 update_title=Mise à jour des statistiques
 update_ecannot=Vous n'êtes pas autorisé à mettre à jour les statistiques
+update_run=Lancement de la mise à jour par la commande
+update_finished=Mise a jour terminée
+update_wait=Merci de patienter
 
 scheduled_title=Programmation de mise à jour
 scheduled_ecannot=Vous n'êtes pas autorisé à mettre à jour ou programmer une mise à jour des statistiques
diff --git a/tools/webmin/awstats/schedule_stats.cgi b/tools/webmin/awstats/schedule_stats.cgi
index 46278ec5..5642a39f 100644
--- a/tools/webmin/awstats/schedule_stats.cgi
+++ b/tools/webmin/awstats/schedule_stats.cgi
@@ -26,8 +26,8 @@ print "<br>\n";
 &foreign_require("logrotate", "logrotate-lib.pl");
 
 # For global update
-print "<u>Update processes scheduled by a <b>cron</b> task :</u><br><br>";
-print "<table border width=100% cellpadding=4 cellspacing=2>\n";
+print "<u>List of update processes scheduled by a <b>cron</b> task :</u><br><br>";
+print "<table border width=100%>\n";
 print "<tr $tb><td align=left>User</td>";
 print "<td>Task</td><td align=center>Active</td><td>Note on task</td><td>Action</td></tr>\n";
 
@@ -74,22 +74,25 @@ print "<br>\n";
 
 
 # For logrotate scheduling
-print "<u>Update processes scheduled by a <b>logrotate</b> task :</u><br><br>";
+print "<u>List of update processes scheduled by a <b>logrotate</b> task :</u><br><br>";
 print "<table border width=100%>\n";
 print "<tr $tb><td>Logrotate file</td>";
 print "<td>Task</td><td>Note on task</td><td>Action</td></tr>\n";
 
 if ( foreign_installed('logrotate', 0) ) {
-
-
+    print "<tr><td colspan=4>This feature is not yet available</td></tr>";
 }
 else {
     print "<tr><td colspan=4>Webmin logrotate module is not installed. It is required to setup logrotate scheduled tasks</td></tr>";
 }
 print "</table>";
 
-print "<br>\n";
+print "<br><br>\n";
+
 
+# Back to config list
+print "<hr>\n";
+&footer("", $text{'index_return'});
 
 0;
 
diff --git a/tools/webmin/awstats/update_stats.cgi b/tools/webmin/awstats/update_stats.cgi
index 2612df66..b561d4aa 100644
--- a/tools/webmin/awstats/update_stats.cgi
+++ b/tools/webmin/awstats/update_stats.cgi
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 # update_stats.cgi
-# run AWStats update process
+# Run AWStats update process
+# $Revision$ - $Author$ - $Date$
 
 require './awstats-lib.pl';
 &ReadParse();
@@ -17,9 +18,9 @@ if ($in{'file'} =~ /^(.*)[\\\/][^\\\/]+$/) { $dir=$1; }
 print "<hr>\n";
 
 my $command=$config{'awstats'}." -update -config=$conf -configdir=$dir";
-print "Run update process with command:\n<br>\n";
+print $text{'update_run'}.":\n<br>\n";
 print "$command<br>\n";
-print "\Please wait...<br>\n";
+print $text{'update_wait'}."...<br>\n";
 print "<br>\n";
 
 &foreign_require("proc", "proc-lib.pl");
@@ -30,9 +31,11 @@ proc::safe_process_exec_logged($command,$config{'user'},undef, STDOUT,undef, 1,
 #print "$retour\n";
 
 print "<hr>\n";
-print "Update process finished<br>\n";
+print $text{'update_finished'}.".<br>\n";
 print "<br>\n";
 
-&footer( "/", $text{ 'index' } );
+
+# Back to config list
+&footer("", $text{'index_return'});
 
 0;