Closed Bug 366962 Opened 13 years ago Closed 13 years ago

move mailnews locale files to suite/

Categories

(SeaMonkey :: MailNews: Message Display, defect)

defect
Not set

Tracking

(Not tracked)

RESOLVED FIXED
seamonkey2.0a1

People

(Reporter: kairo, Assigned: kairo)

References

Details

Attachments

(2 files, 1 obsolete file)

Just as we did with common and browser locale files before for ultimately fixing bug 286110, we should move mailnews locale files to suite/locales.

http://wiki.mozilla.org/SeaMonkey:Suite_Directory_Layout#Proposed_Mailnews_l10n_layout has a first proposal of where to put files, I'm planning on working on that here.
Blocks: 367034
This is the patch to jar.mn files, including some parts for using new registry syntax in content, which I "stole" from Mark's work in bug 366673 :)
Attachment #251521 - Flags: superreview?(neil)
Attachment #251521 - Flags: review?(neil)
Attached file cvs copies for patch v1 (obsolete) —
Those are the needed cvs copies for this patch, which are 125 files total...

I'm not yet completely sure about splitting pref-related files of abook and compose into pref/ (and not doing that for smime), but with having the other files in pref this looked most consistent.
Attachment #251523 - Flags: superreview?(neil)
Attachment #251523 - Flags: review?(neil)
Comment on attachment 251521 [details] [diff] [review]
patch v1: update jar.mn files

>+#ifdef MOZ_XUL_APP
>+% overlay chrome://messenger/content/mailWindowOverlay.xul chrome://messenger/content/msgViewPickerOverlay.xul
>+#else
>+*   content/messenger-views/contents.rdf                             (resources/content/contents.rdf)
>+#endif

>+#ifndef MOZ_XUL_APP
>+*   content/messenger-mdn/contents.rdf                               (resources/content/contents.rdf)
>+#endif
Don't we need % content equivalents for these contents.rdf files too?

>Index: mozilla/mailnews/extensions/offline-startup/jar.mn
>===================================================================
>RCS file: /cvsroot/mozilla/mailnews/extensions/offline-startup/jar.mn,v
>retrieving revision 1.4
>diff -u -7 -p -r1.4 jar.mn
>--- mozilla/mailnews/extensions/offline-startup/jar.mn	31 Mar 2006 15:30:13 -0000	1.4
>+++ mozilla/mailnews/extensions/offline-startup/jar.mn	15 Jan 2007 15:41:41 -0000
>@@ -1,5 +0,0 @@
Then shouldn't this be a diff -N against /dev/null ?
(In reply to comment #3)
> Don't we need % content equivalents for these contents.rdf files too?

No, I wondered about that as well at first, but those content packages are never used anywhere, I think the views one was only done to define the overlay, the mdn one might just be some copy of that, but even without the overlay. In any case, the packages themselves are unused, so I didn't even add them on the toolkit side.

> Then shouldn't this be a diff -N against /dev/null ?

It should bascially, and I want to remove it, but I tend not to do any actions that need cvs write access until I have reviews...
(In reply to comment #4)
>(In reply to comment #3)
>>Don't we need % content equivalents for these contents.rdf files too?
>I think the views one was only done to define the overlay
Ah, makes sense.

>>Then shouldn't this be a diff -N against /dev/null ?
>It should bascially
OK, then I'll review on that assumption.
Comment on attachment 251523 [details]
cvs copies for patch v1

Karsten, as you're the formal owner of SeaMonkey mailnews, I'd like an OK from you on the locations the files end up in with those cvs copies/moves.
Attachment #251523 - Flags: review?(mnyromyr)
Comment on attachment 251521 [details] [diff] [review]
patch v1: update jar.mn files

Note: I don't see the point of changing the chrome registration of content, aren't you going to have to move it anyway?
Attachment #251521 - Flags: superreview?(neil)
Attachment #251521 - Flags: superreview+
Attachment #251521 - Flags: review?(neil)
Attachment #251521 - Flags: review+
Comment on attachment 251523 [details]
cvs copies for patch v1

mozilla/mailnews/mapi/resources/locale/en-US/contents.rdf
mozilla/suite/locales/genericS/chrome/mailnews-mapi/contents.rdf
                             ^

You also forgot imapMsgs.properties

r+sr=me with those fixed.
Attachment #251523 - Flags: superreview?(neil)
Attachment #251523 - Flags: superreview+
Attachment #251523 - Flags: review?(neil)
Attachment #251523 - Flags: review+
Updated cvs copies file to address Neil's nits, mark his r+sr
Attachment #251523 - Attachment is obsolete: true
Attachment #253529 - Flags: superreview+
Attachment #253529 - Flags: review+
Attachment #251523 - Flags: review?(mnyromyr)
Attachment #253529 - Flags: review?(mnyromyr)
Neil: BTW, not all of content has to move, at least not if we want to keep some of it shared (I'm not the one to make this decision, I think). IIRC, the chrome registry needs to have either both locale and content in the new way or both in the old way - I'm not completely sure of that though.
Comment on attachment 253529 [details]
cvs copies, address Neil's nits

I'm definitely no L10N (structure) crack, but AFAICT (and as little as that may mean here), this looks basically okay to me.

I've just a nit for this other patch here:

> +% overlay chrome://communicator/content/pref/preftree.xul chrome://messenger/content/mailPrefsOverlay.xul
> +% overlay chrome://communicator/content/pref/pref-appearance.xul chrome://messenger/content/mailPrefsOverlay.xul
> +% overlay chrome://communicator/content/pref/pref-scripts.xul chrome://messenger/content/mailPrefsOverlay.xul

Can't we align the second the second URIs? AFAIR, whitespace is folded into one and this is a nightmare to read...
Attachment #253529 - Flags: review?(mnyromyr) → review+
Depends on: 369426
The jar.mn changes are checked in, leaving the bug open for the cvs removes of the old locale files.
cvs remove of old files is done. yay!
Status: NEW → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
(In reply to comment #13)
> cvs remove of old files is done. yay!
> 

I've just cvs removed the rest of the old files that KaiRo missed (basically the ones in mailnews/import and a couple of .cvsignore files).
Thanks, Mark (I had to leave, so wouldn't have been able to watch the tree if I did the removing of those)!
Blocks: 381176
You need to log in before you can comment on or make changes to this bug.