Changeset 12484

Timestamp:

2006-08-18T17:07:45+12:00 (18 years ago)

Author:

mdewsnip

Message:

The username of the person who did the translations is now recorded in the "Updated" comment.

File:

• trunk/gsdl/bin/script/gti.pl (modified) (10 diffs)

trunk/gsdl/bin/script/gti.pl

@@ -409 +409 @@
     # The key of the file to translate (ensure it is lowercase)
     my $translation_file_key = lc(shift(@_));
+    # The username of the translation submitter
+    my $submitter_username = shift(@_);
     # Whether to submit a target chunk even if it hasn't changed
     my $force_submission_flag = shift(@_);
 
     # Check that the necessary arguments were supplied
-    if (!$target_language_code || !$translation_file_key) {
+    if (!$target_language_code || !$translation_file_key || !$submitter_username) {
     &log_message("Fatal error (but cannot be thrown): Missing command argument.");
     die "\n";
@@ -524 +526 @@
     if ($force_submission_flag || $target_file_key_to_submission_mapping{$chunk_key} ne $target_file_key_to_text_mapping{$chunk_key}) {
         $target_file_key_to_text_mapping{$chunk_key} = $target_file_key_to_submission_mapping{$chunk_key};
-        $target_file_key_to_gti_comment_mapping{$chunk_key} = "Updated $submission_date";
+        $target_file_key_to_gti_comment_mapping{$chunk_key} = "Updated $submission_date by $submitter_username";
     }
     }
@@ -954 +956 @@
 
     # Check for an "Updated DD-MMM-YYYY" comment at the end of the chunk
-    if ($chunk_text =~ /\#\s+(Updated\s+\d?\d-\D\D\D-\d\d\d\d)\s*$/i) {
+    if ($chunk_text =~ /\#\s+(Updated\s+\d?\d-\D\D\D-\d\d\d\d.*)\s*$/i) {
     return $1;
     }
@@ -1121 +1123 @@
     $chunk_text =~ s/^(\S+?):(\s*)//;
     $chunk_text =~ s/(\s*)$//;  # Remove any nasty whitespace, carriage returns etc.
-    $chunk_text =~ s/(\s*)\#\s+Updated\s+(\d?\d-\D\D\D-\d\d\d\d)\s*$//i;
+    $chunk_text =~ s/(\s*)\#\s+Updated\s+(\d?\d-\D\D\D-\d\d\d\d.*)\s*$//i;
 
     return $chunk_text;
@@ -1132 +1134 @@
 
     # Check for an "Updated DD-MMM-YYYY" comment at the end of the chunk
-    if ($chunk_text =~ /\#\s+(Updated\s+\d?\d-\D\D\D-\d\d\d\d)\s*$/i) {
+    if ($chunk_text =~ /\#\s+(Updated\s+\d?\d-\D\D\D-\d\d\d\d.*)\s*$/i) {
     return $1;
     }
@@ -1220 +1222 @@
         my $chunk_key = $1;
         $line =~ s/\s*$//;  # Remove any nasty whitespace
-        $line =~ s/<Updated date=\"\d?\d-\D\D\D-\d\d\d\d\"\/>$//;
+        $line =~ s/<Updated date=\"\d?\d-\D\D\D-\d\d\d\d.*\"\/>$//;
 
         # While there is still text of the string to go...
@@ -1231 +1233 @@
         $line = $file_lines[$i];
         $line =~ s/\s*$//;  # Remove any nasty whitespace
-        $line =~ s/<Updated date=\"\d?\d-\D\D\D-\d\d\d\d\"\/>$//;
+        $line =~ s/<Updated date=\"\d?\d-\D\D\D-\d\d\d\d.*\"\/>$//;
         }
 
@@ -1254 +1256 @@
     # Simple: just remove the Text tags
     $chunk_text =~ s/^\s*<Text id=\"(.*?)\">(\s*)//;
-    $chunk_text =~ s/<Updated date=\"\d?\d-\D\D\D-\d\d\d\d\"\/>$//;
+    $chunk_text =~ s/<Updated date=\"\d?\d-\D\D\D-\d\d\d\d.*\"\/>$//;
     $chunk_text =~ s/<\/Text>$//;
 
@@ -1266 +1268 @@
 
     # Check for an "Updated DD-MMM-YYYY" comment at the end of the chunk
-    if ($chunk_text =~ /<Updated date=\"(\d?\d-\D\D\D-\d\d\d\d)\"\/>$/i) {
+    if ($chunk_text =~ /<Updated date=\"(\d?\d-\D\D\D-\d\d\d\d.*)\"\/>$/i) {
     return $1;
     }
@@ -1330 +1332 @@
     print TARGET_FILE "<Text id=\"$chunk_key\">$target_file_chunk_text</Text>";
     if ($target_file_key_to_gti_comment_mapping->{$chunk_key}) {
-        print TARGET_FILE "<Updated date=\"" . $target_file_key_to_gti_comment_mapping->{$chunk_key} . "\"\/>";
+        my $chunk_gti_comment = $target_file_key_to_gti_comment_mapping->{$chunk_key};
+        $chunk_gti_comment =~ s/^Updated //;
+        print TARGET_FILE "<Updated date=\"" . $chunk_gti_comment . "\"\/>";
     }
     print TARGET_FILE "\n";