326003 - Move brand.dtd and brand.properties to locales

Status: RESOLVED FIXED

(Calendar :: General, defect)

Description

[Mostafa Hosseini]

We originally added brand.dtd.in and brand.properties in sunbird/app since Firefox did the same. Firefox has long moved their branding files to the locales directory. We should be following the same path.

Comment 1

[Wolfgang Rosenauer [:wolfiR]]

complete path will be calendar/locales/en-US/chrome/branding

brand.dtd should use new version as in bug #325985 but without lang.version entity.

Comment 2

[Wolfgang Rosenauer [:wolfiR]]

one more thing. The old stuff should be removed with checkin for bug 325985.

Comment 3

[Mostafa Hosseini]

Attachment: Creation of brand.dtd and brand.properties in locales

This is the patch to create those files in the right place to begin with. Changes to Makefiles will follow in separate patches.

Comment 4

[Michiel van Leeuwen (email: mvl+moz@)]

Comment on attachment 210788 [details] [diff] [review]
Creation of brand.dtd and brand.properties in locales

r=mvl

Comment 5

[Mostafa Hosseini]

Comment on attachment 210788 [details] [diff] [review]
Creation of brand.dtd and brand.properties in locales

Patch checked in. (Files added).
Wolfgang, can you please prepare a new patch that will only take care of adding a simple Makefile.in and a jar.mn (in locales) for the new files? They don't need to be part of the build yet (but should work if they were). I can review it once you do.

Comment 6

[Wolfgang Rosenauer [:wolfiR]]

AFAIK the branding stuff don't need a jar.mn and/or Makefile in this place.
Both are referenced only from sunbird/apps and the patch to activate them is already in bug 325985. So if this gets reviewed and checked in, the new files will be used. At least this is what happens for en-US builds. What's missing is a direct build of "language-packs".

Comment 7

[Mostafa Hosseini]

You're right, the patch for bug 325985 does add the branding files to the chrome but:
1) The main intention is to start populating the 'locales' directory so we can switch over to it easily, hence I suggested to have a Makefile.in and a jar.mn first.
2) To mimic what Firefox does, we should move that to the make procedure inside 'locales' itself which makes more sense too.

But as you have mentioned branding files are Sunbird specific and shouldn't be in the chrome when the 'locales' directory is being built for an extension. One way to avoid that is to keep the addition of the branding files inside the app directory. That's true, but when we get to the part where we should deal with langpacks, the ideal solution is to just copy the related parts from browser/locales/Makefile.in without worrying about the fact that the branding stuff is packed elsewhere.
So my suggestion is to proceed with the move but use an ifdef MOZ_SUNBIRD in the jar.mn instead.
What do you think?

Comment 8

[Wolfgang Rosenauer [:wolfiR]]

Attachment: build infrastructure

(Is this patch-format OK?)

This adds some needed files to populate calendar-AB_CD.jar with branding files.
The patch to actually activate it is not included. So nothing should change in the current calendar build.

Comment 9

[Wolfgang Rosenauer [:wolfiR]]

Comment on attachment 210907 [details] [diff] [review]
build infrastructure


>diff -uprN mozilla/calendar/locales/jar.mn mozilla-l10n/calendar/locales/jar.mn
>--- mozilla/calendar/locales/jar.mn	1970-01-01 01:00:00.000000000 +0100
>+++ mozilla-l10n/calendar/locales/jar.mn	2006-02-06 20:55:15.000000000 +0100
>@@ -0,0 +1,9 @@
>+#filter substitution
>+
>+calendar-@AB_CD@.jar:

that's wrong. The branding stuff should go to @AB_CD@.jar IIRC.

Comment 10

[Wolfgang Rosenauer [:wolfiR]]

review-request given the above mentioned change for sure

Comment 11

[Mostafa Hosseini]

Comment on attachment 210907 [details] [diff] [review]
build infrastructure

r=mostafah.

Patch checked in with following change:
(Note that the ifdef is moved to top of @AB_CD@.jar)

diff -uprN mozilla/calendar/locales/jar.mn mozilla-l10n/calendar/locales/jar.mn
-- mozilla/calendar/locales/jar.mn	1970-01-01 01:00:00.000000000 +0100
+++ mozilla-l10n/calendar/locales/jar.mn	2006-02-06 20:55:15.000000000 +0100
@@ -0,0 +1,9 @@
+#filter substitution
+
+#ifdef MOZ_SUNBIRD
+@AB_CD@.jar:

Next proposed step: Minimal and unified patch to disable using brand.dtd from sunbird/app and enabling build process in the 'locales' directory.

Comment 12

[Wolfgang Rosenauer [:wolfiR]]

Attachment: build modification

contents.rdf is obsolete for sunbird AFAIK.

After this gets applied localized builds don't work anymore without having
branding stuff in l10n cvs.

And we need the patch for bug 326794 prior to this one.

Comment 13

[Mostafa Hosseini]

Comment on attachment 211486 [details] [diff] [review]
build modification

Patch checked in and obsolete files removed. Is this bug fixed?

Comment 14

[Wolfgang Rosenauer [:wolfiR]]

The bug itself is almost fixed.
What we need now are localizations in the l10n CVS for branding as for example
http://lxr.mozilla.org/l10n/source/de/calendar/chrome/branding/
The locales which are added there should be added to a new file
calendar/locales/all-locales

Notifying Pike in CC