1490294 - Fix services/sync regression in suite's l10n.toml

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Axel Hecht [:Pike]]

There's a regression from https://hg.mozilla.org/comm-central/diff/ea4c0d8fc22e/suite/locales/l10n.toml that I just stumbled upon in testing something unrelated, it lost the {mozilla}/ in the reference path.

Patch coming up.

Comment 1

[Axel Hecht [:Pike]]

Attachment: adding {mozilla} back

Comment 2

[Frank-Rainer Grahl (:frg)]

Is this still needed? Starting with esr60 the former mozilla dir under comm-central is now the top sourcedir and comm-central goes under it as comm so mozilla no longer needs to be a variable?

I might have acutally missed the other ones in bug 1481067 for suite.

Comment 3

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9008045 [details] [diff] [review]
adding {mozilla} back

Anyway this is correct. Thanks. It just fell under the radar because right now we have sync disabled. Until we port 1.5 these are not used.

Comment 4

[Axel Hecht [:Pike]]

Yes, we still need the {mozilla} for the toolkit strings.

I just looked at tb, and it runs 

/builds/worker/workspace/build/src/mach compare-locales -Dmozilla=.. --merge /builds/worker/workspace/build/src/obj-firefox/comm/mail/locales/merge-dir /builds/worker/workspace/build/src/comm/mail/locales/l10n.toml /builds/worker/workspace/build/l10n fi

See the -Dmozilla=.. . 

If the mozilla subdir isn't supported anymore, we should make the default `..`. I'll still need the define for the l10n dashboard , though.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/a2bcfedfe138
fix mozilla reference in suite/locales/l10n.toml, r=frg

Comment 6

[Axel Hecht [:Pike]]

Comment on attachment 9008045 [details] [diff] [review]
adding {mozilla} back

[Approval Request Comment]
Regression caused by (bug #): 1451847
User impact if declined: I won't be able to migrate dashboard automation to toml files this cycle
Testing completed (on m-c, etc.): 
Risk to taking this patch (and alternatives if risky):
String changes made by this patch: None

I'd like this to also land on comm-beta, so that I can drop the current .ini logic in the dashboard in favor of toml files alone.

Comment 7

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9008045 [details] [diff] [review]
adding {mozilla} back

Lets take it to esr60 too.

Comment 8

[Axel Hecht [:Pike]]

Ian, Frank, can you get to the approvals here? I'd love to have this out of the way.

Comment 9

[Ian Neal]

Comment on attachment 9008045 [details] [diff] [review]
adding {mozilla} back

a=me

Comment 10

[Frank-Rainer Grahl (:frg)]

 https://hg.mozilla.org/releases/comm-beta/rev/35db3fee72f9dd34f80f8ded96d1aadfb95739d3
 https://hg.mozilla.org/releases/comm-esr60/rev/d44d43ef68d9ee37d08db418f4229bcb1d2ea0ec