diff -r 6e260b424396 -r 2b104ad132a4 src/eric7/Project/ProjectTranslationsBrowser.py
--- a/src/eric7/Project/ProjectTranslationsBrowser.py Wed Nov 16 10:10:06 2022 +0100
+++ b/src/eric7/Project/ProjectTranslationsBrowser.py Wed Nov 16 10:53:40 2022 +0100
@@ -821,7 +821,9 @@
for itm in itmList:
if isinstance(itm, ProjectBrowserSimpleDirectoryItem):
dname = self.project.getRelativePath(itm.dirName())
- trfiles = sorted(self.project.pdata["TRANSLATIONS"][:])
+ trfiles = sorted(
+ self.project.getProjectData(dataKey="TRANSLATIONS")[:]
+ )
for trfile in trfiles:
if trfile.startswith(dname) and trfile not in fileNames:
fileNames.append(os.path.join(self.project.ppath, trfile))
@@ -830,7 +832,7 @@
if fn not in fileNames:
fileNames.append(os.path.join(self.project.ppath, fn))
else:
- trfiles = sorted(self.project.pdata["TRANSLATIONS"][:])
+ trfiles = sorted(self.project.getProjectData(dataKey="TRANSLATIONS")[:])
fileNames.extend(
[
os.path.join(self.project.ppath, trfile)
@@ -868,24 +870,30 @@
# only consider files satisfying the filter criteria
_sources = [
s
- for s in self.project.pdata["SOURCES"]
+ for s in self.project.getProjectData(dataKey="SOURCES")
if os.path.splitext(s)[1] in filterList
]
sources = []
for s in _sources:
addIt = True
- for transExcept in self.project.pdata["TRANSLATIONEXCEPTIONS"]:
+ for transExcept in self.project.getProjectData(
+ dataKey="TRANSLATIONEXCEPTIONS"
+ ):
if s.startswith(transExcept):
addIt = False
break
if addIt:
sources.append(s)
- _forms = [f for f in self.project.pdata["FORMS"] if f.endswith(".ui")]
+ _forms = [
+ f for f in self.project.getProjectData(dataKey="FORMS") if f.endswith(".ui")
+ ]
forms = []
for f in _forms:
addIt = True
- for transExcept in self.project.pdata["TRANSLATIONEXCEPTIONS"]:
+ for transExcept in self.project.getProjectData(
+ dataKey="TRANSLATIONEXCEPTIONS"
+ ):
if f.startswith(transExcept):
addIt = False
break
@@ -900,12 +908,12 @@
]
else:
try:
- pattern = self.project.pdata["TRANSLATIONPATTERN"].replace(
- "%language%", "*"
- )
+ pattern = self.project.getProjectData(
+ dataKey="TRANSLATIONPATTERN"
+ ).replace("%language%", "*")
langs = [
lang
- for lang in self.project.pdata["TRANSLATIONS"]
+ for lang in self.project.getProjectData(dataKey="TRANSLATIONS")
if fnmatch.fnmatch(lang, pattern)
]
except IndexError:
@@ -1118,12 +1126,14 @@
if generateAll:
if noobsolete:
if self.hooks["generateAll"] is not None:
- self.hooks["generateAll"](self.project.pdata["TRANSLATIONS"])
+ self.hooks["generateAll"](
+ self.project.getProjectData(dataKey="TRANSLATIONS")
+ )
return
else:
if self.hooks["generateAllWithObsolete"] is not None:
self.hooks["generateAllWithObsolete"](
- self.project.pdata["TRANSLATIONS"]
+ self.project.getProjectData(dataKey="TRANSLATIONS")
)
return
else:
@@ -1177,12 +1187,12 @@
]
else:
try:
- pattern = self.project.pdata["TRANSLATIONPATTERN"].replace(
- "%language%", "*"
- )
+ pattern = self.project.getProjectData(
+ dataKey="TRANSLATIONPATTERN"
+ ).replace("%language%", "*")
langs = [
lang
- for lang in self.project.pdata["TRANSLATIONS"]
+ for lang in self.project.getProjectData(dataKey="TRANSLATIONS")
if fnmatch.fnmatch(lang, pattern)
]
except IndexError:
@@ -1218,7 +1228,10 @@
args += ["--ts", lang]
- startPath = self.project.pdata.get("TRANSLATIONSOURCESTARTPATH", "")
+ startPath = self.project.getProjectData(
+ dataKey="TRANSLATIONSOURCESTARTPATH",
+ default="",
+ )
args.append(startPath if bool(startPath) else ".")
proc.setWorkingDirectory(self.project.ppath)
@@ -1359,11 +1372,12 @@
"The release of the translation files (*.qm)" " was successful."
),
)
- if self.project.pdata["TRANSLATIONSBINPATH"]:
+ if self.project.getProjectData(dataKey="TRANSLATIONSBINPATH"):
target = os.path.join(
- self.project.ppath, self.project.pdata["TRANSLATIONSBINPATH"]
+ self.project.ppath,
+ self.project.getProjectData(dataKey="TRANSLATIONSBINPATH"),
)
- for langFile in self.project.pdata["TRANSLATIONS"][:]:
+ for langFile in self.project.getProjectData(dataKey="TRANSLATIONS")[:]:
if langFile.endswith(".ts"):
qmFile = os.path.join(
self.project.ppath, langFile.replace(".ts", ".qm")
@@ -1400,7 +1414,9 @@
# Hooks support
if generateAll:
if self.hooks["releaseAll"] is not None:
- self.hooks["releaseAll"](self.project.pdata["TRANSLATIONS"])
+ self.hooks["releaseAll"](
+ self.project.getProjectData(dataKey="TRANSLATIONS")
+ )
return
else:
if self.hooks["releaseSelected"] is not None:
@@ -1435,12 +1451,12 @@
]
else:
try:
- pattern = self.project.pdata["TRANSLATIONPATTERN"].replace(
- "%language%", "*"
- )
+ pattern = self.project.getProjectData(
+ dataKey="TRANSLATIONPATTERN"
+ ).replace("%language%", "*")
langs = [
lang
- for lang in self.project.pdata["TRANSLATIONS"]
+ for lang in self.project.getProjectData(dataKey="TRANSLATIONS")
if fnmatch.fnmatch(lang, pattern)
]
except IndexError:
