Merge lp://staging/~dholbach/help-app/1423871 into lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk

Our Makefile assumes a dirty build:

bzr ignored | cut -d' ' -f1 | xargs rm -r
rm: missing operand
Try 'rm --help' for more information.
Makefile:4: recipe for target 'clean' failed
make: [clean] Error 123 (ignored)

As for this merge, it appears you cloned the english into the german translation? It does indeed generate the proper files, but the linking seems to be off.

The clean target in the makefile would ignore failures of the rm call. (Note the '-' at the start of the line.) Still I just pushed a cleaner version of the code.

I'll look into the linking next.

Hum, so I have problems figuring out how to make the linking work properly. According to http://docs.getpelican.com/en/latest/content.html we should be all set.

Can we please get this merged? I'll file a separate bug for the broken links.

I filed bug 1424953 for this.

Looks good to me, thanks!

Just two comments:

- I initially suggested using a directory for each language to contain the generated files. In a conversation on IRC, Daniel mentioned that this presents an issue with CSS/JS relative imports' for the toolkit theme.
- On second thoughts, and if we cannot use the above, I'd suggest keeping the same filename for all files, but adding the language as a suffix, just as the Apache docs suggest to load translations [1]. That is:
 - index.en-us.html
 - index.de.html
 - get-in-touch.en-us.html (*)
 - get-in-touch.de.html

[1] http://httpd.apache.org/docs/2.2/content-negotiation.html
(*) Note the - vs. _ and lowercase. This is for converting gettext language codes to BCP-47 language codes, which are understood by the browser: http://www.rfc-editor.org/rfc/bcp/bcp47.txt

If this requires a big change to the branch, we could do the above on a separate one.

<dholbach> dpm, ok, I'll work on bug 1425010 next now, but maybe it'd make sense to land the branches now, so it'll be easier for others to look at the branches
<dholbach> the code is in better shape now then it was
 and I'll try to make the following MPs more targetted
<dpm> dholbach, makes sense, thanks!
<dholbach> ok