Changeset 38761 for main/trunk

Timestamp:

2024-02-20T21:30:00+13:00 (3 months ago)

Author:

anupama

Message:

Changes to get the Italian translation spreadsheet files manually submitted without them throwing up so many warnings about submission source text being different from source text. Issues were 1. entity ampersand#10; (line feed character) was now followed by newline rather than followed by space when the unicode file came out of Excel, and it needed to be removed now. Excel also doesn't seem to add an extra space at the start. So we don't want to remove spaces at start where this exist in the original source string. Both were changes to gti-process-spreadsheet.pl. 2. Next, in gti.pl, a fix I had made in revision 33436 to remove extra spaces at line end that got added when files were processed for the glihelp module, would for regular properties files remove actual spaces at line end that marked submission source different from source. The earlier change may still be necessary for glihelp, so I now only remove that extra space if the module is glihelp.

Location:

main/trunk/greenstone2/bin/script

Files:

• gti-process-spreadsheet.pl (modified) (2 diffs)
• gti.pl (modified) (2 diffs)

main/trunk/greenstone2/bin/script/gti-process-spreadsheet.pl

@@ -106 +106 @@
 
         # Remove the blank space Excel adds at the start of each line
-    $source_file_chunk_text =~ s/\n /\n/g;
-    $target_file_chunk_text =~ s/\n /\n/g;
+    # New excel conversion (noticed Feb 2024) didn't require this change
+    #$source_file_chunk_text =~ s/\n /\n/g;
+    #$target_file_chunk_text =~ s/\n /\n/g;
 
     # Remove Excel's doubled-up quotes
@@ -117 +118 @@
     $target_file_chunk_text =~ s/
 /\n/g;
 
+    # New excel conversion (noticed Feb 2024)
+    $source_file_chunk_text =~ s/
//g;
+    $target_file_chunk_text =~ s/
//g;
+    
     print "<SourceFileText key=\"" . $source_file_chunk_key . "\">\n" . $source_file_chunk_text . "\n</SourceFileText>\n";
     print "<TargetFileText key=\"" . $target_file_chunk_key . "\">\n" . $target_file_chunk_text . "\n</TargetFileText>\n";

main/trunk/greenstone2/bin/script/gti.pl

@@ -665 +665 @@
     foreach my $submission_line (@submission_lines) {
     $submission_line =~ s/\r$//;
-    $submission_line =~ s/ +$//;
+    $submission_line =~ s/ +$// if ($translation_file_key eq "glihelp");
         #&log_message("  $submission_line");
     }
@@ -738 +738 @@
 
         # Make sure the submitted source chunk matches the source file chunk
+        #if ($source_file_key_to_submission_mapping{$chunk_key} ne $source_file_key_to_text_mapping{$chunk_key}
+        #    && $source_file_key_to_submission_mapping{$chunk_key} ne &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key})) {
         if (trim($source_file_key_to_submission_mapping{$chunk_key}) ne trim($source_file_key_to_text_mapping{$chunk_key})
             && trim($source_file_key_to_submission_mapping{$chunk_key}) ne &unmake_text_xml_safe(trim($source_file_key_to_text_mapping{$chunk_key}))) {
-        #if (&unmake_text_xml_safe($source_file_key_to_submission_mapping{$chunk_key}) ne &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key})) {
+        ##if (&unmake_text_xml_safe($source_file_key_to_submission_mapping{$chunk_key}) ne &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key})) {
                     #&log_message("**** submission source:\n|$source_file_key_to_submission_mapping{$chunk_key}|\n");
                 #&log_message("**** unmake xml safe source:\n|" . &unmake_text_xml_safe($source_file_key_to_text_mapping{$chunk_key}) ."|\n");