Closed Bug 1413985 Opened 7 years ago Closed 7 years ago

.ftl files not packaged on repackage

Categories

(Core :: Internationalization, defect, P3)

Product:
Core
Component:
Internationalization
Type:
defect

Tracking

()

Status:
RESOLVED FIXED
Milestone:
mozilla58
Tracking Flags:
Tracking Status
firefox58 --- fixed

People

(Reporter: zbraniecki, Assigned: zbraniecki)

References

Details

Attachments

(1 file)

Bug 1413985 - Package .ftl files on repackage for both, source and AB_CD locales.
59 bytes, text/x-review-board-request
glandium
: review+
Details 
When repackaging Firefox into a locale with an .ftl file translated, we're not picking up the translated .ftl file.

We *are* picking it up when building a langpack tho.

STR:

1) Apply patch from bug 1402069 to add a new .ftl file
2) Apply https://hg.mozilla.org/try/rev/9cf9d3eb03623277f3a98bbae0eb720c6387d5c5 to point to a different l10n-central location [0]
3) ./mach build
4) ./mach package
5) ./mach build langpack-fr
6) Verify that the result langpack has the translated file in browser/localization/fr/browser/preferences/main.ftl
7) ./mach build installers-fr

Current result:

The result tar.bz2 (on Linux) in browser/omni.ja does contain `./localization/en-US/browser/preferences/main.ftl` but not `./localization/fr/browser/preferences/main.ftl`

Expected result:

Should contain both.


[0] I'm testing on french with added .ftl translation https://hg.mozilla.org/users/zbraniecki_mozilla.com/fr/
Blocks: 1402061
Priority: -- → P3
Mike, need your help with http://searchfox.org/mozilla-central/source/python/mozbuild/mozpack/packager/l10n.py

Currently, in m-c when we repackage, we take localization/en-US directory and package it into browser/omni.ja.

With the patch above, we're instead taking `localization/ab-CD` on repackaging.

What we'd like to do is, for `localization/**` take both, en-US and ab-CD into repackaged file.

Can you advise me how to do it? I'm lost betweeb non_chrome, bases and paths in l10n.py.
Flags: needinfo?(mh+mozilla)
I guess you need to add another category of things, since there's currently only non-localized stuff that just is taken from the app and localized stuff that is taken from the langpack and replace what's in the app.
Flags: needinfo?(mh+mozilla)
Assignee: nobody → gandalf
Status: NEW → ASSIGNED
Comment on attachment 8924687 [details]
Bug 1413985 - Package .ftl files on repackage for both, source and AB_CD locales.

https://reviewboard.mozilla.org/r/195918/#review202108

::: python/mozbuild/mozpack/packager/l10n.py:222
(Diff revision 5)
> +    for p, f in l10n_finder:
> +        if p.startswith('localization/') or '/localization/' in p:

The following should work the same:

for p, f in l10n_finder.find('**/localization/**'):
  formatter.add(p, f)

or probably even

for p, f in l10n_finder.find('**/localization'):
  formatter.add(p, f)
Attachment #8924687 - Flags: review?(mh+mozilla) → review+
Pushed by zbraniecki@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/b1216f1952e2
Package .ftl files on repackage for both, source and AB_CD locales. r=glandium
https://hg.mozilla.org/mozilla-central/rev/b1216f1952e2
Status: ASSIGNED → RESOLVED
Closed: 7 years ago
status-firefox58: --- → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla58
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Creator:
Created:
Updated:
Size: