Changeset 5092

Timestamp:

2003-08-04T16:11:57+12:00 (21 years ago)

Author:

mdewsnip

Message:

Moved all output messages into the resource bundle (perllib/strings.rb), in preparation for translation.

File:

• trunk/gsdl/bin/script/mkcol.pl (modified) (12 diffs)

trunk/gsdl/bin/script/mkcol.pl

@@ -89 +89 @@
 
 my $options = { 'name' => "mkcol.pl",
-        'desc' => "PERL script used to create the directory structure for a new Greenstone collection.",
+        'desc' => "{mkcol.desc}",
         'args' => $arguments };
 
@@ -101 +101 @@
     print STDERR "<Info>\n";
     print STDERR "  <Name>$options->{'name'}</Name>\n";
-    print STDERR "  <Desc>$options->{'desc'}</Desc>\n";
+    print STDERR "  <Desc>" . &lookup_string($options->{'desc'}) . "</Desc>\n";
     print STDERR "  <Arguments>\n";
     if (defined($options->{'args'})) {
@@ -125 +125 @@
 
     # Produce the usage information using the data structure above
-    print STDERR " usage: $programname [options] collection-name\n\n";
+    print STDERR " " . &lookup_string("{common.usage}") . ": $programname";
+    print STDERR " " . &lookup_string("{mkcol.params}") . "\n\n";
 
     # Display the program options, if there are some
@@ -132 +133 @@
     local $optiondescoffset = $descoffset + 2;  # 2 spaces between options & descriptions
 
-    print STDERR " options:\n";
+    print STDERR " " . &lookup_string("{common.options}") . ":\n";
 
     # Display the program options
     &PrintUsage::print_options_txt($language, $programargs, $optiondescoffset);
     }
+}
+
+
+sub lookup_string
+{
+    return &PrintUsage::lookup_string($language, shift(@_));
 }
 
@@ -183 +190 @@
     }
 
-    opendir(DIR, $modeldir) || die "Can't read $modeldir";
+    opendir(DIR, $modeldir)
+    || die &lookup_string("{common.cannot_read}") . " $modeldir";
     my @files = grep(!/^(\.\.?|CVS)$/, readdir(DIR));
     closedir(DIR);
@@ -198 +206 @@
         $destfile =~ s/^modelcol/$collection/;
         $destfile =~ s/^MODELCOL/$capcollection/;
-        print STDOUT "  doing replacements for $destfile\n" unless $quiet;
+        print STDOUT "  " . &lookup_string("{mkcol.doing_replacements}") . " $destfile\n"
+        unless $quiet;
         $destfile = &util::filename_cat ($coldir, $destfile);
-        
+
         open (INFILE, $thisfile) || 
-        die "ERROR: Can't read file $thisfile";
+        die &lookup_string("{common.cannot_read_file}") . " $thisfile";
         open (OUTFILE, ">$destfile") ||
-        die "ERROR: Can't create file $destfile";
+        die &lookup_string("{common.cannot_create_file}") . " $destfile";
 
         while (defined ($line = <INFILE>)) {
@@ -256 +265 @@
 
     if ($optionfile =~ /\w/) {
-    open (OPTIONS, $optionfile) || die "Couldn't open $optionfile\n";
+    open (OPTIONS, $optionfile) ||
+        die &lookup_string("{common.cannot_open}") . " $optionfile\n";
     my $line = [];
     my $options = [];
@@ -266 +276 @@
     }
 
-    # load default plugins if none were on command line    
+    # load default plugins if none were on command line
     if (!scalar(@plugin)) {
     @plugin = (ZIPPlug,GAPlug,TEXTPlug,HTMLPlug,EMAILPlug,
@@ -275 +285 @@
     ($collection) = @ARGV;
     if (!defined($collection)) {
-    print STDOUT "ERROR: no collection name was specified\n";
+    print STDOUT &lookup_string("{mkcol.no_colname}") . "\n";
     &print_txt_usage($language);
     die "\n";
@@ -281 +291 @@
 
     if (length($collection) > 8) {
-    print STDOUT "ERROR: The collection name must be less than 8 characters\n";
-    print STDOUT "       so compatibility with earlier filesystems can be\n";
-    print STDOUT "       maintained.\n";
+    print STDOUT &lookup_string("{mkcol.long_colname}") . "\n";
     die "\n";
     }
 
     if ($collection eq "modelcol") {
-    print STDOUT "ERROR: No collection can be named modelcol as this is the\n";
-    print STDOUT "       name of the model collection.\n";
+    print STDOUT &lookup_string("{mkcol.bad_name_modelcol}") . "\n";
     die "\n";
     }
 
     if ($collection eq "CVS") {
-    print STDOUT "ERROR: No collection can be named CVS as this may interfere\n";
-    print STDOUT "       with directories created by the CVS versioning system\n";
+    print STDOUT &lookup_string("{mkcol.bad_name_cvs}") . "\n";
     die "\n";
     }
 
     if (!defined($creator) || $creator eq "") {
-    print STDOUT "ERROR: The creator was not defined. This variable is\n";
-    print STDOUT "       needed to recognise duplicate collection names.\n";
+    print STDOUT &lookup_string("{mkcol.creator_undefined}") . "\n";
     die "\n";
     }
@@ -328 +333 @@
     if (defined $collectdir && $collectdir =~ /\w/) {
     if (!-d $collectdir) {
-        print STDOUT "ERROR: $collectdir doesn't exist\n";
+        print STDOUT &lookup_string("{mkcol.no_collectdir}") . ": $collectdir\n";
         die "\n";
     }
@@ -337 +342 @@
 
     # make sure the model collection exists
-    die "ERROR: Cannot find the model collection $mdir" unless (-d $mdir);
+    die &lookup_string("{mkcol.cannot_find_modelcol}") . " $mdir" unless (-d $mdir);
 
     # make sure this collection does not already exist
     if (-e $cdir) {
-    print STDOUT "ERROR: This collection already exists\n";
+    print STDOUT &lookup_string("{mkcol.col_already_exists}") . "\n";
     die "\n";
     }
 
     # start creating the collection
-    print STDOUT "\nCreating the collection $collection...\n" unless $quiet;
+    print STDOUT "\n" . &lookup_string("{mkcol.creating_col}") . " $collection...\n"
+    unless $quiet;
     &traverse_dir ($mdir, $cdir);
-    print STDOUT "\nThe new collection was created successfully at\n" unless $quiet;
-    print STDOUT "$cdir\n" unless $quiet;
+    print STDOUT "\n" . &lookup_string("{mkcol.success}") . "\n$cdir\n"
+    unless $quiet;
 }