@@ -16,8 +16,13 @@ class TextDTO:
16
16
def __init__ (self , DTO : Dict [str , str ]):
17
17
self .window_title = DTO ["window_title" ]
18
18
self .originalText = DTO ["originalText" ]
19
+ self .src_model = DTO ['src_model' ] #if 'src_model' in DTO else None
19
20
self .translatedText = DTO ["translatedText" ] if "translatedText" in DTO else None
20
- self .speakerName = DTO ['speakerName' ] if 'speakerName' in DTO else None
21
+ self ._speakerName = DTO ['speakerName' ] if 'speakerName' in DTO else None
22
+
23
+ @property
24
+ def speakerName (self ):
25
+ return self ._speakerName if self ._speakerName is not None else ""
21
26
22
27
23
28
def loadFile (name : str ):
@@ -51,7 +56,7 @@ def get_history(lastRowNumber: int):
51
56
if rowNumber > 0 :
52
57
cell = worksheet ().cell (row = rowNumber , column = 2 )
53
58
if cell .value is not None and cell .value != "" :
54
- speaker_name = f"[{ cell .comment .text } ]: " if cell .comment is not None else ""
59
+ speaker_name = f"[{ cell .comment .text } ]: " if cell .comment is not None and len ( cell . comment . text ) else ""
55
60
history .append (speaker_name + cell .value )
56
61
else : break
57
62
@@ -79,15 +84,15 @@ def SaveText(self, textDTO: Dict[str, str]):
79
84
if entry is not None and worksheet () is not None :
80
85
cell = worksheet ().cell (row = entry , column = 2 )
81
86
cell .value = textDTO .translatedText
82
- if textDTO . speakerName is not None : cell .comment = Comment (textDTO .speakerName , textDTO .speakerName )
87
+ cell .comment = Comment (textDTO .speakerName , textDTO .src_model )
83
88
84
89
elif worksheet () is not None :
85
90
lastRow = worksheet ().max_row + 1 # same variable for both calls to avoid the "stairs" bug
86
91
cellA = worksheet ().cell (row = lastRow , column = 1 )
87
92
cellB = worksheet ().cell (row = lastRow , column = 2 )
88
93
cellA .value = textDTO .originalText
89
94
cellB .value = textDTO .translatedText
90
- if textDTO . speakerName is not None : cellB .comment = Comment (textDTO .speakerName , textDTO .speakerName )
95
+ cellB .comment = Comment (textDTO .speakerName , textDTO .src_model )
91
96
92
97
else : return
93
98
0 commit comments