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

[Daniel Holbach]

[Nicholas Skaggs (nskaggs)]

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.

review: Needs Information

[lp:~dholbach/help-app/1423871]

59. By Daniel Holbach on 2015-02-23

fix clean target

[Daniel Holbach (dholbach)]

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.

[lp:~dholbach/help-app/1423871]

60. By Daniel Holbach on 2015-02-23

update .pot file

61. By Daniel Holbach on 2015-02-23

Remove erroneous 'Title' from generated markdown

62. By Daniel Holbach on 2015-02-23

make cleanup more robust and smaller

63. By Daniel Holbach on 2015-02-23

update .pot file

64. By Daniel Holbach on 2015-02-23

catch NotADirectoryError error more appropriately

[Daniel Holbach (dholbach)]

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.

[lp:~dholbach/help-app/1423871]

65. By Daniel Holbach on 2015-02-23

update German translation

66. By Daniel Holbach on 2015-02-23

fix typo

67. By Daniel Holbach on 2015-02-23

mention ubuntu-html5-ui-toolkit as a prerequisite

[Daniel Holbach (dholbach)]

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

[Daniel Holbach (dholbach)]

I filed bug 1424953 for this.

[lp:~dholbach/help-app/1423871]

68. By Daniel Holbach on 2015-02-24

fix python code style issues

69. By Daniel Holbach on 2015-02-24

define common po4a args centrally, add comment

70. By Daniel Holbach on 2015-02-24

run po4a-updatepo as well

71. By Daniel Holbach on 2015-02-24

update German translation

72. By Daniel Holbach on 2015-02-24

update paths

[David Planella (dpm)]

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

review: Needs Fixing

[David Planella (dpm)]

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

[Daniel Holbach (dholbach)]

<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

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-02-10 14:46:34 +0000
+++ .bzrignore	2015-02-24 09:19:38 +0000
@@ -1,5 +1,5 @@
 app/www
 *.click
 edit-here/cache
-edit-here/content/pages/??
+edit-here/content/pages/lang-??-*
 edit-here/backup

=== modified file 'HACKING'
--- HACKING	2015-02-13 16:08:50 +0000
+++ HACKING	2015-02-24 09:19:38 +0000
@@ -7,7 +7,7 @@
 
 Before you get started, run:
 
-	sudo apt install python-pelican po4a make bzr
+	sudo apt install python-pelican po4a make bzr ubuntu-html5-ui-toolkit
 
 
 Editing

=== modified file 'Makefile'
--- Makefile	2015-02-13 16:08:50 +0000
+++ Makefile	2015-02-24 09:19:38 +0000
@@ -1,12 +1,16 @@
 #!/usr/bin/make -f
 
+ignored := $(shell bzr ignored | cut -d' ' -f1)
+
 clean:
-	bzr ignored | cut -d' ' -f1 | xargs rm -r
+ifneq ($(strip $(ignored)),)
+	$(foreach fn, $(ignored), $(shell rm -r $(fn);))
+endif
 
 click: html
 	cd app && click build . && mv *.click ..
 
-html:
+html: clean
 	cd edit-here && ./generate-translations
 	make -C edit-here html
 

=== modified file 'edit-here/content/pages/apps.md'
--- edit-here/content/pages/apps.md	2015-02-20 09:39:31 +0000
+++ edit-here/content/pages/apps.md	2015-02-24 09:19:38 +0000
@@ -1,6 +1,4 @@
 Title: FAQ - Apps
-URL:
-Save_as: pages/app.html
 Lang: en
 
 Are you looking for a good way to do X and can't find it in the app

=== modified file 'edit-here/content/pages/faq.md'
--- edit-here/content/pages/faq.md	2015-02-20 09:39:31 +0000
+++ edit-here/content/pages/faq.md	2015-02-24 09:19:38 +0000
@@ -1,10 +1,8 @@
 Title: Get your questions answered.
-URL:
-Save_as: pages/faq.html
 Lang: en
 
 We divided the questions up into categories, so you can spot yours more 
 easily. Here we go:
 
-  * [Apps](apps.html)
+  * [Apps]({filename}apps.md)
   * ...

=== modified file 'edit-here/content/pages/get-in-touch.md'
--- edit-here/content/pages/get-in-touch.md	2015-02-20 09:39:31 +0000
+++ edit-here/content/pages/get-in-touch.md	2015-02-24 09:19:38 +0000
@@ -1,6 +1,4 @@
 Title: Get in touch
-URL:
-Save_as: pages/get-in-touch.html
 Lang: en
 
 Ubuntu has a huge community. You can easily get in touch with experts and

=== modified file 'edit-here/content/pages/index.md'
--- edit-here/content/pages/index.md	2015-02-20 09:39:31 +0000
+++ edit-here/content/pages/index.md	2015-02-24 09:19:38 +0000
@@ -1,6 +1,4 @@
 Title: Welcome to Help for Ubuntu for devices!
-URL:
-Save_as: pages/index.html
 Lang: en
 
 The world-wide Ubuntu community wants to give you the best possible 
@@ -12,7 +10,7 @@
 
 in this app for you.
 
-[Take me to the FAQ!](faq.html)  
-[Get in touch](get-in-touch.html)
+[Take me to the FAQ!]({filename}faq.md)  
+[Get in touch]({filename}get-in-touch.md)
 
 ---

=== modified file 'edit-here/generate-pot'
--- edit-here/generate-pot	2015-02-20 09:10:30 +0000
+++ edit-here/generate-pot	2015-02-24 09:19:38 +0000
@@ -13,6 +13,8 @@
     if not translations.clean_documents():
         sys.exit(1)
     translations.generate_pot_file()
+    if not translations.update_po_files():
+        sys.exit(1)
 
 if __name__ == '__main__':
     try:

=== modified file 'edit-here/pelicanconf.py'
--- edit-here/pelicanconf.py	2015-02-09 13:40:52 +0000
+++ edit-here/pelicanconf.py	2015-02-24 09:19:38 +0000
@@ -12,6 +12,13 @@
 
 DEFAULT_LANG = u'en'
 
+DIRECT_TEMPLATES = []
+SLUGIFY_SOURCE = 'basename'
+PAGE_URL =          '{slug}.html'
+PAGE_SAVE_AS =      '{slug}.html'
+PAGE_LANG_URL =     '{slug}.html'
+PAGE_LANG_SAVE_AS = '{slug}.html'
+
 # Feed generation is usually not desired when developing
 FEED_ALL_ATOM = None
 CATEGORY_FEED_ATOM = None

=== modified file 'edit-here/po/de.po'
--- edit-here/po/de.po	2015-02-13 16:08:50 +0000
+++ edit-here/po/de.po	2015-02-24 09:19:38 +0000
@@ -7,19 +7,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-13 14:35+0100\n"
+"POT-Creation-Date: 2015-02-24 10:15+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #: content/pages/faq.md:2
 msgid "Title: Get your questions answered."
-msgstr ""
+msgstr "Title: Antworten auf Deine Fragen."
 
 #. type: Plain text
 #: content/pages/faq.md:5
@@ -27,11 +27,13 @@
 "We divided the questions up into categories, so you can spot yours more "
 "easily. Here we go:"
 msgstr ""
+"Wir haben die Fragen in Kategorien aufgeteilt, so dass Du Deine schneller "
+"finden kannst. Los geht's:"
 
 #. type: Bullet: '  * '
 #: content/pages/faq.md:7
-msgid "[Apps](apps.html)"
-msgstr ""
+msgid "[Apps]({filename}apps.md)"
+msgstr "[Apps]({filename}apps.md)"
 
 #. type: Bullet: '  * '
 #: content/pages/faq.md:7
@@ -41,7 +43,7 @@
 #. type: Plain text
 #: content/pages/index.md:2
 msgid "Title: Welcome to Help for Ubuntu for devices!"
-msgstr ""
+msgstr "Title: Willkommen bei der Hilfe für Ubuntu-Geräte!"
 
 #. type: Plain text
 #: content/pages/index.md:5
@@ -49,42 +51,48 @@
 "The world-wide Ubuntu community wants to give you the best possible "
 "experience on your Ubuntu device. This is why we collected:"
 msgstr ""
+"Die weltweite Ubuntu Community will Dir helfen, die bestmögliche "
+"Nutzererfahrung zu haben. Deswegen haben wir folgendes: "
 
 #. type: Bullet: '  * '
 #: content/pages/index.md:9
 msgid "answers to frequently asked questions"
-msgstr ""
+msgstr "Antworten auf oft-gestellte Fragen"
 
 #. type: Bullet: '  * '
 #: content/pages/index.md:9
 msgid "tips and tricks to make you more productive"
-msgstr ""
+msgstr "Tips und Tricks, die Dir das Leben leichter machen"
 
 #. type: Bullet: '  * '
 #: content/pages/index.md:9
 msgid "links to get in touch with experts and other community members"
 msgstr ""
+"Links, um mit anderen Community-Mitgliedern und Experten in Kontakt zu kommen"
 
 #. type: Plain text
 #: content/pages/index.md:11
 msgid "in this app for you."
-msgstr ""
+msgstr "in dieser App gesammelt"
 
 #. type: Plain text
 #: content/pages/index.md:12
-#, no-wrap
-msgid "[Take me to the FAQ!](faq.html)  \n"
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "[Take me to the FAQ!](faq.html)  \n"
+msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
+msgstr "[Zu den Antworten!]({filename}faq.md)  \n"
 
 #. type: Plain text
 #: content/pages/index.md:14
-msgid "[Get in touch](get-in-touch.html)"
-msgstr ""
+#, fuzzy
+#| msgid "[Get in touch](get-in-touch.html)"
+msgid "[Get in touch]({filename}get-in-touch.md)"
+msgstr "[Kontakt]({filename}get-in-touch.md)"
 
 #. type: Plain text
 #: content/pages/apps.md:2
 msgid "Title: FAQ - Apps"
-msgstr ""
+msgstr "Title: FAQ - Apps"
 
 #. type: Plain text
 #: content/pages/apps.md:5
@@ -112,7 +120,7 @@
 #: content/pages/apps.md:11
 #, no-wrap
 msgid "**Q:** Do you have Google Authenticator?  \n"
-msgstr ""
+msgstr "**Q:** Habt ihr Google Authenticator?  \n"
 
 #. type: Plain text
 #: content/pages/apps.md:13
@@ -125,7 +133,7 @@
 #. type: Plain text
 #: content/pages/get-in-touch.md:2
 msgid "Title: Get in touch"
-msgstr ""
+msgstr "Title: Kontakt"
 
 #. type: Plain text
 #: content/pages/get-in-touch.md:7

=== modified file 'edit-here/po/help.pot'
--- edit-here/po/help.pot	2015-02-20 09:14:19 +0000
+++ edit-here/po/help.pot	2015-02-24 09:19:38 +0000
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-02-20 10:13+0100\n"
+"POT-Creation-Date: 2015-02-23 12:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -22,19 +22,19 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/faq.md:5 content/de/pages/faq.md:5
+#: content/pages/faq.md:5
 msgid ""
 "We divided the questions up into categories, so you can spot yours more "
 "easily. Here we go:"
 msgstr ""
 
 #. type: Bullet: '  * '
-#: content/pages/faq.md:7 content/de/pages/faq.md:7
-msgid "[Apps](apps.html)"
+#: content/pages/faq.md:7
+msgid "[Apps]({filename}apps.md)"
 msgstr ""
 
 #. type: Bullet: '  * '
-#: content/pages/faq.md:7 content/de/pages/faq.md:7
+#: content/pages/faq.md:7
 msgid "..."
 msgstr ""
 
@@ -44,41 +44,41 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/index.md:5 content/de/pages/index.md:5
+#: content/pages/index.md:5
 msgid ""
 "The world-wide Ubuntu community wants to give you the best possible "
 "experience on your Ubuntu device. This is why we collected:"
 msgstr ""
 
 #. type: Bullet: '  * '
-#: content/pages/index.md:9 content/de/pages/index.md:9
+#: content/pages/index.md:9
 msgid "answers to frequently asked questions"
 msgstr ""
 
 #. type: Bullet: '  * '
-#: content/pages/index.md:9 content/de/pages/index.md:9
+#: content/pages/index.md:9
 msgid "tips and tricks to make you more productive"
 msgstr ""
 
 #. type: Bullet: '  * '
-#: content/pages/index.md:9 content/de/pages/index.md:9
+#: content/pages/index.md:9
 msgid "links to get in touch with experts and other community members"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/index.md:11 content/de/pages/index.md:11
+#: content/pages/index.md:11
 msgid "in this app for you."
 msgstr ""
 
 #. type: Plain text
-#: content/pages/index.md:12 content/de/pages/index.md:12
+#: content/pages/index.md:12
 #, no-wrap
-msgid "[Take me to the FAQ!](faq.html)  \n"
+msgid "[Take me to the FAQ!]({filename}faq.md)  \n"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/index.md:14 content/de/pages/index.md:14
-msgid "[Get in touch](get-in-touch.html)"
+#: content/pages/index.md:14
+msgid "[Get in touch]({filename}get-in-touch.md)"
 msgstr ""
 
 #. type: Plain text
@@ -87,7 +87,7 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:5 content/de/pages/apps.md:5
+#: content/pages/apps.md:5
 msgid ""
 "Are you looking for a good way to do X and can't find it in the app store? "
 "Want some suggestions to solve a particular problem?"
@@ -100,7 +100,7 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:10 content/de/pages/apps.md:10
+#: content/pages/apps.md:10
 #, no-wrap
 msgid ""
 "**A:** If you have a Spotify premium account, just install 'CuteSpotify'\n"
@@ -109,13 +109,13 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:11 content/de/pages/apps.md:11
+#: content/pages/apps.md:11
 #, no-wrap
 msgid "**Q:** Do you have Google Authenticator?  \n"
 msgstr ""
 
 #. type: Plain text
-#: content/pages/apps.md:13 content/de/pages/apps.md:13
+#: content/pages/apps.md:13
 #, no-wrap
 msgid ""
 "**A:** Sure, install the 'Authenticator' app from the software store.\n"
@@ -128,7 +128,7 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/get-in-touch.md:7 content/de/pages/get-in-touch.md:7
+#: content/pages/get-in-touch.md:7
 #, no-wrap
 msgid ""
 "Ubuntu has a huge community. You can easily get in touch with experts and\n"
@@ -139,36 +139,10 @@
 msgstr ""
 
 #. type: Plain text
-#: content/pages/get-in-touch.md:12 content/de/pages/get-in-touch.md:12
+#: content/pages/get-in-touch.md:12
 msgid ""
 "Another great place to **get involved** with Ubuntu is our very own [Ubuntu "
 "Community Website](http://community.ubuntu.com/). You can very easily find "
 "out about all the indiviual teams in Ubuntu, what they do, where they hang "
 "out and how to get involved."
 msgstr ""
-
-#. type: Plain text
-#: content/de/pages/faq.md:2
-msgid "Title: Get your questions answered.  Lang: en"
-msgstr ""
-
-#. type: Plain text
-#: content/de/pages/index.md:2
-msgid "Title: Welcome to Help for Ubuntu for devices! Lang: en"
-msgstr ""
-
-#. type: Plain text
-#: content/de/pages/apps.md:2
-msgid "Title: FAQ - Apps Lang: en"
-msgstr ""
-
-#. type: Plain text
-#: content/de/pages/apps.md:7
-#, no-wrap
-msgid "**Q:** Habt ihr Spotify?  \n"
-msgstr ""
-
-#. type: Plain text
-#: content/de/pages/get-in-touch.md:2
-msgid "Title: Get in touch Lang: en"
-msgstr ""

=== modified file 'edit-here/theme/templates/base.html'
--- edit-here/theme/templates/base.html	2015-02-09 13:50:46 +0000
+++ edit-here/theme/templates/base.html	2015-02-24 09:19:38 +0000
@@ -1,5 +1,6 @@
 <!doctype html>
-<html lang="en">
+
+<html lang="{% block html_lang %}{{ DEFAULT_LANG }}{% endblock %}">
     <head>
         <title>Ubuntu for devices - Help</title>
         <meta name="description" content="Ubuntu for devices - Help">

=== modified file 'edit-here/theme/templates/page.html'
--- edit-here/theme/templates/page.html	2015-02-09 13:40:52 +0000
+++ edit-here/theme/templates/page.html	2015-02-24 09:19:38 +0000
@@ -1,3 +1,4 @@
+{%- if page.lang %}{% set DEFAULT_LANG = page.lang %}{% endif -%}
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{%endblock%}
 {% block content %}

=== modified file 'edit-here/translations.py'
--- edit-here/translations.py	2015-02-20 10:54:43 +0000
+++ edit-here/translations.py	2015-02-24 09:19:38 +0000
@@ -11,8 +11,16 @@
     'title',
     'lang',
     'date',
-    'save_as',
-    'url',
+    ]
+
+# This defines how complete we expect translations to be before we generate
+# HTML from them. Needs to be string.
+TRANSLATION_COMPLETION_PERCENTAGE = '0'
+
+PO4A_ARGS = [
+    '-f', 'text',
+    '-o', 'markdown',
+    '-M', 'utf-8',
     ]
 
 
@@ -20,9 +28,9 @@
     def __init__(self):
         self._cleanup()
         self.translations_dir = os.path.abspath(os.path.join(PATH, '../po'))
-        self.available_languages = list(
-            map(lambda a: os.path.basename(a).split('.po')[0],
-                glob.glob(self.translations_dir+'/*.po')))
+        self.available_languages = \
+            [os.path.basename(a).split('.po')[0] for a
+             in glob.glob(self.translations_dir+'/*.po')]
         self.documents = self._find_documents()
         self.tempdir = tempfile.mkdtemp()
 
@@ -38,15 +46,15 @@
 
     def _cleanup(self):
         r = subprocess.Popen(['bzr', 'ignored'], stdout=subprocess.PIPE)
-        files = codecs.decode(r.communicate()[0]).split('\n')
+        files = [os.path.join(PATH, '../..', f.split(' ')[0])
+                 for f in codecs.decode(r.communicate()[0]).split('\n')
+                 if f.strip() != '']
+        files = [f for f in files if os.path.exists(f)]
         for f in files:
-            if f != '':
-                fn = os.path.join(PATH, '../..', f.split(' ')[0])
-                if os.path.exists(fn):
-                    try:
-                        shutil.rmtree(fn)
-                    except:
-                        pass
+            try:
+                shutil.rmtree(f)
+            except NotADirectoryError:
+                os.remove(f)
 
     def _remove_metadata(self, filename):
         new_dir = os.path.join(self.tempdir, os.path.dirname(filename))
@@ -58,7 +66,8 @@
                       (x.startswith('Title:') or x.startswith('title:'))]
         index = 0
         for line in lines:
-            if not [x for x in METADATA_TAGS if line.lower().startswith(x+':')] and \
+            if not [x for x in METADATA_TAGS
+                    if line.lower().startswith(x+':')] and \
                line.strip() != '':
                 index = lines.index(line)
                 break
@@ -79,31 +88,39 @@
         return True
 
     def generate_pot_file(self):
-        args = [
-            '-f', 'text',
-            '-o', 'markdown',
-            '-M', 'utf-8',
-            '-L', 'utf-8',
-            ]
+        args = PO4A_ARGS.copy()
         for document in self.documents:
             args += ['-m', document]
         args += [
-            '-p', os.path.join(self.translations_dir, 'help.pot')
+            '-p', os.path.join(self.translations_dir, 'help.pot'),
+            '-L', 'utf-8',
             ]
         pwd = os.getcwd()
         os.chdir(self.tempdir)
         subprocess.call(['po4a-gettextize']+args)
         os.chdir(pwd)
 
+    def update_po_files(self):
+        pwd = os.getcwd()
+        os.chdir(self.tempdir)
+        for lang in self.available_languages:
+            args = PO4A_ARGS.copy()
+            for document in self.documents:
+                args += ['-m', document]
+            args += ['-p', os.path.join(self.translations_dir, lang+'.po')]
+            ret = subprocess.call(['po4a-updatepo']+args)
+            if ret:
+                return False
+        os.chdir(pwd)
+        return True
+
     def _call_po4a_translate(self, doc, lang):
-        args = [
-            '-k', '0',  # this defines the percentage of completion
-            '-f', 'text',
-            '-o', 'markdown',
-            '-M', 'utf-8',
-            '-L', 'utf-8',
+        args = PO4A_ARGS.copy()
+        args += [
+            '-k', TRANSLATION_COMPLETION_PERCENTAGE,
             '-m', doc,
             '-p', 'po/%s.po' % lang,
+            '-L', 'utf-8',
             ]
         res = subprocess.Popen(['po4a-translate']+args,
                                stdout=subprocess.PIPE)
@@ -115,25 +132,24 @@
         output = '\n'.join(rest)
         return (broken_title_line, output)
 
-    def _new_header(self, lang, doc, broken_title_line):
+    def _new_header(self, lang, broken_title_line):
         title_line = broken_title_line
         for metadata_tag in [x for x in METADATA_TAGS if not x == 'title']:
             title_line = title_line.split(metadata_tag)[0]
             title_line = title_line.split(metadata_tag.capitalize())[0]
             title_line = title_line.split(metadata_tag.upper())[0]
-        save_as = os.path.join('pages', lang,
-                               os.path.basename(doc)).replace('.md', '.html')
-        return "Title:%s\nLang: %s\nSave_as: %s\nDate:\nURL:\n\n" % \
-            (title_line, lang, save_as)
+        return "%s\nLang: %s\nDate:\n\n" % \
+            (title_line, lang)
 
     def generate_translations(self):
         for lang in self.available_languages:
             for doc in self.documents:
                 (broken_title_line, output) = \
                     self._call_po4a_translate(doc, lang)
-                new_path = os.path.join(PATH, 'pages', lang,
-                                        os.path.basename(doc))
-                text = self._new_header(lang, doc, broken_title_line)
+                new_path = os.path.join(PATH, 'pages',
+                                        'lang-%s-%s' %
+                                        (lang, os.path.basename(doc)))
+                text = self._new_header(lang, broken_title_line)
                 text += output
                 if os.path.exists(new_path):
                     os.remove(new_path)