diff -r cdaaf2526503 -r e700f73e1c6f ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py
--- a/ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py Tue Dec 01 18:00:22 2020 +0100
+++ b/ProjectFlask/FlaskBabelExtension/PyBabelProjectExtension.py Tue Dec 01 19:38:47 2020 +0100
@@ -136,7 +136,7 @@
"""
Public method to add our hook methods.
"""
- if self.__project.hasCapability("pybabel"):
+ if self.__project.hasCapability("flask-babel"):
self.__e5project.projectLanguageAddedByCode.connect(
self.__projectLanguageAdded)
self.__translationsBrowser = (
@@ -201,7 +201,7 @@
Public method to determine the availability of flask-babel.
"""
available = self.__flaskBabelAvailable()
- self.__project.setCapability("pybabel", available)
+ self.__project.setCapability("flask-babel", available)
self.pybabelConfigAct.setEnabled(available)
self.pybabelInstallAct.setEnabled(not available)
@@ -250,11 +250,11 @@
"""
from .PyBabelConfigDialog import PyBabelConfigDialog
- config = self.__project.getData("pybabel", "")
+ config = self.__project.getData("flask-babel", "")
dlg = PyBabelConfigDialog(config)
if dlg.exec() == QDialog.Accepted:
config = dlg.getConfiguration()
- self.__project.setData("pybabel", "", config)
+ self.__project.setData("flask-babel", "", config)
self.__e5project.setTranslationPattern(os.path.join(
config["translationsDirectory"], "%language%", "LC_MESSAGES",
@@ -274,12 +274,12 @@
@return flag indicating successful configuration
@rtype bool
"""
- config = self.__project.getData("pybabel", "")
+ config = self.__project.getData("flask-babel", "")
if not config:
self.__configurePybabel()
return True
- configFileName = self.__project.getData("pybabel", "configFile")
+ configFileName = self.__project.getData("flask-babel", "configFile")
if configFileName:
cfgFileName = self.__e5project.getAbsoluteUniversalPath(
configFileName)
@@ -365,7 +365,7 @@
Private slot to check the availability of the 'flask-babel' extension.
"""
self.determineCapability()
- if self.__project.hasCapability("pybabel"):
+ if self.__project.hasCapability("flask-babel"):
msg = self.tr("The 'flask-babel' extension is installed.")
else:
msg = self.tr("The 'flask-babel' extension is not installed.")
@@ -426,7 +426,7 @@
if self.__ensurePybabelConfigured():
workdir = self.__project.getApplication()[0]
potFile = self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "catalogFile"))
+ self.__project.getData("flask-babel", "catalogFile"))
try:
potFilePath = os.path.dirname(potFile)
@@ -438,12 +438,12 @@
"-F",
os.path.relpath(
self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "configFile")),
+ self.__project.getData("flask-babel", "configFile")),
workdir
)
]
- if self.__project.getData("pybabel", "markersList"):
- for marker in self.__project.getData("pybabel", "markersList"):
+ if self.__project.getData("flask-babel", "markersList"):
+ for marker in self.__project.getData("flask-babel", "markersList"):
args += ["-k", marker]
args += [
"-o",
@@ -476,11 +476,11 @@
self.__e5project.getTranslationPattern().replace(
"%language%", code))
potFile = self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "catalogFile"))
+ self.__project.getData("flask-babel", "catalogFile"))
args = [
"--domain={0}".format(
- self.__project.getData("pybabel", "domain")),
+ self.__project.getData("flask-babel", "domain")),
"--input-file={0}".format(os.path.relpath(potFile, workdir)),
"--output-file={0}".format(os.path.relpath(langFile, workdir)),
"--locale={0}".format(code),
@@ -509,11 +509,11 @@
if self.__ensurePybabelConfigured():
workdir = self.__project.getApplication()[0]
translationsDirectory = self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "translationsDirectory"))
+ self.__project.getData("flask-babel", "translationsDirectory"))
args = [
"--domain={0}".format(
- self.__project.getData("pybabel", "domain")),
+ self.__project.getData("flask-babel", "domain")),
"--directory={0}".format(
os.path.relpath(translationsDirectory, workdir)),
"--use-fuzzy",
@@ -555,14 +555,14 @@
if self.__ensurePybabelConfigured():
workdir = self.__project.getApplication()[0]
translationsDirectory = self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "translationsDirectory"))
+ self.__project.getData("flask-babel", "translationsDirectory"))
argsList = []
for loc in locales:
argsList.append([
"compile",
"--domain={0}".format(
- self.__project.getData("pybabel", "domain")),
+ self.__project.getData("flask-babel", "domain")),
"--directory={0}".format(
os.path.relpath(translationsDirectory, workdir)),
"--use-fuzzy",
@@ -598,13 +598,13 @@
if self.__ensurePybabelConfigured():
workdir = self.__project.getApplication()[0]
translationsDirectory = self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "translationsDirectory"))
+ self.__project.getData("flask-babel", "translationsDirectory"))
potFile = self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "catalogFile"))
+ self.__project.getData("flask-babel", "catalogFile"))
args = [
"--domain={0}".format(
- self.__project.getData("pybabel", "domain")),
+ self.__project.getData("flask-babel", "domain")),
"--input-file={0}".format(os.path.relpath(potFile, workdir)),
"--output-dir={0}".format(
os.path.relpath(translationsDirectory, workdir)),
@@ -653,15 +653,15 @@
if self.__ensurePybabelConfigured():
workdir = self.__project.getApplication()[0]
translationsDirectory = self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "translationsDirectory"))
+ self.__project.getData("flask-babel", "translationsDirectory"))
potFile = self.__e5project.getAbsoluteUniversalPath(
- self.__project.getData("pybabel", "catalogFile"))
+ self.__project.getData("flask-babel", "catalogFile"))
argsList = []
for loc in locales:
args = [
"update",
"--domain={0}".format(
- self.__project.getData("pybabel", "domain")),
+ self.__project.getData("flask-babel", "domain")),
"--input-file={0}".format(
os.path.relpath(potFile, workdir)),
"--output-dir={0}".format(
