Changeset 206

Timestamp:

02/14/07 15:25:27 (2 years ago)

Author:

ludo

Message:

Translation fixes. Small bugfix for image size. Group's boot menu are now generated when apply is clicked, not at boot. (from r4013)

Files:

• trunk/webmin/lbs/bootmenu.cgi (modified) (1 diff)
• trunk/webmin/lbs/debian/changelog (modified) (1 diff)
• trunk/webmin/lbs/lang/en (modified) (2 diffs)
• trunk/webmin/lbs/lang/fr (modified) (2 diffs)
• trunk/webmin/lbs/lbs.pl (modified) (2 diffs)
• trunk/webmin/lbs/module.info (modified) (1 diff)
• trunk/webmin/lbs/postinst.cgi (modified) (4 diffs)

trunk/webmin/lbs/bootmenu.cgi

@@ -205 +205 @@
-                                $cmd .= " $cfgpath";
-                                system($cmd);
+                                updateEntry( $lbs_home, $macaddr ) or error( lbsGetError() );
-                        }
-                }

trunk/webmin/lbs/debian/changelog

@@ -1 @@
-8
+9
-
-  * New release.

trunk/webmin/lbs/lang/en

@@ -66 +66 @@
-lab_burn=Burn
-lab_command=Command
-s
+
-lab_comments=Comments
-lab_convtolocal=Conv. to Local
@@ -108 +108 @@
-lab_nodesc=(no description)
-lab_none=(none)
+lab_nopostinst=No post-installation
-lab_nosecurity=GRUB command line access
-lab_notitle=(no title)

trunk/webmin/lbs/lang/fr

@@ -109 +109 @@
-lab_nodesc=(sans description)
-lab_none=(néant)
+lab_nopostinst=Pas de post-installation
-lab_nosecurity=Accès ligne de command GRUB
-lab_notitle=(sans titre)
@@ -225 +226 @@
-tooltip_scheddefchoice=Choix par défaut pour un WOL
-tooltip_scheddisplay=Affiché lors d un WOL
-
-blabla="BlaBla"

trunk/webmin/lbs/lbs.pl

@@ -133 +133 @@
-                push @lsdesc, lbs_common::colorStatus($$bstat{$k},$$bdesc{$k});
-                
-
+|tail -1
-
-                if ( ($siz =~ m/\d+k/i) || ($siz =~ m/\d+o/i)) {        # images below 1 MB aren't shown
@@ -306 +306 @@
-  use vars qw ($current_lang);
-
-"Pas de postinstall"
+$text{lab_nopostinst}
-
-  opendir(DIR, $lbs_home."/images/templates/") || return @tmpl;

trunk/webmin/lbs/module.info

@@ -7 +7 @@
-
-depends=0.94 lbs_common proc at
-8
+9

trunk/webmin/lbs/postinst.cgi

@@ -24 +24 @@
-
-# ... and vars
-
+ $current_lang
-# get some common functions ...
-require "./lbs.pl";
@@ -62 +62 @@
-sub postinst_main_page($) {
-        
-in{'lang'}
+current_lang
-        my $lbs_home=shift;
-        opendir(DIR, $POSTINST_PATH) || error(text("err_notarelativefile"));
@@ -82 +82 @@
-                $script =~ s|.*/(.*)$|$1|;
-                $t->assign('FILENAME', "$script: " . $postinstcontent[0]->{'desc'}->{'en'})             if $postinstcontent[0]->{'desc'}->{'en'};       # keep the english translation in last case
+                $t->assign('FILENAME', "$script: " . $postinstcontent[0]->{'desc'}->{'unified'})        if $postinstcontent[0]->{'desc'}->{'unified'};  # keep the user's desc if it exists
-                $t->assign('FILENAME', "$script: " . $postinstcontent[0]->{'desc'}->{$lang})            if $postinstcontent[0]->{'desc'}->{$lang};      # keep the local translation if we found it
-                $t->assign('FILENAME', "$script: " . $postinstcontent[0]->{'desc'}->{'unified'})        if $postinstcontent[0]->{'desc'}->{'unified'};  # keep the user's desc if it exists
-                $t->parse('fileslist.file');
-        }
@@ -240 +240 @@
-        $t->assign('TB', $tb);
-        $t->assign('DESC', $postinstcontent[0]->{'desc'}->{'en'})               if $postinstcontent[0]->{'desc'}->{'en'};       # keep the english translation in last case
+        $t->assign('DESC', $postinstcontent[0]->{'desc'}->{'unified'})          if $postinstcontent[0]->{'desc'}->{'unified'};  # keep the user's desc if it exists
-        $t->assign('DESC', $postinstcontent[0]->{'desc'}->{$lang})              if $postinstcontent[0]->{'desc'}->{$lang};      # keep the local translation if we found it
-        $t->assign('DESC', $postinstcontent[0]->{'desc'}->{'unified'})          if $postinstcontent[0]->{'desc'}->{'unified'};  # keep the user's desc if it exists
-
-        $t->assign('COMMENTS', $postinstcontent[0]->{'comments'});