Checking po-files (shortcut handling)

1.) Allow ' ' as a menu shortcut (corrected for missing/unexpected spaces at message end)
2.) Adapt for utf-8 shortcuts (corrected chacking for missing/unexpected shortcuts)
This commit is contained in:
Kornel Benko 2020-10-24 14:05:19 +02:00
parent 8af747c9d9
commit 12557b094c

View File

@ -168,8 +168,11 @@ foreach my $pofilename ( @ARGV ) {
} }
if ($check_spaces) { if ($check_spaces) {
# Check space at the end of a message # Check space at the end of a message (if not a shortcut)
if ( ( $msgid =~ m/ *?(\|.*)?$/ ) != ( $msgstr =~ m/ *?(\|.*)?$/ ) ) { my ($msgid1, $msgstr1);
($msgid1 = $msgid) =~ s/\|.$//;
($msgstr1 = $msgstr) =~ s/\|.$//; # TODO: Shortcut may be utf-8 char
if (($msgid1 =~ / $/) != ($msgstr1 =~ / $/)) {
print "Line $linenum: Missing or unexpected space:\n '$msgid' => '$msgstr'\n" print "Line $linenum: Missing or unexpected space:\n '$msgid' => '$msgstr'\n"
unless $only_total; unless $only_total;
++$bad{"Bad spaces"}; ++$bad{"Bad spaces"};
@ -188,8 +191,16 @@ foreach my $pofilename ( @ARGV ) {
} }
if ($check_menu) { if ($check_menu) {
# Check for "|..." shortcuts # Check for "|..." shortcuts (space shortcut allowed)
if ( ( $msgid =~ m/\|[^ ]/ ) != ( $msgstr =~ m/\|[^ ]/ ) ) { # Shortcut is either 1 char (ascii in msgid) or utf8 char (in msgstr)
my ($s1, $s2) = (0,0);
$s1 = 1 if ($msgid =~ /\|([^\|])$/);
if ($msgstr =~ /\|([^\|]+)$/) {
my $chars = $1;
my $u = decode('utf-8', $chars);
$s2 = 1 if (length($u) == 1);
}
if($s1 != $s2) {
print "Line $linenum: Missing or unexpected menu shortcut:\n '$msgid' => '$msgstr'\n" print "Line $linenum: Missing or unexpected menu shortcut:\n '$msgid' => '$msgstr'\n"
unless $only_total; unless $only_total;
++$bad{"Bad menu shortcuts"}; ++$bad{"Bad menu shortcuts"};