From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 20 Feb 2015 10:36:56 +0000 (+0100)
Subject: Ignore empty plurals just like with singulars
X-Git-Tag: v8.1.0alpha1~157^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3ab9ad2d7849c58e3b1048e49d158a1742aa4fd4;p=nextcloud-server.git

Ignore empty plurals just like with singulars

The js and php code of n() has fallbacks for when the key is missing.
However there is no fallback, when the key is defined with an array of empty
strings. So we just don't extract them anymore and use the english language.
---

diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index 26ed4ecba30..b4ad1d034dd 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -145,7 +145,7 @@ elsif( $task eq 'write' ){
 			my @js_strings = ();
 			my $plurals;
 
-			foreach my $string ( @{$array} ){
+			TRANSLATIONS: foreach my $string ( @{$array} ){
 				if( $string->msgid() eq '""' ){
 					# Translator information
 					$plurals = getPluralInfo( $string->msgstr());
@@ -157,6 +157,7 @@ elsif( $task eq 'write' ){
 					$identifier =~ s/"/_/g;
 
 					foreach my $variant ( sort { $a <=> $b} keys( %{$string->msgstr_n()} )){
+						next TRANSLATIONS if $string->msgstr_n()->{$variant} eq '""';
 						push( @variants, $string->msgstr_n()->{$variant} );
 					}
 
@@ -165,7 +166,7 @@ elsif( $task eq 'write' ){
 				}
 				else{
 					# singular translations
-					next if $string->msgstr() eq '""';
+					next TRANSLATIONS if $string->msgstr() eq '""';
 					push( @strings, $string->msgid()." => ".$string->msgstr());
 					push( @js_strings, $string->msgid()." : ".$string->msgstr());
 				}