corretto errore per cui non importava tutte le traduzioni

This commit is contained in:
2020-04-21 15:29:15 +02:00
parent ac168d1e10
commit f7b77db942
5 changed files with 93 additions and 71 deletions

View File

@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS><TS version="2.0"> <!DOCTYPE TS>
<TS version="2.1" language="en" sourcelanguage="it_IT">
<context> <context>
<name>bananaAdvOpt</name> <name>bananaAdvOpt</name>
<message> <message>
<location filename="../../../guimain.py" line="521"/> <location filename="../../../guimain.py" line="523"/>
<source>AdvancedOptions: Configurazione non accettata</source> <source>AdvancedOptions: Configurazione non accettata</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="527"/> <location filename="../../../guimain.py" line="529"/>
<source>Avanzate Globali</source> <source>Avanzate Globali</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="535"/> <location filename="../../../guimain.py" line="537"/>
<source>Parametri inseriti validi, configurazione accettata</source> <source>Parametri inseriti validi, configurazione accettata</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -23,113 +24,113 @@
<message> <message>
<location filename="../../../guimain.py" line="43"/> <location filename="../../../guimain.py" line="43"/>
<source>Impostazioni Titolo</source> <source>Impostazioni Titolo</source>
<translation type="unfinished"></translation> <translation type="obsolete">Title Settings</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="44"/> <location filename="../../../guimain.py" line="44"/>
<source>Selezione Output</source> <source>Selezione Output</source>
<translation type="unfinished"></translation> <translation type="obsolete">Output Selection</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="89"/> <location filename="../../../guimain.py" line="91"/>
<source>MainWindow: Configurazione non accettata</source> <source>MainWindow: Configurazione non accettata</source>
<translation type="unfinished"></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="109"/> <location filename="../../../guimain.py" line="111"/>
<source>Prossima Tab</source> <source>Prossima Tab</source>
<translation type="unfinished"></translation> <translation>Next Tab</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="114"/> <location filename="../../../guimain.py" line="116"/>
<source>Tab Precedente</source> <source>Tab Precedente</source>
<translation type="unfinished"></translation> <translation>Previous Tab</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="118"/> <location filename="../../../guimain.py" line="120"/>
<source>Apri Carica Preset</source> <source>Apri Carica Preset</source>
<translation type="unfinished"></translation> <translation>Open Load Preset</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="119"/> <location filename="../../../guimain.py" line="121"/>
<source>Carica Preset</source> <source>Carica Preset</source>
<translation type="unfinished"></translation> <translation>Load Preset</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="128"/> <location filename="../../../guimain.py" line="130"/>
<source>Riempio tutte le tab</source> <source>Riempio tutte le tab</source>
<translation type="unfinished"></translation> <translation>Filling all Tabs</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="133"/> <location filename="../../../guimain.py" line="135"/>
<source>Apri Salva Preset</source> <source>Apri Salva Preset</source>
<translation type="unfinished"></translation> <translation>Opena Save Preset</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="153"/> <location filename="../../../guimain.py" line="155"/>
<source>Apri Opzioni Avanzate</source> <source>Apri Opzioni Avanzate</source>
<translation type="unfinished"></translation> <translation>Open Advanced Options</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="159"/> <location filename="../../../guimain.py" line="161"/>
<source>Apri Opzioni Lingua</source> <source>Apri Opzioni Lingua</source>
<translation type="unfinished"></translation> <translation>Open Language Settings</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="163"/> <location filename="../../../guimain.py" line="165"/>
<source>Apri Finestra About</source> <source>Apri Finestra About</source>
<translation type="unfinished"></translation> <translation>Open About Window</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="167"/> <location filename="../../../guimain.py" line="169"/>
<source>Seleziona Cartella Sorgente</source> <source>Seleziona Cartella Sorgente</source>
<translation type="unfinished"></translation> <translation>Select Source Folder</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="171"/> <location filename="../../../guimain.py" line="173"/>
<source>Selezionata Cartella Sorgente: {}</source> <source>Selezionata Cartella Sorgente: {}</source>
<translation type="unfinished"></translation> <translation>Selected Source Folder: {}</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="176"/> <location filename="../../../guimain.py" line="178"/>
<source>Seleziona Cartella Destinazione</source> <source>Seleziona Cartella Destinazione</source>
<translation type="unfinished"></translation> <translation>Select Destination Folder</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="180"/> <location filename="../../../guimain.py" line="182"/>
<source>Selezionata Cartella Destinazione: {}</source> <source>Selezionata Cartella Destinazione: {}</source>
<translation type="unfinished"></translation> <translation>Selected Destination Folder: {}</translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="188"/> <location filename="../../../guimain.py" line="190"/>
<source>Apro in directory: {}</source> <source>Apro in directory: {}</source>
<translation type="unfinished"></translation> <translation>Opening Directory: {}</translation>
</message> </message>
</context> </context>
<context> <context>
<name>bananaSelezOut</name> <name>bananaSelezOut</name>
<message> <message>
<location filename="../../../guimain.py" line="433"/> <location filename="../../../guimain.py" line="435"/>
<source>SelezUscita: Configurazione non accettata</source> <source>SelezUscita: Configurazione non accettata</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="437"/> <location filename="../../../guimain.py" line="439"/>
<source>Applico Impostazioni File Uscita</source> <source>Applico Impostazioni File Uscita</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="477"/> <location filename="../../../guimain.py" line="479"/>
<source>Sto SPLITTANDO, attendi..</source> <source>Sto SPLITTANDO, attendi..</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="478"/> <location filename="../../../guimain.py" line="480"/>
<source>Sto Splittando..</source> <source>Sto Splittando..</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="497"/> <location filename="../../../guimain.py" line="499"/>
<source>FINITO!</source> <source>FINITO!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -137,17 +138,17 @@
<context> <context>
<name>bananaTitolo</name> <name>bananaTitolo</name>
<message> <message>
<location filename="../../../guimain.py" line="243"/> <location filename="../../../guimain.py" line="245"/>
<source>Titolo: Configurazione non accettata</source> <source>Titolo: Configurazione non accettata</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="246"/> <location filename="../../../guimain.py" line="248"/>
<source>Mostro la finestra avanzate titolo</source> <source>Mostro la finestra avanzate titolo</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="251"/> <location filename="../../../guimain.py" line="253"/>
<source>Applico impostazioni Titolo</source> <source>Applico impostazioni Titolo</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@@ -155,19 +156,32 @@
<context> <context>
<name>bananaTitoloAvanzate</name> <name>bananaTitoloAvanzate</name>
<message> <message>
<location filename="../../../guimain.py" line="308"/> <location filename="../../../guimain.py" line="310"/>
<source>AvanzateTitolo: Configurazione non accettata</source> <source>AvanzateTitolo: Configurazione non accettata</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="362"/> <location filename="../../../guimain.py" line="364"/>
<source>Avanzate Titolo Accettate</source> <source>Avanzate Titolo Accettate</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../../../guimain.py" line="368"/> <location filename="../../../guimain.py" line="370"/>
<source>Avanzate Titolo Rifiutate</source> <source>Avanzate Titolo Rifiutate</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>init</name>
<message>
<location filename="../../../guimain.py" line="45"/>
<source>Impostazioni Titolo</source>
<translation>Title Settings</translation>
</message>
<message>
<location filename="../../../guimain.py" line="46"/>
<source>Selezione Output</source>
<translation>Output Selection</translation>
</message>
</context>
</TS> </TS>

View File

@@ -24,6 +24,7 @@ from libsplit import bananaSPLITTER
from PyQt5.QtCore import QDir, QSize, QTranslator, pyqtSlot, pyqtSignal from PyQt5.QtCore import QDir, QSize, QTranslator, pyqtSlot, pyqtSignal
from PyQt5.QtWidgets import QMessageBox, QSizePolicy from PyQt5.QtWidgets import QMessageBox, QSizePolicy
class bananaMain(PyQt5.QtWidgets.QMainWindow): class bananaMain(PyQt5.QtWidgets.QMainWindow):
def __init__(self, logger=None, confloader=None): def __init__(self, logger=None, confloader=None):
PyQt5.QtWidgets.QMainWindow.__init__(self) PyQt5.QtWidgets.QMainWindow.__init__(self)
@@ -578,28 +579,23 @@ if __name__ == '__main__':
conf.use(conf.getParam('paths', 'lastUsed')) conf.use(conf.getParam('paths', 'lastUsed'))
iflan = conf.getParam('settings','uiLang') iflan = conf.getParam('settings','uiLang')
trlist = [f":/tr/translations/guimain_{iflan}.qm",
f":/tr/translations/libconfload_{iflan}.qm",
f":/tr/translations/libsplit_{iflan}.qm",
f":/tr/translations/mainwindow_{iflan}.qm",
f":/tr/translations/avanzatetitolo3_{iflan}.qm",
f":/tr/translations/titolow_{iflan}.qm",
f":/tr/translations/selezout_{iflan}.qm",
f":/tr/translations/about_{iflan}.qm"]
qtrlist=[]
if iflan != 'it': if iflan != 'it':
p = QTranslator() LOGGER.debug("Carico Traduzioni: ")
pp = QTranslator() for tr in trlist:
ppp = QTranslator() qtr = QTranslator()
t = QTranslator() print(qtr.load(tr),f" {tr}")
tt = QTranslator() app.installTranslator(qtr)
ttt = QTranslator() qtrlist.append(qtr)
tttt = QTranslator()
print(p.load(f":/tr/translations/guimain_{iflan}.qm"))
print(pp.load(f":/tr/translations/libconfload_{iflan}.qm"))
print(ppp.load(f":/tr/translations/libsplit_{iflan}.qm"))
print(t.load(f":/tr/translations/mainwindow_{iflan}.qm"))
print(tt.load(f":/tr/translations/avanzatetitolo3_{iflan}.qm"))
print(ttt.load(f":/tr/translations/titolow_{iflan}.qm"))
print(tttt.load(f":/tr/translations/selezout_{iflan}.qm"))
app.installTranslator(p)
app.installTranslator(pp)
app.installTranslator(ppp)
app.installTranslator(t)
app.installTranslator(tt)
app.installTranslator(ttt)
app.installTranslator(tttt)
except Exception as e: except Exception as e:
print(f"Errore main: {e}") print(f"Errore main: {e}")

View File

@@ -5,9 +5,7 @@ Created on 24 nov 2019
''' '''
import os, glob, subprocess import os, glob, subprocess
if __name__ == '__main__': def updateInterfaces():
os.chdir("..\\UserInterface")
print(os.getcwd())
uifiles = glob.glob("*.ui") uifiles = glob.glob("*.ui")
for f in uifiles: for f in uifiles:
command = r"pyuic5.exe "+f command = r"pyuic5.exe "+f
@@ -16,10 +14,20 @@ if __name__ == '__main__':
fp = open(r".\\CompiledUI\\"+f.replace("ui","py"), 'w') fp = open(r".\\CompiledUI\\"+f.replace("ui","py"), 'w')
fp.write(str(rv.stdout, encoding='utf-8').replace('\r', '')) fp.write(str(rv.stdout, encoding='utf-8').replace('\r', ''))
fp.close() fp.close()
def updateResources():
command = r'pyrcc5.exe '+'.\\resources\\resources.qrc' command = r'pyrcc5.exe '+'.\\resources\\resources.qrc'
print (command) print (command)
rv = subprocess.run(command, capture_output=True) rv = subprocess.run(command, capture_output=True)
fp = open(r".\\compiledUI\\resources_rc.py", 'w') fp = open(r".\\compiledUI\\resources_rc.py", 'w')
fp.write(str(rv.stdout, encoding='utf-8').replace('\r', '')) fp.write(str(rv.stdout, encoding='utf-8').replace('\r', ''))
fp.close() fp.close()
if __name__ == '__main__':
os.chdir("..\\UserInterface")
print(os.getcwd())
updateInterfaces()
updateResources()
pass pass

View File

@@ -5,10 +5,14 @@ Created on 10 apr 2020
''' '''
import os,glob import os,glob
import subprocess import subprocess
from bananaSPLIT.scripts.compileUI import updateResources
if __name__ == '__main__': if __name__ == '__main__':
tsfiles = glob.glob("..\\UserInterface\\resources\\translations\\*.ts") tsfiles = glob.glob("..\\UserInterface\\resources\\translations\\*.ts")
for ts in tsfiles: for ts in tsfiles:
tso = "..\\UserInterface\\resources\\translations\\"+os.path.splitext((os.path.split(ts)[1]))[0]+".qm" tso = "..\\UserInterface\\resources\\translations\\"+os.path.splitext((os.path.split(ts)[1]))[0]+".qm"
subprocess.run(f'lrelease.exe {ts} -qm {tso}') subprocess.run(f'lrelease.exe {ts} -qm {tso}')
os.chdir("..\\UserInterface")
#print(os.getcwd())
#updateResources()
pass pass