From 47146ab8a3f73dca7e158fb3a2fc0195e7684dc8 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 24 Oct 2020 18:40:15 +0200 Subject: [PATCH] Amend 12557b09: Checking po-files (shortcut handling) --- po/pocheck.pl | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/po/pocheck.pl b/po/pocheck.pl index db59aa0b77..fcc5dc11dd 100755 --- a/po/pocheck.pl +++ b/po/pocheck.pl @@ -169,9 +169,16 @@ foreach my $pofilename ( @ARGV ) { if ($check_spaces) { # Check space at the end of a message (if not a shortcut) - my ($msgid1, $msgstr1); - ($msgid1 = $msgid) =~ s/\|.$//; - ($msgstr1 = $msgstr) =~ s/\|.$//; # TODO: Shortcut may be utf-8 char + my ($msgid1, $msgstr1) = ($msgid, $msgstr); + $msgid1 =~ s/\|.$//; + if ($msgstr =~ /^(.*)\|(.+)$/) { + my ($msg, $shortcut) = ($1, $2); + # Check for unicode char + my $u = decode('utf-8', $shortcut); + if (length($u) == 1) { + $msgstr1 = $msg; + } + } if (($msgid1 =~ / $/) != ($msgstr1 =~ / $/)) { print "Line $linenum: Missing or unexpected space:\n '$msgid' => '$msgstr'\n" unless $only_total; @@ -194,8 +201,8 @@ foreach my $pofilename ( @ARGV ) { # Check for "|..." shortcuts (space shortcut allowed) # Shortcut is either 1 char (ascii in msgid) or utf8 char (in msgstr) my ($s1, $s2) = (0,0); - $s1 = 1 if ($msgid =~ /\|([^\|])$/); - if ($msgstr =~ /\|([^\|]+)$/) { + $s1 = 1 if ($msgid =~ /\|(.)$/); + if ($msgstr =~ /.*\|(.+)$/) { my $chars = $1; my $u = decode('utf-8', $chars); $s2 = 1 if (length($u) == 1); -- 2.39.2