From 31774a2ee8583f49bc204ce75e8a25030fcab0ac Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Thu, 5 Mar 2020 10:23:53 -0300 Subject: [PATCH] Bug 24262: (follow-up) admit null values on labels This patch adds handling of null values on translatable labels. Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize --- misc/translator/LangInstaller.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/translator/LangInstaller.pm b/misc/translator/LangInstaller.pm index ef5dd3d6c3..7b5e23648b 100644 --- a/misc/translator/LangInstaller.pm +++ b/misc/translator/LangInstaller.pm @@ -523,7 +523,7 @@ sub get_po_from_target { } } } else { - if ( length($row->{$field}) > 1 # discard small strings + if ( defined $row->{$field} and length($row->{$field}) > 1 # discard null values and small strings and not $po->{ $row->{$field} } ) { my $msg = new Locale::PO( -msgid => $row->{$field}, -msgstr => '', @@ -653,6 +653,7 @@ sub translate_yaml { } } } else { + next unless defined $row->{$field}; # next if null value my $po = $po_ref->{"\"$row->{$field}\""}; # quoted key if ( $po and not defined( $po->fuzzy() ) # not fuzzy and length( $po->msgid() ) > 2 # not empty msgid -- 2.39.5