Ubuntu Help App

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

  1. pelican-case
  2. Merge into 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
=== modified file 'HACKING'
--- HACKING 2015-02-09 13:40:52 +0000
+++ HACKING 2015-02-10 16:08:38 +0000
@@ -22,12 +22,14 @@
22a look at http://daringfireball.net/projects/markdown/ and some of the 22a look at http://daringfireball.net/projects/markdown/ and some of the
23existing files to get started.23existing files to get started.
2424
25Once you're happy with your edits, run 25Once you're happy with your edits, change to the top-level directory and run
2626
27 make html27 make html
2828
29in the top-level directory and you can find the updated HTML in29You can find the updated HTML in ./app/www/. For instance, you can browse
30./app/www/.30the site in firefox with
31
32firefox app/www/index.html
3133
3234
33Creating a click35Creating a click
3436
=== modified file 'edit-here/content/pages/apps.md'
--- edit-here/content/pages/apps.md 2015-02-09 14:37:30 +0000
+++ edit-here/content/pages/apps.md 2015-02-10 16:08:38 +0000
@@ -1,10 +1,5 @@
1title: FAQ - Apps1Title: FAQ - Apps
22Lang: en
3lang: en
4
5date:
6
7save_as: apps.html
83
9Are you looking for a good way to do X and can't find it in the app4Are you looking for a good way to do X and can't find it in the app
10store? Want some suggestions to solve a particular problem?5store? Want some suggestions to solve a particular problem?
116
=== modified file 'edit-here/content/pages/faq.md'
--- edit-here/content/pages/faq.md 2015-02-09 14:37:30 +0000
+++ edit-here/content/pages/faq.md 2015-02-10 16:08:38 +0000
@@ -1,10 +1,5 @@
1title: Get your questions answered.1Title: Get your questions answered.
22Lang: en
3lang: en
4
5date:
6
7save_as: faq.html
83
9We divided the questions up into categories, so you can spot yours more 4We divided the questions up into categories, so you can spot yours more
10easily. Here we go:5easily. Here we go:
116
=== modified file 'edit-here/content/pages/get-in-touch.md'
--- edit-here/content/pages/get-in-touch.md 2015-02-09 14:37:30 +0000
+++ edit-here/content/pages/get-in-touch.md 2015-02-10 16:08:38 +0000
@@ -1,10 +1,5 @@
1title: Get in touch1Title: Get in touch
22Lang: en
3lang: en
4
5date:
6
7save_as: get-in-touch.html
83
9Ubuntu has a huge community. You can easily get in touch with experts and4Ubuntu has a huge community. You can easily get in touch with experts and
10other enthusiasts. One good way to do so, particularly if you **have 5other enthusiasts. One good way to do so, particularly if you **have
116
=== modified file 'edit-here/content/pages/index.md'
--- edit-here/content/pages/index.md 2015-02-09 14:37:30 +0000
+++ edit-here/content/pages/index.md 2015-02-10 16:08:38 +0000
@@ -1,10 +1,5 @@
1title: Welcome to Help for Ubuntu for devices!1Title: Welcome to Help for Ubuntu for devices!
22Lang: en
3lang: en
4
5date:
6
7save_as: index.html
83
9The world-wide Ubuntu community wants to give you the best possible 4The world-wide Ubuntu community wants to give you the best possible
10experience on your Ubuntu device. This is why we collected:5experience on your Ubuntu device. This is why we collected:
116
=== modified file 'edit-here/po/de.po'
--- edit-here/po/de.po 2015-02-09 17:20:12 +0000
+++ edit-here/po/de.po 2015-02-10 16:08:38 +0000
@@ -18,18 +18,18 @@
1818
19#. type: Plain text19#. type: Plain text
20#: content/pages/faq.md:220#: content/pages/faq.md:2
21msgid "title: Get your questions answered."21msgid "Title: Get your questions answered."
22msgstr "title: Lass Deine Fragen beantworten."22msgstr "Title: Lass Deine Fragen beantworten."
2323
24#. type: Plain text24#. type: Plain text
25#: content/pages/faq.md:4 content/pages/get-in-touch.md:4 content/pages/index.md:4 content/pages/apps.md:425#: content/pages/faq.md:4 content/pages/get-in-touch.md:4 content/pages/index.md:4 content/pages/apps.md:4
26msgid "lang: en"26msgid "Lang: en"
27msgstr "lang: de"27msgstr "Lang: de"
2828
29#. type: Plain text29#. type: Plain text
30#: content/pages/faq.md:6 content/pages/get-in-touch.md:6 content/pages/index.md:6 content/pages/apps.md:630#: content/pages/faq.md:6 content/pages/get-in-touch.md:6 content/pages/index.md:6 content/pages/apps.md:6
31msgid "date:"31msgid "Date:"
32msgstr "date:"32msgstr "Date:"
3333
34#. type: Plain text34#. type: Plain text
35#: content/pages/faq.md:835#: content/pages/faq.md:8
@@ -56,8 +56,8 @@
5656
57#. type: Plain text57#. type: Plain text
58#: content/pages/get-in-touch.md:258#: content/pages/get-in-touch.md:2
59msgid "title: Get in touch"59msgid "Title: Get in touch"
60msgstr "title: Kontakt"60msgstr "Title: Kontakt"
6161
62#. type: Plain text62#. type: Plain text
63#: content/pages/get-in-touch.md:863#: content/pages/get-in-touch.md:8
@@ -92,8 +92,8 @@
9292
93#. type: Plain text93#. type: Plain text
94#: content/pages/index.md:294#: content/pages/index.md:2
95msgid "title: Welcome to Help for Ubuntu for devices!"95msgid "Title: Welcome to Help for Ubuntu for devices!"
96msgstr "title: Willkommen zur Hilfe für Ubuntu"96msgstr "Title: Willkommen zur Hilfe für Ubuntu"
9797
98#. type: Plain text98#. type: Plain text
99#: content/pages/index.md:899#: content/pages/index.md:8
@@ -140,8 +140,8 @@
140140
141#. type: Plain text141#. type: Plain text
142#: content/pages/apps.md:2142#: content/pages/apps.md:2
143msgid "title: FAQ - Apps"143msgid "Title: FAQ - Apps"
144msgstr "title: FAQ - Apps"144msgstr "Title: FAQ - Apps"
145145
146#. type: Plain text146#. type: Plain text
147#: content/pages/apps.md:8147#: content/pages/apps.md:8
148148
=== modified file 'edit-here/po/help.pot'
--- edit-here/po/help.pot 2015-02-09 14:37:30 +0000
+++ edit-here/po/help.pot 2015-02-10 16:08:38 +0000
@@ -18,17 +18,17 @@
1818
19#. type: Plain text19#. type: Plain text
20#: content/pages/faq.md:220#: content/pages/faq.md:2
21msgid "title: Get your questions answered."21msgid "Title: Get your questions answered."
22msgstr ""22msgstr ""
2323
24#. type: Plain text24#. type: Plain text
25#: content/pages/faq.md:4 content/pages/get-in-touch.md:4 content/pages/index.md:4 content/pages/apps.md:425#: content/pages/faq.md:4 content/pages/get-in-touch.md:4 content/pages/index.md:4 content/pages/apps.md:4
26msgid "lang: en"26msgid "Lang: en"
27msgstr ""27msgstr ""
2828
29#. type: Plain text29#. type: Plain text
30#: content/pages/faq.md:6 content/pages/get-in-touch.md:6 content/pages/index.md:6 content/pages/apps.md:630#: content/pages/faq.md:6 content/pages/get-in-touch.md:6 content/pages/index.md:6 content/pages/apps.md:6
31msgid "date:"31msgid "Date:"
32msgstr ""32msgstr ""
3333
34#. type: Plain text34#. type: Plain text
@@ -55,7 +55,7 @@
5555
56#. type: Plain text56#. type: Plain text
57#: content/pages/get-in-touch.md:257#: content/pages/get-in-touch.md:2
58msgid "title: Get in touch"58msgid "Title: Get in touch"
59msgstr ""59msgstr ""
6060
61#. type: Plain text61#. type: Plain text
@@ -85,7 +85,7 @@
8585
86#. type: Plain text86#. type: Plain text
87#: content/pages/index.md:287#: content/pages/index.md:2
88msgid "title: Welcome to Help for Ubuntu for devices!"88msgid "Title: Welcome to Help for Ubuntu for devices!"
89msgstr ""89msgstr ""
9090
91#. type: Plain text91#. type: Plain text
@@ -133,7 +133,7 @@
133133
134#. type: Plain text134#. type: Plain text
135#: content/pages/apps.md:2135#: content/pages/apps.md:2
136msgid "title: FAQ - Apps"136msgid "Title: FAQ - Apps"
137msgstr ""137msgstr ""
138138
139#. type: Plain text139#. type: Plain text

Subscribers

People subscribed via source and target branches