From e7d43371bb2bf5cd31d169115c8681a3f29619a2 Mon Sep 17 00:00:00 2001 From: Faraphel Date: Mon, 1 Jan 2024 13:25:41 +0100 Subject: [PATCH] tweaked some translation system --- assets/language/en.qm | Bin 341 -> 449 bytes assets/language/en.ts | 21 +++++++++++++-------- assets/language/es.qm | Bin 363 -> 473 bytes assets/language/es.ts | 21 +++++++++++++-------- assets/language/fr.qm | Bin 374 -> 488 bytes assets/language/fr.ts | 23 ++++++++++++++--------- source/save.py | 4 +++- source/ui/LanguageSelection.py | 17 ++++++++++++++--- source/ui/SurveyEngine.py | 2 +- source/ui/SurveyWindow.py | 4 ++-- 10 files changed, 60 insertions(+), 32 deletions(-) diff --git a/assets/language/en.qm b/assets/language/en.qm index 5b122fff50b8cba503148a70b17bcd07d821d3f5..6ea56dcaeb9483d6c76a3477e50b8070da46688e 100644 GIT binary patch delta 224 zcmcc0bdY(1biDxstJW0;21a%U*7^rP+JYgXt%QMrA&E6jvkpj~y5WBJiWdwZ^^U_Nb(^G>}b5fH_GV}8oK~``9ttbH+Qp8XK YH-t4f#4#uYho*_1m)JXi8kraw0rprf!vFvP delta 115 zcmX@ee3fZ}w4Me7tJW0;28IF#*7^rPdLe6?W*v|=W9_P138XJ^r|XpiX@*P&21eG2 zFD_Xz135el!3?DgMGR#OsSK4IAZa!b4h{_pbB$yNDF`ktDod>l&&*57FK6rkiZC%U F0sy0< diff --git a/assets/language/en.ts b/assets/language/en.ts index 95c42ba..9dcdeb1 100644 --- a/assets/language/en.ts +++ b/assets/language/en.ts @@ -1,6 +1,19 @@ + + LanguageSelection + + + SELECT YOUR LANGUAGE + Select your language + + + + START + Start + + SurveyEngine @@ -27,12 +40,4 @@ Next - - SurveyWindow - - - SURVEY - Survey - - diff --git a/assets/language/es.qm b/assets/language/es.qm index 9d5259e6f844f68e27869ebdc667d1ca1ffe5b0d..99e7510b894a2e55a9e2babd05155a8d18493651 100644 GIT binary patch delta 230 zcmaFObd!04biDxstJW0;21a29*7^rP+K(Zkt%QMrA&E6jvkpjK!CV6j|=L=KQPHXs%WcJ*;} z4pE5o4-HcAarAQ!bqsNLWe3U#`XuJ1mnNpC2B+qvCYNO9=P`n;5MXcy8k-9=Hjkl- dA(5d7ZWL>9h+|L)4y_YCpRjiTwKFj?0svrEFlqn* delta 119 zcmcb~{F-Tkw4Me7tJW0;28J>Q*7^rPdLwI^W*v~WVC||}38bHJr|XpiX@*P&21e839V98EF6j diff --git a/assets/language/es.ts b/assets/language/es.ts index b30617d..22c16fc 100644 --- a/assets/language/es.ts +++ b/assets/language/es.ts @@ -1,6 +1,19 @@ + + LanguageSelection + + + SELECT YOUR LANGUAGE + Seleccione su idioma + + + + START + Comenzar + + SurveyEngine @@ -27,12 +40,4 @@ Siguiente - - SurveyWindow - - - SURVEY - Encuesta - - diff --git a/assets/language/fr.qm b/assets/language/fr.qm index 19f8f2cb5f6c2ebaa32e3185d6a9bcbbfdf7481f..0d86afbd270e53f7b83fc45d9ad73c7a6463fd4b 100644 GIT binary patch delta 273 zcmeyy^n!VUT)hDUtJW0;21Z2&*7^rPI)Wjht%QMrA%`_hvkpi<TQ70AwENCb+fGn6u< za)1nA17eY2S07jB5QWHk|Ii=>A4fm;P)B!HcA$))PhwtrX<~Y6aB5C!a!F=>9wW#y z0R|VKWw}73ionJe!Hr@K4si?$!J}1(!4c?|5};f1VD5x#W}jGkl)VFJJ`*z|03+}? AEC2ui delta 149 zcmaFC{EcaXoUaB0tJW0;28JdE*7^rPdM9g|W*v}rV(qG038dd~r|XpiX@*P&21aFO zAVZ45k)ezsm7$2C1SnVxgsBXGg ghX#eYMzRB$Ji( diff --git a/assets/language/fr.ts b/assets/language/fr.ts index c0b0980..55d7abb 100644 --- a/assets/language/fr.ts +++ b/assets/language/fr.ts @@ -1,12 +1,25 @@ + + LanguageSelection + + + SELECT YOUR LANGUAGE + Sélectionner votre langue + + + + START + Démarrer + + SurveyEngine WARNING - Avertissement + Attention @@ -27,12 +40,4 @@ Suivant - - SurveyWindow - - - SURVEY - Sondage - - diff --git a/source/save.py b/source/save.py index c6f5053..62ae555 100644 --- a/source/save.py +++ b/source/save.py @@ -5,6 +5,7 @@ from typing import Optional import nextcord import requests from PyQt6.QtCore import pyqtSignal +from PyQt6.QtWidgets import QApplication result_path = Path("./results/") @@ -59,6 +60,7 @@ def upload_discord( except Exception as exc: if signal_warning is not None: - signal_warning.emit("COULD NOT UPLOAD THE DATA") # NOQA: emit exist + application = QApplication.instance() + signal_warning.emit(application.tr("COULD NOT UPLOAD THE DATA")) # NOQA: emit exist else: raise exc diff --git a/source/ui/LanguageSelection.py b/source/ui/LanguageSelection.py index 1f07071..7f01e06 100644 --- a/source/ui/LanguageSelection.py +++ b/source/ui/LanguageSelection.py @@ -19,7 +19,6 @@ class LanguageSelection(QWidget): # title self.title = QLabel() self._layout.addWidget(self.title) - self.title.setText("Select your language.") self.title.setAlignment(Qt.AlignmentFlag.AlignCenter) # language selection @@ -40,13 +39,17 @@ class LanguageSelection(QWidget): if language == language_default: self.select_language.setCurrentIndex(i) + self.select_language.currentIndexChanged.connect(self.refresh_language) # NOQA: connect exist + # start button self.button_start = QPushButton() self._layout.addWidget(self.button_start) - self.button_start.setText("Start") self.button_start.clicked.connect(self.start) # NOQA: connect exist - def start(self) -> None: + # refresh the texts + self.refresh_language() + + def refresh_language(self): language_code = self.select_language.currentData() # load the correct translator @@ -60,6 +63,14 @@ class LanguageSelection(QWidget): application = QApplication.instance() application.installTranslator(translator) + # refresh the texts + self.retranslate() + + def retranslate(self): + self.title.setText(self.tr("SELECT YOUR LANGUAGE")) + self.button_start.setText(self.tr("START")) + + def start(self) -> None: # call the after event self.after() diff --git a/source/ui/SurveyEngine.py b/source/ui/SurveyEngine.py index 9426ee8..5612245 100644 --- a/source/ui/SurveyEngine.py +++ b/source/ui/SurveyEngine.py @@ -175,5 +175,5 @@ class SurveyEngine(QWidget): QMessageBox.warning( self, self.tr("WARNING"), - self.tr(message), + message, ) diff --git a/source/ui/SurveyWindow.py b/source/ui/SurveyWindow.py index 253e0d0..97bc379 100644 --- a/source/ui/SurveyWindow.py +++ b/source/ui/SurveyWindow.py @@ -3,7 +3,7 @@ from pathlib import Path from PyQt6.QtGui import QIcon from PyQt6.QtWidgets import QMainWindow -from source import ui, assets_path, __icon_png__ +from source import ui, assets_path, __icon_png__, __appname__ icon_path = assets_path / "icon.png" @@ -14,7 +14,7 @@ class SurveyWindow(QMainWindow): # window style self.setWindowIcon(QIcon(__icon_png__)) - self.setWindowTitle(self.tr("SURVEY")) + self.setWindowTitle(__appname__) # start by asking the user his language language_selection = ui.LanguageSelection(