Skip to content

Improved serialization + related fixes #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rozyczko merged 1 commit into from
Mar 28, 2023
Merged

Improved serialization + related fixes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion easyApp/Gui/Components/PreferencesDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ EaElements.Dialog {
id: languageSelector
model: XmlListModel {
xml: EaGlobals.Variables.translator.languagesAsXml()
query: "/root/item"
query: "/data/item"
XmlRole {
name: "name"
query: "name/string()"
Expand Down
6 changes: 2 additions & 4 deletions easyApp/Logic/Translate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
__version__ = "0.0.1"

import os
from dicttoxml import dicttoxml

from PySide2.QtCore import QObject, QTranslator, QLocale, Slot
from PySide2.QtWidgets import QApplication
from PySide2.QtQml import QQmlApplicationEngine

from easyCore.Utils.io.xml import XMLSerializer

class Translator(QObject):
def __init__(self, app, engine, translations_path, languages):
Expand Down Expand Up @@ -56,8 +55,7 @@ def selectLanguage(self, index):

@Slot(result=str)
def languagesAsXml(self):
xml = dicttoxml(self._languages, attr_type=False)
xml = xml.decode()
xml = XMLSerializer().encode({"item": self._languages})
return xml

@Slot(result=int)
Expand Down