Bugzilla – Attachment 138711 Details for
Bug 31292
Untranslatable string in sample_notices.yaml
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31292 - Untranslatable string in sample_notices.yaml
Bug-31292---Untranslatable-string-in-samplenotices.patch (text/plain), 2.59 KB, created by
Bernardo Gonzalez Kriegel
on 2022-08-05 16:04:36 UTC
(
hide
)
Description:
Bug 31292 - Untranslatable string in sample_notices.yaml
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2022-08-05 16:04:36 UTC
Size:
2.59 KB
patch
obsolete
>From a85d79e333284c5c45b4cbfc96a31d5de1e6cdab Mon Sep 17 00:00:00 2001 >From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >Date: Fri, 5 Aug 2022 11:34:05 -0300 >Subject: [PATCH] Bug 31292 - Untranslatable string in sample_notices.yaml > >This patch removes a regex that discard lines in multiline YAML values >On close inspection, there is no need for it. > >To test: >1) go to misc translator, update some language > ./translate update fr-CA > >2) check missing string > > egrep "You may pick up your article" po/fr-CA-installer.po > > from sample_notices.yaml > >3) apply the patch, repeat 1) > >4) repeat 2), verify the string is present in the translation file > >5) translate the new string, install the language, > verify string is present in the translated file > ./translate install fr-CA > > check fr-CA/mandatory/sample_notices.yml > >There are three new strings >msgid "%sDear %s %s,%s" >msgid "%s%s%sTitle: %s" >msgid "%sYou may pick up your article at %s.%sYou can download the scanned materials via the following url(s): %s.%s" >--- > misc/translator/LangInstaller.pm | 1 - > misc/translator/xgettext-installer | 3 --- > 2 files changed, 4 deletions(-) > >diff --git a/misc/translator/LangInstaller.pm b/misc/translator/LangInstaller.pm >index f5dd1831ba..7ba313ecaa 100644 >--- a/misc/translator/LangInstaller.pm >+++ b/misc/translator/LangInstaller.pm >@@ -318,7 +318,6 @@ sub translate_yaml { > for my $field ( @translatable ) { # each translatable field > if ( @multiline and grep { $_ eq $field } @multiline ) { # multiline fields, only notices ATM > foreach my $line ( @{$row->{$field}} ) { >- next if ( $line =~ /^(\s*<\/*\w+\s*>|\s*\[.*\]|\s*<.*\[.*\].*>|\s*)$/ ); # discard pure html, TT, empty > my @ttvar; > while ( $line =~ s/(<<.*?>>|\[\%.*?\%\]|<.*?>)/\%s/ ) { # put placeholders, save matches > my $var = $1; >diff --git a/misc/translator/xgettext-installer b/misc/translator/xgettext-installer >index ecb134b14a..45d2a872e5 100755 >--- a/misc/translator/xgettext-installer >+++ b/misc/translator/xgettext-installer >@@ -110,9 +110,6 @@ for my $file (@files) { > foreach my $line ( @{ $row->{$field} } ) { > $mulc++; > >- # discard pure html, TT, empty >- next if ( $line =~ /^(\s*<\/*\w+\s*>|\s*\[.*\]|\s*<.*\[.*\].*>|\s*)$/ ); >- > # put placeholders > $line =~ s/(<<.*?>>|\[\%.*?\%\]|<.*?>)/\%s/g; > >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 31292
:
138711
|
138745
|
138746
|
138796