<feature> improve replace fonts for some special styles

update version to v2.2.0
anonymousException · Apr 17, 2024 · dd740a8 · dd740a8
1 parent 8d16bac
commit dd740a8
Show file tree

Hide file tree

Showing 30 changed files with 41 additions and 38 deletions.
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_fonts.py b/src/renpy_fonts.py
@@ -55,21 +55,21 @@ def ExtractStyleFontList(data, file=None):
         # print(i)
         # dic[i[0]] = i[1]
         # print(len(i))
-        if (len(i) > 1):
+        if len(i) > 1:
             content = ''
             flag = False
             font_line = ''
             for _i, e in enumerate(i):
-                if (_i != 0):
-                    if ('font "' in e):
+                if _i != 0:
+                    if 'font "' in e or "font '" in e:
                         font_line = e
                         flag = True
                         continue
-                    if (len(e.strip()) > 0):
+                    if len(e.strip()) > 0:
                         content = content + e.rstrip() + '\n'
 
             # print(content)
-            if (flag):
+            if flag:
                 d = dict()
                 d['font'] = font_line
                 d['content'] = content
@@ -105,7 +105,8 @@ def ExtractStyleFontListFromDirectory(p):
                 continue
             # print(i)
             d = ExtractStyleFontListFromFile(i)
-            ret_d.update(d)
+            if len(d) > 0:
+                ret_d.update(d)
     return ret_d
 
 
@@ -135,15 +136,16 @@ def GenGuiFontsOriginal(p, tl_name, font_path):
     if (appendMode):
         f = io.open(guiPath, 'a+', encoding='utf-8')
         for key, value in result.items():
-            if (key in _read):
+            if key in _read:
                 continue
+            f.write('\n')
             # content = 'translate ' + tl_name + ' ' + key + '\n'  +value['content'] +'    #' +value['font'].lstrip() + '\n' + value['font']
             fontLine = value['font']
             fontContent = ExtractFontContent(fontLine)
             replacedFont = fontLine.replace(fontContent, 'font gui.text_font')
             # print(replacedFont)
             content = 'translate ' + tl_name + ' ' + key + '\n' + value['content'] + '    #' + value[
-                'font'].lstrip() + '\n' + replacedFont
+                'font'].lstrip() + '\n    ' + replacedFont
             # print(value['file'])
             # print(content)
             f.write(content)
@@ -179,13 +181,14 @@ def GenGuiFontsOriginal(p, tl_name, font_path):
         f.write(header)
         f.write('\n')
         for key, value in result.items():
+            f.write('\n')
             # content = 'translate ' + tl_name + ' ' + key + '\n'  +value['content'] +'    #' +value['font'].lstrip() + '\n' + value['font']
             fontLine = value['font']
             fontContent = ExtractFontContent(fontLine)
             replacedFont = fontLine.replace(fontContent, 'font gui.text_font')
             # print(replacedFont)
             content = 'translate ' + tl_name + ' ' + key + '\n' + value['content'] + '    #' + value[
-                'font'].lstrip() + '\n' + replacedFont
+                'font'].lstrip() + '\n    ' + replacedFont
             # print(value['file'])
             # print(content)
             f.write(content)

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/ts/urdu.ts b/src/ts/urdu.ts
@@ -1174,8 +1174,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.1.9</source>
-        <translation>ورژن 2.1.9</translation>
+        <source>Version 2.2.0</source>
+        <translation>ورژن 2.2.0</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.1.9", None))
+        self.versionLabel.setText(QCoreApplication.translate("MainWindow", u"Version 2.2.0", 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.1.9</string>
+       <string>Version 2.2.0</string>
       </property>
      </widget>
     </item>