Mercurial > genshi > mirror
comparison genshi/filters/i18n.py @ 1018:fa0e84724fee stable-0.6.x
Merge r1242 from trunk (fix handling of case where a translation has text after a closing tag).
| author | hodgestar |
|---|---|
| date | Thu, 09 Jan 2014 21:26:14 +0000 |
| parents | ea40c6ff63da |
| children | 51515d7ffbe4 |
comparison
equal
deleted
inserted
replaced
| 1015:203d981d314a | 1018:fa0e84724fee |
|---|---|
| 1039 for order, string in parts: | 1039 for order, string in parts: |
| 1040 parts_counter.setdefault(order, []).append(None) | 1040 parts_counter.setdefault(order, []).append(None) |
| 1041 | 1041 |
| 1042 while parts: | 1042 while parts: |
| 1043 order, string = parts.pop(0) | 1043 order, string = parts.pop(0) |
| 1044 events = self.events[order].pop(0) | 1044 events = self.events[order] |
| 1045 if events: | |
| 1046 events = events.pop(0) | |
| 1047 else: | |
| 1048 # create a dummy empty text event so any remaining | |
| 1049 # part of the translation can be processed. | |
| 1050 events = [(TEXT, "", (None, -1, -1))] | |
| 1045 parts_counter[order].pop() | 1051 parts_counter[order].pop() |
| 1046 | 1052 |
| 1047 for event in events: | 1053 for event in events: |
| 1048 if event[0] is SUB_START: | 1054 if event[0] is SUB_START: |
| 1049 substream = [] | 1055 substream = [] |