1
=== modified file 'lib/lp/translations/stories/standalone/xx-pofile-details.txt'
2
--- lib/lp/translations/stories/standalone/xx-pofile-details.txt	2009-09-18 15:42:19 +0000
3
+++ lib/lp/translations/stories/standalone/xx-pofile-details.txt	2009-12-15 14:14:15 +0000
4
@@ -1,3 +1,6 @@
5
1
POFile Details Page
6
2
===================
7
3
8
1
Each translation file has an overview page which shows the list of
4
Each translation file has an overview page which shows the list of
9
2
contributors.
5
contributors.
10
3
6
11
@@ -103,7 +106,9 @@
12
103
    >>> print anon_browser.title
106
    >>> print anon_browser.title
13
104
    Browsing Spanish translation...
107
    Browsing Spanish translation...
14
105
108
16
106
== Invalid input ==
109
17
110
Invalid input
18
111
-------------
19
107
112
20
108
Manually filtering by non-existent user warns the user of the problem.
113
Manually filtering by non-existent user warns the user of the problem.
21
109
114
22
@@ -121,3 +126,48 @@
23
121
    [u'No person to filter by specified.',
126
    [u'No person to filter by specified.',
24
122
    u'This person has made no contributions to this file.']
127
    u'This person has made no contributions to this file.']
25
123
128
26
129
27
130
Merged accounts
28
131
---------------
29
132
30
133
On the overview page of each translation pofile, users will not see merged 
31
134
accounts.
32
135
33
136
We'll create two new accounts to demonstrate this.
34
137
35
138
    >>> from zope.component import getUtility
36
139
    >>> from canonical.launchpad.interfaces.launchpad import (
37
140
    ...     ILaunchpadCelebrities)
38
141
39
142
    >>> login("admin@canonical.com")
40
143
    >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
41
144
    >>> hoary = ubuntu.getSeries('hoary')
42
145
    >>> translator = factory.makePerson(displayname="Poly Glot")
43
146
    >>> merged_translator = factory.makePerson(displayname="Mere Pere")
44
147
    >>> package = factory.makeSourcePackage(distroseries=hoary)
45
148
    >>> template = factory.makePOTemplate(
46
149
    ...     distroseries=hoary,
47
150
    ...     sourcepackagename=package.sourcepackagename, name='first')
48
151
    >>> language_code = 'es'
49
152
    >>> pofile = factory.makePOFile(language_code, potemplate=template)
50
153
    >>> potmsgset = factory.makePOTMsgSet(template)
51
154
    >>> potmsgset.setSequence(template, 1)
52
155
    >>> translation = factory.makeTranslationMessage(pofile=pofile,
53
156
    ...     translator=merged_translator, potmsgset=potmsgset)
54
157
    >>> potmsgset.setSequence(template, 2)
55
158
    >>> translation = factory.makeTranslationMessage(pofile=pofile,
56
159
    ...     translator=translator, potmsgset=potmsgset)
57
160
    >>> merged_translator.merged = translator
58
161
    >>> logout()
59
162
60
163
    >>> browser.open(
61
164
    ...     ("http://translations.launchpad.dev/"
62
165
    ...     "ubuntu/hoary/+source/%s/+pots/%s/%s/+details") % (
63
166
    ...     package.name, template.name, language_code))
64
167
    >>> print extract_text(find_main_content(browser.contents))
65
168
    Details for ...
66
169
    Contributors to this translation
67
170
    The following people have made some contribution to this specific
68
171
    translation:
69
172
    Poly Glot (filter)
70
173
71
124
174
72
=== modified file 'lib/lp/translations/templates/pofile-details.pt'
73
--- lib/lp/translations/templates/pofile-details.pt	2009-09-16 15:27:39 +0000
74
+++ lib/lp/translations/templates/pofile-details.pt	2009-12-15 14:14:15 +0000
75
@@ -42,10 +42,12 @@
76
42
42
77
43
        <ul tal:condition="view/contributors">
43
        <ul tal:condition="view/contributors">
78
44
          <li tal:repeat="contributor view/contributors">
44
          <li tal:repeat="contributor view/contributors">
83
45
            <a tal:replace="structure contributor/fmt:link" />
45
            <tal:not-merged condition="not: contributor/merged">
84
46
            (<a tal:attributes="
46
              <a tal:replace="structure contributor/fmt:link" />
85
47
               href string:${context/fmt:url}/+filter?person=${contributor/name}"
47
              (<a tal:attributes="
86
48
              >filter</a>)
48
                 href string:${context/fmt:url}/+filter?person=${contributor/name}"
87
49
                >filter</a>)
88
50
            </tal:not-merged>
89
49
          </li>
51
          </li>
90
50
        </ul>
52
        </ul>
91
51
53
92
52
54
93
=== modified file 'lib/lp/translations/templates/pofile-translate-contributors.pt'
94
--- lib/lp/translations/templates/pofile-translate-contributors.pt	2009-07-17 17:59:07 +0000
95
+++ lib/lp/translations/templates/pofile-translate-contributors.pt	2009-12-15 14:14:15 +0000
96
@@ -9,9 +9,11 @@
97
9
  <p tal:condition="view/contributors">
9
  <p tal:condition="view/contributors">
98
10
    Contributors to this translation:
10
    Contributors to this translation:
99
11
    <tal:contributors repeat="contributor view/contributors">
11
    <tal:contributors repeat="contributor view/contributors">
103
12
      <tal:contributor replace="structure contributor/fmt:link" /><tal:comma
12
      <tal:not-merged condition="not: contributor/merged">
104
13
      condition="not:repeat/contributor/end">,</tal:comma><tal:period
13
        <tal:contributor replace="structure contributor/fmt:link" /><tal:comma
105
14
      condition="repeat/contributor/end">.</tal:period>
14
        condition="not:repeat/contributor/end">,</tal:comma><tal:period
106
15
        condition="repeat/contributor/end">.</tal:period>
107
16
      </tal:not-merged>
108
15
    </tal:contributors>
17
    </tal:contributors>
109
16
  </p>
18
  </p>
110
17
</tal:root>
19
</tal:root>
Reviewer	Review Type	Date Requested	Status
Graham Binns (community)	code	2009-12-15	Approve on 2009-12-15
Review via email: mp+16183@code.staging.launchpad.net