upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Ignore empty plurals just like with singulars

Browse source 
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.
This commit is contained in:
Joas Schilling 2015-02-20 11:36:56 +01:00
parent 79ef5eda96
commit 3ab9ad2d78
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
l10n/l10n.pl
View file

@ -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());
}