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

Ignore empty plurals just like with singulars

diff --cc l10n/l10n.pl
index 4f8d8debb8d932ecead3d97c2db5742f173b5e29,b4ad1d034dd27dbcede78f2bb23d01adaac28d10..0ff25944d6ca69cc8d285757ba6fcc0a6c3a0f4d
--- 1/l10n/l10n.pl
--- 2/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} );
                                        }
  

diff --cc lib/private/l10n.php
Simple merge

diff --cc lib/private/l10n/string.php
Simple merge

diff --cc tests/lib/l10n.php
Simple merge