1
=== modified file 'lib/lp/translations/browser/browser_helpers.py'
2
--- lib/lp/translations/browser/browser_helpers.py	2012-11-29 06:35:35 +0000
3
+++ lib/lp/translations/browser/browser_helpers.py	2017-08-07 09:09:17 +0000
4
@@ -54,7 +54,7 @@
5
54
    if text is None:
54
    if text is None:
6
55
        return None
55
        return None
7
56
56
9
57
    lines = []
57
    markup_lines = []
10
58
    # Replace leading and trailing spaces on each line with special markup.
58
    # Replace leading and trailing spaces on each line with special markup.
11
59
    if u'\r\n' in text:
59
    if u'\r\n' in text:
12
60
        newline_chars = u'\r\n'
60
        newline_chars = u'\r\n'
13
@@ -62,7 +62,7 @@
14
62
        newline_chars = u'\r'
62
        newline_chars = u'\r'
15
63
    else:
63
    else:
16
64
        newline_chars = u'\n'
64
        newline_chars = u'\n'
18
65
    for line in html_escape(text).split(newline_chars):
65
    for line in text.split(newline_chars):
19
66
        # Pattern:
66
        # Pattern:
20
67
        # - group 1: zero or more spaces: leading whitespace
67
        # - group 1: zero or more spaces: leading whitespace
21
68
        # - group 2: zero or more groups of (zero or
68
        # - group 2: zero or more groups of (zero or
22
@@ -72,37 +72,32 @@
23
72
        match = re.match(u'^( *)((?: *[^ ]+)*)( *)$', line)
72
        match = re.match(u'^( *)((?: *[^ ]+)*)( *)$', line)
24
73
73
25
74
        if match:
74
        if match:
30
75
            lines.append(
75
            format_segments = None
31
76
                space * len(match.group(1)) +
76
            if 'c-format' in flags:
32
77
                match.group(2) +
77
                try:
33
78
                space * len(match.group(3)))
78
                    format_segments = parse_cformat_string(match.group(2))
34
79
                except UnrecognisedCFormatString:
35
80
                    pass
36
81
            if format_segments is not None:
37
82
                markup = ''
38
83
                for segment in format_segments:
39
84
                    type, content = segment
40
85
41
86
                    if type == 'interpolation':
42
87
                        markup += (u'<code>%s</code>' % html_escape(content))
43
88
                    elif type == 'string':
44
89
                        markup += html_escape(content)
45
90
            else:
46
91
                markup = html_escape(match.group(2))
47
92
            markup_lines.append(
48
93
                space * len(match.group(1))
49
94
                + markup
50
95
                + space * len(match.group(3)))
51
79
        else:
96
        else:
52
80
            raise AssertionError(
97
            raise AssertionError(
53
81
                "A regular expression that should always match didn't.")
98
                "A regular expression that should always match didn't.")
54
82
99
78
83
    if 'c-format' in flags:
100
    return expand_rosetta_escapes(newline.join(markup_lines))
56
84
        # Replace c-format sequences with marked-up versions. If there is a
57
85
        # problem parsing the c-format sequences on a particular line, that
58
86
        # line is left unformatted.
59
87
        for i in range(len(lines)):
60
88
            formatted_line = ''
61
89
62
90
            try:
63
91
                segments = parse_cformat_string(lines[i])
64
92
            except UnrecognisedCFormatString:
65
93
                continue
66
94
67
95
            for segment in segments:
68
96
                type, content = segment
69
97
70
98
                if type == 'interpolation':
71
99
                    formatted_line += (u'<code>%s</code>' % content)
72
100
                elif type == 'string':
73
101
                    formatted_line += content
74
102
75
103
            lines[i] = formatted_line
76
104
77
105
    return expand_rosetta_escapes(newline.join(lines))
79
106
101
80
107
102
81
108
def convert_newlines_to_web_form(unicode_text):
103
def convert_newlines_to_web_form(unicode_text):
82
109
104
83
=== modified file 'lib/lp/translations/doc/browser-helpers.txt'
84
--- lib/lp/translations/doc/browser-helpers.txt	2010-10-08 16:58:10 +0000
85
+++ lib/lp/translations/doc/browser-helpers.txt	2017-08-07 09:09:17 +0000
86
@@ -206,6 +206,19 @@
87
206
    >>> text_to_html(u'foo\rbar', [])
206
    >>> text_to_html(u'foo\rbar', [])
88
207
    u'foo<img alt="" src="/@@/translation-newline" /><br/>\nbar'
207
    u'foo<img alt="" src="/@@/translation-newline" /><br/>\nbar'
89
208
208
90
209
HTML in the input string is escaped.
91
210
92
211
    >>> text_to_html(u'<b>Test %d</b>', [])
93
212
    u'&lt;b&gt;Test %d&lt;/b&gt;'
94
213
    >>> text_to_html(u'<b>Test %d</b>', ['c-format'])
95
214
    u'&lt;b&gt;Test <code>%d</code>&lt;/b&gt;'
96
215
97
216
Format strings are parsed before markup is generated (the %q is invalid
98
217
as it has no conversion specifier until the <samp> is injected):
99
218
100
219
    >>> text_to_html(u'Test %q: ', ['c-format'])
101
220
    u'Test %q:<samp> </samp>'
102
221
103
209
222
104
210
convert_newlines_to_web_form
223
convert_newlines_to_web_form
105
211
----------------------------
224
----------------------------
Reviewer	Date Requested	Status
Adam Collard (community)		Approve on 2017-08-07
Launchpad code reviewers	2017-08-07	Pending
Review via email: mp+328652@code.launchpad.net