Mercurial Repositories > Django Project / changeset

diff -r f9b4ceeb0fdc -r bceb78c1b1f0 ChangeLog
--- a/ChangeLog	Fri Jan 01 12:18:57 2016 +0100
+++ b/ChangeLog	Mon Aug 15 17:41:36 2016 +0200
@@ -1,5 +1,8 @@
 ChangeLog
 ---------
+Version 4.0.3:
+- some adjustments to eric changes
+
 Version 4.0.2:
 - updated Russian translations provided by Alexander Barkoff
 

diff -r f9b4ceeb0fdc -r bceb78c1b1f0 PluginProjectDjango.py
--- a/PluginProjectDjango.py	Fri Jan 01 12:18:57 2016 +0100
+++ b/PluginProjectDjango.py	Mon Aug 15 17:41:36 2016 +0200
@@ -28,7 +28,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "4.0.2"
+version = "4.0.3"
 className = "ProjectDjangoPlugin"
 packageName = "ProjectDjango"
 shortDescription = "Project support for Django projects."

diff -r f9b4ceeb0fdc -r bceb78c1b1f0 PluginProjectDjango.zip
Binary file PluginProjectDjango.zip has changed

diff -r f9b4ceeb0fdc -r bceb78c1b1f0 ProjectDjango/Project.py
--- a/ProjectDjango/Project.py	Fri Jan 01 12:18:57 2016 +0100
+++ b/ProjectDjango/Project.py	Mon Aug 15 17:41:36 2016 +0200
@@ -1598,12 +1598,23 @@
             self.tr('&Current Django project ({0})').format(curSite))
         
         if self.__currentSite is None:
-            self.__e5project.pdata["TRANSLATIONPATTERN"] = []
+            try:
+                self.__e5project.setTranslationPattern("")
+            except AttributeError:
+                # backward compatibility
+                self.__e5project.pdata["TRANSLATIONPATTERN"] = []
         else:
-            self.__e5project.pdata["TRANSLATIONPATTERN"] = [
-                os.path.join(site, "locale", "%language%", "LC_MESSAGES",
-                             "django.po")
-            ]
+            try:
+                self.__e5project.setTranslationPattern(
+                    os.path.join(site, "locale", "%language%", "LC_MESSAGES",
+                                 "django.po")
+                )
+            except AttributeError:
+                # backward compatibility
+                self.__e5project.pdata["TRANSLATIONPATTERN"] = [
+                    os.path.join(site, "locale", "%language%", "LC_MESSAGES",
+                                 "django.po")
+                ]
     
     def __site(self):
         """
@@ -2291,8 +2302,8 @@
         @param filename name of the file used for extraction (string)
         @return extracted locale (string) or None
         """
-        if self.__e5project.pdata["TRANSLATIONPATTERN"]:
-            pattern = self.__e5project.pdata["TRANSLATIONPATTERN"][0]\
+        if self.__e5project.getTranslationPattern():
+            pattern = self.__e5project.getTranslationPattern()\
                 .replace("%language%", "(.*?)")
             match = re.search(pattern, filename)
             if match is not None:
@@ -2370,7 +2381,7 @@
         if res:
             dia.exec_()
             
-            langFile = self.__e5project.pdata["TRANSLATIONPATTERN"][0]\
+            langFile = self.__e5project.getTranslationPattern()\
                 .replace("%language%", code)
             self.__e5project.appendFile(langFile)