Ubuntu Help App

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

  1. translations-fixes
  2. Merge into trunk
Proposed by Daniel Holbach
Status: Merged
Merged at revision: 68
Proposed branch: lp:~dholbach/help-app/translations-fixes
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 184 lines (+50/-32)
3 files modified
edit-here/po/es.po (+39/-27)
edit-here/po/help.pot (+1/-1)
edit-here/translations.py (+10/-4)
To merge this branch: bzr merge lp:~dholbach/help-app/translations-fixes
Reviewer Review Type Date Requested Status
David Planella Approve
Review via email: mp+251887@code.launchpad.net
To post a comment you must log in.
lp:~dholbach/help-app/translations-fixes updated
71. By Daniel Holbach

rewrite links in Spanish translations

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

Tested it to work fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'edit-here/po/es.po'
--- edit-here/po/es.po 2015-03-05 06:06:56 +0000
+++ edit-here/po/es.po 2015-03-05 09:35:04 +0000
@@ -2,7 +2,7 @@
2# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 20152# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
3# This file is distributed under the same license as the ubuntu-devices-help package.3# This file is distributed under the same license as the ubuntu-devices-help package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.4# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
5#5#
6msgid ""6msgid ""
7msgstr ""7msgstr ""
8"Project-Id-Version: ubuntu-devices-help\n"8"Project-Id-Version: ubuntu-devices-help\n"
@@ -14,13 +14,8 @@
14"MIME-Version: 1.0\n"14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"16"Content-Transfer-Encoding: 8bit\n"
17"X-Generator: Launchpad (build 17374)\n"
17"X-Launchpad-Export-Date: 2015-03-05 06:06+0000\n"18"X-Launchpad-Export-Date: 2015-03-05 06:06+0000\n"
18"X-Generator: Launchpad (build 17374)\n"
19
20#. type: Plain text
21#: content/pages/faq.md:2
22msgid "Title: Get your questions answered."
23msgstr ""
2419
25#. type: Plain text20#. type: Plain text
26#: content/pages/faq.md:521#: content/pages/faq.md:5
@@ -34,7 +29,7 @@
34#. type: Bullet: ' * '29#. type: Bullet: ' * '
35#: content/pages/faq.md:730#: content/pages/faq.md:7
36msgid "[Apps]({filename}apps.md)"31msgid "[Apps]({filename}apps.md)"
37msgstr ""32msgstr "[Apps]({filename}apps.es.md)"
3833
39#. type: Bullet: ' * '34#. type: Bullet: ' * '
40#: content/pages/faq.md:735#: content/pages/faq.md:7
@@ -42,18 +37,13 @@
42msgstr ""37msgstr ""
4338
44#. type: Plain text39#. type: Plain text
45#: content/pages/index.md:2
46msgid "Title: Welcome to Help for Ubuntu for devices!"
47msgstr ""
48
49#. type: Plain text
50#: content/pages/index.md:540#: content/pages/index.md:5
51msgid ""41msgid ""
52"The world-wide Ubuntu community wants to give you the best possible "42"The world-wide Ubuntu community wants to give you the best possible "
53"experience on your Ubuntu device. This is why we collected:"43"experience on your Ubuntu device. This is why we collected:"
54msgstr ""44msgstr ""
55"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible "45"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible"
56"en su dispositivo con Ubuntu. Por ello hemos recopilado:"46" en su dispositivo con Ubuntu. Por ello hemos recopilado:"
5747
58#. type: Bullet: ' * '48#. type: Bullet: ' * '
59#: content/pages/index.md:949#: content/pages/index.md:9
@@ -79,17 +69,12 @@
79#: content/pages/index.md:1269#: content/pages/index.md:12
80#, no-wrap70#, no-wrap
81msgid "[Take me to the FAQ!]({filename}faq.md) \n"71msgid "[Take me to the FAQ!]({filename}faq.md) \n"
82msgstr ""72msgstr "[Take me to the FAQ!]({filename}faq.es.md) \n"
8373
84#. type: Plain text74#. type: Plain text
85#: content/pages/index.md:1475#: content/pages/index.md:14
86msgid "[Get in touch]({filename}get-in-touch.md)"76msgid "[Get in touch]({filename}get-in-touch.md)"
87msgstr ""77msgstr "[Get in touch]({filename}get-in-touch.es.md)"
88
89#. type: Plain text
90#: content/pages/apps.md:2
91msgid "Title: FAQ - Apps"
92msgstr ""
9378
94#. type: Plain text79#. type: Plain text
95#: content/pages/apps.md:580#: content/pages/apps.md:5
@@ -128,11 +113,6 @@
128msgstr ""113msgstr ""
129114
130#. type: Plain text115#. type: Plain text
131#: content/pages/get-in-touch.md:2
132msgid "Title: Get in touch"
133msgstr ""
134
135#. type: Plain text
136#: content/pages/get-in-touch.md:7116#: content/pages/get-in-touch.md:7
137#, no-wrap117#, no-wrap
138msgid ""118msgid ""
@@ -151,3 +131,35 @@
151"out about all the individual teams in Ubuntu, what they do, where they hang "131"out about all the individual teams in Ubuntu, what they do, where they hang "
152"out and how to get involved."132"out and how to get involved."
153msgstr ""133msgstr ""
134
135#. type: Plain text
136#: content/pages/faq.md:2
137msgid "Get your questions answered."
138msgstr ""
139
140#. type: Plain text
141#: content/pages/index.md:2
142msgid "Welcome to Help for Ubuntu for devices!"
143msgstr ""
144
145#. type: Plain text
146#: content/pages/apps.md:2
147msgid "FAQ - Apps"
148msgstr ""
149
150#. type: Plain text
151#: content/pages/get-in-touch.md:2
152msgid "Get in touch"
153msgstr ""
154
155#~ msgid "Title: Get your questions answered."
156#~ msgstr ""
157
158#~ msgid "Title: Welcome to Help for Ubuntu for devices!"
159#~ msgstr ""
160
161#~ msgid "Title: FAQ - Apps"
162#~ msgstr ""
163
164#~ msgid "Title: Get in touch"
165#~ msgstr ""
154166
=== modified file 'edit-here/po/help.pot'
--- edit-here/po/help.pot 2015-03-03 12:37:30 +0000
+++ edit-here/po/help.pot 2015-03-05 09:35:04 +0000
@@ -7,7 +7,7 @@
7msgid ""7msgid ""
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"POT-Creation-Date: 2015-02-26 15:28+0100\n"10"POT-Creation-Date: 2015-03-05 10:31+0100\n"
11"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"11"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: LANGUAGE <LL@li.org>\n"13"Language-Team: LANGUAGE <LL@li.org>\n"
1414
=== modified file 'edit-here/translations.py'
--- edit-here/translations.py 2015-03-05 08:14:09 +0000
+++ edit-here/translations.py 2015-03-05 09:35:04 +0000
@@ -57,7 +57,7 @@
57 return ret57 return ret
5858
59 def gettextize(self, document_fns, pot_file):59 def gettextize(self, document_fns, pot_file):
60 args = []60 args = copy.copy(self.default_args)
61 for document_fn in document_fns:61 for document_fn in document_fns:
62 args += ['-m', document_fn]62 args += ['-m', document_fn]
63 args += [63 args += [
@@ -82,6 +82,9 @@
82 self.po_fn = po_fn82 self.po_fn = po_fn
83 self.pofile = polib.pofile(po_fn)83 self.pofile = polib.pofile(po_fn)
8484
85 def reread(self):
86 self.pofile = polib.pofile(self.po_fn)
87
85 def merge(self, pot_file_ob):88 def merge(self, pot_file_ob):
86 self.pofile.merge(pot_file_ob)89 self.pofile.merge(pot_file_ob)
8790
@@ -107,9 +110,11 @@
107 results = {}110 results = {}
108 for entry in self.find_in_msgid('Title: '):111 for entry in self.find_in_msgid('Title: '):
109 if entry.msgid.startswith('Title: '):112 if entry.msgid.startswith('Title: '):
110 if entry.linenum != 1:113 where = entry.occurrences[0][0]
111 print('Title line "%s" found, but at linenum "%s", '114 first_line = open(where).readline().strip()
112 'not 1.' % (entry.msgid, entry.linenum))115 if entry.msgid != first_line:
116 print('Title line "%s" found, but not on the first line '
117 'of "%s".' % (entry.msgid, entry.linenum))
113 return False118 return False
114 entry.msgid = entry.msgid.replace('Title: ', '')119 entry.msgid = entry.msgid.replace('Title: ', '')
115 fn = entry.occurrences[0][0]120 fn = entry.occurrences[0][0]
@@ -176,6 +181,7 @@
176 def generate_pot_file(self, documents):181 def generate_pot_file(self, documents):
177 if not self.po4a.gettextize(documents.docs, self.pot_fn):182 if not self.po4a.gettextize(documents.docs, self.pot_fn):
178 return False183 return False
184 self.pot_file_ob.reread()
179 if not self.pot_file_ob.replace_title_lines():185 if not self.pot_file_ob.replace_title_lines():
180 return False186 return False
181 for po_fn in self.langs:187 for po_fn in self.langs:

Subscribers

People subscribed via source and target branches