[Scummvm-git-logs] scummvm-tools master -> 4c3e586e0bc9184e18897bd8871d30d9c7be01a5

sev- sev at scummvm.org
Thu May 17 21:49:05 CEST 2018


This automated email contains information about 4 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
63a9724b3d TOOLS: PRINCE: Print out extra lines right at their position
0a49dfa2c7 TOOLS: PRINCE: Correctly print missing multiline texts
2230cbd83f TOOLS: PRINCE: Group credits texts into bigger chunks
4c3e586e0b TOOLS: PRINCE: Clean up mob.lst output


Commit: 63a9724b3d3dfda7689a3ee0f90d50dd35c62e57
    https://github.com/scummvm/scummvm-tools/commit/63a9724b3d3dfda7689a3ee0f90d50dd35c62e57
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-16T17:15:07+02:00

Commit Message:
TOOLS: PRINCE: Print out extra lines right at their position

Changed paths:
    engines/prince/gen-po.pl


diff --git a/engines/prince/gen-po.pl b/engines/prince/gen-po.pl
index f6005dd..a3ead6b 100644
--- a/engines/prince/gen-po.pl
+++ b/engines/prince/gen-po.pl
@@ -65,6 +65,22 @@ process_varia 'pl', "$poldir/variatxt.txt.out";
 my $miss_tr = 0;
 my $extra_tr = 0;
 
+for my $f (sort keys $data{$lang}) {
+	for my $n (sort {$a<=>$b} keys $data{$lang}{$f}) {
+		if (exists $data{$lang}{$f}{$n} and not exists $data{'pl'}{$f}{$n}) {
+			warn "$lang:$f:$n extra";
+
+			if (index($data{$lang}{$f}{$n}, "\\n") != -1) {  # Multiline
+				$data{'pl'}{$f}{$n} = "\"extra$extra_tr\\n\"";
+			} else {
+				$data{'pl'}{$f}{$n} = "extra$extra_tr";
+			}
+
+			$extra_tr++;
+		}
+	}
+}
+
 for my $f (sort keys $data{'pl'}) {
 	for my $n (sort {$a<=>$b} keys $data{'pl'}{$f}) {
 		if (not exists $data{$lang}{$f}{$n}) {
@@ -99,36 +115,6 @@ EOF
 	}
 }
 
-for my $f (sort keys $data{$lang}) {
-	for my $n (sort {$a<=>$b} keys $data{$lang}{$f}) {
-		if (exists $data{$lang}{$f}{$n}) {
-			warn "$lang:$f:$n extra";
-
-			if (index($data{$lang}{$f}{$n}, "\\n") != -1) {  # Multiline
-				chomp $data{$lang}{$f}{$n};
-
-				print <<EOF;
-
-#: $f:$n
-msgid ""
-"extra$extra_tr"
-msgstr ""
-$data{$lang}{$f}{$n}
-EOF
-			} else {
-				print <<EOF;
-
-#: $f:$n
-msgid "extra$extra_tr"
-msgstr "$data{$lang}{$f}{$n}"
-EOF
-			}
-
-			$extra_tr++;
-		}
-	}
-}
-
 warn "Missing: $miss_tr  Extra: $extra_tr" if ($miss_tr || $extra_tr);
 
 exit;


Commit: 0a49dfa2c7db90facfa7e8e26537d665fe668e72
    https://github.com/scummvm/scummvm-tools/commit/0a49dfa2c7db90facfa7e8e26537d665fe668e72
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-16T17:15:34+02:00

Commit Message:
TOOLS: PRINCE: Correctly print missing multiline texts

Changed paths:
    engines/prince/gen-po.pl


diff --git a/engines/prince/gen-po.pl b/engines/prince/gen-po.pl
index a3ead6b..100878c 100644
--- a/engines/prince/gen-po.pl
+++ b/engines/prince/gen-po.pl
@@ -85,7 +85,11 @@ for my $f (sort keys $data{'pl'}) {
 	for my $n (sort {$a<=>$b} keys $data{'pl'}{$f}) {
 		if (not exists $data{$lang}{$f}{$n}) {
 			warn "$lang:$f:$n missing";
-			$data{$lang}{$f}{$n} = "";
+			if (index($data{'pl'}{$f}{$n}, "\\n") != -1) {  # Multiline
+				$data{$lang}{$f}{$n} = "\"\\n\"";
+			} else {
+				$data{$lang}{$f}{$n} = "";
+			}
 
 			$miss_tr++;
 		}


Commit: 2230cbd83f480ae0fa6eb0d383e93b3db2dd863b
    https://github.com/scummvm/scummvm-tools/commit/2230cbd83f480ae0fa6eb0d383e93b3db2dd863b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-16T17:15:55+02:00

Commit Message:
TOOLS: PRINCE: Group credits texts into bigger chunks

Changed paths:
    engines/prince/gen-po.pl


diff --git a/engines/prince/gen-po.pl b/engines/prince/gen-po.pl
index 100878c..bd37886 100644
--- a/engines/prince/gen-po.pl
+++ b/engines/prince/gen-po.pl
@@ -209,7 +209,7 @@ sub process_credits($$) {
 		$line++;
 		$str .= "\"$_\\n\"\n";
 
-		if ($line == 10) {
+		if ($line == 20) {
 			$n++;
 			$data{$lang}{'credits.txt'}{$n} = $str;
 			$line = 0;


Commit: 4c3e586e0bc9184e18897bd8871d30d9c7be01a5
    https://github.com/scummvm/scummvm-tools/commit/4c3e586e0bc9184e18897bd8871d30d9c7be01a5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-16T17:18:45+02:00

Commit Message:
TOOLS: PRINCE: Clean up mob.lst output

Changed paths:
    engines/prince/gen-po.pl


diff --git a/engines/prince/gen-po.pl b/engines/prince/gen-po.pl
index bd37886..a2df664 100644
--- a/engines/prince/gen-po.pl
+++ b/engines/prince/gen-po.pl
@@ -181,6 +181,8 @@ sub process_mob($$) {
 			next;
 		}
 
+		s/\x1//g; # Remove ^A symbol
+
 		my $n = sprintf("%d%03d", $num, $line);
 
 		$line++;





More information about the Scummvm-git-logs mailing list