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

diff --git a/po/pocheck.pl b/po/pocheck.pl
index 44d077d6ca..fcc5dc11dd 100755
--- a/po/pocheck.pl
+++ b/po/pocheck.pl
@@ -15,13 +15,14 @@ use Getopt::Std;
 use Encode qw(encode decode);
 
 sub mylc($);
+sub replaceSynopsis($);
 
 my $usage = <<EOT;
 pocheck.pl [-acmpqst] po_file [po_file] ...
 
-This script performs some consistency checks on po files. 
+This script performs some consistency checks on po files.
 
-We check for everything listed here, unless one or more of these 
+We check for everything listed here, unless one or more of these
 options is given, in which case we checks only for those requested.
 -a: Check arguments, like %1\$s
 -c: Check for colons at end
@@ -39,9 +40,9 @@ EOT
 my %options;
 getopts(":hacfmpqstwi", \%options);
 
-if (defined($options{h})) { 
-  print $usage; 
-  exit 0; 
+if (defined($options{h})) {
+  print $usage;
+  exit 0;
 }
 
 my $only_total = defined($options{w});
@@ -155,6 +156,9 @@ foreach my $pofilename ( @ARGV ) {
 
     if ($check_periods) {
       # Check period at the end of a message; uncomment code if you are paranoid
+      # Convert '...' to '…' first
+      $msgid = replaceSynopsis($msgid);
+      $msgstr = replaceSynopsis($msgstr);
       if ( ( $msgid =~ m/\. *(\|.*)?$/ ) != ( $msgstr =~ m/\. *(\|.*)?$/ ) ) {
        print "Line $linenum: Missing or unexpected period:\n  '$msgid' => '$msgstr'\n"
         unless $only_total;
@@ -164,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"};
@@ -175,7 +189,7 @@ foreach my $pofilename ( @ARGV ) {
 
     if ($check_qt) {
       # Check for "&" shortcuts
-      if ( ( $msgid =~ m/&[^ ]/ ) != ( $msgstr =~ m/&[^ ]/ ) ) {
+      if ( ( $msgid =~ m/&[^ &]/ ) != ( $msgstr =~ m/&[^ &]/ ) ) {
         print "Line $linenum: Missing or unexpected Qt shortcut:\n  '$msgid' => '$msgstr'\n"
           unless $only_total;
         ++$bad{"Bad Qt shortcuts"};
@@ -184,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"};
@@ -257,3 +279,13 @@ sub mylc($)
   my ($msg) = @_;
   return(encode('utf-8',lc(decode('utf-8', $msg))));
 }
+
+sub replaceSynopsis($)
+{
+  my ($string) = @_;
+
+  return ($string) if ($string !~ /^(.*)\.\.\.(.*)$/);
+  my ($before, $after) = ($1, $2);
+  return $string if (($before =~ /\.$/) || ($after =~ /^\./));
+  return("$before…$after");
+}