Changeset 4125

Timestamp:

2003-04-11T10:20:42+12:00 (21 years ago)

Author:

mdewsnip

Message:

Some small improvements.

Location:

trunk/gsdl/bin/script

Files:

• picklanguage.pl (modified) (3 diffs)
• submit_translation.pl (modified) (5 diffs)
• translator.pl (modified) (21 diffs)

trunk/gsdl/bin/script/picklanguage.pl

@@ -43 +43 @@
 sub main
 {
-    # directory in which to put the generated html pages
-    my $lang_dir = util::filename_cat($ENV{'GSDLHOME'},"tmp","lang");
-    my @lang_list;
-    my $langlog_fname = util::filename_cat($lang_dir,"languages.log");
+    my $gsdldir = "$ENV{'GSDLHOME'}";
 
-    if (!-e $langlog_fname) {
-    # generate one based on content of etc/main.cfg
-    my $maincfg_fname = util::filename_cat($ENV{'GSDLHOME'},"etc","main.cfg");
+    # Read the languages available from etc/main.cfg
+    my $maincfg_fname = util::filename_cat($gsdldir, "etc", "main.cfg");
+    open(MCFILE, "<$maincfg_fname") or die "Error: Could not open $maincfg_fname: $!\n";
 
-    open(MCFILE, "<$maincfg_fname") 
-        || die "Unable to open $maincfg_fname: $!\n";
-    my $line;
-    while (defined ($line=<MCFILE>)) {
-        chomp($line);
-        if ($line =~ m/^Language\s+/i) {
-        my @args = split(/ +/,$line);
-        my ($lang_abbr) = ($args[1] =~ m/^shortname=(.*)$/);
-        my ($lang_long) = ($args[2] =~ m/^longname=(.*)$/);
-        push(@lang_list, { 'long' => $lang_long, 'abbr' => $lang_abbr } );
-        }
+    my @languages;
+    my $line;
+    while (defined ($line=<MCFILE>)) {
+    chomp($line);
+    if ($line =~ m/^Language\s+/i) {
+        my @args = split(/ +/,$line);
+        my ($lang_abbr) = ($args[1] =~ m/^shortname=(.*)$/);
+        my ($lang_long) = ($args[2] =~ m/^longname=(.*)$/);
+        push(@languages, $lang_long);
     }
-    close MCFILE;
+    }
+    close MCFILE;
 
-    open(LANGFILE,">$langlog_fname")
-        || die "Unable to create $langlog_fname: $!\n";
+    # Write the HTML content of the page to tmp/lang/picklanguage.lang
+    my $picklang_fname = util::filename_cat($gsdldir, "tmp", "lang", "picklanguage.lang");
 
-    my $l;
-    my $first = 1;
-    foreach $l ( @lang_list ) {
-        my $long = lc($l->{'long'});
-        my $abbr = $l->{'abbr'};
-        if ($first =~ 1) {
-        print LANGFILE "$long\n$abbr";
-        $first = 0;
-        }
-        else {
-        print LANGFILE "\n$long\n$abbr";
-        }
-    }
-    close LANGFILE;
+    # Make the file world writeable
+    my $currentmask = umask;
+    umask(0000);
+    if (! open(HTMLFILE,">$picklang_fname")) {
+    umask($currentmask);
+    die "Error: Could not create $picklang_fname: $!\n";
     }
+    umask($currentmask);
 
-    open(LANGFILE, "<$langlog_fname") 
-    || die "Unable to open $langlog_fname for reading: $!\n";
-
-    #reads into the languages array all languages currently in use
-    #and their corresponding language codes from the languages.log file
-    my @languages;
-    while (<LANGFILE>) {
-    $lang = $_;
-    chomp($lang);
-    push(@languages,$lang);
-    <LANGFILE>;
-    }
-    close LANGFILE;
-
-    #opens a file to write HTML content of the page to
-    my $picklang_fname = util::filename_cat($lang_dir, "picklanguage.lang");
-    open(HTMLFILE, ">$picklang_fname") 
-    || die "Unable to open $picklang_fname: $!\n";
-
-    #writes to file the instructions on how to use the interface (_textinitial)
-    #and then displays a table at the end with menu options from which the user
-    #selects their base and translation languages, and submits these choices
-    #to proceed into the interface translation agency
+    # Writes to file the instructions on how to use the interface (_textinitial_)
+    #   and then displays a table at the end with menu options from which the user
+    #   selects their base and translation languages, and submits these choices
+    #   to proceed into the interface translation agency
     my $query = new CGI;
     print HTMLFILE (" _textinitial_ <br>\n",
@@ -114 +84 @@
             $query->popup_menu(-name=>"bl",
                        -values=>\@languages,
-                       -default=>'english'),
+                       -default=>'English'),
             "<p></center></td><td><center>\n",
             "_textselectforeign_ <p>\n",
@@ -128 +98 @@
             "</center><p>\n",
             "<center><img src=\"_httpimg_/divb.gif\"></center><p>");
-    
     close HTMLFILE;
 }

trunk/gsdl/bin/script/submit_translation.pl

@@ -68 +68 @@
     $sourcelang =~ tr/A-Z/a-z/;
     $targetlang =~ tr/A-Z/a-z/;
-
-    # Handles cases where the macro file name is different to the language name
-    $sourcelang = "port" if ($sourcelang =~ m/portuguese/);
-    $sourcelang = "indo" if ($sourcelang =~ m/indonesian/);
-    $targetlang = "port" if ($targetlang =~ m/portuguese/);
-    $targetlang = "indo" if ($targetlang =~ m/indonesian/);
 
     my $gsdldir = "$ENV{'GSDLHOME'}/";
@@ -186 +180 @@
     $macrotext = "[l=$targetcode] {" . $macrotext . "}\n";
 
-    my $targetkey = &get_target_key_equivalent($sourcelang, $targetlang, $sourcekey);
+    my $targetkey = &get_macroname_equivalent($sourcelang, $targetlang, $sourcekey);
     $translations{$targetkey} = $macrotext;
     }
@@ -194 +188 @@
 
 
-sub get_target_key_equivalent
-{
-    my ($sourcelang, $targetlang, $sourcekey) = @_;
-
-    my $macrofile = $sourcekey;
+sub get_macrofile_name
+{
+    my ($language, $suffix) = @_;
+
+    my $macrofilename = $language;
+
+    # Handles cases where the macro file name is different to the language name
+    $macrofilename = "port" if ($language =~ m/portuguese/);
+    $macrofilename = "indo" if ($language =~ m/indonesian/);
+
+    # Add suffix (if any) and file extension, and return
+    $macrofilename = $macrofilename . $suffix . ".dm";
+    return $macrofilename;
+}
+
+
+sub get_macroname_equivalent
+{
+    my ($languageA, $languageB, $languageAkey) = @_;
+
+    my $macrofile = $languageAkey;
     $macrofile =~ s/^([^:]+)::(.*)/$1/;
-    my $key = $sourcekey;
+    my $key = $languageAkey;
     $key =~ s/^([^:])+::(.*)/$2/;
 
-    my $targetkey;
-    if ($macrofile eq ($sourcelang . ".dm")) {
-    $targetkey = $targetlang . ".dm" . "::" . $key;
-    }
-    if ($macrofile eq ($sourcelang . "2.dm")) {
-    $targetkey = $targetlang . "2.dm" . "::" . $key;
-    }
-
-    return ($targetkey);
+    my $languageBkey;
+    if ($macrofile eq &get_macrofile_name($languageA, "")) {
+    $languageBkey = &get_macrofile_name($languageB, "") . "::" . $key;
+    }
+    if ($macrofile eq &get_macrofile_name($languageA, "2")) {
+    $languageBkey = &get_macrofile_name($languageB, "2") . "::" . $key;
+    }
+
+    return ($languageBkey);
 }
 
@@ -246 +256 @@
     my ($sourcelang, $targetlang, $macrosdir) = @_;
 
-    my $targetdmfile1 = $macrosdir . $targetlang . ".dm";
-    my $targetdmfile2 = $macrosdir . $targetlang . "2.dm";
+    my $targetdmfile1 = $macrosdir . &get_macrofile_name($targetlang, "");
+    my $targetdmfile2 = $macrosdir . &get_macrofile_name($targetlang, "2");
 
     my $currentfile = "1";
@@ -262 +272 @@
 
     # Check if this is a target macro
-    if ($macrofile eq ($targetlang . ".dm") || $macrofile eq ($targetlang . "2.dm")) {
-        if ($macrofile eq ($targetlang . "2.dm") && $currentfile eq "1") {
+    if ($macrofile eq &get_macrofile_name($targetlang, "") ||
+        $macrofile eq &get_macrofile_name($targetlang, "2")) {
+
+        # Detect the point where we start on the auxiliary macros
+        if ($macrofile eq &get_macrofile_name($targetlang, "2") && $currentfile eq "1") {
         # Write the macros for the package just finished
         &write_macros(TARGET_DM_FILE, $currentpackage, $textmacros, $iconmacros);

trunk/gsdl/bin/script/translator.pl

@@ -34 +34 @@
 
 
+use util;
 use GDBM_File;
 use CGI;
@@ -66 +67 @@
     # If the source language is not English, it may not be up to date
     if ($sourcelang !~ m/english/) {
-    # print STDERR "Warning: Source language is not English. You should check that" .
-    #              " the source language is up to date before beginning.\n";
-    }
-
-    # Handles cases where the macro file name is different to the language name
-    $sourcelang = "port" if ($sourcelang =~ m/portuguese/);
-    $sourcelang = "indo" if ($sourcelang =~ m/indonesian/);
-    $targetlang = "port" if ($targetlang =~ m/portuguese/);
-    $targetlang = "indo" if ($targetlang =~ m/indonesian/);
-
-    my $gsdldir = "$ENV{'GSDLHOME'}/";
-    my $macrosdir = $gsdldir . "macros/";
+    print STDERR "Warning: Source language is not English. You should check that" .
+                 " the source language is up to date before beginning.\n";
+    }
+
+    my $gsdldir = "$ENV{'GSDLHOME'}";
+    my $macrosdir = util::filename_cat($gsdldir, "macros");
 
     # Check that the source language macro files exist, and parse them
-    my $sourcedmfile1 = $sourcelang . ".dm";
-    my $sourcehash1;
-    if (-e $macrosdir.$sourcedmfile1) {
-    $sourcehash1 = &parse_macrofile($macrosdir, $sourcedmfile1);
-    }
-
-    my $sourcedmfile2 = $sourcelang . "2.dm";
-    my $sourcehash2;
-    if (-e $macrosdir.$sourcedmfile2) {
-    $sourcehash2 = &parse_macrofile($macrosdir, $sourcedmfile2);
-    }
+    my $sourcedmname1 = &get_macrofile_name($sourcelang, "");
+    my $sourcehash1 = &parse_macrofile($macrosdir, $sourcedmname1);
+    my $sourcedmname2 = &get_macrofile_name($sourcelang, "2");
+    my $sourcehash2 = &parse_macrofile($macrosdir, $sourcedmname2);
 
     # Make sure some macros exist to be translated
@@ -99 +87 @@
     # Combine the two source hashes
     my $sourcehash = &combine_hashes($sourcehash1, $sourcehash2);
-    # print "Source hash:\n";
-    # &display_hash($sourcehash);
 
     # Check if this is a new translation process or the continuation of an old one
-    $translationdir = $gsdldir . "tmp/lang/" . $sourcelang . "-" . $targetlang . "/";
-    $translationdb = $translationdir . "translation.db";
-    $updatedb = $translationdir . "update.db";
+    $translationdir = util::filename_cat($gsdldir, "tmp", "lang", "$sourcelang-$targetlang");
+    $translationdb = util::filename_cat($translationdir, "translation.db");
+    $updatedb = util::filename_cat($translationdir, "update.db");
 
     if (! -e $translationdir) {
-    # Create a directory to store the data for the new translation
+    # Create a directory to store the data for the new translation, make world-writeable
+    my $currentmask = umask;
+    umask(0000);
     if (! mkdir($translationdir, 0777)) {
+        umask($currentmask);
         die "Error: Couldn't create directory $translationdir.\n";
     }
+    umask($currentmask);
 
     # Start a new database for the translation information
@@ -117 +107 @@
 
     # Work out what the target language code should be, and store it in the database
-    my $langdir = $gsdldir . "tmp/lang/";
-    my $langlogfile = $langdir . "languages.log";
+    my $maincfgfile = util::filename_cat($gsdldir, "etc", "main.cfg");
     my $languagecodes = &get_language_codes();
-    my $targetcode = &get_language_code($targetlang, $langlogfile, $languagecodes);
-    print STDERR "Target language code: $targetcode\n";
+    my $targetcode = &get_language_code($targetlang, $maincfgfile, $languagecodes);
     $translationdata{"*target_lang_code*"} = $targetcode;
 
@@ -134 +122 @@
 
     # Create the target language macro files if they don't exist
-    my $targetdmfile1 = $targetlang . ".dm";
-    if (! -e $macrosdir.$targetdmfile1) {
-    # print "Target macro file $macrosdir$targetdmfile1 does not exist... creating.\n";
-    &create_empty_macrofile($macrosdir.$sourcedmfile1, $macrosdir.$targetdmfile1);
-    }
-    my $targetdmfile2 = $targetlang . "2.dm";
-    if (! -e $macrosdir.$targetdmfile2) {
-    # print "Target macro file $macrosdir$targetdmfile2 does not exist... creating.\n";
-    &create_empty_macrofile($macrosdir.$sourcedmfile2, $macrosdir.$targetdmfile2);
+    my $targetdmname1 = &get_macrofile_name($targetlang, "");
+    my $targetdmfile1 = util::filename_cat($macrosdir, $targetdmname1);
+    if (! -e $targetdmfile1) {
+    my $sourcedmfile1 = util::filename_cat($macrosdir, $sourcedmname1);
+    &create_empty_macrofile($sourcedmfile1, $targetdmfile1);
+    }
+    my $targetdmname2 = &get_macrofile_name($targetlang, "2");
+    my $targetdmfile2 = util::filename_cat($macrosdir, $targetdmname2);
+    if (! -e $targetdmfile2) {
+    my $sourcedmfile2 = util::filename_cat($macrosdir, $sourcedmname2);
+    &create_empty_macrofile($sourcedmfile2, $targetdmfile2);
     }
 
     # Parse the target language macro files
-    my $targethash1 = &parse_macrofile($macrosdir, $targetdmfile1);
-    my $targethash2 = &parse_macrofile($macrosdir, $targetdmfile2);
+    my $targethash1 = &parse_macrofile($macrosdir, $targetdmname1);
+    my $targethash2 = &parse_macrofile($macrosdir, $targetdmname2);
 
     # Combine the two target hashes
     my $targethash = &combine_hashes($targethash1, $targethash2);
-    # print "Target hash:\n";
-    # &display_hash($targethash);
 
     # Determine the macros that need translating
     my $needstranslating = &find_macros_needing_translation($sourcelang, $sourcehash,
                                 $targetlang, $targethash);
-    # print "Macros needing translation:\n";
-    # &display_hash($needstranslating);
 
     # Generates HTML code to display user interface on webpage with what needs translation
-    &generate_pages($sourcelang, $targetlang, $needstranslating);
+    my $targetcode = $translationdata{"*target_lang_code*"};
+    print STDERR "Target language code: $targetcode\n";
+    &generate_pages($sourcelang, $targetlang, $targetcode, $needstranslating);
 
     # Clean up
@@ -169 +157 @@
 
 
+sub get_macrofile_name
+{
+    my ($language, $suffix) = @_;
+
+    my $macrofilename = $language;
+
+    # Handles cases where the macro file name is different to the language name
+    $macrofilename = "port" if ($language =~ m/portuguese/);
+    $macrofilename = "indo" if ($language =~ m/indonesian/);
+
+    # Add suffix (if any) and file extension, and return
+    $macrofilename = $macrofilename . $suffix . ".dm";
+    return $macrofilename;
+}
+
+
 sub get_language_code
 {
-    my ($language, $langlogfile, $languagecodes) = @_;
-
-    # Try the languages.log file
-    open(LANG_LOG_IN, "<$langlogfile") or die "Error: Could not open $langlogfile.\n";
-
-    my $linenum = "odd";
-    my $found = "false";
-    while (<LANG_LOG_IN>) {
+    my ($language, $maincfgfile, $languagecodes) = @_;
+
+    # Check if the language is in the main.cfg file
+    open(MAIN_CFG_IN, "<$maincfgfile") or die "Error: Could not open $maincfgfile.\n";
+    my $lastlangline;
+    while (<MAIN_CFG_IN>) {
     $line = $_;
     chomp($line);
-
-    # Check if the language code appears in the languages.log file
-    if ($linenum eq "odd") {
-        if ($line eq $language) {
-        $found = "true";
+    # print "Line: $line\n";
+    if ($line =~ m/^Language\s+/i) {
+        my @args = split(/ +/,$line);
+        my ($lang_abbr) = ($args[1] =~ m/^shortname=(.*)$/);
+        $lang_abbr =~ tr/A-Z/a-z/;
+        my ($lang_long) = ($args[2] =~ m/^longname=(.*)$/);
+        $lang_long =~ tr/A-Z/a-z/;
+
+        # Is this the language we are translating into?
+        if ($lang_long eq $language) {
+        return $lang_abbr;
         }
-        $linenum = "even";
-    }
-    else {
-        if ($found eq "true") {
-        return $line;
-        }
-        $linenum = "odd";
-    }
-    }
-
-    close LANG_LOG_IN;
+
+        $lastlangline = $line;
+    }
+    }
+    close MAIN_CFG_IN;
 
     # Try to find it using the ISO 639 language codes
@@ -209 +211 @@
     }
 
-    # Add the language code to the languages.log file
-    open LANG_LOG_OUT, ">>$langlogfile" or die "Error: Could not append to $langlogfile.\n";
-    print LANG_LOG_OUT "\n$language\n$langcode";
-    close LANG_LOG_OUT;
+    # Add the new language code into the main.cfg file
+    open MAIN_CFG_OUT, ">$maincfgfile.new" or die "Error: Could not write $maincfgfile.new\n";
+    open MAIN_CFG_IN, "<$maincfgfile" or die "Error: Could not open $maincfgfile.\n";
+    my $inmacros = "false";
+    while (<MAIN_CFG_IN>) {
+    $line = $_;
+    chomp($line);
+    print MAIN_CFG_OUT $line;
+    if ($line =~ m/^macrofiles /) {
+        $inmacros = "true";
+    }
+    if ($inmacros eq "true" && $line !~ m/\\$/) {
+        print MAIN_CFG_OUT " \\\n";
+        print MAIN_CFG_OUT "                $language" . ".dm $language" . "2.dm";
+        $inmacros = "false";
+    }
+    print MAIN_CFG_OUT "\n";
+
+    if ($line eq $lastlangline) {
+        # Change language into title case
+        my $langtitlecase = $language;
+        substr($langtitlecase, 0, 1) =~ tr/a-z/A-Z/;
+        print MAIN_CFG_OUT ("Language shortname=$langcode longname=$langtitlecase ",
+                "default_encoding=utf-8\n");
+    }
+    }
+    close MAIN_CFG_IN;
+    close MAIN_CFG_OUT;
+
+    # Delete the old main.cfg and replace it with the new one
+    unlink($maincfgfile);
+    rename("$maincfgfile.new", $maincfgfile);
 
     return $langcode;
@@ -261 +291 @@
     my ($macrosdir, $macrofile) = @_;
 
+    # Opens macro file or returns
+    my $macropath = util::filename_cat($macrosdir, $macrofile);
+    open(IN, "<$macropath") or return;
+
     # Initialises some local variables
     my $currpackage;
     my %macros = ();
-
-    # Opens macro file or returns
-    my $macropath = $macrosdir . $macrofile;
-    open(IN, "<$macropath") or return;
 
     # Reads in contents of macro file, line by line
@@ -357 +387 @@
 
 
-sub display_hash
-{
-    my ($hash) = @_;
-
-    foreach $key (sort (keys %$hash)) {
-    print $key . "\n";
-    print $hash->{$key} . "\n";
-    }
-}
-
-
 sub find_macros_needing_translation
 {
@@ -377 +396 @@
         if ($translationdata{$sourcekey} ne $sourcehash->{$sourcekey}) {
         # print "Source macro $sourcekey has changed value.\n"; 
-
-        my $targetkey = &get_target_key_equivalent($sourcelang, $targetlang,
-                               $sourcekey);
+        my $targetkey = &get_macroname_equivalent($sourcelang, $targetlang,
+                              $sourcekey);
         if ($targethash->{$targetkey}) {
             $updatedata{$targetkey} = $targethash->{$targetkey};
@@ -409 +427 @@
 
     # Macros that need translating are those that are in the source language macro file
-    #  but no translation exists in the translation database
+    #  but no translation exists in the translation database...
     foreach $sourcekey (sort keys(%$sourcehash)) {
-    my $targetkey = &get_target_key_equivalent($sourcelang, $targetlang, $sourcekey);
+    my $targetkey = &get_macroname_equivalent($sourcelang, $targetlang, $sourcekey);
     if (!$translationdata{$targetkey}) {
         # print "Macro $sourcekey needs translating.\n";
@@ -421 +439 @@
     # ...and those in the list of macros to update
     foreach $targetkey (sort keys(%updatedata)) {
-    my $sourcekey = &get_source_key_equivalent($sourcelang, $targetlang, $targetkey);
+    my $sourcekey = &get_macroname_equivalent($targetlang, $sourcelang, $targetkey);
     $needstranslating{$sourcekey}[0] = $sourcehash->{$sourcekey};
     $needstranslating{$sourcekey}[1] = $updatedata{$targetkey};
@@ -430 +448 @@
 
 
-sub get_source_key_equivalent
-{
-    my ($sourcelang, $targetlang, $targetkey) = @_;
-
-    my $macrofile = $targetkey;
+sub get_macroname_equivalent
+{
+    my ($languageA, $languageB, $languageAkey) = @_;
+
+    my $macrofile = $languageAkey;
     $macrofile =~ s/^([^:]+)::(.*)/$1/;
-    my $key = $targetkey;
+    my $key = $languageAkey;
     $key =~ s/^([^:])+::(.*)/$2/;
 
-    my $sourcekey;
-    if ($macrofile eq ($targetlang . ".dm")) {
-    $sourcekey = $sourcelang . ".dm" . "::" . $key;
-    }
-    if ($macrofile eq ($targetlang . "2.dm")) {
-    $sourcekey = $sourcelang . "2.dm" . "::" . $key;
-    }
-
-    return ($sourcekey);
-}
-
-
-sub get_target_key_equivalent
-{
-    my ($sourcelang, $targetlang, $sourcekey) = @_;
-
-    my $macrofile = $sourcekey;
-    $macrofile =~ s/^([^:]+)::(.*)/$1/;
-    my $key = $sourcekey;
-    $key =~ s/^([^:])+::(.*)/$2/;
-
-    my $targetkey;
-    if ($macrofile eq ($sourcelang . ".dm")) {
-    $targetkey = $targetlang . ".dm" . "::" . $key;
-    }
-    if ($macrofile eq ($sourcelang . "2.dm")) {
-    $targetkey = $targetlang . "2.dm" . "::" . $key;
-    }
-
-    return ($targetkey);
+    my $languageBkey;
+    if ($macrofile eq &get_macrofile_name($languageA, "")) {
+    $languageBkey = &get_macrofile_name($languageB, "") . "::" . $key;
+    }
+    if ($macrofile eq &get_macrofile_name($languageA, "2")) {
+    $languageBkey = &get_macrofile_name($languageB, "2") . "::" . $key;
+    }
+
+    return ($languageBkey);
 }
 
@@ -476 +473 @@
 sub generate_pages
 {
-    my ($sourcelang, $targetlang, $needstranslating) = @_;
+    my ($sourcelang, $targetlang, $targetcode, $needstranslating) = @_;
 
     my %pagehash = ();
 
-    @pageno = ();
+    @pages = ();
     $pageno = 1;
     $keysperpage = 0;
@@ -493 +490 @@
     #each macro is associated with some macrotext and whether it was from the core
     #or auxiliary macrofile
-    # my $targetkey = &get_target_key_equivalent($sourcelang, $targetlang, $sourcekey);
-    # print "Source key: $sourcekey Target key: $targetkey\n";
-
     $pagehash->{$pageno}->{$sourcekey} = $needstranslating->{$sourcekey};
     $keysperpage++;
 
-    #reduce the number of macros per page in these cases
-    # $limit = 7 if($key =~ m/collector::_text.*/);
-    # $limit = 7 if($key =~ m/help::_text.*/);
-    # $limit = 1 if($key =~ m/translang::_textinitial_/);
-    # $limit = 3 if($key =~ m/home::.*/);
-    # $limit = 3 if($key =~ m/gsdl::.*/);
-    # $limit = 1 if($key =~ m/help::_(.*)texthelp.*/);
-    # $limit = $keysperpage if ($limit <= $keysperpage);
-
-    #if have enough keys to generate a page with
+    # If have enough keys to generate a page with
     if ($keysperpage == $limit) {
         #opens a file to write the HTML code to for current page
-        open HTMLFILE, ">$translationdir/$pageno.lang";
+        my $transpagefile = util::filename_cat($translationdir, $pageno . ".lang");
+        open HTMLFILE, ">$transpagefile";
 
         #passes hash of keys for current page and filehandle, returns CGI data
-        &generate_form($sourcelang, $targetlang, $pagehash->{$pageno}, \*HTMLFILE);
+        &generate_form($sourcelang, $targetlang, $targetcode,
+               $pagehash->{$pageno}, \*HTMLFILE);
         close HTMLFILE;
 
         #push the page number onto the array of pages
-        push(@pageno, $pageno);
+        push(@pages, $pageno);
         $pageno++;
 
@@ -530 +517 @@
     if ($keysperpage != 0) {
     # writes out the remaining keys, same format as above
-    open HTMLFILE, ">$translationdir/$pageno.lang";
-    &generate_form($sourcelang, $targetlang, $pagehash->{$pageno}, \*HTMLFILE);
+    my $transpagefile = util::filename_cat($translationdir, $pageno . ".lang");
+    open HTMLFILE, ">$transpagefile";
+    &generate_form($sourcelang, $targetlang, $targetcode, $pagehash->{$pageno}, \*HTMLFILE);
     close HTMLFILE;
-    push(@pageno, $pageno);
-    }
-
-    #writes each page number to a file
-    open PAGELOG, ">$translationdir/pageno.log";
-    foreach $page (@pageno) {
-    print PAGELOG $page, "\n";
-    }
-    close PAGELOG;
-
-    #write thankyou page for language translator once translation is complete
-    open THANKYOU, ">$translationdir/thankyou.lang" or die("MURGH\n");
+    push(@pages, $pageno);
+    }
+
+    # Write the number of pages to a file
+    my $numpagesfile = util::filename_cat($translationdir, "numpages.log");
+    open NUMPAGESLOG, ">$numpagesfile" or die "Error: Could not write $numpagesfile.\n";
+    print NUMPAGESLOG ($pageno - 1);
+    close NUMPAGESLOG;
+
+    # Write thankyou page for language translator once translation is complete
+    my $thankyoufile = util::filename_cat($translationdir, "thankyou.lang");
+    open THANKYOU, ">$thankyoufile" or die "Error: Could not write $thankyoufile.\n";
     print THANKYOU ("<center> _textthanks_ $targetlang _texttrans_ _textgetdmfiles_ ",
             "<a href=\"_httpprefix_/gsdl/macros/$targetlang" . ".dm\">_texthere_</a>",
@@ -551 +539 @@
             "<p></center>\n");
     close THANKYOU;
-
-    #returns CGI data
-    return @queries;
 }
 
@@ -561 +546 @@
     my $sourcelang = shift(@_);
     my $targetlang = shift(@_);
+    my $targetcode = shift(@_);
     my $formhash = shift(@_);
     my $fh = shift(@_);
@@ -569 +555 @@
 
     $first = "true";
-
     foreach $key (sort (keys(%$formhash))) {
 
@@ -734 +719 @@
            $query->submit($pageno, "_textsubmit_"),
            "</td></tr><tr><td width=\"50%\"></td><td align=right width=\"50%\">",
-           "<br> _textsubmittext_ \n",
-           "_textgetdmfiles_ ",
-           "<a href=\"_httpprefix_/gsdl/macros/$targetlang" . ".dm\">_texthere_</a>",
-           " &amp; ",
-           "<a href=\"_httpprefix_/gsdl/macros/$targetlang" . "2.dm\">_texthere_</a>.",
+           "<br> _textsubmittext_ ",
+           "<a href=\"_gwcgi_?a=p&p=home&l=$targetcode\">_texthere_</a>.",
+           # "_textgetdmfiles_ ",
+           # "<a href=\"_httpprefix_/gsdl/macros/$targetlang" . ".dm\">_texthere_</a>",
+           # " &amp; ",
+           # "<a href=\"_httpprefix_/gsdl/macros/$targetlang" . "2.dm\">_texthere_</a>.",
            "</td></tr></table>");
-
-    # adds the CGI area just written to the array of CGI areas
-    push (@queries, $query);
-
-    # return $query;
 }
 
@@ -776 +757 @@
     if ($macrofile eq ($sourcelang . "2.dm")) {
     return "2";  # Auxiliary macro
+    }
+}
+
+
+sub display_hash
+{
+    my ($hash) = @_;
+
+    foreach $key (sort (keys %$hash)) {
+    print $key . "\n";
+    print $hash->{$key} . "\n";
     }
 }