1604663 - Include cZ in merge comparison

Status: RESOLVED FIXED

(SeaMonkey :: Chat, task)

Description

[Ian Neal]

At the moment cZ is not included when you run a merge comparison.

Comment 1

[Ian Neal]

Attachment: patch for SM's l10n.toml

Cannot see a way of excluding if cZ is not being built

Comment 2

[Ian Neal]

Attachment: patch to create l10n.toml for cZ

Comment 3

[Ian Neal]

Attachment: correct patch to create l10n.toml for cZ

Correct patch attached

Comment 4

[Ian Neal]

Attachment: patch to create l10n.toml for cZ v1.1

Ignore MOZ_LANGPACK_CONTRIBUTORS

Comment 5

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9116572 [details] [diff] [review]
patch for SM's l10n.toml

Because this doesn't work when irc is disabled we should do it after integrating cZ into our tree and product.

Comment 6

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9116605 [details] [diff] [review]
patch to create l10n.toml for cZ v1.1

f+ for the moment 

ca is dead. 

We should wait till we intergate cZ into our product. Depending on how we do it this is not needed then. In any case locales would need to be moved to suite/extensions/irc/locales/... and depending on version mozilla as top source dir taken into account.

Comment 8

[Ian Neal]

Attachment: 1604663-irc-merge-2538.patch

[Approval Request Comment]
Regression caused by (bug #): n/a
User impact if declined: none
Testing completed (on m-c, etc.): 2.53.8
Risk to taking this patch (and alternatives if risky): low
String changes made by this patch: none

As we have now forked the cZ code, this should be achievable.
A few notes:

• I have tested this patch against both existing locales (de and en-GB) and one that doesn't localise cZ (el).
• There may still be unneeded code in the moz.build/Makefile.in files, if you spot any say.
• In the l10n.toml / all-locales for our cZ we could remove ca and si locales as SM does not build for them.
• This patch requires for each locale that extensions/irc is copied/moved to suite/extensions/irc
• If / when this lands on l10n-central we need to arrange for the entities in each locale to be copied from extensions/irc to suite/extensions/irc and check that we are only exposing the entities in suite/extensions/irc to the locales that are in our cZ's l10n.toml rather than to all SM's locales.

Comment 9

[Ian Neal]

Additional note:

• Next version of this patch should remove the xpi directory under suite/extensions/irc/ (but that could be a separate bug/patch if preferred).

Comment 10

[Ian Neal]

Attachment: 1604663-irc-l10n-2538.patch

Changes needed for toolkit's l10n.mk file

Comment 11

[Ian Neal]

Attachment: 1694760-mailservices-base-v1_2-2538.patch

Patch updated to remove unneeded xpi/ files

Comment 12

[Ian Neal]

Comment on attachment 9217851 [details] [diff] [review]
1694760-mailservices-base-v1_2-2538.patch

Wrong patch

Comment 13

[Ian Neal]

Attachment: 1604663-irc-merge-v1_2-2538.patch

Updated version, tested both unpackaged and packaged localised version.

Comment 14

[Ian Neal]

Attachment: 1604663-irc-installer-2538.patch

Requesting feedback as needs to be tested on non-linux platforms. Not sure what is needed in removed-files.in

Comment 15

[Ian Neal]

Attachment: 1604663-irc-merge-v1_3-2538.patch

Changes since last patch:

• Combined the merge and installer patches
• Remove xpi changes as they are now in Bug 1707458
• Found the fixes for packaging extension l10n in app langpacks

Comment 16

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9217847 [details] [diff] [review]
1604663-irc-l10n-2538.patch

LGTM

Comment 17

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9218759 [details] [diff] [review]
1604663-irc-merge-v1_3-2538.patch

LGTM

+DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']

NIT:
I think we should remove MOZ_APP_MAXVERSION and just set the max version to MOZ_APP_VERSION in the rdf. cZ is now bundled and should always match.

Would it make sense for this bug to be included in 2.57 and c-c too and just turn bug 1707459 into an incremental bug for the move and conversion?. Both should be checked in at the same time. Reason is that we then can just add bug 1707459 to 2.53 if desired later.

Comment 18

[Ian Neal]

Comment on attachment 9217847 [details] [diff] [review]
1604663-irc-l10n-2538.patch

Also for 2.57

Comment 19

[Ian Neal]

Comment on attachment 9218759 [details] [diff] [review]
1604663-irc-merge-v1_3-2538.patch

Also for 2.57

Comment 20

[Frank-Rainer Grahl (:frg)]

So far only in 2.53.8b1 and up. Might be merged with Bug 1707459 for central.

https://gitlab.com/seamonkey-project/seamonkey-2.53-mozilla/-/commit/5075a2ce87dc5a5c6117d7af8eb3e1dd76987fcd
Include cZ in merge comparison - stop ignoring cZ. r=frg a=frg
https://gitlab.com/seamonkey-project/seamonkey-2.53-comm/-/commit/9b8c07c3cdddbbf1aba4cf40b47f7c48dea6fcce
Include cZ in merge comparison. r=frg a=frg

Comment 21

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/de28453479ac
Include cZ in merge comparison. r=frg

Comment 22

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9218759 [details] [diff] [review]
1604663-irc-merge-v1_3-2538.patch

In unofficial queue as 1604663-irc-merge-v1_3a-257.patch

Comment 23

[Frank-Rainer Grahl (:frg)]

Comment on attachment 9217847 [details] [diff] [review]
1604663-irc-l10n-2538.patch

in unoffical queue as 1604663-irc-l10n-257.patch