X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=po%2Fpocheck.pl;h=fcc5dc11dd2ab395654a51c3286a4dbb93feaa39;hb=d64c9a9d00c175c8859ce94dfcf7b39d6293132d;hp=391245a11ebc2ef672c2ff7f0943a38b001bcd19;hpb=626f607db73d1ccf8171dae600ecbb1ea198ef24;p=lyx.git

diff --git a/po/pocheck.pl b/po/pocheck.pl
index 391245a11e..fcc5dc11dd 100755
--- a/po/pocheck.pl
+++ b/po/pocheck.pl
@@ -168,8 +168,18 @@ foreach my $pofilename ( @ARGV ) {
     }
 
     if ($check_spaces) {
-      # Check space at the end of a message
-      if ( ( $msgid =~ m/  *?(\|.*)?$/ ) != ( $msgstr =~ m/  *?(\|.*)?$/ ) ) {
+      # Check space at the end of a message (if not a shortcut)
+      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;
         ++$bad{"Bad spaces"};
@@ -188,8 +198,16 @@ foreach my $pofilename ( @ARGV ) {
     }
 
     if ($check_menu) {
-      # Check for "|..." shortcuts
-      if ( ( $msgid =~ m/\|[^ ]/ ) != ( $msgstr =~ m/\|[^ ]/ ) ) {
+      # 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 =~ /.*\|(.+)$/) {
+	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"
           unless $only_total;
         ++$bad{"Bad menu shortcuts"};