Merge lp:~danilo/launchpad/bug-427843 into lp:launchpad
- bug-427843
- Merge into devel
Proposed by
Данило Шеган
Status: | Merged |
---|---|
Approved by: | Aaron Bentley |
Approved revision: | no longer in the source branch. |
Merged at revision: | not available |
Proposed branch: | lp:~danilo/launchpad/bug-427843 |
Merge into: | lp:launchpad |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~danilo/launchpad/bug-427843 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Aaron Bentley (community) | Approve | ||
Review via email: mp+11697@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote : | # |
Revision history for this message
Aaron Bentley (abentley) wrote : | # |
Looks pretty straightforward.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'lib/lp/translations/browser/configure.zcml' | |||
2 | --- lib/lp/translations/browser/configure.zcml 2009-09-11 10:55:54 +0000 | |||
3 | +++ lib/lp/translations/browser/configure.zcml 2009-09-13 20:24:35 +0000 | |||
4 | @@ -887,6 +887,13 @@ | |||
5 | 887 | permission="launchpad.TranslationsAdmin" | 887 | permission="launchpad.TranslationsAdmin" |
6 | 888 | template="../../app/templates/generic-edit.pt" | 888 | template="../../app/templates/generic-edit.pt" |
7 | 889 | layer="canonical.launchpad.layers.TranslationsLayer"/> | 889 | layer="canonical.launchpad.layers.TranslationsLayer"/> |
8 | 890 | <!-- Language pack admin portlet --> | ||
9 | 891 | <browser:page | ||
10 | 892 | name="+language-pack-admin-info" | ||
11 | 893 | for="lp.registry.interfaces.distribution.IDistribution" | ||
12 | 894 | permission="launchpad.View" | ||
13 | 895 | template="../templates/distribution-language-pack-admin-info.pt" | ||
14 | 896 | layer="canonical.launchpad.layers.TranslationsLayer"/> | ||
15 | 890 | 897 | ||
16 | 891 | <!-- DistroSeries --> | 898 | <!-- DistroSeries --> |
17 | 892 | 899 | ||
18 | 893 | 900 | ||
19 | === modified file 'lib/lp/translations/browser/distroseries.py' | |||
20 | --- lib/lp/translations/browser/distroseries.py 2009-08-31 13:49:49 +0000 | |||
21 | +++ lib/lp/translations/browser/distroseries.py 2009-09-13 20:24:35 +0000 | |||
22 | @@ -248,6 +248,10 @@ | |||
23 | 248 | def potemplates(self): | 248 | def potemplates(self): |
24 | 249 | return list(self.context.getCurrentTranslationTemplates()) | 249 | return list(self.context.getCurrentTranslationTemplates()) |
25 | 250 | 250 | ||
26 | 251 | @property | ||
27 | 252 | def is_translation_focus(self): | ||
28 | 253 | """Is this DistroSeries the translation focus.""" | ||
29 | 254 | return self.context.distribution.translation_focus == self.context | ||
30 | 251 | 255 | ||
31 | 252 | class DistroSeriesTranslationsMenu(NavigationMenu): | 256 | class DistroSeriesTranslationsMenu(NavigationMenu): |
32 | 253 | 257 | ||
33 | 254 | 258 | ||
34 | === modified file 'lib/lp/translations/stories/distribution/xx-distribution-change-language-pack-admins.txt' | |||
35 | --- lib/lp/translations/stories/distribution/xx-distribution-change-language-pack-admins.txt 2009-08-13 19:03:36 +0000 | |||
36 | +++ lib/lp/translations/stories/distribution/xx-distribution-change-language-pack-admins.txt 2009-09-14 13:47:28 +0000 | |||
37 | @@ -7,7 +7,7 @@ | |||
38 | 7 | 7 | ||
39 | 8 | >>> browser = setupBrowser(auth='Basic test@canonical.com:test') | 8 | >>> browser = setupBrowser(auth='Basic test@canonical.com:test') |
40 | 9 | >>> browser.open('http://translations.launchpad.dev/ubuntu/') | 9 | >>> browser.open('http://translations.launchpad.dev/ubuntu/') |
42 | 10 | >>> browser.getLink('Language pack admin') | 10 | >>> browser.getLink('Set language pack administrator') |
43 | 11 | Traceback (most recent call last): | 11 | Traceback (most recent call last): |
44 | 12 | ... | 12 | ... |
45 | 13 | LinkNotFoundError | 13 | LinkNotFoundError |
46 | @@ -22,7 +22,7 @@ | |||
47 | 22 | 22 | ||
48 | 23 | >>> browser = setupBrowser(auth='Basic mark@example.com:test') | 23 | >>> browser = setupBrowser(auth='Basic mark@example.com:test') |
49 | 24 | >>> browser.open('http://translations.launchpad.dev/ubuntu/') | 24 | >>> browser.open('http://translations.launchpad.dev/ubuntu/') |
51 | 25 | >>> browser.getLink('Language pack admin').click() | 25 | >>> browser.getLink('Set language pack administrator').click() |
52 | 26 | 26 | ||
53 | 27 | Current value is empty. | 27 | Current value is empty. |
54 | 28 | 28 | ||
55 | 29 | 29 | ||
56 | === modified file 'lib/lp/translations/stories/distribution/xx-distribution-translations.txt' | |||
57 | --- lib/lp/translations/stories/distribution/xx-distribution-translations.txt 2009-08-23 05:28:49 +0000 | |||
58 | +++ lib/lp/translations/stories/distribution/xx-distribution-translations.txt 2009-09-14 13:47:28 +0000 | |||
59 | @@ -52,7 +52,7 @@ | |||
60 | 52 | And the other Ubuntu distributions should be there too. | 52 | And the other Ubuntu distributions should be there too. |
61 | 53 | 53 | ||
62 | 54 | >>> content = find_main_content(browser.contents) | 54 | >>> content = find_main_content(browser.contents) |
64 | 55 | >>> print extract_text(content.findAll('h2')[1]) | 55 | >>> print extract_text(content.findAll('h2')[2]) |
65 | 56 | Other versions of Ubuntu | 56 | Other versions of Ubuntu |
66 | 57 | 57 | ||
67 | 58 | >>> print extract_text(content.find(id='distroseries-list')) | 58 | >>> print extract_text(content.find(id='distroseries-list')) |
68 | @@ -94,7 +94,7 @@ | |||
69 | 94 | And the other Ubuntu distributions should be there too. | 94 | And the other Ubuntu distributions should be there too. |
70 | 95 | 95 | ||
71 | 96 | >>> content = find_main_content(browser.contents) | 96 | >>> content = find_main_content(browser.contents) |
73 | 97 | >>> print extract_text(content.findAll('h2')[1]) | 97 | >>> print extract_text(content.findAll('h2')[2]) |
74 | 98 | Other versions of Debian | 98 | Other versions of Debian |
75 | 99 | 99 | ||
76 | 100 | >>> print extract_text(content.find(id='distroseries-list')) | 100 | >>> print extract_text(content.find(id='distroseries-list')) |
77 | 101 | 101 | ||
78 | === modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt' | |||
79 | --- lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt 2009-09-01 21:12:37 +0000 | |||
80 | +++ lib/lp/translations/stories/distroseries/xx-distroseries-language-packs.txt 2009-09-14 13:54:29 +0000 | |||
81 | @@ -16,7 +16,7 @@ | |||
82 | 16 | 16 | ||
83 | 17 | >>> admin_browser.open( | 17 | >>> admin_browser.open( |
84 | 18 | ... 'http://translations.launchpad.dev/ubuntu/hoary') | 18 | ... 'http://translations.launchpad.dev/ubuntu/hoary') |
86 | 19 | >>> admin_browser.getLink('Language packs').click() | 19 | >>> admin_browser.getLink('See all language packs').click() |
87 | 20 | 20 | ||
88 | 21 | Initially, there is no package selected. | 21 | Initially, there is no package selected. |
89 | 22 | 22 | ||
90 | @@ -50,7 +50,7 @@ | |||
91 | 50 | Also, that change is shown in the public language pack listing web page: | 50 | Also, that change is shown in the public language pack listing web page: |
92 | 51 | 51 | ||
93 | 52 | >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary') | 52 | >>> browser.open('http://translations.launchpad.dev/ubuntu/hoary') |
95 | 53 | >>> browser.getLink('Language packs').click() | 53 | >>> browser.getLink('See all language packs').click() |
96 | 54 | >>> print extract_text(find_tag_by_id(browser.contents, "language_packs")) | 54 | >>> print extract_text(find_tag_by_id(browser.contents, "language_packs")) |
97 | 55 | Language packs for Ubuntu 5.04 | 55 | Language packs for Ubuntu 5.04 |
98 | 56 | ... | 56 | ... |
99 | 57 | 57 | ||
100 | === modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt' | |||
101 | --- lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt 2009-07-16 14:40:28 +0000 | |||
102 | +++ lib/lp/translations/stories/distroseries/xx-distroseries-templates.txt 2009-09-14 13:54:29 +0000 | |||
103 | @@ -11,14 +11,14 @@ | |||
104 | 11 | 11 | ||
105 | 12 | >>> user_browser.open( | 12 | >>> user_browser.open( |
106 | 13 | ... 'http://translations.launchpad.dev/ubuntu/hoary') | 13 | ... 'http://translations.launchpad.dev/ubuntu/hoary') |
108 | 14 | >>> user_browser.getLink('Templates') | 14 | >>> user_browser.getLink('full list of templates') |
109 | 15 | Traceback (most recent call last): | 15 | Traceback (most recent call last): |
110 | 16 | ... | 16 | ... |
111 | 17 | LinkNotFoundError | 17 | LinkNotFoundError |
112 | 18 | 18 | ||
113 | 19 | >>> admin_browser.open( | 19 | >>> admin_browser.open( |
114 | 20 | ... 'http://translations.launchpad.dev/ubuntu/hoary') | 20 | ... 'http://translations.launchpad.dev/ubuntu/hoary') |
116 | 21 | >>> admin_browser.getLink('Templates').click() | 21 | >>> admin_browser.getLink('full list of templates').click() |
117 | 22 | >>> print admin_browser.url | 22 | >>> print admin_browser.url |
118 | 23 | http://translations.launchpad.dev/ubuntu/hoary/+templates | 23 | http://translations.launchpad.dev/ubuntu/hoary/+templates |
119 | 24 | 24 | ||
120 | 25 | 25 | ||
121 | === modified file 'lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt' | |||
122 | --- lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt 2009-07-16 13:28:25 +0000 | |||
123 | +++ lib/lp/translations/stories/distroseries/xx-distroseries-translations.txt 2009-09-14 13:54:29 +0000 | |||
124 | @@ -50,7 +50,7 @@ | |||
125 | 50 | Launchpad has an option to hide all of the translations for a distribution | 50 | Launchpad has an option to hide all of the translations for a distribution |
126 | 51 | series. The link to hide translations is not available to anonymous users: | 51 | series. The link to hide translations is not available to anonymous users: |
127 | 52 | 52 | ||
129 | 53 | >>> anon_browser.getLink('Settings') | 53 | >>> anon_browser.getLink('Change settings') |
130 | 54 | Traceback (most recent call last): | 54 | Traceback (most recent call last): |
131 | 55 | ... | 55 | ... |
132 | 56 | LinkNotFoundError | 56 | LinkNotFoundError |
133 | @@ -67,7 +67,7 @@ | |||
134 | 67 | 67 | ||
135 | 68 | >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary') | 68 | >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary') |
136 | 69 | 69 | ||
138 | 70 | >>> admin_browser.getLink('Settings').click() | 70 | >>> admin_browser.getLink('Change settings').click() |
139 | 71 | 71 | ||
140 | 72 | Once the administrator hides all translations... | 72 | Once the administrator hides all translations... |
141 | 73 | 73 | ||
142 | @@ -151,7 +151,7 @@ | |||
143 | 151 | form where we hide all translations and an admin is able to change it: | 151 | form where we hide all translations and an admin is able to change it: |
144 | 152 | 152 | ||
145 | 153 | >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary') | 153 | >>> admin_browser.open('http://translations.launchpad.dev/ubuntu/hoary') |
147 | 154 | >>> admin_browser.getLink('Settings').click() | 154 | >>> admin_browser.getLink('Change settings').click() |
148 | 155 | >>> admin_browser.getControl( | 155 | >>> admin_browser.getControl( |
149 | 156 | ... 'Defer translation imports').selected | 156 | ... 'Defer translation imports').selected |
150 | 157 | False | 157 | False |
151 | @@ -163,7 +163,7 @@ | |||
152 | 163 | 163 | ||
153 | 164 | Once the system accepts the submission, we can see such change applied. | 164 | Once the system accepts the submission, we can see such change applied. |
154 | 165 | 165 | ||
156 | 166 | >>> admin_browser.getLink('Settings').click() | 166 | >>> admin_browser.getLink('Change settings').click() |
157 | 167 | >>> admin_browser.getControl( | 167 | >>> admin_browser.getControl( |
158 | 168 | ... 'Defer translation imports').selected | 168 | ... 'Defer translation imports').selected |
159 | 169 | True | 169 | True |
160 | 170 | 170 | ||
161 | === modified file 'lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt' | |||
162 | --- lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt 2009-09-10 18:35:28 +0000 | |||
163 | +++ lib/lp/translations/stories/importqueue/xx-translation-import-queue-targets.txt 2009-09-14 13:54:29 +0000 | |||
164 | @@ -10,7 +10,7 @@ | |||
165 | 10 | The import queue is linked from the translations page for distribution. | 10 | The import queue is linked from the translations page for distribution. |
166 | 11 | 11 | ||
167 | 12 | >>> user_browser.open('http://translations.launchpad.dev/ubuntu') | 12 | >>> user_browser.open('http://translations.launchpad.dev/ubuntu') |
169 | 13 | >>> user_browser.getLink('Import queue').click() | 13 | >>> user_browser.getLink('Ubuntu import queue').click() |
170 | 14 | 14 | ||
171 | 15 | There is no content for Ubuntu. | 15 | There is no content for Ubuntu. |
172 | 16 | 16 | ||
173 | @@ -30,7 +30,7 @@ | |||
174 | 30 | The import queue is linked from the translations page for distribution series. | 30 | The import queue is linked from the translations page for distribution series. |
175 | 31 | 31 | ||
176 | 32 | >>> user_browser.open('http://translations.launchpad.dev/ubuntu/hoary') | 32 | >>> user_browser.open('http://translations.launchpad.dev/ubuntu/hoary') |
178 | 33 | >>> user_browser.getLink('Import queue').click() | 33 | >>> user_browser.getLink('Hoary import queue').click() |
179 | 34 | 34 | ||
180 | 35 | And obviously, given that the ubuntu distribution had no content, Hoary, an | 35 | And obviously, given that the ubuntu distribution had no content, Hoary, an |
181 | 36 | Ubuntu distro series has also no content. | 36 | Ubuntu distro series has also no content. |
182 | 37 | 37 | ||
183 | === modified file 'lib/lp/translations/stories/translationgroups/10-distro-translation-group.txt' | |||
184 | --- lib/lp/translations/stories/translationgroups/10-distro-translation-group.txt 2009-08-31 22:13:07 +0000 | |||
185 | +++ lib/lp/translations/stories/translationgroups/10-distro-translation-group.txt 2009-09-14 13:47:28 +0000 | |||
186 | @@ -26,14 +26,14 @@ | |||
187 | 26 | >>> ubuntu_owner_browser = setupBrowser( | 26 | >>> ubuntu_owner_browser = setupBrowser( |
188 | 27 | ... auth='Basic colin.watson@ubuntulinux.com:test') | 27 | ... auth='Basic colin.watson@ubuntulinux.com:test') |
189 | 28 | >>> ubuntu_owner_browser.open(anon_browser.url) | 28 | >>> ubuntu_owner_browser.open(anon_browser.url) |
191 | 29 | >>> ubuntu_owner_browser.getLink('Settings').click() | 29 | >>> ubuntu_owner_browser.getLink('Change permissions').click() |
192 | 30 | >>> print ubuntu_owner_browser.title | 30 | >>> print ubuntu_owner_browser.title |
193 | 31 | Set translation permissions for Ubuntu | 31 | Set translation permissions for Ubuntu |
194 | 32 | 32 | ||
195 | 33 | Other users cannot access this page, nor see the menu link to it. | 33 | Other users cannot access this page, nor see the menu link to it. |
196 | 34 | 34 | ||
197 | 35 | >>> user_browser.open(anon_browser.url) | 35 | >>> user_browser.open(anon_browser.url) |
199 | 36 | >>> user_browser.getLink('Settings').click() | 36 | >>> user_browser.getLink('Change permissions').click() |
200 | 37 | Traceback (most recent call last): | 37 | Traceback (most recent call last): |
201 | 38 | ... | 38 | ... |
202 | 39 | LinkNotFoundError | 39 | LinkNotFoundError |
203 | 40 | 40 | ||
204 | === added file 'lib/lp/translations/templates/distribution-language-pack-admin-info.pt' | |||
205 | --- lib/lp/translations/templates/distribution-language-pack-admin-info.pt 1970-01-01 00:00:00 +0000 | |||
206 | +++ lib/lp/translations/templates/distribution-language-pack-admin-info.pt 2009-09-13 20:24:35 +0000 | |||
207 | @@ -0,0 +1,30 @@ | |||
208 | 1 | <tal:root | ||
209 | 2 | xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
210 | 3 | xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
211 | 4 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | ||
212 | 5 | omit-tag=""> | ||
213 | 6 | |||
214 | 7 | <p tal:condition="context/language_pack_admin"> | ||
215 | 8 | Language packs are administered by | ||
216 | 9 | <span tal:replace="structure | ||
217 | 10 | context/language_pack_admin/fmt:link" | ||
218 | 11 | >Mr. No | ||
219 | 12 | </span>. | ||
220 | 13 | <tal:admin | ||
221 | 14 | condition="context/required:launchpad.Edit"> | ||
222 | 15 | <a tal:attributes=" | ||
223 | 16 | href | ||
224 | 17 | context/fmt:url/+select-language-pack-admin" | ||
225 | 18 | class="edit sprite"></a> | ||
226 | 19 | </tal:admin> | ||
227 | 20 | </p> | ||
228 | 21 | <tal:admin | ||
229 | 22 | condition="context/required:launchpad.Edit"> | ||
230 | 23 | <p tal:condition="not:context/language_pack_admin"> | ||
231 | 24 | <a tal:attributes=" | ||
232 | 25 | href | ||
233 | 26 | context/fmt:url/+select-language-pack-admin" | ||
234 | 27 | class="edit sprite">Set language pack administrator</a> | ||
235 | 28 | </p> | ||
236 | 29 | </tal:admin> | ||
237 | 30 | </tal:root> | ||
238 | 0 | 31 | ||
239 | === modified file 'lib/lp/translations/templates/distribution-translations.pt' | |||
240 | --- lib/lp/translations/templates/distribution-translations.pt 2009-07-17 17:59:07 +0000 | |||
241 | +++ lib/lp/translations/templates/distribution-translations.pt 2009-09-13 20:24:35 +0000 | |||
242 | @@ -3,59 +3,69 @@ | |||
243 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
244 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
245 | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" | 5 | xmlns:i18n="http://xml.zope.org/namespaces/i18n" |
251 | 6 | xml:lang="en" | 6 | metal:use-macro="view/macro:page/main_only" |
252 | 7 | lang="en" | 7 | > |
248 | 8 | dir="ltr" | ||
249 | 9 | metal:use-macro="view/macro:page/onecolumn" | ||
250 | 10 | i18n:domain="launchpad" > | ||
253 | 11 | 8 | ||
254 | 12 | <body> | 9 | <body> |
255 | 13 | <div metal:fill-slot="main"> | 10 | <div metal:fill-slot="main"> |
256 | 11 | <ul class="helplinks"> | ||
257 | 12 | <li> | ||
258 | 13 | <a href="https://help.launchpad.net/Translations" | ||
259 | 14 | id="link-to-translations-help" | ||
260 | 15 | >Help for translations | ||
261 | 16 | </a> | ||
262 | 17 | </li> | ||
263 | 18 | </ul> | ||
264 | 14 | <h1>Translations</h1> | 19 | <h1>Translations</h1> |
265 | 15 | 20 | ||
309 | 16 | <ul class="helplinks"> | 21 | <tal:translation_focus condition="view/translation_focus" |
310 | 17 | <li> | 22 | define="target view/translation_focus"> |
311 | 18 | <a href="https://help.launchpad.net/Translations" | 23 | |
312 | 19 | id="link-to-translations-help" | 24 | <div class="top-portlet"> |
313 | 20 | >Help for translations | 25 | <p> |
314 | 21 | </a> | 26 | Launchpad currently recommends translating |
315 | 22 | </li> | 27 | <tal:target replace="structure target/fmt:link/+translations" |
316 | 23 | </ul> | 28 | >trunk</tal:target>. |
317 | 24 | <tal:translation_focus condition="view/translation_focus"> | 29 | </p> |
318 | 25 | <p> | 30 | </div> |
319 | 26 | The current translation focus for | 31 | <div class="yui-g"> |
320 | 27 | <span tal:replace="context/displayname">Ubuntu</span> is | 32 | <div class="yui-u first"> |
321 | 28 | <span tal:replace="view/translation_focus/version">6.06</span> | 33 | <div class="portlet"> |
322 | 29 | (<span tal:replace="view/translation_focus/displayname">Dapper</span>), | 34 | <h3>Permissions</h3> |
323 | 30 | and we encourage you to translate it first. | 35 | <p> |
324 | 31 | </p> | 36 | <tal:permissions replace=" |
325 | 32 | <p id="translation-permissions"> | 37 | structure |
326 | 33 | <tal:distro replace="context/displayname">This | 38 | context/@@+portlet-translation-groups-and-permission"/> |
327 | 34 | distribution</tal:distro> is translated | 39 | </p> |
328 | 35 | <tal:hasgroup condition="context/translationgroup">by | 40 | </div> |
329 | 36 | <a tal:attributes="href context/translationgroup/fmt:url" | 41 | </div> |
330 | 37 | tal:content="context/translationgroup/title">translators</a> | 42 | <div class="yui-u"> |
331 | 38 | </tal:hasgroup> | 43 | <div class="portlet"> |
332 | 39 | with <a target="help" href="/+help/permissions-policies.html" | 44 | <h3>Administration</h3> |
333 | 40 | tal:content="context/translationpermission/title">certain</a> | 45 | <p>To see all the translation files that are waiting to be |
334 | 41 | permissions. | 46 | imported, please look at |
335 | 42 | <tal:permissions condition="context/required:launchpad.Edit"> | 47 | <a tal:attributes="href context/fmt:url/+imports" |
336 | 43 | You can modify permissions on the | 48 | tal:content="string:${context/displayname} import queue"> |
337 | 44 | <a | 49 | import queue</a>. |
338 | 45 | tal:define="link context/menu:navigation/settings" | 50 | </p> |
339 | 46 | tal:attributes="href link/url" | 51 | |
340 | 47 | >Settings</a> page. | 52 | <div tal:replace="structure |
341 | 48 | </tal:permissions> | 53 | context/@@+language-pack-admin-info" /> |
342 | 49 | </p> | 54 | </div> |
343 | 50 | 55 | </div> | |
344 | 51 | <h2> | 56 | </div> |
345 | 52 | <span tal:replace="view/translation_focus/version">5.04</span>: | 57 | |
346 | 53 | <span tal:replace="view/translation_focus/title"> | 58 | <h2> |
347 | 54 | Hoary Hedgehog | 59 | <span tal:replace="view/translation_focus/version">5.04</span>: |
348 | 55 | </span> | 60 | <span tal:replace="view/translation_focus/title"> |
349 | 56 | </h2> | 61 | Hoary Hedgehog |
350 | 57 | <div tal:replace="structure view/translation_focus/@@+langchart" /> | 62 | </span> |
351 | 58 | </tal:translation_focus> | 63 | </h2> |
352 | 64 | <div tal:replace="structure view/translation_focus/@@+langchart" /> | ||
353 | 65 | <div class="translations-legend"> | ||
354 | 66 | <div tal:replace="structure context/@@+rosetta-status-legend" /> | ||
355 | 67 | </div> | ||
356 | 68 | </tal:translation_focus> | ||
357 | 59 | 69 | ||
358 | 60 | <tal:secondary condition="view/secondary_translatable_serieses"> | 70 | <tal:secondary condition="view/secondary_translatable_serieses"> |
359 | 61 | <h2 tal:condition="view/translation_focus"> | 71 | <h2 tal:condition="view/translation_focus"> |
360 | 62 | 72 | ||
361 | === modified file 'lib/lp/translations/templates/distroseries-translations.pt' | |||
362 | --- lib/lp/translations/templates/distroseries-translations.pt 2009-07-17 17:59:07 +0000 | |||
363 | +++ lib/lp/translations/templates/distroseries-translations.pt 2009-09-13 20:24:35 +0000 | |||
364 | @@ -2,33 +2,140 @@ | |||
365 | 2 | xmlns="http://www.w3.org/1999/xhtml" | 2 | xmlns="http://www.w3.org/1999/xhtml" |
366 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" |
367 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" |
372 | 5 | xml:lang="en" | 5 | metal:use-macro="view/macro:page/main_only"> |
369 | 6 | lang="en" | ||
370 | 7 | dir="ltr" | ||
371 | 8 | metal:use-macro="view/macro:page/onecolumn"> | ||
373 | 9 | 6 | ||
374 | 10 | <body> | 7 | <body> |
397 | 11 | <div metal:fill-slot="main"> | 8 | <div metal:fill-slot="main"> |
398 | 12 | <ul class="helplinks"> | 9 | <ul class="helplinks"> |
399 | 13 | <li> | 10 | <li> |
400 | 14 | <a href="https://help.launchpad.net/Translations" | 11 | <a href="https://help.launchpad.net/Translations" |
401 | 15 | id="link-to-translations-help" | 12 | id="link-to-translations-help" |
402 | 16 | >Help for translations | 13 | >Help for translations |
403 | 17 | </a> | 14 | </a> |
404 | 18 | </li> | 15 | </li> |
405 | 19 | </ul> | 16 | </ul> |
406 | 20 | <h1>Translation status by language</h1> | 17 | <h1>Translation status by language</h1> |
407 | 21 | 18 | ||
408 | 22 | <div tal:replace="structure context/@@+langchart" /> | 19 | <div class="top-portlet"> |
409 | 23 | <div tal:replace="structure context/@@+rosetta-status-legend" /> | 20 | <p tal:condition="not:view/is_translation_focus"> |
410 | 24 | 21 | Launchpad currently recommends translating | |
411 | 25 | <ul> | 22 | <tal:target replace=" |
412 | 26 | <li class="edit"> | 23 | structure |
413 | 27 | <a href="/+editmylanguages">Customize displayed languages</a> | 24 | context/distribution/translation_focus/fmt:link/+translations" |
414 | 28 | </li> | 25 | >Hoary</tal:target>. |
415 | 29 | </ul> | 26 | </p> |
416 | 30 | 27 | <p tal:condition="view/is_translation_focus"> | |
417 | 31 | </div> | 28 | <tal:target replace="context/displayname">Hoary</tal:target> is |
418 | 32 | </body> | 29 | the current translation focus for |
419 | 30 | <tal:distro replace="structure context/distribution/fmt:link"> | ||
420 | 31 | Ubuntu | ||
421 | 32 | </tal:distro>. | ||
422 | 33 | </p> | ||
423 | 34 | </div> | ||
424 | 35 | <div class="yui-g"> | ||
425 | 36 | <div class="yui-u first"> | ||
426 | 37 | <div class="portlet"> | ||
427 | 38 | <h3>Permissions</h3> | ||
428 | 39 | <p> | ||
429 | 40 | <tal:permissions replace=" | ||
430 | 41 | structure | ||
431 | 42 | context/distribution/@@+portlet-translation-groups-and-permission"/> | ||
432 | 43 | </p> | ||
433 | 44 | </div> | ||
434 | 45 | </div> | ||
435 | 46 | <div class="yui-u"> | ||
436 | 47 | <div class="portlet"> | ||
437 | 48 | <h3>Administration</h3> | ||
438 | 49 | <p>Translation files that are waiting to be imported are shown in | ||
439 | 50 | the | ||
440 | 51 | <a tal:attributes="href context/fmt:url/+imports" | ||
441 | 52 | tal:content="string:${context/displayname} import queue"> | ||
442 | 53 | import queue</a>. | ||
443 | 54 | </p> | ||
444 | 55 | <p tal:condition="context/required:launchpad.Edit"> | ||
445 | 56 | To manage all the translation templates in | ||
446 | 57 | <tal:series replace="context/displayname">Hoary</tal:series>, | ||
447 | 58 | see the | ||
448 | 59 | <a tal:attributes="href context/menu:navigation/templates/url"> | ||
449 | 60 | full list of templates</a>. | ||
450 | 61 | </p> | ||
451 | 62 | <p> | ||
452 | 63 | <tal:series replace="context/displayname">Hoary</tal:series> | ||
453 | 64 | translations are | ||
454 | 65 | <em tal:condition="not:context/hide_all_translations"> | ||
455 | 66 | visible to everyone<!-- | ||
456 | 67 | --></em><em tal:condition="context/hide_all_translations"> | ||
457 | 68 | hidden from everyone but translation admins</em>. | ||
458 | 69 | Import queue is | ||
459 | 70 | <em tal:condition="not:context/defer_translation_imports"> | ||
460 | 71 | active<!-- | ||
461 | 72 | --></em><em tal:condition="context/defer_translation_imports"> | ||
462 | 73 | currently halted for | ||
463 | 74 | <tal:series replace="context/displayname"> | ||
464 | 75 | Hoary | ||
465 | 76 | </tal:series></em>. | ||
466 | 77 | <a tal:attributes="href context/menu:navigation/admin/url" | ||
467 | 78 | tal:condition="context/required:launchpad.TranslationsAdmin" | ||
468 | 79 | class="edit sprite"> | ||
469 | 80 | Change settings | ||
470 | 81 | </a> | ||
471 | 82 | </p> | ||
472 | 83 | </div> | ||
473 | 84 | </div> | ||
474 | 85 | |||
475 | 86 | <div class="yui-u first"> | ||
476 | 87 | <div class="portlet"> | ||
477 | 88 | <h3>Language packs</h3> | ||
478 | 89 | |||
479 | 90 | <div tal:replace=" | ||
480 | 91 | structure | ||
481 | 92 | context/distribution/@@+language-pack-admin-info" /> | ||
482 | 93 | |||
483 | 94 | <div> | ||
484 | 95 | <strong>Current base pack:</strong> | ||
485 | 96 | <a tal:condition="context/language_pack_base" | ||
486 | 97 | tal:attributes="href context/language_pack_base/file/http_url"> | ||
487 | 98 | <tal:export-date | ||
488 | 99 | replace="context/language_pack_base/date_exported/fmt:datetime" /> | ||
489 | 100 | <img tal:condition="context/language_pack_base" | ||
490 | 101 | alt="download icon" src="/@@/download" /> | ||
491 | 102 | </a> | ||
492 | 103 | <tal:not-export-date condition="not: context/language_pack_base"> | ||
493 | 104 | none yet | ||
494 | 105 | </tal:not-export-date> | ||
495 | 106 | </div> | ||
496 | 107 | <div> | ||
497 | 108 | <strong>Update pack:</strong> | ||
498 | 109 | <a tal:condition="context/language_pack_delta" | ||
499 | 110 | tal:attributes="href context/language_pack_delta/file/http_url"> | ||
500 | 111 | <tal:export-date | ||
501 | 112 | replace="context/language_pack_delta/date_exported/fmt:datetime" /> | ||
502 | 113 | <img tal:condition="context/language_pack_delta" | ||
503 | 114 | alt="download icon" src="/@@/download" /> | ||
504 | 115 | </a> | ||
505 | 116 | <tal:not-export-date condition="not: context/language_pack_delta"> | ||
506 | 117 | none yet | ||
507 | 118 | </tal:not-export-date> | ||
508 | 119 | </div> | ||
509 | 120 | <p> | ||
510 | 121 | <a tal:attributes=" | ||
511 | 122 | href context/menu:navigation/language_packs/url"> | ||
512 | 123 | See all language packs</a> | ||
513 | 124 | </p> | ||
514 | 125 | </div> | ||
515 | 126 | </div> | ||
516 | 127 | </div> | ||
517 | 128 | |||
518 | 129 | <tal:stats condition="view/distroserieslanguages"> | ||
519 | 130 | <div class="yui-b top-portlet"> | ||
520 | 131 | <h2>Translation statistics</h2> | ||
521 | 132 | <div tal:replace="structure context/@@+langchart" /> | ||
522 | 133 | <div class="translations-legend"> | ||
523 | 134 | <div tal:replace="structure context/@@+rosetta-status-legend" /> | ||
524 | 135 | </div> | ||
525 | 136 | </div> | ||
526 | 137 | </tal:stats> | ||
527 | 138 | </div> | ||
528 | 139 | </body> | ||
529 | 33 | </html> | 140 | </html> |
530 | 34 | 141 | ||
531 | 35 | 142 |
= Bug #427843 =
This includes mechanical changes to convert distribution and
distroseries translations pages to 3.0.
All links from the navigation menus are moved inline.
= Demo & QA =
https:/ /translations. launchpad. dev/ubuntu/ /translations. launchpad. dev/ubuntu/ hoary /translations. launchpad. dev/ubuntu/ breezy- autotest
https:/
https:/
= Tests =
bin/test -vvt translation- import- queue-targets -t *stories. distroseries' -t *stories. distribution' -t stories. translationgrou ps
'translations.
'translations.
= Launchpad lint =
Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.
Linting changed files: translations/ browser/ configure. zcml translations/ browser/ distroseries. py
lib/lp/
lib/lp/
lib/lp/ translations/ stories/ distribution/ xx-distribution -change- language- pack-admins. txt
lib/lp/ translations/ stories/ distribution/ xx-distribution -translations. txt
lib/lp/ translations/ stories/ distroseries/ xx-distroseries -language- packs.txt translations/ stories/ distroseries/ xx-distroseries -templates. txt
lib/lp/
lib/lp/ translations/ stories/ distroseries/ xx-distroseries -translations. txt
lib/lp/ translations/ stories/ importqueue/ xx-translation- import- queue-targets. txt
lib/lp/ translations/ stories/ translationgrou ps/10-distro- translation- group.txt translations/ templates/ distribution- language- pack-admin- info.pt translations/ templates/ distribution- translations. pt translations/ templates/ distroseries- translations. pt
lib/lp/
lib/lp/
lib/lp/