Merge lp:~nskaggs/help-app/pelican-case into lp:~dholbach/help-app/pelican

Proposed by Nicholas Skaggs
Status: Merged
Merged at revision: 37
Proposed branch: lp:~nskaggs/help-app/pelican-case
Merge into: lp:~dholbach/help-app/pelican
Diff against target: 203 lines (+31/-49)
7 files modified
HACKING (+5/-3)
edit-here/content/pages/apps.md (+2/-7)
edit-here/content/pages/faq.md (+2/-7)
edit-here/content/pages/get-in-touch.md (+2/-7)
edit-here/content/pages/index.md (+2/-7)
edit-here/po/de.po (+12/-12)
edit-here/po/help.pot (+6/-6)
To merge this branch: bzr merge lp:~nskaggs/help-app/pelican-case
Reviewer Review Type Date Requested Status
Daniel Holbach Approve
Review via email: mp+249127@code.launchpad.net

Commit message

Fix translations build

Description of the change

Fix translations build

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Apparently stripping line endings too . . .

lp:~nskaggs/help-app/pelican-case updated
33. By Nicholas Skaggs

fix pages

34. By Nicholas Skaggs

missed one

35. By Nicholas Skaggs

fix save_as syntax

36. By Nicholas Skaggs

fix po files

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

This now builds properly locally for me, and the click package also launches and works on. I'm curious about how translations will work however. Also the click package needs some real layout and theming work.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Agreed, layout and theming work definitely needs to happen.

Your branch makes the build work, but breaks the setup like this:

 - in the .pot file the meta-data is merged into one line:
+msgid "Title: Get your questions answered. Lang: en save_as: faq.html"
+msgstr ""

 - file names in app/www are broken:
daniel@daydream:~/dev/apps/help$ ls app/www/pages/
faq-apps.html get-your-questions-answered-lang-en-save_as-faqhtml.html
faq-apps-lang-en-save_as-appshtml.html welcome-to-help-for-ubuntu-for-devices-lang-en-save_as-indexhtml.html
get-in-touch-lang-en-save_as-get-in-touchhtml.html
daniel@daydream:~/dev/apps/help$

 - line breaks in the HTML are broken, ie missing <br /> at the end of line one::
<p><strong>Q:</strong> Do you have Spotify?
<strong>A:</strong> If you have a Spotify premium account, just install 'CuteSpotify'
       (<a href="https://www.youtube.com/watch?v=ea90rwK_VuI">video</a>).</p>

review: Needs Fixing
Revision history for this message
Daniel Holbach (dholbach) wrote :

I'm working on a script to remove the meta-data and re-inject it into the translated docs. It's a shame we have to do this, but I don't know how else to do it.

lp:~nskaggs/help-app/pelican-case updated
37. By Nicholas Skaggs

force commit to fix po files

38. By Nicholas Skaggs

fix line breaks

39. By Nicholas Skaggs

fix spacing

40. By Nicholas Skaggs

remove date again

41. By Nicholas Skaggs

remove saveas

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

This seems to fix everything; except for the fact the lang-en.html files contain German ;-)

Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2015-02-09 13:40:52 +0000
3+++ HACKING 2015-02-10 16:08:38 +0000
4@@ -22,12 +22,14 @@
5 a look at http://daringfireball.net/projects/markdown/ and some of the
6 existing files to get started.
7
8-Once you're happy with your edits, run
9+Once you're happy with your edits, change to the top-level directory and run
10
11 make html
12
13-in the top-level directory and you can find the updated HTML in
14-./app/www/.
15+You can find the updated HTML in ./app/www/. For instance, you can browse
16+the site in firefox with
17+
18+firefox app/www/index.html
19
20
21 Creating a click
22
23=== modified file 'edit-here/content/pages/apps.md'
24--- edit-here/content/pages/apps.md 2015-02-09 14:37:30 +0000
25+++ edit-here/content/pages/apps.md 2015-02-10 16:08:38 +0000
26@@ -1,10 +1,5 @@
27-title: FAQ - Apps
28-
29-lang: en
30-
31-date:
32-
33-save_as: apps.html
34+Title: FAQ - Apps
35+Lang: en
36
37 Are you looking for a good way to do X and can't find it in the app
38 store? Want some suggestions to solve a particular problem?
39
40=== modified file 'edit-here/content/pages/faq.md'
41--- edit-here/content/pages/faq.md 2015-02-09 14:37:30 +0000
42+++ edit-here/content/pages/faq.md 2015-02-10 16:08:38 +0000
43@@ -1,10 +1,5 @@
44-title: Get your questions answered.
45-
46-lang: en
47-
48-date:
49-
50-save_as: faq.html
51+Title: Get your questions answered.
52+Lang: en
53
54 We divided the questions up into categories, so you can spot yours more
55 easily. Here we go:
56
57=== modified file 'edit-here/content/pages/get-in-touch.md'
58--- edit-here/content/pages/get-in-touch.md 2015-02-09 14:37:30 +0000
59+++ edit-here/content/pages/get-in-touch.md 2015-02-10 16:08:38 +0000
60@@ -1,10 +1,5 @@
61-title: Get in touch
62-
63-lang: en
64-
65-date:
66-
67-save_as: get-in-touch.html
68+Title: Get in touch
69+Lang: en
70
71 Ubuntu has a huge community. You can easily get in touch with experts and
72 other enthusiasts. One good way to do so, particularly if you **have
73
74=== modified file 'edit-here/content/pages/index.md'
75--- edit-here/content/pages/index.md 2015-02-09 14:37:30 +0000
76+++ edit-here/content/pages/index.md 2015-02-10 16:08:38 +0000
77@@ -1,10 +1,5 @@
78-title: Welcome to Help for Ubuntu for devices!
79-
80-lang: en
81-
82-date:
83-
84-save_as: index.html
85+Title: Welcome to Help for Ubuntu for devices!
86+Lang: en
87
88 The world-wide Ubuntu community wants to give you the best possible
89 experience on your Ubuntu device. This is why we collected:
90
91=== modified file 'edit-here/po/de.po'
92--- edit-here/po/de.po 2015-02-09 17:20:12 +0000
93+++ edit-here/po/de.po 2015-02-10 16:08:38 +0000
94@@ -18,18 +18,18 @@
95
96 #. type: Plain text
97 #: content/pages/faq.md:2
98-msgid "title: Get your questions answered."
99-msgstr "title: Lass Deine Fragen beantworten."
100+msgid "Title: Get your questions answered."
101+msgstr "Title: Lass Deine Fragen beantworten."
102
103 #. type: Plain text
104 #: content/pages/faq.md:4 content/pages/get-in-touch.md:4 content/pages/index.md:4 content/pages/apps.md:4
105-msgid "lang: en"
106-msgstr "lang: de"
107+msgid "Lang: en"
108+msgstr "Lang: de"
109
110 #. type: Plain text
111 #: content/pages/faq.md:6 content/pages/get-in-touch.md:6 content/pages/index.md:6 content/pages/apps.md:6
112-msgid "date:"
113-msgstr "date:"
114+msgid "Date:"
115+msgstr "Date:"
116
117 #. type: Plain text
118 #: content/pages/faq.md:8
119@@ -56,8 +56,8 @@
120
121 #. type: Plain text
122 #: content/pages/get-in-touch.md:2
123-msgid "title: Get in touch"
124-msgstr "title: Kontakt"
125+msgid "Title: Get in touch"
126+msgstr "Title: Kontakt"
127
128 #. type: Plain text
129 #: content/pages/get-in-touch.md:8
130@@ -92,8 +92,8 @@
131
132 #. type: Plain text
133 #: content/pages/index.md:2
134-msgid "title: Welcome to Help for Ubuntu for devices!"
135-msgstr "title: Willkommen zur Hilfe für Ubuntu"
136+msgid "Title: Welcome to Help for Ubuntu for devices!"
137+msgstr "Title: Willkommen zur Hilfe für Ubuntu"
138
139 #. type: Plain text
140 #: content/pages/index.md:8
141@@ -140,8 +140,8 @@
142
143 #. type: Plain text
144 #: content/pages/apps.md:2
145-msgid "title: FAQ - Apps"
146-msgstr "title: FAQ - Apps"
147+msgid "Title: FAQ - Apps"
148+msgstr "Title: FAQ - Apps"
149
150 #. type: Plain text
151 #: content/pages/apps.md:8
152
153=== modified file 'edit-here/po/help.pot'
154--- edit-here/po/help.pot 2015-02-09 14:37:30 +0000
155+++ edit-here/po/help.pot 2015-02-10 16:08:38 +0000
156@@ -18,17 +18,17 @@
157
158 #. type: Plain text
159 #: content/pages/faq.md:2
160-msgid "title: Get your questions answered."
161+msgid "Title: Get your questions answered."
162 msgstr ""
163
164 #. type: Plain text
165 #: content/pages/faq.md:4 content/pages/get-in-touch.md:4 content/pages/index.md:4 content/pages/apps.md:4
166-msgid "lang: en"
167+msgid "Lang: en"
168 msgstr ""
169
170 #. type: Plain text
171 #: content/pages/faq.md:6 content/pages/get-in-touch.md:6 content/pages/index.md:6 content/pages/apps.md:6
172-msgid "date:"
173+msgid "Date:"
174 msgstr ""
175
176 #. type: Plain text
177@@ -55,7 +55,7 @@
178
179 #. type: Plain text
180 #: content/pages/get-in-touch.md:2
181-msgid "title: Get in touch"
182+msgid "Title: Get in touch"
183 msgstr ""
184
185 #. type: Plain text
186@@ -85,7 +85,7 @@
187
188 #. type: Plain text
189 #: content/pages/index.md:2
190-msgid "title: Welcome to Help for Ubuntu for devices!"
191+msgid "Title: Welcome to Help for Ubuntu for devices!"
192 msgstr ""
193
194 #. type: Plain text
195@@ -133,7 +133,7 @@
196
197 #. type: Plain text
198 #: content/pages/apps.md:2
199-msgid "title: FAQ - Apps"
200+msgid "Title: FAQ - Apps"
201 msgstr ""
202
203 #. type: Plain text

Subscribers

People subscribed via source and target branches