Hi,

I have added changes to use localized images. But committing failed somehow (with a message like "committing successful, there are errors").

Then svn revert and svn cleanup failed too...

It seems that some files are committed, though.

Any ideas what happened and what I can do?

Ulf

julien (Dienstag, 13. Januar 2009, 07:19):

All seems to be right after svn update...

Yes, obviously just a local problem. My working copy was fucked up and I had to checkout the changed directories again.

I need some more explanations.
Example: src/menus/selection-border.xml In this file we have
fileref="images/dialogs/selection-border.png"

I suppose that 'make' will add /C/, /de/, /fr/... automatically according to the selected language.

'make' will (hopefully) create
xml/
xml/fr/
xml/fr/images/

(There is a minor bug: empty directories xml/fr/images/{C,common} will be created too - I'll fix that.)

But we have also
fileref="images/dialogs/examples/border-selection-02.png", that is an image common to all languages. There, /C/, /de/, /fr/... must not be added.

How will 'make' manage this? Must we move this image to images/common/ ?

'make' searches for image files in images/common/ and in images/C/, and checks if there is a corresponding localized image in images/fr/ - if so, it will create a symlink to the localized file, otherwise it creates a symlink to the image file in images/C.

The images in "images/common/" were just the images/*.* files which didn't belong to any special section (menus, filters, etc.).

Example:

1) For "images/C/dialogs/selection-border.png" there is a localized version "images/fr/menus/selection-border.png", then a symlink

xml/fr/images/menus/selection-border.png -> /path/to/images/fr/menus/selection-border.png

will be created. Of course, if there is a localized file with a different name, this won't work.

2) For "images/C/dialogs/examples/border-selection-02.png" there is no corresponding localized image, so 'make' creates the symlink

xml/fr/images/dialogs/examples/border-selection-02.png -> /path/to/images/C/dialogs/examples/border-selection-02.png

Then "html/fr/images" will be created as a symlink to "xml/fr/images", and you should have your French images back.

For 'en' I have changed the code so that there is the same directory structure as for the other languages, and making xml-en will create symlinks to the source files and to the image files.

You'll have to remove the symlink "xml/en", because now a directory "xml/en" will be created. (Maybe it's the right time for testing
"make [-n] [-f Makefile.GNU] clean".)

Good luck! Ulf

julien (Dienstag, 13. Januar 2009, 15:03):

Of course, if there is a localized file with a different name, this won't work.

That's a problem.
Can you give a line command that checks for non corresponding en-LANG image names?

find images/fr/ -name .svn -prune -o -type f -print | while read localized; do
english=images/C/${localized#images/*/} test -e $english || echo $localized done

I will reanimate our validate_references script that checks for broken image reference and orphaned image files, this should find images with different names.

Ulf

Ulf-D. Ehlert (Dienstag, 13. Januar 2009, 19:11):

I will reanimate our validate_references script that checks for broken image reference and orphaned image files, this should find images with different names.

Done. Try
make [-f Makefile.GNU] check-images-fr unless you are really happy - the output is rather depressing. :-(

(Don't forget to run autogen.sh.)

Ulf

julien (Donnerstag, 15. Januar 2009, 09:43):

But check-images-fr lists as broken /common/ images that exist, for instance:
BROKEN: images/common/dialogs-icon-delete.png IN src/dialogs/channel-dialog.xml

No, 'make' will copy the image files in "common/" to your images directory "xml/fr/images", so the fileref attribute should read

It's just like we used to handle icons like next.png or tip.png. In fact, the images I moved to 'common/' were just these icons and some background images used by stylesheets, e.g. splash image and draft background (try "grep images/ stylsheets/*").

So for a fileref you always have to remove the second directory level (images/{C,common,fr}/path/to/image.png --> images/path/to/image.png).

If a file like "dialogs-icon-delete.png" is referred to only in the dialogs source files, IMHO it's better to leave it in the C/dialogs directory.
But we should consider renaming it to "delete-icon.png" or "delete.png", or even creating an icons subdir "images/C/dialogs/icons".

BTW, is it true that the callout icons are no longer used? Shouldn't we move them to docs/ or to src/images?

and lists /C/ orphaned images. Only fr orphaned images should be listed IMO.

No, that was intended. There may be orphaned images in 'images/C' and localized versions (also orphaned. of course) in 'images/fr', so you are invited to fix (rename, remove, or what ever) both.

The validating script checks src/ and images/C + images/fr, but you can call it with different options and check whether or not the output is more useful:

tools/validate_references.py --verbose --broken --orphaned \ --imgdir=xml/fr/images [ --xmldir=xml/fr ]

Bye, Ulf