Size: 2928
Comment:
|
Size: 3154
Comment:
|
Deletions are marked like this. | Additions are marked like this. |
Line 19: | Line 19: |
{{{ | |
Line 25: | Line 25: |
}}} | |
Line 27: | Line 28: |
{{{ | |
Line 29: | Line 30: |
}}} | |
Line 32: | Line 34: |
1. create TM 'new' new.is_current = True |
Some numbers are unused because their scenarios have collapsed into other ones. |
Line 35: | Line 36: |
2. create TM 'new' new.is_current = True new.potemplate = current.potemplate |
1. create TM 'new'<<BR>>new.is_current = True |
Line 39: | Line 38: |
3. create TM 'new' new.is_current = True POLICY/PRIVILEGES determine if current.is_other goes into new.is_other |
2. create TM 'new'<<BR>>new.is_current = True<<BR>>new.potemplate = current.potemplate |
Line 45: | Line 42: |
5. if new.is_current: pass else: (2) |
5. if new.is_current: pass<<BR>>else: (2) |
Line 48: | Line 44: |
6. new.is_current = True POLICY/PRIVILEGES determine if current.is_other goes into new.is_other 7. new.potemplate = None (watch for existing identical TM) new.is_current = True 8. new.is_current = True new.potemplate = None (watch for existing identical TM) POLICY/PRIVILEGES determine if current.is_other goes into new.is_other |
7. new.potemplate = None (watch for existing identical TM)<<BR>>new.is_current = True |
Line 59: | Line 47: |
Get other, current, shared translation 'other' other.is_other = False new.is_other = True |
Look for shared translation with the is_other flag set: 'other' If found: 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. |
Line 65: | Line 58: |
{{{ | |
Line 77: | Line 71: |
| T | upstream | B3 | B6 | B8 | ∅ | | | T | upstream | B1⊕ | B4⊕ | B7⊕ | ∅ | |
Line 80: | Line 74: |
}}} | |
Line 81: | Line 76: |
||<|2-2#E0E0E0> ||<-6:> IDENTICAL EXISTING TM 'new' || || None || shared || diverged || upstream shared || ||<|4>CURRENT || None || Z1⊕ || Z4⊕ || Z7⊕ || Z4⊕ || || shared || B1 || B4 || B7 || B4 || || diverged || A2 || A5 || A4 || A5 || || upstream shared || B1⊕ || B4⊕ || B7⊕ || Ø || |
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 TM 'new'
new.is_current = True
2. create TM 'new'
new.is_current = True
new.potemplate = current.potemplate
4. new.is_current = True
5. if new.is_current: pass
else: (2)
7. 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:
- 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' | +------+--------+----------+----------+ | | | | 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 | | | | | +---+----------+------+--------+----------+----------+
|
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.