<fix> fix error when use unpack or runtime extract in a newer version…

… of renpy and fix unable to translate with local glossary update version to v2.2.7
anonymousException · May 7, 2024 · 154fd9a · 154fd9a
1 parent b98c318
commit 154fd9a
Show file tree

Hide file tree

Showing 32 changed files with 47 additions and 37 deletions.
diff --git a/src/hook_extract.rpy b/src/hook_extract.rpy
@@ -7,11 +7,18 @@ init python:
     default_translates = translator.default_translates
     dic = dict()
     for identifier,value in default_translates.items():
-        say = value.block[0]
-        if not hasattr(say,'what'):
-            continue
-        what = say.what
-        who = say.who
+        if hasattr(value,"block"):
+            say = value.block[0]
+            if not hasattr(say,'what'):
+                continue
+            what = say.what
+            who = say.who
+        else:
+            if not hasattr(value,'what') or not hasattr(value,"who"):
+                continue
+            what = value.what
+            who = value.who
+
         filename = value.filename
         linenumber = value.linenumber
         if filename not in dic:

diff --git a/src/hook_unrpa.rpy b/src/hook_unrpa.rpy
@@ -1,13 +1,16 @@
 init python early hide:
     import renpy.loader
     import threading
-    from renpy.loader import file_open_callbacks,load_from_archive,SubFile
+    import io
+    from renpy.loader import file_open_callbacks,load_from_archive
 
     def my_load_from_archive(name):
         rv = load_from_archive(name)
         if rv is None:
             return rv
-        if isinstance(rv,SubFile):
+        if hasattr(renpy.loader,"SubFile") and isinstance(rv,renpy.loader.SubFile):
+            _read = rv.read()
+        elif isinstance(rv,io.BufferedReader):
             _read = rv.read()
         elif 'RWops' in str(type(rv)):
             _read = rv.readall()

diff --git a/src/qm/arabic.qm b/src/qm/arabic.qm
diff --git a/src/qm/bengali.qm b/src/qm/bengali.qm
diff --git a/src/qm/chinese.qm b/src/qm/chinese.qm
diff --git a/src/qm/french.qm b/src/qm/french.qm
diff --git a/src/qm/german.qm b/src/qm/german.qm
diff --git a/src/qm/hindi.qm b/src/qm/hindi.qm
diff --git a/src/qm/japanese.qm b/src/qm/japanese.qm
diff --git a/src/qm/korean.qm b/src/qm/korean.qm
diff --git a/src/qm/portuguese.qm b/src/qm/portuguese.qm
diff --git a/src/qm/russian.qm b/src/qm/russian.qm
diff --git a/src/qm/spanish.qm b/src/qm/spanish.qm
diff --git a/src/qm/turkish.qm b/src/qm/turkish.qm
diff --git a/src/qm/urdu.qm b/src/qm/urdu.qm
diff --git a/src/renpy_translate.py b/src/renpy_translate.py
@@ -108,6 +108,7 @@ def TranslateFile(self, p, lang_target, lang_source, is_gen_bak, local_glossary,
                 target = current
             else:
                 target = original
+            dic['target'] = target
             if is_skip_translated and original != current:
                 continue
             if local_glossary is not None and len(local_glossary) > 0:
@@ -128,7 +129,6 @@ def TranslateFile(self, p, lang_target, lang_source, is_gen_bak, local_glossary,
                     continue
             if not isAllPunctuations(d['encoded'].strip('"')):
                 transList.append(d['encoded'].strip('"'))
-                dic['target'] = target
                 dic['d'] = d
                 trans_ori_dic.append((dic, d['encoded'].strip('"')))
 

diff --git a/src/ts/arabic.ts b/src/ts/arabic.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>الإصدار2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>الإصدار2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/bengali.ts b/src/ts/bengali.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>সংস্করণ 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>সংস্করণ 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/chinese.ts b/src/ts/chinese.ts
@@ -1178,8 +1178,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>版本 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>版本 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/default.ts b/src/ts/default.ts
@@ -1253,7 +1253,7 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
+        <source>Version 2.2.7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/src/ts/french.ts b/src/ts/french.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>Version 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>Version 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/german.ts b/src/ts/german.ts
@@ -1288,8 +1288,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>Version 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>Version 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/hindi.ts b/src/ts/hindi.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>संस्करण 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>संस्करण 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/japanese.ts b/src/ts/japanese.ts
@@ -1174,8 +1174,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>バージョン2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>バージョン2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/korean.ts b/src/ts/korean.ts
@@ -1288,8 +1288,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>버전 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>버전 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/portuguese.ts b/src/ts/portuguese.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>Versão 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>Versão 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/russian.ts b/src/ts/russian.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>Версия 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>Версия 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/spanish.ts b/src/ts/spanish.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>Versión 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>Versión 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/turkish.ts b/src/ts/turkish.ts
@@ -1265,8 +1265,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>Sürüm 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>Sürüm 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/urdu.ts b/src/ts/urdu.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.6</source>
-        <translation>ورژن 2.2.6</translation>
+        <source>Version 2.2.7</source>
+        <translation>ورژن 2.2.7</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ui.py b/src/ui.py
@@ -380,7 +380,7 @@ def retranslateUi(self, MainWindow):
         self.actionpack_game_files.setText(QCoreApplication.translate("MainWindow", u"pack game files", None))
         self.clearLogBtn.setText(QCoreApplication.translate("MainWindow", u"clear log", None))
         self.copyrightLabel.setText(QCoreApplication.translate("MainWindow", u"\u00a92024 Last moment,All rights reserved.", None))
-        self.versionLabel.setText(QCoreApplication.translate("MainWindow", u"Version 2.2.6", None))
+        self.versionLabel.setText(QCoreApplication.translate("MainWindow", u"Version 2.2.7", None))
         self.translateBtn.setText(QCoreApplication.translate("MainWindow", u"translate", None))
         self.selectFilesBtn.setText(QCoreApplication.translate("MainWindow", u"...", None))
         self.label_2.setText(QCoreApplication.translate("MainWindow", u"directory", None))

diff --git a/src/ui.ui b/src/ui.ui
@@ -75,7 +75,7 @@
        </size>
       </property>
       <property name="text">
-       <string>Version 2.2.6</string>
+       <string>Version 2.2.7</string>
       </property>
      </widget>
     </item>