Ubuntu Developer Portal

Merge lp:~davidc3/developer-ubuntu-com/pip-cache-back-to-the-people into lp:developer-ubuntu-com

  1. pip-cache-back-to-the-people
  2. Merge into stable
Proposed by David Callé on 2015-08-13
Status: Merged
Approved by: Daniel Holbach on 2015-08-13
Approved revision: 128
Merged at revision: 128
Proposed branch: lp:~davidc3/developer-ubuntu-com/pip-cache-back-to-the-people
Merge into: lp:developer-ubuntu-com
Diff against target: 212 lines (+21/-57)
7 files modified
Makefile (+3/-3)
locale/de.po (+3/-13)
locale/developer_portal.pot (+5/-1)
locale/en_GB.po (+3/-13)
locale/es.po (+3/-13)
locale/zh_CN.po (+3/-13)
pip-cache-revno.txt (+1/-1)
To merge this branch: bzr merge lp:~davidc3/developer-ubuntu-com/pip-cache-back-to-the-people
Reviewer Review Type Date Requested Status
Daniel Holbach (community) 2015-08-13 Approve on 2015-08-13
Review via email: mp+267922@code.launchpad.net

Description of the Change

- Update pip-cache management to use a branch owned by the whole team
- commit new pip-cache-revno
- misc: translations

To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

Good work, comrade!

With socialist greetings, Daniel

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-08-11 13:12:21 +0000
3+++ Makefile 2015-08-13 09:17:33 +0000
4@@ -53,18 +53,18 @@
5 update-pip-cache:
6 @echo "Updating pip-cache"
7 rm -rf pip-cache
8- bzr branch lp:~mhall119/developer-ubuntu-com/dependencies pip-cache
9+ bzr branch lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
10 pip install --exists-action=w --download pip-cache/ -r requirements.txt
11 bzr add pip-cache/*
12 bzr commit pip-cache/ -m 'automatically updated devportal requirements'
13- bzr push --directory pip-cache lp:~mhall119/developer-ubuntu-com/dependencies
14+ bzr push --directory pip-cache lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies
15 bzr revno pip-cache > pip-cache-revno.txt
16 rm -rf pip-cache
17 @echo "** Remember to commit pip-cache-revno.txt"
18
19 pip-cache:
20 @echo "Downloading pip-cache"
21- bzr branch -r `cat pip-cache-revno.txt` lp:~mhall119/developer-ubuntu-com/dependencies pip-cache
22+ bzr branch -r `cat pip-cache-revno.txt` lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
23
24 translations:
25 @echo "Updating translations"
26
27=== modified file 'locale/de.po'
28--- locale/de.po 2015-08-12 06:35:33 +0000
29+++ locale/de.po 2015-08-13 09:17:33 +0000
30@@ -7,7 +7,7 @@
31 msgstr ""
32 "Project-Id-Version: developer-ubuntu-com\n"
33 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
34-"POT-Creation-Date: 2015-07-27 14:41+0000\n"
35+"POT-Creation-Date: 2015-04-24 09:17+0000\n"
36 "PO-Revision-Date: 2015-06-29 08:26+0000\n"
37 "Last-Translator: Daniel Holbach <daniel.holbach@ubuntu.com>\n"
38 "Language-Team: German <de@li.org>\n"
39@@ -15,23 +15,13 @@
40 "Content-Type: text/plain; charset=UTF-8\n"
41 "Content-Transfer-Encoding: 8bit\n"
42 "Plural-Forms: nplurals=2; plural=n != 1;\n"
43-"X-Launchpad-Export-Date: 2015-08-12 06:35+0000\n"
44-"X-Generator: Launchpad (build 17686)\n"
45+"X-Launchpad-Export-Date: 2015-07-22 05:50+0000\n"
46+"X-Generator: Launchpad (build 17628)\n"
47
48 #: developer_portal/cms_plugins.py:10
49 msgid "Raw HTML"
50 msgstr "Rohes HTML"
51
52-#: developer_portal/models.py:24
53-msgid "Launchpad branch location, ie: lp:snappy/15.04"
54-msgstr ""
55-
56-#: developer_portal/models.py:27
57-msgid ""
58-"Path alias we want to use for the docs, ie \"snappy/guides/15.04\" or "
59-"\"snappy/guides/latest\", etc."
60-msgstr ""
61-
62 #: developer_portal/settings.py:187 developer_portal/settings.py:195
63 msgid "English"
64 msgstr "Englisch"
65
66=== modified file 'locale/developer_portal.pot'
67--- locale/developer_portal.pot 2015-07-27 14:44:23 +0000
68+++ locale/developer_portal.pot 2015-08-13 09:17:33 +0000
69@@ -8,7 +8,7 @@
70 msgstr ""
71 "Project-Id-Version: PACKAGE VERSION\n"
72 "Report-Msgid-Bugs-To: \n"
73-"POT-Creation-Date: 2015-07-27 14:41+0000\n"
74+"POT-Creation-Date: 2015-08-13 09:13+0000\n"
75 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
76 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
77 "Language-Team: LANGUAGE <LL@li.org>\n"
78@@ -31,6 +31,10 @@
79 "\"snappy/guides/latest\", etc."
80 msgstr ""
81
82+#: developer_portal/models.py:32
83+msgid "File name of doc to be used as index document, ie \"intro.md\""
84+msgstr ""
85+
86 #: developer_portal/settings.py:187 developer_portal/settings.py:195
87 msgid "English"
88 msgstr ""
89
90=== modified file 'locale/en_GB.po'
91--- locale/en_GB.po 2015-08-12 06:35:33 +0000
92+++ locale/en_GB.po 2015-08-13 09:17:33 +0000
93@@ -7,7 +7,7 @@
94 msgstr ""
95 "Project-Id-Version: developer-ubuntu-com\n"
96 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
97-"POT-Creation-Date: 2015-07-27 14:41+0000\n"
98+"POT-Creation-Date: 2015-04-24 09:17+0000\n"
99 "PO-Revision-Date: 2015-03-05 13:55+0000\n"
100 "Last-Translator: Andi Chandler <Unknown>\n"
101 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
102@@ -15,23 +15,13 @@
103 "Content-Type: text/plain; charset=UTF-8\n"
104 "Content-Transfer-Encoding: 8bit\n"
105 "Plural-Forms: nplurals=2; plural=n != 1;\n"
106-"X-Launchpad-Export-Date: 2015-08-12 06:35+0000\n"
107-"X-Generator: Launchpad (build 17686)\n"
108+"X-Launchpad-Export-Date: 2015-07-22 05:50+0000\n"
109+"X-Generator: Launchpad (build 17628)\n"
110
111 #: developer_portal/cms_plugins.py:10
112 msgid "Raw HTML"
113 msgstr ""
114
115-#: developer_portal/models.py:24
116-msgid "Launchpad branch location, ie: lp:snappy/15.04"
117-msgstr ""
118-
119-#: developer_portal/models.py:27
120-msgid ""
121-"Path alias we want to use for the docs, ie \"snappy/guides/15.04\" or "
122-"\"snappy/guides/latest\", etc."
123-msgstr ""
124-
125 #: developer_portal/settings.py:187 developer_portal/settings.py:195
126 msgid "English"
127 msgstr "English"
128
129=== modified file 'locale/es.po'
130--- locale/es.po 2015-08-12 06:35:33 +0000
131+++ locale/es.po 2015-08-13 09:17:33 +0000
132@@ -7,7 +7,7 @@
133 msgstr ""
134 "Project-Id-Version: developer-ubuntu-com\n"
135 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
136-"POT-Creation-Date: 2015-07-27 14:41+0000\n"
137+"POT-Creation-Date: 2015-04-24 09:17+0000\n"
138 "PO-Revision-Date: 2015-01-07 06:38+0000\n"
139 "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
140 "Language-Team: Spanish <es@li.org>\n"
141@@ -15,23 +15,13 @@
142 "Content-Type: text/plain; charset=UTF-8\n"
143 "Content-Transfer-Encoding: 8bit\n"
144 "Plural-Forms: nplurals=2; plural=n != 1;\n"
145-"X-Launchpad-Export-Date: 2015-08-12 06:35+0000\n"
146-"X-Generator: Launchpad (build 17686)\n"
147+"X-Launchpad-Export-Date: 2015-07-22 05:50+0000\n"
148+"X-Generator: Launchpad (build 17628)\n"
149
150 #: developer_portal/cms_plugins.py:10
151 msgid "Raw HTML"
152 msgstr ""
153
154-#: developer_portal/models.py:24
155-msgid "Launchpad branch location, ie: lp:snappy/15.04"
156-msgstr ""
157-
158-#: developer_portal/models.py:27
159-msgid ""
160-"Path alias we want to use for the docs, ie \"snappy/guides/15.04\" or "
161-"\"snappy/guides/latest\", etc."
162-msgstr ""
163-
164 #: developer_portal/settings.py:187 developer_portal/settings.py:195
165 msgid "English"
166 msgstr "Inglés"
167
168=== modified file 'locale/zh_CN.po'
169--- locale/zh_CN.po 2015-08-12 06:35:33 +0000
170+++ locale/zh_CN.po 2015-08-13 09:17:33 +0000
171@@ -7,7 +7,7 @@
172 msgstr ""
173 "Project-Id-Version: developer-ubuntu-com\n"
174 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
175-"POT-Creation-Date: 2015-07-27 14:41+0000\n"
176+"POT-Creation-Date: 2015-04-24 09:17+0000\n"
177 "PO-Revision-Date: 2015-03-16 11:06+0000\n"
178 "Last-Translator: F.J Kong <fanjun.kong@canonical.com>\n"
179 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
180@@ -15,23 +15,13 @@
181 "Content-Type: text/plain; charset=UTF-8\n"
182 "Content-Transfer-Encoding: 8bit\n"
183 "Plural-Forms: nplurals=1; plural=0;\n"
184-"X-Launchpad-Export-Date: 2015-08-12 06:35+0000\n"
185-"X-Generator: Launchpad (build 17686)\n"
186+"X-Launchpad-Export-Date: 2015-07-22 05:50+0000\n"
187+"X-Generator: Launchpad (build 17628)\n"
188
189 #: developer_portal/cms_plugins.py:10
190 msgid "Raw HTML"
191 msgstr "原始 HTML"
192
193-#: developer_portal/models.py:24
194-msgid "Launchpad branch location, ie: lp:snappy/15.04"
195-msgstr ""
196-
197-#: developer_portal/models.py:27
198-msgid ""
199-"Path alias we want to use for the docs, ie \"snappy/guides/15.04\" or "
200-"\"snappy/guides/latest\", etc."
201-msgstr ""
202-
203 #: developer_portal/settings.py:187 developer_portal/settings.py:195
204 msgid "English"
205 msgstr "英语"
206
207=== modified file 'pip-cache-revno.txt'
208--- pip-cache-revno.txt 2015-04-16 14:20:11 +0000
209+++ pip-cache-revno.txt 2015-08-13 09:17:33 +0000
210@@ -1,1 +1,1 @@
211-9
212+11

Subscribers

People subscribed via source and target branches