Size: 3129
Comment:
|
Size: 2461
Comment:
|
Deletions are marked like this. | Additions are marked like this. |
Line 36: | Line 36: |
1. create TM 'new'<<BR>>new.is_current = True | 1. Create & activate. {{{ create TM 'new' new.is_current = True }}} |
Line 38: | Line 42: |
2. create TM 'new'<<BR>>new.is_current = True<<BR>>new.potemplate = current.potemplate | 2. Create, diverge, activate. {{{ create TM 'new' new.is_current = True new.potemplate = current.potemplate }}} |
Line 40: | Line 49: |
4. new.is_current = True | 4. Activate. {{{ new.is_current = True }}} |
Line 42: | Line 54: |
5. if new.is_current: pass<<BR>>else: (2) | 5. If other is not current, fork a diverged message. {{{ if new.is_current: pass else: (2) }}} |
Line 44: | Line 60: |
7. new.potemplate = None (watch for existing identical TM)<<BR>>new.is_current = True | 7. Converge & activate. {{{ new.potemplate = None # (watch for existing identical TM) new.is_current = True }}} |
Line 48: | Line 68: |
If found: | If found, steal its flag: {{{ |
Line 51: | Line 72: |
}}} | |
Line 58: | Line 80: |
{{{ +-------------------------------------+ | IDENTICAL EXISTING TM 'new' | +------+--------+----------+----------+ | | | | upstream | | None | shared | diverged | shared | +---+----------+---------------+----------+----------+ | C | None | Z1⊕ | Z4⊕ | Z7⊕ | Z4⊕ | | U +----------+------+--------+----------+----------+ | R | shared | B1 | B4 | B7 | B4 | | R +----------+------+--------+----------+----------+ | E | diverged | A2 | A5 | A4 | A5 | | N +----------+------+--------+----------+----------+ | T | upstream | B1⊕ | B4⊕ | B7⊕ | ∅ | | | shared | | | | | +---+----------+------+--------+----------+----------+ }}} || ||<-4> IDENTICAL EXISTING TM 'new' || || || None || shared || diverged || upstream shared || || None || Z1⊕ || Z4⊕ || Z7⊕ || Z4⊕ || |
||<|2-2#E0E0E0> ||<-6:> IDENTICAL EXISTING TM 'new' || || None || shared || diverged || upstream shared || ||<|4>CURRENT || None || Z1⊕ || Z4⊕ || Z7⊕ || Z4⊕ || |
Setting a translation
Assumptions
We're not setting a translation that's identical to the current one.
We've checked that lock_timestamp is newer than the last update date.
A diverged message cannot be both the current Ubuntu message and the current upstream message. Those would be diverged in different templates.
When we look for an "identical" message, we look for ones that are either shared or diverged in the same template that we're looking at. We completely ignore messages that are diverged to other templates.
What happens to the existing current message
A: Deactivate & converge.
If there is already an identical shared message: current.delete() else: current.is_current = False current.potemplate = None
B: Deactivate.
current.is_current = False
What happens to the new current message
Some numbers are unused because their scenarios have collapsed into other ones.
1. Create & activate.
create TM 'new' new.is_current = True
2. Create, diverge, activate.
create TM 'new' new.is_current = True new.potemplate = current.potemplate
4. Activate.
new.is_current = True
5. If other is not current, fork a diverged message.
if new.is_current: pass else: (2)
7. Converge & activate.
new.potemplate = None # (watch for existing identical TM) new.is_current = True
⊕. MERGING POLICY determines if we need to do:
- Look for shared translation with the is_other flag set: 'other' If found, steal its flag:
other.is_other = False new.is_other = True
By default, the policy should approve the change on is_other if working on upstream; or if working on Ubuntu but with privileges to edit both.
Execution matrix
|
IDENTICAL EXISTING TM 'new' |
||||||
None |
shared |
diverged |
upstream shared |
||||
CURRENT |
None |
Z1⊕ |
Z4⊕ |
Z7⊕ |
Z4⊕ |
||
shared |
B1 |
B4 |
B7 |
B4 |
|||
diverged |
A2 |
A5 |
A4 |
A5 |
|||
upstream shared |
B1⊕ |
B4⊕ |
B7⊕ |
Ø |
Notes
A diverged message can mask a similar shared message as well. We tried to take this into account throughout, and believe we covered it. Conditionals in the numbered parts ("what happens to the new current message") may warrant splitting rows or columns later.
Karma is being handled.