From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 26 Mar 2015 19:15:33 +0000 (+0100)
Subject: Merge pull request #14399 from owncloud/ignore-empty-plurals
X-Git-Tag: v8.1.0alpha1~157
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74a9fc29b43b54ec8aa9f6b9cac1cbfa4a5136e2;p=nextcloud-server.git

Merge pull request #14399 from owncloud/ignore-empty-plurals

Ignore empty plurals just like with singulars
---

74a9fc29b43b54ec8aa9f6b9cac1cbfa4a5136e2
diff --cc l10n/l10n.pl
index 4f8d8debb8d,b4ad1d034dd..0ff25944d6c
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@@ -153,13 -153,11 +153,14 @@@ elsif( $task eq 'write' )
  				elsif( defined( $string->msgstr_n() )){
  					# plural translations
  					my @variants = ();
 -					my $identifier = $string->msgid()."::".$string->msgid_plural();
 -					$identifier =~ s/"/_/g;
 +					my $msgid = $string->msgid();
 +					$msgid =~ s/^"(.*)"$/$1/;
 +					my $msgid_plural = $string->msgid_plural();
 +					$msgid_plural =~ s/^"(.*)"$/$1/;
 +					my $identifier = "_" . $msgid."_::_".$msgid_plural . "_";
  
  					foreach my $variant ( sort { $a <=> $b} keys( %{$string->msgstr_n()} )){
+ 						next TRANSLATIONS if $string->msgstr_n()->{$variant} eq '""';
  						push( @variants, $string->msgstr_n()->{$variant} );
  					}