Ubuntu Help App

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

  1. 1426304
  2. Merge into trunk
Proposed by Daniel Holbach
Status: Merged
Merged at revision: 67
Proposed branch: lp://staging/~dholbach/help-app/1426304
Merge into: lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 1083 lines (+391/-266)
10 files modified
edit-here/generate-pot (+1/-2)
edit-here/generate-translations (+0/-1)
edit-here/index.html (+4/-0)
edit-here/po/de.po (+39/-26)
edit-here/po/fr.po (+37/-25)
edit-here/po/help.pot (+5/-5)
edit-here/po/it.po (+37/-25)
edit-here/po/pt.po (+38/-27)
edit-here/po/ro.po (+37/-25)
edit-here/translations.py (+193/-130)
To merge this branch: bzr merge lp://staging/~dholbach/help-app/1426304
Reviewer Review Type Date Requested Status
David Planella Approve
Daniel Holbach (community) Needs Fixing
Review via email: mp+251589@code.staging.launchpad.net
To post a comment you must log in.
lp://staging/~dholbach/help-app/1426304 updated
68. By Daniel Holbach

add require() function to simplify code a bit

69. By Daniel Holbach

update index.html with new languages

70. By Daniel Holbach

merge from trunk, resolve conflicts

71. By Daniel Holbach

update German translation, this will help as a test-case

72. By Daniel Holbach

omit untranslated 'Title:' line, as it would give us two 'Title:' lines

73. By Daniel Holbach

also bend links if the link title is translated

74. By Daniel Holbach

fix case where 'original_title in msgid' was not good enough, we need it exact

Revision history for this message
David Planella (dpm) wrote :

Looks good to me, just two inline comments.

review: Needs Information
lp://staging/~dholbach/help-app/1426304 updated
75. By Daniel Holbach

add Portoguese

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

Ok, we decided to go without saving 'title_lines' anywhere, but just agree that the Title line is always the first. I'll add a piece of code in the "Title" line replacer which checks the line number.

Working on this now.

review: Needs Fixing
lp://staging/~dholbach/help-app/1426304 updated
76. By Daniel Holbach

instead of doing internal bookkeeping, assume that the first line is the title_line - also error out, if we find a title line that doesn't have linenumber 1

Revision history for this message
David Planella (dpm) wrote :

Looks good to me, good work! I've just added an inline comment as a suggestion, but for me it's already good to go.

review: Approve
lp://staging/~dholbach/help-app/1426304 updated
77. By Daniel Holbach

remove leftover print statement

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

Fixed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches