1
0
Fork 0
mirror of synced 2024-05-07 22:22:46 +12:00

Remove languages from qresources

This commit is contained in:
Dummerle 2021-12-10 20:05:51 +01:00
parent fd05540902
commit bab0659e12
No known key found for this signature in database
GPG key ID: AB68CC59CA39F2F1
5 changed files with 9 additions and 12 deletions

View file

@ -1,2 +1,3 @@
include README.md include README.md
include rare/resources/images/* include rare/resources/images/*
include rare/resources/languages/*

View file

@ -5,7 +5,7 @@ import sys
import time import time
import traceback import traceback
from PyQt5.QtCore import QThreadPool, QSettings, QTranslator, QFile from PyQt5.QtCore import QThreadPool, QSettings, QTranslator
from PyQt5.QtGui import QIcon from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QApplication, QSystemTrayIcon, QMessageBox from PyQt5.QtWidgets import QApplication, QSystemTrayIcon, QMessageBox
from requests import HTTPError from requests import HTTPError
@ -13,7 +13,7 @@ from requests import HTTPError
# noinspection PyUnresolvedReferences # noinspection PyUnresolvedReferences
import rare.resources.resources import rare.resources.resources
import rare.shared as shared import rare.shared as shared
from rare import cache_dir from rare import cache_dir, resources_path
from rare.components.dialogs.launch_dialog import LaunchDialog from rare.components.dialogs.launch_dialog import LaunchDialog
from rare.components.main_window import MainWindow from rare.components.main_window import MainWindow
from rare.components.tray_icon import TrayIcon from rare.components.tray_icon import TrayIcon
@ -100,17 +100,17 @@ class App(QApplication):
self.translator = QTranslator() self.translator = QTranslator()
lang = self.settings.value("language", self.core.language_code, type=str) lang = self.settings.value("language", self.core.language_code, type=str)
if QFile(f":/languages/{lang}.qm").exists(): if os.path.isfile(f := os.path.join(resources_path, "languages", f"{lang}.qm")):
self.translator.load(f":/languages/{lang}.qm") self.translator.load(f)
logger.info("Your language is supported: " + lang) logger.info("Your language is supported: " + lang)
elif not lang == "en": elif not lang == "en":
logger.info("Your language is not supported") logger.info("Your language is not supported")
self.installTranslator(self.translator) self.installTranslator(self.translator)
# translator for qt stuff # translator for qt stuff
if QFile(f":/languages/{lang}.qm").exists(): if os.path.isfile(f := os.path.join(resources_path, f"qt_{lang}.qm")):
self.qt_translator = QTranslator() self.qt_translator = QTranslator()
self.qt_translator.load(f":/languages/qt_{lang}.qm") self.qt_translator.load(f)
self.installTranslator(self.qt_translator) self.installTranslator(self.qt_translator)
# Style # Style

Binary file not shown.

View file

@ -25,10 +25,6 @@
<file alias="square.svg">stylesheets/RareStyle/square.svg</file> <file alias="square.svg">stylesheets/RareStyle/square.svg</file>
<file alias="square-disabled.svg">stylesheets/RareStyle/square-disabled.svg</file> <file alias="square-disabled.svg">stylesheets/RareStyle/square-disabled.svg</file>
</qresource> </qresource>
<qresource prefix="languages">
<file alias="de.qm">languages/de.qm</file>
<file alias="qt_de.qm">languages/qt_de.qm</file>
</qresource>
<qresource prefix="images"> <qresource prefix="images">
<file alias="Rare.png">images/Rare.png</file> <file alias="Rare.png">images/Rare.png</file>
<file alias="loader.gif">images/loader.gif</file> <file alias="loader.gif">images/loader.gif</file>

View file

@ -187,8 +187,8 @@ def get_style_sheets() -> List[str]:
def get_translations(): def get_translations():
langs = ["en"] langs = ["en"]
for i in QDir(":/languages"): for i in os.listdir(os.path.join(resources_path, "languages")):
if i.endswith(".qm"): if i.endswith(".qm") and not i.startswith("qt_"):
langs.append(i.split(".")[0]) langs.append(i.split(".")[0])
return langs return langs