Pootle, Virtaal & The Translate Toolkit

Revision: 4185
          http://svn.sourceforge.net/translate/?rev=4185&view=rev
Author:   zejn
Date:     2006-11-03 05:18:44 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
[django-migration] 'instance' and 'potree' objects are now available in Pootle/conf.py 
Example usage:
>From Pootle.conf import potree
potree_object = potree()

Modified Paths:
--------------
    src/branches/django-migration/Pootle/pootle.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/conf.py

Added: src/branches/django-migration/Pootle/conf.py
===================================================================
--- src/branches/django-migration/Pootle/conf.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/conf.py	2006-11-03 13:18:44 UTC (rev 4185)
@@ -0,0 +1,19 @@
+# This file is meant as a container for global objects that are in use in 
+# Pootle, eg. Pootle instance, prefs, potree.
+#
+
+_instance = None
+_potree = None
+
+def instance():
+    return _instance
+
+def potree():
+    return _potree
+
+def set_instance(inst, potree):
+    global _instance, _potree
+
+    _instance = inst
+    _potree = potree
+

Modified: src/branches/django-migration/Pootle/pootle.py
===================================================================
--- src/branches/django-migration/Pootle/pootle.py	2006-11-03 12:36:53 UTC (rev 4184)
+++ src/branches/django-migration/Pootle/pootle.py	2006-11-03 13:18:44 UTC (rev 4185)
@@ -36,6 +36,7 @@
 from Pootle import potree
 from Pootle import users
 from Pootle import filelocations
+from Pootle.conf import set_instance
 # Versioning information
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -55,6 +56,8 @@
     if sessioncache is None:
       sessioncache = session.SessionCache(sessionclass=users.PootleSession)
     self.potree = potree.POTree(instance)
+    # set Pootle-wide settings
+    set_instance(instance, self.potree)
     super(PootleServer, self).__init__(instance, webserver, sessioncache, errorhandler, loginpageclass)
     self.templatedir = filelocations.templatedir
     self.setdefaultoptions()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4186
          http://svn.sourceforge.net/translate/?rev=4186&view=rev
Author:   zejn
Date:     2006-11-03 06:08:30 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
[django-migration] Moving methods from classes to storage_client.py

Modified Paths:
--------------
    src/branches/django-migration/Pootle/pagelayout.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/storage_client.py

Modified: src/branches/django-migration/Pootle/pagelayout.py
===================================================================
--- src/branches/django-migration/Pootle/pagelayout.py	2006-11-03 13:18:44 UTC (rev 4185)
+++ src/branches/django-migration/Pootle/pagelayout.py	2006-11-03 14:08:30 UTC (rev 4186)
@@ -19,6 +19,8 @@
 # along with translate; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+from Pootle.storage_client import getstats as new_getstats
+
 def layout_banner(maxheight):
   """calculates dimensions, image name for banner"""
   logo_width, logo_height = min((98*maxheight/130, maxheight), (98, 130))
@@ -239,32 +241,5 @@
   def getstats(self, project, projectstats, numfiles):
     """returns a list with the data items to fill a statistics table
     Remember to update getstatsheadings() above as needed"""
-    wanted = ["translated", "fuzzy", "untranslated", "total"]
-    gotten = {}
-    for key in wanted:
-      gotten[key] = projectstats.get(key, [])
-      wordkey = key + "words"
-      if wordkey in projectstats:
-        gotten[wordkey] = projectstats[wordkey]
-      else:
-        count = projectstats.get(key, [])
-        gotten[wordkey] = project.countwords(count)
-      if isinstance(gotten[key], list):
-        #TODO: consider carefully:
-        gotten[key] = len(gotten[key])
+    return new_getstats(project, projectstats, numfiles)
 
-    gotten["untranslated"] = gotten["total"] - gotten["translated"] - gotten["fuzzy"]
-    gotten["untranslatedwords"] = gotten["totalwords"] - gotten["translatedwords"] - gotten["fuzzywords"]
-
-    for key in wanted[:-1]:
-      percentkey = key + "percentage"
-      wordkey = key + "words"
-      gotten[percentkey] = gotten[wordkey]*100/max(gotten["totalwords"], 1)
-
-    for key in gotten:
-      if key.find("check-") == 0:
-        value = gotten.pop(key)
-        gotten[key[len("check-"):]] = value
-
-    return gotten
-

Added: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/storage_client.py	2006-11-03 14:08:30 UTC (rev 4186)
@@ -0,0 +1,37 @@
+# This file is supposed to have all translation accessing functions in Pootle,
+# at least the web portal part of it.
+
+from Pootle.conf import instance, potree
+from gettext import gettext as _
+
+def getstats(project, projectstats, numfiles):
+    """returns a list with the data items to fill a statistics table
+    Remember to update getstatsheadings() above as needed"""
+    wanted = ["translated", "fuzzy", "untranslated", "total"]
+    gotten = {}
+    for key in wanted:
+        gotten[key] = projectstats.get(key, [])
+        wordkey = key + "words"
+        if wordkey in projectstats:
+            gotten[wordkey] = projectstats[wordkey]
+        else:
+            count = projectstats.get(key, [])
+            gotten[wordkey] = project.countwords(count)
+        if isinstance(gotten[key], list):
+            #TODO: consider carefully:
+            gotten[key] = len(gotten[key])
+    gotten["untranslated"] = gotten["total"] - gotten["translated"] - gotten["fuzzy"]
+    gotten["untranslatedwords"] = gotten["totalwords"] - gotten["translatedwords"] - gotten["fuzzywords"]
+
+    for key in wanted[:-1]:
+        percentkey = key + "percentage"
+        wordkey = key + "words"
+        gotten[percentkey] = gotten[wordkey]*100/max(gotten["totalwords"], 1)
+
+    for key in gotten:
+        if key.find("check-") == 0:
+            value = gotten.pop(key)
+            gotten[key[len("check-"):]] = value
+
+    return gotten
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4189
          http://svn.sourceforge.net/translate/?rev=4189&view=rev
Author:   zejn
Date:     2006-11-03 06:24:41 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
[django-migration] Moving LoginPage.getlanguageoptions to storage_client.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/storage_client.py
    src/branches/django-migration/Pootle/users.py

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2006-11-03 14:19:58 UTC (rev 4188)
+++ src/branches/django-migration/Pootle/storage_client.py	2006-11-03 14:24:41 UTC (rev 4189)
@@ -35,3 +35,15 @@
 
     return gotten
 
+## users.py
+def getlanguageselector(languagenames, session):
+    """returns the language selector..."""
+    # TODO: work out how we handle localization of language names...
+    languageoptions = [('', session.localize("Default"))]
+    if isinstance(languagenames, dict):
+        languageoptions += languagenames.items()
+    else:
+        languageoptions += languagenames
+    return [{"code": key, "name": value, "selected": key==session.language or None} for key, value in languageoptions]
+
+

Modified: src/branches/django-migration/Pootle/users.py
===================================================================
--- src/branches/django-migration/Pootle/users.py	2006-11-03 14:19:58 UTC (rev 4188)
+++ src/branches/django-migration/Pootle/users.py	2006-11-03 14:24:41 UTC (rev 4189)
@@ -24,6 +24,7 @@
 from jToolkit import mailer
 from jToolkit import prefs
 from Pootle import pagelayout
+from Pootle.storage_client import getlanguageselector as new_getlanguageselector
 
 class RegistrationError(ValueError):
   def __init__(self, message):
@@ -69,13 +70,7 @@
 
   def getlanguageoptions(self, session):
     """returns the language selector..."""
-    # TODO: work out how we handle localization of language names...
-    languageoptions = [('', session.localize("Default"))]
-    if isinstance(self.languagenames, dict):
-      languageoptions += self.languagenames.items()
-    else:
-      languageoptions += self.languagenames
-    return [{"code": key, "name": value, "selected": key==session.language or None} for key, value in languageoptions]
+    return new_getlanguageselector(self.languagenames, session)
 
 class RegisterPage(pagelayout.PootlePage):
   """page for new registrations"""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4193
          http://svn.sourceforge.net/translate/?rev=4193&view=rev
Author:   zejn
Date:     2006-11-03 07:21:21 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
[django-migration] Moving UserOptions' methods to storage_client.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/storage_client.py
    src/branches/django-migration/Pootle/users.py

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2006-11-03 15:16:40 UTC (rev 4192)
+++ src/branches/django-migration/Pootle/storage_client.py	2006-11-03 15:21:21 UTC (rev 4193)
@@ -46,4 +46,44 @@
         languageoptions += languagenames
     return [{"code": key, "name": value, "selected": key==session.language or None} for key, value in languageoptions]
 
+def getprojectoptions(session):
+    """gets the options box to change the user's projects"""
+    projectoptions = []
+    userprojects = session.getprojects()
+    for projectcode in potree().getprojectcodes():
+      projectname = potree().getprojectname(projectcode)
+      projectoptions.append({"code": projectcode, "name": projectname, "selected": projectcode
+ in userprojects or None})
+    return projectoptions
 
+def getlanguageoptions(session):
+    """returns options for languages"""
+    userlanguages = session.getlanguages()
+    languageoptions = potree().getlanguages()
+    languages = []
+    for language, name in languageoptions:
+      languages.append({"code": language, "name": name, "selected": language in userlanguages
+or None})
+    return languages
+
+def getotheroptions(session):
+    uilanguage = getattr(session.prefs, "uilanguage", "")
+    if not uilanguage:
+      userlanguages = session.getlanguages()
+      if userlanguages:
+        uilanguage = userlanguages[0]
+    languageoptions = [{"code": '', "name": ''}]
+    for code, name in potree().getlanguages():
+      languageoptions.append({"code": code, "name": name, "selected": uilanguage == code or None})
+    options = {
+        "inputheight": _("Input Height (in lines)"),
+        "inputwidth": _("Input Width (in characters)"),
+        "viewrows": _("Number of rows in view mode"),
+        "translaterows": _("Number of rows in translate mode")}
+    optionlist = []
+    for option, description in options.items():
+      optionvalue = getattr(session.prefs, option, "")
+      optionlist.append({"code": option, "description": description, "value": optionvalue})
+    return {"uilanguage": uilanguage, "uilanguage_options": languageoptions, "other_options": optionlist}
+
+

Modified: src/branches/django-migration/Pootle/users.py
===================================================================
--- src/branches/django-migration/Pootle/users.py	2006-11-03 15:16:40 UTC (rev 4192)
+++ src/branches/django-migration/Pootle/users.py	2006-11-03 15:21:21 UTC (rev 4193)
@@ -25,6 +25,9 @@
 from jToolkit import prefs
 from Pootle import pagelayout
 from Pootle.storage_client import getlanguageselector as new_getlanguageselector
+from Pootle.storage_client import getlanguageoptions as new_getlanguageoptions
+from Pootle.storage_client import getprojectoptions as new_getprojectoptions
+from Pootle.storage_client import getotheroptions as new_getotheroptions
 
 class RegistrationError(ValueError):
   def __init__(self, message):
@@ -167,40 +170,13 @@
     pagelayout.PootlePage.__init__(self, templatename, templatevars, session)
 
   def getprojectoptions(self):
-    """gets the options box to change the user's projects"""
-    projectoptions = []
-    userprojects = self.session.getprojects()
-    for projectcode in self.potree.getprojectcodes():
-      projectname = self.potree.getprojectname(projectcode)
-      projectoptions.append({"code": projectcode, "name": projectname, "selected": projectcode in userprojects or None})
-    return projectoptions
+    return new_getprojectoptions(self.session)
 
   def getlanguageoptions(self):
-    """returns options for languages"""
-    userlanguages = self.session.getlanguages()
-    languageoptions = self.potree.getlanguages()
-    languages = []
-    for language, name in languageoptions:
-      languages.append({"code": language, "name": name, "selected": language in userlanguages or None})
-    return languages
+    return new_getlanguageoptions(self.session)
 
   def getotheroptions(self):
-    uilanguage = getattr(self.session.prefs, "uilanguage", "")
-    if not uilanguage:
-      userlanguages = self.session.getlanguages()
-      if userlanguages:
-        uilanguage = userlanguages[0]
-    languageoptions = [{"code": '', "name": ''}]
-    for code, name in self.potree.getlanguages():
-      languageoptions.append({"code": code, "name": name, "selected": uilanguage == code or None})
-    options = {"inputheight": self.localize("Input Height (in lines)"), "inputwidth": self.localize("Input Width (in characters)"),
-          "viewrows": self.localize("Number of rows in view mode"), 
-          "translaterows": self.localize("Number of rows in translate mode")}
-    optionlist = []
-    for option, description in options.items():
-      optionvalue = getattr(self.session.prefs, option, "")
-      optionlist.append({"code": option, "description": description, "value": optionvalue})
-    return {"uilanguage": uilanguage, "uilanguage_options": languageoptions, "other_options": optionlist}
+    return new_getotheroptions(self.session)
 
 class OptionalLoginAppServer(server.LoginAppServer):
   """a server that enables login but doesn't require it except for specified pages"""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4197
          http://svn.sourceforge.net/translate/?rev=4197&view=rev
Author:   zejn
Date:     2006-11-03 13:16:28 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
[django-migration] Moving PootleIndex methods to storage_client. Added utils.py, a common file for useful functions.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/indexpage.py
    src/branches/django-migration/Pootle/storage_client.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/utils.py

Modified: src/branches/django-migration/Pootle/indexpage.py
===================================================================
--- src/branches/django-migration/Pootle/indexpage.py	2006-11-03 18:07:46 UTC (rev 4196)
+++ src/branches/django-migration/Pootle/indexpage.py	2006-11-03 21:16:28 UTC (rev 4197)
@@ -23,6 +23,8 @@
 from Pootle import projects
 from Pootle import pootlefile
 from Pootle import versioncontrol
+from Pootle.storage_client import getprojects as new_getprojects
+from Pootle.storage_client import getprojectnames as new_getprojectnames
 # Versioning information
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -107,18 +109,10 @@
     pagelayout.PootlePage.__init__(self, templatename, templatevars, session)
 
   def getprojects(self):
-    """gets the options for the projects"""
-    projects = []
-    for projectcode in self.potree.getprojectcodes():
-      projectname = self.potree.getprojectname(projectcode)
-      description = shortdescription(self.potree.getprojectdescription(projectcode))
-      projects.append({"code": projectcode, "name": projectname, "description": description, "sep": ", "})
-    if projects:
-      projects[-1]["sep"] = ""
-    return projects
+    return new_getprojects()
 
   def getprojectnames(self):
-    return [self.potree.getprojectname(projectcode) for projectcode in self.potree.getprojectcodes()]
+    return new_getprojectnames()
 
 class UserIndex(pagelayout.PootlePage):
   """home page for a given user"""

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2006-11-03 18:07:46 UTC (rev 4196)
+++ src/branches/django-migration/Pootle/storage_client.py	2006-11-03 21:16:28 UTC (rev 4197)
@@ -2,6 +2,7 @@
 # at least the web portal part of it.
 
 from Pootle.conf import instance, potree
+from Pootle.utils import shortdescription
 from gettext import gettext as _
 
 def getstats(project, projectstats, numfiles):
@@ -86,4 +87,18 @@
       optionlist.append({"code": option, "description": description, "value": optionvalue})
     return {"uilanguage": uilanguage, "uilanguage_options": languageoptions, "other_options": optionlist}
 
+# indexpage.py
+def getprojects():
+    """gets the options for the projects"""
+    projects = []
+    for projectcode in potree().getprojectcodes():
+      projectname = potree().getprojectname(projectcode)
+      description = shortdescription(potree().getprojectdescription(projectcode))
+      projects.append({"code": projectcode, "name": projectname, "description": description, "sep": ", "})
+    if projects:
+      projects[-1]["sep"] = ""
+    return projects
 
+def getprojectnames():
+    return [potree().getprojectname(projectcode) for projectcode in potree().getprojectcodes()]
+

Added: src/branches/django-migration/Pootle/utils.py
===================================================================
--- src/branches/django-migration/Pootle/utils.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/utils.py	2006-11-03 21:16:28 UTC (rev 4197)
@@ -0,0 +1,28 @@
+# Useful functions used throughout Pootle
+
+import sre
+
+
+def shortdescription(descr):
+    """Returns a short description by removing markup and only including up
+    to the first br-tag"""
+    stopsign = descr.find("<br")
+    if stopsign >= 0:
+        descr = descr[:stopsign]
+    return sre.sub("<[^>]*>", "", descr).strip()
+
+
+# Useful functions used throughout Pootle
+
+import sre
+
+
+def shortdescription(descr):
+    """Returns a short description by removing markup and only including up
+    to the first br-tag"""
+    stopsign = descr.find("<br")
+    if stopsign >= 0:
+        descr = descr[:stopsign]
+    return sre.sub("<[^>]*>", "", descr).strip()
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4198
          http://svn.sourceforge.net/translate/?rev=4198&view=rev
Author:   zejn
Date:     2006-11-03 14:30:54 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
[django-migration] Moving UserIndex and LanguageIndex methods to storage_client.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/indexpage.py
    src/branches/django-migration/Pootle/storage_client.py

Modified: src/branches/django-migration/Pootle/indexpage.py
===================================================================
--- src/branches/django-migration/Pootle/indexpage.py	2006-11-03 21:16:28 UTC (rev 4197)
+++ src/branches/django-migration/Pootle/indexpage.py	2006-11-03 22:30:54 UTC (rev 4198)
@@ -25,6 +25,10 @@
 from Pootle import versioncontrol
 from Pootle.storage_client import getprojects as new_getprojects
 from Pootle.storage_client import getprojectnames as new_getprojectnames
+from Pootle.storage_client import getquicklinks as new_getquicklinks
+from Pootle.storage_client import getlanguageinfo as new_getlanguageinfo
+from Pootle.storage_client import getprojects_languageindex as new_getprojects_languageindex
+from Pootle.storage_client import getprojectitem as new_getprojectitem
 # Versioning information
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -139,25 +143,7 @@
     pagelayout.PootlePage.__init__(self, templatename, templatevars, session)
 
   def getquicklinks(self):
-    """gets a set of quick links to user's project-languages"""
-    quicklinks = []
-    for languagecode in self.session.getlanguages():
-      if not self.potree.haslanguage(languagecode):
-        continue
-      languagename = self.potree.getlanguagename(languagecode)
-      langlinks = []
-      for projectcode in self.session.getprojects():
-        if self.potree.hasproject(languagecode, projectcode):
-          projecttitle = self.potree.getprojectname(projectcode)
-          project = self.potree.getproject(languagecode, projectcode)
-          isprojectadmin = "admin" in project.getrights(session=self.session) \
-                            or self.session.issiteadmin()
-          langlinks.append({"code": projectcode, "name": projecttitle, 
-                            "isprojectadmin": isprojectadmin, "sep": "<br />"})
-      if langlinks:
-        langlinks[-1]["sep"] = ""
-      quicklinks.append({"code": languagecode, "name": languagename, "projects": langlinks})
-    return quicklinks
+    return new_getquicklinks(self.session)
 
 class ProjectsIndex(PootleIndex):
   """the list of languages"""
@@ -201,37 +187,13 @@
     pagelayout.PootleNavPage.__init__(self, templatename, templatevars, session, bannerheight=81)
 
   def getlanguageinfo(self):
-    """returns information defined for the language"""
-    # specialchars = self.potree.getlanguagespecialchars(self.languagecode)
-    nplurals = self.potree.getlanguagenplurals(self.languagecode)
-    pluralequation = self.potree.getlanguagepluralequation(self.languagecode)
-    infoparts = [(self.localize("Language Code"), self.languagecode),
-                 (self.localize("Language Name"), self.languagename),
-                 # (self.localize("Special Characters"), specialchars),
-                 (self.localize("Number of Plurals"), str(nplurals)),
-                 (self.localize("Plural Equation"), pluralequation),
-                ]
-    return [{"title": title, "value": value} for title, value in infoparts]
+    return new_getlanguageinfo(self.languagecode)
 
   def getprojects(self):
-    """gets the info on the projects"""
-    projectcodes = self.potree.getprojectcodes(self.languagecode)
-    self.projectcount = len(projectcodes)
-    projectitems = [self.getprojectitem(projectcode) for projectcode in projectcodes]
-    for n, item in enumerate(projectitems):
-      item["parity"] = ["even", "odd"][n % 2]
-    return projectitems
+    return new_getprojects_languageindex(self.languagecode)
 
   def getprojectitem(self, projectcode):
-    href = '%s/' % projectcode
-    projectname = self.potree.getprojectname(projectcode)
-    projectdescription = shortdescription(self.potree.getprojectdescription(projectcode))
-    project = self.potree.getproject(self.languagecode, projectcode)
-    pofilenames = project.browsefiles()
-    projectstats = project.getquickstats()
-    projectdata = self.getstats(project, projectstats, len(pofilenames))
-    self.updatepagestats(projectdata["translatedwords"], projectdata["totalwords"])
-    return {"code": projectcode, "href": href, "icon": "folder", "title": projectname, "description": projectdescription, "data": projectdata, "isproject": True}
+    return new_getprojectitem(projectcode, self.languagecode)
 
 class ProjectLanguageIndex(pagelayout.PootleNavPage):
   """The main page for a project, listing all the languages belonging to it"""

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2006-11-03 21:16:28 UTC (rev 4197)
+++ src/branches/django-migration/Pootle/storage_client.py	2006-11-03 22:30:54 UTC (rev 4198)
@@ -102,3 +102,76 @@
 def getprojectnames():
     return [potree().getprojectname(projectcode) for projectcode in potree().getprojectcodes()]
 
+def getquicklinks(session):
+    """gets a set of quick links to user's project-languages"""
+    quicklinks = []
+    for languagecode in session.getlanguages():
+      if not potree().haslanguage(languagecode):
+        continue
+      languagename = potree().getlanguagename(languagecode)
+      langlinks = []
+      for projectcode in instance().session.getprojects():
+        if potree().hasproject(languagecode, projectcode):
+          projectname = potree().getprojectname(projectcode)
+          projecttitle = projectname
+          langlinks.append({"code": projectcode, "name": projecttitle, "sep": "<br />"})
+      if langlinks:
+        langlinks[-1]["sep"] = ""
+      quicklinks.append({"code": languagecode, "name": languagename, "projects": langlinks})
+    return quicklinks
+
+def getprojects_languageindex(languagecode):
+    """gets the info on the projects"""
+    projectcodes = potree().getprojectcodes(languagecode)
+    projectcount = len(projectcodes)
+    projectitems = [getprojectitem(projectcode, languagecode) for projectcode in projectcodes]
+    for n, item in enumerate(projectitems):
+      item["parity"] = ["even", "odd"][n % 2]
+    return projectitems
+
+def getprojectcount(languagecode):
+    return len(potree().getprojectcodes(languagecode))
+
+def getlanguages(projectcode):
+    """gets the stats etc of the languages"""
+    languages = potree().getlanguages(projectcode)
+    languagecount = len(languages)
+    languageitems = [getlanguageitem(languagecode, languagename, projectcode) for languagecode, languagename in languages]
+    for n, item in enumerate(languageitems):
+      item["parity"] = ["even", "odd"][n % 2]
+    return languageitems
+
+def getlanguageinfo(languagecode):
+    try:
+        nplurals = potree().getlanguagenplurals(languagecode)
+    except AttributeError:
+        return ''
+    pluralequation = potree().getlanguagepluralequation(languagecode)
+    infoparts = [(_("Language Code"), languagecode),
+                 (_("Language Name"), potree().getlanguagename(languagecode)),
+                 # (_("Special Characters"), specialchars),
+                 (_("Number of Plurals"), str(nplurals)),
+                 (_("Plural Equation"), pluralequation),
+                ]
+    return [{"title": title, "value": value} for title, value in infoparts]
+
+def getprojectitem(projectcode, languagecode):
+
+    href = '%s/' % projectcode
+    projectname = potree().getprojectname(projectcode)
+    projectdescription = shortdescription(potree().getprojectdescription(projectcode))
+    project = potree().getproject(languagecode, projectcode)
+    pofilenames = project.browsefiles()
+    projectstats = project.getquickstats()
+    projectdata = getstats(project, projectstats, len(pofilenames))
+    # updatepagestats(projectdata["translatedwords"], projectdata["totalwords"])
+    return {
+        'code': projectcode,
+        'href': href,
+        'icon': 'folder',
+        'title': projectname,
+        'description': projectdescription,
+        'data': projectdata,
+        'isproject': True,
+        }
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4199
          http://svn.sourceforge.net/translate/?rev=4199&view=rev
Author:   zejn
Date:     2006-11-03 14:43:24 -0800 (Fri, 03 Nov 2006)

Log Message:
-----------
[django-migration] Moving ProjectLanguageIndex' methods to storage_client.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/indexpage.py
    src/branches/django-migration/Pootle/storage_client.py

Modified: src/branches/django-migration/Pootle/indexpage.py
===================================================================
--- src/branches/django-migration/Pootle/indexpage.py	2006-11-03 22:30:54 UTC (rev 4198)
+++ src/branches/django-migration/Pootle/indexpage.py	2006-11-03 22:43:24 UTC (rev 4199)
@@ -29,6 +29,8 @@
 from Pootle.storage_client import getlanguageinfo as new_getlanguageinfo
 from Pootle.storage_client import getprojects_languageindex as new_getprojects_languageindex
 from Pootle.storage_client import getprojectitem as new_getprojectitem
+from Pootle.storage_client import getlanguages as new_getlanguages
+from Pootle.storage_client import getlanguageitem as new_getlanguageitem
 # Versioning information
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -205,7 +207,7 @@
     self.initpagestats()
     languages = self.getlanguages()
     average = self.getpagestats()
-    projectstats = self.nlocalize("%d language, average %d%% translated", "%d languages, average %d%% translated", self.languagecount, self.languagecount, average)
+    projectstats = self.nlocalize("%d language, average %d%% translated", "%d languages, average %d%% translated", len(languages), len(languages), average)
     projectname = self.potree.getprojectname(self.projectcode)
     description = self.potree.getprojectdescription(projectcode)
     meta_description = shortdescription(description)
@@ -228,21 +230,10 @@
     pagelayout.PootleNavPage.__init__(self, templatename, templatevars, session, bannerheight=81)
 
   def getlanguages(self):
-    """gets the stats etc of the languages"""
-    languages = self.potree.getlanguages(self.projectcode)
-    self.languagecount = len(languages)
-    languageitems = [self.getlanguageitem(languagecode, languagename) for languagecode, languagename in languages]
-    for n, item in enumerate(languageitems):
-      item["parity"] = ["even", "odd"][n % 2]
-    return languageitems
+    return new_getlanguages(self.projectcode)
 
   def getlanguageitem(self, languagecode, languagename):
-    language = self.potree.getproject(languagecode, self.projectcode)
-    href = "../../%s/%s/" % (languagecode, self.projectcode)
-    quickstats = language.getquickstats()
-    data = self.getstats(language, quickstats, len(language.pofilenames))
-    self.updatepagestats(data["translatedwords"], data["totalwords"])
-    return {"code": languagecode, "icon": "language", "href": href, "title": languagename, "data": data}
+    return new_getlanguageitem(languagecode, languagename, self.projectcode)
 
 class ProjectIndex(pagelayout.PootleNavPage):
   """The main page of a project in a specific language"""

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2006-11-03 22:30:54 UTC (rev 4198)
+++ src/branches/django-migration/Pootle/storage_client.py	2006-11-03 22:43:24 UTC (rev 4199)
@@ -175,3 +175,12 @@
         'isproject': True,
         }
 
+def getlanguageitem(languagecode, languagename, projectcode):
+    language = potree().getproject(languagecode, projectcode)
+    href = "../../%s/%s/" % (languagecode, projectcode)
+    quickstats = language.getquickstats()
+    data = getstats(language, quickstats, len(language.pofilenames))
+    # boo
+    #updatepagestats(data["translatedwords"], data["totalwords"])
+    return {"code": languagecode, "icon": "language", "href": href, "title": languagename, "data": data}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4201
          http://svn.sourceforge.net/translate/?rev=4201&view=rev
Author:   zejn
Date:     2006-11-04 13:41:53 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
[django-migration] Adding Django pages, which are at this stage actually just calls to old page classes.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/settings.py
    src/branches/django-migration/Pootle/urls.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/instance.py
    src/branches/django-migration/Pootle/localsettings.py
    src/branches/django-migration/Pootle/views.py

Added: src/branches/django-migration/Pootle/instance.py
===================================================================
--- src/branches/django-migration/Pootle/instance.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/instance.py	2006-11-04 21:41:53 UTC (rev 4201)
@@ -0,0 +1,27 @@
+from django.conf import settings
+from Pootle import potree
+from Pootle.conf import set_instance
+from jToolkit import prefs
+import os
+
+serverprefs = prefs.PrefsParser()
+serverprefs.parsefile(settings.POOTLE_PREFS)
+instance = serverprefs
+# find the instance prefs
+try:
+    instance = serverprefs
+    if settings.POOTLE_INSTANCE:
+        for part in settings.POOTLE_INSTANCE.split("."):
+            instance = getattr(instance, part)
+except AttributeError:
+    errormessage = "Prefs file %r has no attribute %r\nprefs file is %r, attributes are %r" \
+                   % (settings.POOTLE_PREFS, settings.POOTLE_INSTANCE, serverprefs, [top[0] for top in serverprefs.iteritems()])
+    raise AttributeError(errormessage)
+
+
+# set instance and potree globally
+set_instance(instance, potree.POTree(instance))
+
+
+users = prefs.PrefsParser()
+users.parsefile(os.path.join(os.path.dirname(settings.POOTLE_PREFS), instance.userprefs))

Added: src/branches/django-migration/Pootle/localsettings.py
===================================================================
--- src/branches/django-migration/Pootle/localsettings.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/localsettings.py	2006-11-04 21:41:53 UTC (rev 4201)
@@ -0,0 +1,29 @@
+# Django settings for Pootle project.
+from Pootle.utils import next_to_this_file
+
+DEBUG = True
+
+DATABASE_ENGINE = 'sqlite3'           # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
+DATABASE_NAME = '/home/hruske/Desktop/pootle/db'             # Or path to database file if using sqlite3.
+DATABASE_USER = ''             # Not used with sqlite3.
+DATABASE_PASSWORD = ''         # Not used with sqlite3.
+DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+
+MEDIA_ROOT = next_to_this_file(__file__,'html')
+
+# URL that handles the media served from MEDIA_ROOT.
+# Example: "http://media.lawrence.com"
+MEDIA_URL = '/static/'
+
+TEMPLATE_DIRS = (
+    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+    # Always use forward slashes, even on Windows.
+    # Don't forget to use absolute paths, not relative paths.
+    '/home/hruske/Desktop/pootle/pootle_src/django-migration-orig/Pootle/templates/',
+)
+
+POOTLE_INSTANCE = 'Pootle'

Modified: src/branches/django-migration/Pootle/settings.py
===================================================================
--- src/branches/django-migration/Pootle/settings.py	2006-11-04 14:29:27 UTC (rev 4200)
+++ src/branches/django-migration/Pootle/settings.py	2006-11-04 21:41:53 UTC (rev 4201)
@@ -1,6 +1,6 @@
 # Django settings for Pootle project.
+from localsettings import *
 
-DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
@@ -9,13 +9,6 @@
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = ''           # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
 # Local time zone for this installation. All choices can be found here:
 # http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
 TIME_ZONE = 'America/Chicago'
@@ -31,21 +24,13 @@
 # to load the internationalization machinery.
 USE_I18N = True
 
-# Absolute path to the directory that holds media.
-# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = ''
-
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
 ADMIN_MEDIA_PREFIX = '/media/'
 
 # Make this unique, and don't share it with anybody.
-SECRET_KEY = 'wkwnhfd+m%#rfal3jewd%-wr)0b0qjf62bz6n=t!g4ih%!yt4w'
+SECRET_KEY = '3*o6pmcfgjhx#7+9e59dj7yo#y2f!gfx-zko0rad=rk#n))@@x'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
@@ -63,15 +48,14 @@
 
 ROOT_URLCONF = 'Pootle.urls'
 
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
 )
+
+# This sets pootle.prefs file path to be in same dir as these settings.py
+from Pootle.utils import next_to_this_file
+POOTLE_PREFS = next_to_this_file(__file__,'pootle.prefs')
+

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2006-11-04 14:29:27 UTC (rev 4200)
+++ src/branches/django-migration/Pootle/urls.py	2006-11-04 21:41:53 UTC (rev 4201)
@@ -1,9 +1,43 @@
 from django.conf.urls.defaults import *
+from django.conf import settings
 
 urlpatterns = patterns('',
-    # Example:
-    # (r'^Pootle/', include('Pootle.apps.foo.urls.foo')),
+    # js, images, pootle.css, /favicon.ico
+    (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
+)
 
-    # Uncomment this for admin:
-#     (r'^admin/', include('django.contrib.admin.urls')),
+urlpatterns += patterns('Pootle.views',
+    (r'^$', 'index'),
+    (r'^login.html$', 'login'),
+    (r'^register.html$', 'register'),
+    (r'^activate.html$', 'activate'),
+    (r'^about.html$', 'about'),
+    (r'^home/$', 'home'),
+    (r'^home/index.html$', 'home'),
+    (r'^home/options.html$', 'options'),
+    (r'^languages/$', 'languagesindex'),
+    
+    (r'^projects/$', 'projectsindex'),
+    (r'^projects/(?P<project>\w+)/$', 'projectlanguageindex'),
+    (r'^projects/(?P<project>\w+)/index.html$', 'projectlanguageindex'),
+    (r'^projects/(?P<project>\w+)/admin.html$', 'projectadmin'),
+    
+    (r'^admin/$', 'admin'),
+    (r'^admin/index.html$', 'admin'),
+    (r'^admin/users.html$', 'adminusers'),
+    (r'^admin/languages.html$', 'adminlanguages'),
+    (r'^admin/projects.html$', 'adminprojects'),
+    
+    (r'^(?P<language>\w+)/$', 'languageindex'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/$', 'projectindex'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/index.html$', 'projectindex'),
+    
+    (r'^(?P<language>\w+)/(?P<project>\w+)/admin.html', 'admintranslationproject'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/translate.html$', 'translatepage'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/(.*).po?translate$', 'translatepage'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/spellcheck.html$', 'spellcheck'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/spellingstandby.html$', 'spellingstandby'),
+
+
+    (r'^robots.txt$', 'robots'),
 )

Added: src/branches/django-migration/Pootle/views.py
===================================================================
--- src/branches/django-migration/Pootle/views.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/views.py	2006-11-04 21:41:53 UTC (rev 4201)
@@ -0,0 +1,230 @@
+from django.http import HttpResponse, HttpResponseRedirect
+from django.conf import settings
+from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth import REDIRECT_FIELD_NAME
+
+from Pootle import indexpage, adminpages, users, translatepage
+from Pootle.conf import instance, potree
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext
+
+#from instance import instance
+from instance import users as pootleusers
+
+### backwards compatiblity 
+import kid
+import os
+from jToolkit.xml import DOMOverlay
+OLD_TEMPLATEDIR = settings.TEMPLATE_DIRS[0]
+
+class AttrDict(dict):
+  """Dictionary that also allows access to keys using attributes"""
+  def __getattr__(self, attr, default=None):
+    if attr in self:
+      return self[attr]
+    else:
+      return default
+
+# needed for 'buildpage'
+def attribify(context):
+  """takes a set of nested dictionaries and converts them into AttrDict. Also searches through lists"""
+  if isinstance(context, dict) and not isinstance(context, AttrDict):
+    newcontext = AttrDict(context)
+    for key, value in newcontext.items():
+      if isinstance(value, (dict, list)):
+        newcontext[key] = attribify(value)
+    return newcontext
+  elif isinstance(context, list):
+    for n, item in enumerate(context):
+      if isinstance(item, (dict, list)):
+        context[n] = attribify(item)
+    return context
+  else:
+    return context
+
+def loadurl(filename, context):
+    "opens a template file and returns contents as string"
+    filename = os.path.join(OLD_TEMPLATEDIR, filename+os.extsep+"html")
+    if os.path.exists(filename):
+        return open(filename, "r").read()
+    return None
+    
+def buildpage(source, context, loadurl=loadurl, localize=None, innerid=None):
+    #(self, source, context, loadurl=None, localize=None, innerid=None):
+    if DOMOverlay is not None:
+      innerid = context.pop("@innerid", None)
+      if loadurl is None:
+        loadurl = DOMOverlay.loadurl
+      domoverlay = DOMOverlay.DOMOverlay(source, loadurl, context)
+      source = domoverlay.serialise(innerid)
+    context = attribify(context)
+    t = kid.Template(source=source,**context)
+    return t.serialize(output='xhtml')
+
+# the most "important" method for rendering backwards compatible templates
+def render_to_pootleresponse(pootlepage):
+    templatename = pootlepage.templatename
+    template = open(os.path.join(OLD_TEMPLATEDIR, templatename+os.extsep+"html"), "r").read()
+    page = buildpage(template, pootlepage.templatevars or {})
+    return HttpResponse(page)
+
+def pootlesession(req):
+    """Make a wrapper around Django session object to make it work
+    with Pootle's page classes seamlessly."""
+    def localize(s, *args):
+        if args:
+            return _(s) % args
+        return s 
+    def nlocalize(s, s2, numarg, *args):
+        if args: 
+            return s % args
+        return s
+    session = req.session
+    session.localize = localize
+    session.nlocalize = nlocalize
+    session.username = req.user
+    session.instance = instance()
+    if not req.user.is_authenticated():
+        session.status = 'not logged in'
+    else:
+        session.status = 'logged in as <b>%s</b>' % req.user
+    session.isopen = req.user.is_authenticated()
+    session.prefs = req.user
+    
+    # user's projects
+    class getprojects:
+        def __call__(self):
+            userlanguages = getattr(session.prefs, "languages", "")
+            return [languagecode.strip() for languagecode in userlanguages.split(',') if languagecode.strip()]
+    session.getprojects = getprojects()
+    
+    def is_admin(req):
+        def _inner():
+            if not req.user.is_anonymous:
+                if req.user.is_authenticated and req.user.is_superuser:
+                    return True
+            return False
+        return _inner
+    session.issiteadmin = is_admin(req)
+
+    def getlanguages():
+        return []
+    session.getlanguages = getlanguages
+    
+    session.language = 'sl'
+    return session
+
+def css(req):
+    css = open('/home/hruske/Desktop/pootle/trunk/Pootle/html/pootle.css','r').read()
+    return HttpResponse(content=css, mimetype='text/css')
+
+### end backwards compatibility
+
+# indexpage.py
+def index(req):
+    if req.GET:
+        next_page = req.GET.get('next_page','/')
+        from django.contrib.auth import logout as djangologout
+        djangologout(req)
+        req.session.isopen = False
+        return HttpResponseRedirect(next_page)
+
+    return render_to_pootleresponse(indexpage.PootleIndex(potree(), pootlesession(req)))
+    
+def about(req):
+    return render_to_pootleresponse(indexpage.AboutPage(pootlesession(req)))
+
+def home(req):
+    return render_to_pootleresponse(indexpage.UserIndex(potree(), pootlesession(req)))
+
+def languagesindex(req):
+    return render_to_pootleresponse(indexpage.LanguagesIndex(potree(), pootlesession(req)))
+
+def projectlanguageindex(req, project):
+    return render_to_pootleresponse(indexpage.ProjectLanguageIndex(potree(), project, pootlesession(req)))
+
+def languageindex(req, language):
+    return render_to_pootleresponse(indexpage.LanguageIndex(potree(), language, pootlesession(req)))
+    
+def projectsindex(req):
+    return render_to_pootleresponse(indexpage.ProjectsIndex(potree(), pootlesession(req)))
+    
+def projectindex(req, language, project):
+    # important, handles 4 urls
+    argdict = {}
+
+    proj = potree().getproject(language, project)
+    return render_to_pootleresponse(indexpage.ProjectIndex(proj, pootlesession(req), argdict, dirfilter=None))
+
+# users.py
+
+def options(req):
+    message = None
+    return render_to_pootleresponse(users.UserOptions(potree(), pootlesession(req), message))
+
+def login(req):
+    message = None
+    if req.POST:
+        # do login here
+        redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
+        manipulator = AuthenticationForm(req)
+        errors = manipulator.get_validation_errors(req.POST)
+        if not errors:
+            if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
+                redirect_to = '/home/'
+            from django.contrib.auth import login
+            login(req, manipulator.get_user())
+            req.session.delete_test_cookie()
+            req.session.isopen = True
+            return HttpResponseRedirect(redirect_to) 
+    else:
+        errors = {}
+    req.session.set_test_cookie()
+    return render_to_pootleresponse(users.LoginPage(pootlesession(req), languagenames=potree().getlanguages(), message=message))
+
+# users.py: registration, activation
+
+def register(req):
+    message = None
+    argdict = req.POST.copy()
+    return render_to_pootleresponse(users.RegisterPage(pootlesession(req), argdict, message))
+
+def activate(req):
+    argdict = req.POST.copy()
+    return render_to_pootleresponse(users.ActivatePage(pootlesession(req), argdict, title=None, message=None))
+
+# adminpages.py
+
+def projectadmin(req, project):
+    argdict = {}
+    return render_to_pootleresponse(adminpages.ProjectAdminPage(potree(), project, pootlesession(req), argdict))
+    
+def admin(req):
+    return render_to_pootleresponse(adminpages.AdminPage(potree(), pootlesession(req), instance))
+
+def adminusers(req):
+    return render_to_pootleresponse(adminpages.UsersAdminPage(None, pootleusers, pootlesession(req), instance))
+
+def adminlanguages(req):
+    return render_to_pootleresponse(adminpages.LanguagesAdminPage(potree(), pootlesession(req), instance))
+
+def adminprojects(req):
+    return render_to_pootleresponse(adminpages.ProjectsAdminPage(potree(), pootlesession(req), instance))
+
+def admintranslationproject(req):
+    return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project, pootlesession(req), argdict))
+
+# translatepage.py
+
+def translatepage(req):
+    # handles 2 urls
+    return render_to_pootleresponse(translatepage.TranslatePage(project, pootlesession(req), argdict={}, dirfilter=None))
+
+# spellui.py
+
+def spellcheck(req):
+    return render_to_pootleresponse(spellui.SpellingReview(pootlesession(req), argdict={}, js_url="/js/spellui.js"))
+
+def spellingstandby(req):
+    return render_to_pootleresponse(spellui.SpellingStandby())
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4202
          http://svn.sourceforge.net/translate/?rev=4202&view=rev
Author:   zejn
Date:     2006-11-04 13:52:47 -0800 (Sat, 04 Nov 2006)

Log Message:
-----------
[django-migration] Fix links to static content in Django version to make them work in both versions. Django's are now prefixed with /static/, while Pootle now strips /static/.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/html/js/sorttable.js
    src/branches/django-migration/Pootle/pootle.py
    src/branches/django-migration/Pootle/templates/about.html
    src/branches/django-migration/Pootle/templates/activate.html
    src/branches/django-migration/Pootle/templates/adminindex.html
    src/branches/django-migration/Pootle/templates/adminlanguages.html
    src/branches/django-migration/Pootle/templates/adminprojects.html
    src/branches/django-migration/Pootle/templates/adminusers.html
    src/branches/django-migration/Pootle/templates/error.html
    src/branches/django-migration/Pootle/templates/fileindex.html
    src/branches/django-migration/Pootle/templates/home.html
    src/branches/django-migration/Pootle/templates/index.html
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/templates/languages.html
    src/branches/django-migration/Pootle/templates/login.html
    src/branches/django-migration/Pootle/templates/navbar.html
    src/branches/django-migration/Pootle/templates/options.html
    src/branches/django-migration/Pootle/templates/pootlepage.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/templates/projectadmin.html
    src/branches/django-migration/Pootle/templates/projectlangadmin.html
    src/branches/django-migration/Pootle/templates/projects.html
    src/branches/django-migration/Pootle/templates/redirect.html
    src/branches/django-migration/Pootle/templates/register.html
    src/branches/django-migration/Pootle/templates/translatepage.html

Modified: src/branches/django-migration/Pootle/html/js/sorttable.js
===================================================================
--- src/branches/django-migration/Pootle/html/js/sorttable.js	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/html/js/sorttable.js	2006-11-04 21:52:47 UTC (rev 4202)
@@ -35,9 +35,9 @@
 
 var SORT_COLUMN_INDEX;
 
-var arrowUp = "/images/up.png";
-var arrowDown = "/images/down.png";
-var arrowBlank = "/images/none.png";
+var arrowUp = "/static/images/up.png";
+var arrowDown = "/static/images/down.png";
+var arrowBlank = "/static/images/none.png";
 
 function trim(str) {
     return str.replace(/^\s*|\s*$/g, "");

Modified: src/branches/django-migration/Pootle/pootle.py
===================================================================
--- src/branches/django-migration/Pootle/pootle.py	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/pootle.py	2006-11-04 21:52:47 UTC (rev 4202)
@@ -215,7 +215,7 @@
       newargdict[key] = value
     argdict = newargdict
     # TODO: strip off the initial path properly
-    while pathwords and pathwords[0] == "pootle":
+    while pathwords and pathwords[0] in ("pootle", "static"):
       pathwords = pathwords[1:]
     if pathwords:
       top = pathwords[0]

Modified: src/branches/django-migration/Pootle/templates/about.html
===================================================================
--- src/branches/django-migration/Pootle/templates/about.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/about.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -8,10 +8,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="description" content="${meta_description}" />
   <meta name="keywords" content="${', '.join(keywords)}" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/activate.html
===================================================================
--- src/branches/django-migration/Pootle/templates/activate.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/activate.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">Pootle Account Activation</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/adminindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminindex.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/adminindex.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title>Pootle Admin Page</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/adminlanguages.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminlanguages.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/adminlanguages.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title>Pootle Languages Admin Page</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/adminprojects.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminprojects.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/adminprojects.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title>Pootle Projects Admin Page</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/adminusers.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminusers.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/adminusers.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title>Pootle User Admin Page</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/error.html
===================================================================
--- src/branches/django-migration/Pootle/templates/error.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/error.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -7,10 +7,10 @@
   <title py:content="pagetitle">Error</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta py:if="refresh" http-equiv="Refresh" content="${refresh}; URL=${refreshurl}" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/fileindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/fileindex.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/fileindex.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,11 +6,11 @@
 
   <title py:content="pagetitle">Pootle: Project ${project.name}, Language ${language.name}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
-  <script type="text/javascript" src="/js/sorttable.js"></script>
+  <script type="text/javascript" src="/static/js/sorttable.js"></script>
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 
@@ -75,7 +75,7 @@
       <div py:if="'isgoal' in item" class="goalitem">
         <div over:include="navbar#item">
           <div py:if="item.goal.users or item.goal.show_adduser">
-            <img src="/images/person.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
+            <img src="/static/images/person.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
             <span py:for="user in item.goal.users" py:strip="True">${user.name}${user.sep}</span>
             <form py:if="item.goal.show_adduser" action="" method="post" name="goaluserform">
               <input type="hidden" name="editgoalname" value="${item.goal.name}"/>

Modified: src/branches/django-migration/Pootle/templates/home.html
===================================================================
--- src/branches/django-migration/Pootle/templates/home.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/home.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">User Page for: ${username}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/index.html
===================================================================
--- src/branches/django-migration/Pootle/templates/index.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/index.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -8,10 +8,10 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="description" content="${meta_description}" />
   <meta name="keywords" content="${', '.join(keywords)}" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/language.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,11 +6,11 @@
 
   <title py:content="pagetitle">Pootle: ${language.name}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
-  <script type="text/javascript" src="/js/sorttable.js"></script>
+  <script type="text/javascript" src="/static/js/sorttable.js"></script>
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 
@@ -20,7 +20,7 @@
 
   <div id="content" dir="$uidir" lang="$uilanguage">
     <div class="navbar">
-      <img src="/images/language.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
+      <img src="/static/images/language.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
 
       <h3 class="title">[ <a href="/${language.code}/" py:content="language.name">Language</a> ]</h3>
 

Modified: src/branches/django-migration/Pootle/templates/languages.html
===================================================================
--- src/branches/django-migration/Pootle/templates/languages.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/languages.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">Pootle</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/login.html
===================================================================
--- src/branches/django-migration/Pootle/templates/login.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/login.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">Login to Pootle</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/navbar.html
===================================================================
--- src/branches/django-migration/Pootle/templates/navbar.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/navbar.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -4,12 +4,12 @@
 <head>
   <title>Pootle Navigation Bar</title>
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 <body>
   <div id="item" class="contentsitem">
-    <img src="/images/${item.icon}.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
+    <img src="/static/images/${item.icon}.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
     <h3 id="itemtitle" class="title"><a href="${item.href}">${item.title}</a></h3>
     <div id="actionlinks" class="item-description" py:if="item.actions">
       <span py:for="link in item.actions.basic" py:strip="True">
@@ -62,7 +62,7 @@
   </div>
   <div id="itemdata" class="item-statistics" py:strip="True">
     <td class="stats-name">
-      <img src="/images/${item.icon}.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
+      <img src="/static/images/${item.icon}.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
       <a href="${item.href}" lang="en" dir="ltr">${item.title}</a>
     </td>
     <span py:if="item.data" py:strip="True">
@@ -73,9 +73,9 @@
       <td class="stats-graph">
         <span class="sortkey">${item.data.translatedpercentage}</span>
         <table border="0" cellpadding="0" cellspacing="0"><tr>
-<!--!        <td bgcolor="green"><img src="/images/green.png" class="data" bgcolor="green" height="20" width="${item.data.translatedpercentage}" /></td>-->
-<!--!        <td bgcolor="grey"><img src="/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" /></td>-->
-<!--!        <td bgcolor="red"><img src="/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" /></td>-->
+<!--!        <td bgcolor="green"><img src="/static/images/green.png" class="data" bgcolor="green" height="20" width="${item.data.translatedpercentage}" /></td>-->
+<!--!        <td bgcolor="grey"><img src="/static/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" /></td>-->
+<!--!        <td bgcolor="red"><img src="/static/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" /></td>-->
             <td bgcolor="green" class="data" height="20" width="${item.data.translatedpercentage}" />
             <td bgcolor="lightgray" class="data" height="20" width="${item.data.fuzzypercentage}" py:if="item.data.fuzzypercentage"/>
             <td bgcolor="red" class="data" height="20" width="${item.data.untranslatedpercentage}" py:if="item.data.untranslatedpercentage"/>
@@ -83,7 +83,7 @@
           
         <!--! The following is simpler, but kid reformats the img tags which inserts spaces between them -->
 
-<!--!        <img src="/images/green.png" class="data" height="20" width="${item.data.translatedpercentage}" background="green" /><img src="/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" background="grey" /><img src="/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" background="red" />-->
+<!--!        <img src="/static/images/green.png" class="data" height="20" width="${item.data.translatedpercentage}" background="green" /><img src="/static/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" background="grey" /><img src="/static/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" background="red" />-->
       </td>      
     </span>
   </div>

Modified: src/branches/django-migration/Pootle/templates/options.html
===================================================================
--- src/branches/django-migration/Pootle/templates/options.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/options.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">Options for: ${username}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/pootlepage.html
===================================================================
--- src/branches/django-migration/Pootle/templates/pootlepage.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/pootlepage.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -4,10 +4,10 @@
 <head>
   <title>Pootle Page</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 <body>
@@ -15,18 +15,18 @@
     <table cellpadding="0" width="100%" border="0" cellspacing="0">
       <tr>
         <td rowspan="1" colspan="1" align="left" width="${logo_width}" valign="top">
-          <img src="/images/${logo_image}" height="${logo_height}" width="${logo_width}" alt="${logo_alttext}" style="padding-top:5px;" />
+          <img src="/static/images/${logo_image}" height="${logo_height}" width="${logo_width}" alt="${logo_alttext}" style="padding-top:5px;" />
         </td>
 
         <td colspan="1" rowspan="1" width="5">
-          <img src="/images/gap.png" height="5" width="5" alt="" />
+          <img src="/static/images/gap.png" height="5" width="5" alt="" />
         </td>
 
         <td colspan="1" rowspan="1" width="100%">
           <table cellspacing="0" style="height: ${banner_height}px" width="100%" cellpadding="0" border="0" class="header">
             <tr>
               <td colspan="1" align="center" rowspan="1" valign="middle">
-                 <img src="/images/WordForge-white.png" height="${banner_height}" width="${banner_width}" alt="${banner_alttext}" style="padding-top:5px;"/>
+                 <img src="/static/images/WordForge-white.png" height="${banner_height}" width="${banner_width}" alt="${banner_alttext}" style="padding-top:5px;"/>
               </td>
             </tr>
 
@@ -43,7 +43,7 @@
     <!-- Account information -->
     <div class="account">
     <div class="side">
-      <img src="/images/person.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
+      <img src="/static/images/person.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
     </div>
     <div class="side" py:if="session.isopen">
       <span py:content="XML(session.status)">logged in as <b>somebody</b></span> |

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/project.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -7,11 +7,11 @@
   <title py:content="pagetitle">Pootle: ${project.name}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="description" content="${meta_description}" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
-  <script type="text/javascript" src="/js/sorttable.js"></script>
+  <script type="text/javascript" src="/static/js/sorttable.js"></script>
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 
@@ -21,7 +21,7 @@
 
   <div id="content" dir="$uidir" lang="$uilanguage">
     <div class="navbar">
-      <img src="/images/folder.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
+      <img src="/static/images/folder.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
 
       <h3 class="title">[ <a href="/projects/${project.code}/" py:content="project.name">Project</a> ]</h3>
 

Modified: src/branches/django-migration/Pootle/templates/projectadmin.html
===================================================================
--- src/branches/django-migration/Pootle/templates/projectadmin.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/projectadmin.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">Pootle Admin: ${project.name}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/projectlangadmin.html
===================================================================
--- src/branches/django-migration/Pootle/templates/projectlangadmin.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/projectlangadmin.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">Pootle Admin: ${language.name} ${project.name}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/projects.html
===================================================================
--- src/branches/django-migration/Pootle/templates/projects.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/projects.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">Pootle</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/redirect.html
===================================================================
--- src/branches/django-migration/Pootle/templates/redirect.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/redirect.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -7,10 +7,10 @@
   <title py:content="pagetitle">Redirecting...</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta http-equiv="Refresh" content="${refresh}; URL=${refreshurl}" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/register.html
===================================================================
--- src/branches/django-migration/Pootle/templates/register.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/register.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,10 +6,10 @@
 
   <title py:content="pagetitle">Pootle Registration</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 

Modified: src/branches/django-migration/Pootle/templates/translatepage.html
===================================================================
--- src/branches/django-migration/Pootle/templates/translatepage.html	2006-11-04 21:41:53 UTC (rev 4201)
+++ src/branches/django-migration/Pootle/templates/translatepage.html	2006-11-04 21:52:47 UTC (rev 4202)
@@ -6,14 +6,14 @@
 
   <title py:content="pagetitle">Pootle: translating ${project.name} into ${language.name}: ${pofilename}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/pootle.css" />
+  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
-<script src="/js/autoexpand.js" type="text/javascript">
+<script src="/static/js/autoexpand.js" type="text/javascript">
 <!--
 //-->
 </script>
   <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/js/correctpng.js"></script>
+    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->
 </head>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4205
          http://svn.sourceforge.net/translate/?rev=4205&view=rev
Author:   zejn
Date:     2006-11-05 05:19:55 -0800 (Sun, 05 Nov 2006)

Log Message:
-----------
[django-migration] Moving generaterobotsfile to storage_client, improving speed and readability.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/pootle.py
    src/branches/django-migration/Pootle/storage_client.py
    src/branches/django-migration/Pootle/views.py

Modified: src/branches/django-migration/Pootle/pootle.py
===================================================================
--- src/branches/django-migration/Pootle/pootle.py	2006-11-05 10:47:57 UTC (rev 4204)
+++ src/branches/django-migration/Pootle/pootle.py	2006-11-05 13:19:55 UTC (rev 4205)
@@ -37,6 +37,7 @@
 from Pootle import users
 from Pootle import filelocations
 from Pootle.conf import set_instance
+from Pootle.storage_client import generaterobotsfile
 # Versioning information
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -191,17 +192,6 @@
     """generates a unique activation code"""
     return "".join(["%02x" % int(random.random()*0x100) for i in range(16)])
 
-  def generaterobotsfile(self):
-    """generates the robots.txt file"""
-    langcodes = self.potree.getlanguagecodes()
-    excludedfiles = ["login.html", "register.html", "activate.html"]
-    content = "User-agent: *\n"
-    for excludedfile in excludedfiles:
-      content += "Disallow: /%s\n" % excludedfile
-    for langcode in langcodes:
-      content += "Disallow: /%s/\n" % langcode
-    return content
-
   def getpage(self, pathwords, session, argdict):
     """return a page that will be sent to the user"""
     #Ensure we get unicode from argdict
@@ -267,7 +257,7 @@
       picture.allowcaching = True
       return picture
     elif top == "robots.txt":
-      robotspage = widgets.PlainContents(self.generaterobotsfile())
+      robotspage = widgets.PlainContents(generaterobotsfile(["login.html", "register.html", "activate.html"]))
       robotspage.content_type = 'text/plain'
       robotspage.allowcaching = True
       return robotspage

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2006-11-05 10:47:57 UTC (rev 4204)
+++ src/branches/django-migration/Pootle/storage_client.py	2006-11-05 13:19:55 UTC (rev 4205)
@@ -184,3 +184,10 @@
     #updatepagestats(data["translatedwords"], data["totalwords"])
     return {"code": languagecode, "icon": "language", "href": href, "title": languagename, "data": data}
 
+def generaterobotsfile(excludedfiles=[]):
+    """generates the robots.txt file"""
+    content = ["User-agent: *\n"]
+    content.extend([ "Disallow: /%s\n" % ef for ef in excludedfiles])
+    content.extend([ "Disallow: /%s/\n" % lc for lc in potree().getlanguagecodes() ])
+    return ''.join(content)
+

Modified: src/branches/django-migration/Pootle/views.py
===================================================================
--- src/branches/django-migration/Pootle/views.py	2006-11-05 10:47:57 UTC (rev 4204)
+++ src/branches/django-migration/Pootle/views.py	2006-11-05 13:19:55 UTC (rev 4205)
@@ -5,6 +5,7 @@
 
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
+from Pootle.storage_client import generaterobotsfile
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 
@@ -120,6 +121,9 @@
 
 ### end backwards compatibility
 
+def robots(req):
+    return HttpResponse(content=generaterobotsfile(["login.html", "register.html", "activate.html"]), mimetype="text/plain")
+
 # indexpage.py
 def index(req):
     if req.GET:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4206
          http://svn.sourceforge.net/translate/?rev=4206&view=rev
Author:   zejn
Date:     2006-11-05 05:45:18 -0800 (Sun, 05 Nov 2006)

Log Message:
-----------
[django-migration] Adding pootleauth module for Django to use users.prefs. Also fixing login to redirect if already logged in.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/settings.py
    src/branches/django-migration/Pootle/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/pootleauth.py

Added: src/branches/django-migration/Pootle/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/pootleauth.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/pootleauth.py	2006-11-05 13:45:18 UTC (rev 4206)
@@ -0,0 +1,44 @@
+"""Pootle authentication backend for Django, users are saved in users.prefs 
+file, just like with Pootle."""
+
+
+import md5
+from Pootle.instance import users
+
+def md5hexdigest(text):
+  if isinstance(text, unicode): text = text.encode('utf8')
+  return md5.md5(text).hexdigest()
+
+class UserWrapper:
+    """A class to wrap user object in just to map different naming 
+    between jToolkit and Django"""
+    def __init__(self, user, username):
+        def istrue():
+            return True
+        self.user = user
+        self.mapping = {
+            'is_active': user.activated,
+            'is_authenticated': istrue,
+            'is_anonymous': False,
+            'id': username,
+            'is_superuser': user.rights.siteadmin
+            }
+    def __getattr__(self, key):
+        if key in self.mapping:
+            return self.mapping[key]
+        else:
+            return self.user.__getattr__(key)
+
+class PootleAuth:
+    "Authenticate against Pootle's users.prefs file"
+    def authenticate(self, username=None, password=None):
+        if users.__hasattr__(username):
+            user = users.__getattr__(username)
+            if md5hexdigest(password) == user.passwdhash:
+                return UserWrapper(user, username)
+        return None
+
+    def get_user(self, username):
+        if users.__hasattr__(username):
+            return UserWrapper(users.__getattr__(username), username)
+        return None

Modified: src/branches/django-migration/Pootle/settings.py
===================================================================
--- src/branches/django-migration/Pootle/settings.py	2006-11-05 13:19:55 UTC (rev 4205)
+++ src/branches/django-migration/Pootle/settings.py	2006-11-05 13:45:18 UTC (rev 4206)
@@ -59,3 +59,4 @@
 from Pootle.utils import next_to_this_file
 POOTLE_PREFS = next_to_this_file(__file__,'pootle.prefs')
 
+AUTHENTICATION_BACKENDS = ('Pootle.pootleauth.PootleAuth', )

Modified: src/branches/django-migration/Pootle/views.py
===================================================================
--- src/branches/django-migration/Pootle/views.py	2006-11-05 13:19:55 UTC (rev 4205)
+++ src/branches/django-migration/Pootle/views.py	2006-11-05 13:45:18 UTC (rev 4206)
@@ -168,23 +168,27 @@
 
 def login(req):
     message = None
-    if req.POST:
-        # do login here
-        redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
-        manipulator = AuthenticationForm(req)
-        errors = manipulator.get_validation_errors(req.POST)
-        if not errors:
-            if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
-                redirect_to = '/home/'
-            from django.contrib.auth import login
-            login(req, manipulator.get_user())
-            req.session.delete_test_cookie()
-            req.session.isopen = True
-            return HttpResponseRedirect(redirect_to) 
+    redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
+    if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
+        redirect_to = '/home/'
+
+    if req.user.is_authenticated():
+        return HttpResponseRedirect(redirect_to)
     else:
-        errors = {}
-    req.session.set_test_cookie()
-    return render_to_pootleresponse(users.LoginPage(pootlesession(req), languagenames=potree().getlanguages(), message=message))
+        if req.POST:
+            # do login here
+            manipulator = AuthenticationForm(req)
+            errors = manipulator.get_validation_errors(req.POST)
+            if not errors:
+                from django.contrib.auth import login
+                login(req, manipulator.get_user())
+                req.session.delete_test_cookie()
+                req.session.isopen = True
+                return HttpResponseRedirect(redirect_to) 
+        else:
+            errors = {}
+        req.session.set_test_cookie()
+        return render_to_pootleresponse(users.LoginPage(pootlesession(req), languagenames=potree().getlanguages(), message=message))
 
 # users.py: registration, activation
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4207
          http://svn.sourceforge.net/translate/?rev=4207&view=rev
Author:   zejn
Date:     2006-11-05 09:59:46 -0800 (Sun, 05 Nov 2006)

Log Message:
-----------
[django-migration] Moving views.py into web subdirectory to make structure more meaningful.

Added Paths:
-----------
    src/branches/django-migration/Pootle/web/
    src/branches/django-migration/Pootle/web/views.py

Removed Paths:
-------------
    src/branches/django-migration/Pootle/views.py

Deleted: src/branches/django-migration/Pootle/views.py
===================================================================
--- src/branches/django-migration/Pootle/views.py	2006-11-05 13:45:18 UTC (rev 4206)
+++ src/branches/django-migration/Pootle/views.py	2006-11-05 17:59:46 UTC (rev 4207)
@@ -1,238 +0,0 @@
-from django.http import HttpResponse, HttpResponseRedirect
-from django.conf import settings
-from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth import REDIRECT_FIELD_NAME
-
-from Pootle import indexpage, adminpages, users, translatepage
-from Pootle.conf import instance, potree
-from Pootle.storage_client import generaterobotsfile
-from django.utils.translation import gettext_lazy as _
-from django.utils.translation import ngettext
-
-#from instance import instance
-from instance import users as pootleusers
-
-### backwards compatiblity 
-import kid
-import os
-from jToolkit.xml import DOMOverlay
-OLD_TEMPLATEDIR = settings.TEMPLATE_DIRS[0]
-
-class AttrDict(dict):
-  """Dictionary that also allows access to keys using attributes"""
-  def __getattr__(self, attr, default=None):
-    if attr in self:
-      return self[attr]
-    else:
-      return default
-
-# needed for 'buildpage'
-def attribify(context):
-  """takes a set of nested dictionaries and converts them into AttrDict. Also searches through lists"""
-  if isinstance(context, dict) and not isinstance(context, AttrDict):
-    newcontext = AttrDict(context)
-    for key, value in newcontext.items():
-      if isinstance(value, (dict, list)):
-        newcontext[key] = attribify(value)
-    return newcontext
-  elif isinstance(context, list):
-    for n, item in enumerate(context):
-      if isinstance(item, (dict, list)):
-        context[n] = attribify(item)
-    return context
-  else:
-    return context
-
-def loadurl(filename, context):
-    "opens a template file and returns contents as string"
-    filename = os.path.join(OLD_TEMPLATEDIR, filename+os.extsep+"html")
-    if os.path.exists(filename):
-        return open(filename, "r").read()
-    return None
-    
-def buildpage(source, context, loadurl=loadurl, localize=None, innerid=None):
-    #(self, source, context, loadurl=None, localize=None, innerid=None):
-    if DOMOverlay is not None:
-      innerid = context.pop("@innerid", None)
-      if loadurl is None:
-        loadurl = DOMOverlay.loadurl
-      domoverlay = DOMOverlay.DOMOverlay(source, loadurl, context)
-      source = domoverlay.serialise(innerid)
-    context = attribify(context)
-    t = kid.Template(source=source,**context)
-    return t.serialize(output='xhtml')
-
-# the most "important" method for rendering backwards compatible templates
-def render_to_pootleresponse(pootlepage):
-    templatename = pootlepage.templatename
-    template = open(os.path.join(OLD_TEMPLATEDIR, templatename+os.extsep+"html"), "r").read()
-    page = buildpage(template, pootlepage.templatevars or {})
-    return HttpResponse(page)
-
-def pootlesession(req):
-    """Make a wrapper around Django session object to make it work
-    with Pootle's page classes seamlessly."""
-    def localize(s, *args):
-        if args:
-            return _(s) % args
-        return s 
-    def nlocalize(s, s2, numarg, *args):
-        if args: 
-            return s % args
-        return s
-    session = req.session
-    session.localize = localize
-    session.nlocalize = nlocalize
-    session.username = req.user
-    session.instance = instance()
-    if not req.user.is_authenticated():
-        session.status = 'not logged in'
-    else:
-        session.status = 'logged in as <b>%s</b>' % req.user
-    session.isopen = req.user.is_authenticated()
-    session.prefs = req.user
-    
-    # user's projects
-    class getprojects:
-        def __call__(self):
-            userlanguages = getattr(session.prefs, "languages", "")
-            return [languagecode.strip() for languagecode in userlanguages.split(',') if languagecode.strip()]
-    session.getprojects = getprojects()
-    
-    def is_admin(req):
-        def _inner():
-            if not req.user.is_anonymous:
-                if req.user.is_authenticated and req.user.is_superuser:
-                    return True
-            return False
-        return _inner
-    session.issiteadmin = is_admin(req)
-
-    def getlanguages():
-        return []
-    session.getlanguages = getlanguages
-    
-    session.language = 'sl'
-    return session
-
-def css(req):
-    css = open('/home/hruske/Desktop/pootle/trunk/Pootle/html/pootle.css','r').read()
-    return HttpResponse(content=css, mimetype='text/css')
-
-### end backwards compatibility
-
-def robots(req):
-    return HttpResponse(content=generaterobotsfile(["login.html", "register.html", "activate.html"]), mimetype="text/plain")
-
-# indexpage.py
-def index(req):
-    if req.GET:
-        next_page = req.GET.get('next_page','/')
-        from django.contrib.auth import logout as djangologout
-        djangologout(req)
-        req.session.isopen = False
-        return HttpResponseRedirect(next_page)
-
-    return render_to_pootleresponse(indexpage.PootleIndex(potree(), pootlesession(req)))
-    
-def about(req):
-    return render_to_pootleresponse(indexpage.AboutPage(pootlesession(req)))
-
-def home(req):
-    return render_to_pootleresponse(indexpage.UserIndex(potree(), pootlesession(req)))
-
-def languagesindex(req):
-    return render_to_pootleresponse(indexpage.LanguagesIndex(potree(), pootlesession(req)))
-
-def projectlanguageindex(req, project):
-    return render_to_pootleresponse(indexpage.ProjectLanguageIndex(potree(), project, pootlesession(req)))
-
-def languageindex(req, language):
-    return render_to_pootleresponse(indexpage.LanguageIndex(potree(), language, pootlesession(req)))
-    
-def projectsindex(req):
-    return render_to_pootleresponse(indexpage.ProjectsIndex(potree(), pootlesession(req)))
-    
-def projectindex(req, language, project):
-    # important, handles 4 urls
-    argdict = {}
-
-    proj = potree().getproject(language, project)
-    return render_to_pootleresponse(indexpage.ProjectIndex(proj, pootlesession(req), argdict, dirfilter=None))
-
-# users.py
-
-def options(req):
-    message = None
-    return render_to_pootleresponse(users.UserOptions(potree(), pootlesession(req), message))
-
-def login(req):
-    message = None
-    redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
-    if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
-        redirect_to = '/home/'
-
-    if req.user.is_authenticated():
-        return HttpResponseRedirect(redirect_to)
-    else:
-        if req.POST:
-            # do login here
-            manipulator = AuthenticationForm(req)
-            errors = manipulator.get_validation_errors(req.POST)
-            if not errors:
-                from django.contrib.auth import login
-                login(req, manipulator.get_user())
-                req.session.delete_test_cookie()
-                req.session.isopen = True
-                return HttpResponseRedirect(redirect_to) 
-        else:
-            errors = {}
-        req.session.set_test_cookie()
-        return render_to_pootleresponse(users.LoginPage(pootlesession(req), languagenames=potree().getlanguages(), message=message))
-
-# users.py: registration, activation
-
-def register(req):
-    message = None
-    argdict = req.POST.copy()
-    return render_to_pootleresponse(users.RegisterPage(pootlesession(req), argdict, message))
-
-def activate(req):
-    argdict = req.POST.copy()
-    return render_to_pootleresponse(users.ActivatePage(pootlesession(req), argdict, title=None, message=None))
-
-# adminpages.py
-
-def projectadmin(req, project):
-    argdict = {}
-    return render_to_pootleresponse(adminpages.ProjectAdminPage(potree(), project, pootlesession(req), argdict))
-    
-def admin(req):
-    return render_to_pootleresponse(adminpages.AdminPage(potree(), pootlesession(req), instance))
-
-def adminusers(req):
-    return render_to_pootleresponse(adminpages.UsersAdminPage(None, pootleusers, pootlesession(req), instance))
-
-def adminlanguages(req):
-    return render_to_pootleresponse(adminpages.LanguagesAdminPage(potree(), pootlesession(req), instance))
-
-def adminprojects(req):
-    return render_to_pootleresponse(adminpages.ProjectsAdminPage(potree(), pootlesession(req), instance))
-
-def admintranslationproject(req):
-    return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project, pootlesession(req), argdict))
-
-# translatepage.py
-
-def translatepage(req):
-    # handles 2 urls
-    return render_to_pootleresponse(translatepage.TranslatePage(project, pootlesession(req), argdict={}, dirfilter=None))
-
-# spellui.py
-
-def spellcheck(req):
-    return render_to_pootleresponse(spellui.SpellingReview(pootlesession(req), argdict={}, js_url="/js/spellui.js"))
-
-def spellingstandby(req):
-    return render_to_pootleresponse(spellui.SpellingStandby())
-

Copied: src/branches/django-migration/Pootle/web/views.py (from rev 4206, src/branches/django-migration/Pootle/views.py)
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-05 17:59:46 UTC (rev 4207)
@@ -0,0 +1,238 @@
+from django.http import HttpResponse, HttpResponseRedirect
+from django.conf import settings
+from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth import REDIRECT_FIELD_NAME
+
+from Pootle import indexpage, adminpages, users, translatepage
+from Pootle.conf import instance, potree
+from Pootle.storage_client import generaterobotsfile
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext
+
+#from instance import instance
+from instance import users as pootleusers
+
+### backwards compatiblity 
+import kid
+import os
+from jToolkit.xml import DOMOverlay
+OLD_TEMPLATEDIR = settings.TEMPLATE_DIRS[0]
+
+class AttrDict(dict):
+  """Dictionary that also allows access to keys using attributes"""
+  def __getattr__(self, attr, default=None):
+    if attr in self:
+      return self[attr]
+    else:
+      return default
+
+# needed for 'buildpage'
+def attribify(context):
+  """takes a set of nested dictionaries and converts them into AttrDict. Also searches through lists"""
+  if isinstance(context, dict) and not isinstance(context, AttrDict):
+    newcontext = AttrDict(context)
+    for key, value in newcontext.items():
+      if isinstance(value, (dict, list)):
+        newcontext[key] = attribify(value)
+    return newcontext
+  elif isinstance(context, list):
+    for n, item in enumerate(context):
+      if isinstance(item, (dict, list)):
+        context[n] = attribify(item)
+    return context
+  else:
+    return context
+
+def loadurl(filename, context):
+    "opens a template file and returns contents as string"
+    filename = os.path.join(OLD_TEMPLATEDIR, filename+os.extsep+"html")
+    if os.path.exists(filename):
+        return open(filename, "r").read()
+    return None
+    
+def buildpage(source, context, loadurl=loadurl, localize=None, innerid=None):
+    #(self, source, context, loadurl=None, localize=None, innerid=None):
+    if DOMOverlay is not None:
+      innerid = context.pop("@innerid", None)
+      if loadurl is None:
+        loadurl = DOMOverlay.loadurl
+      domoverlay = DOMOverlay.DOMOverlay(source, loadurl, context)
+      source = domoverlay.serialise(innerid)
+    context = attribify(context)
+    t = kid.Template(source=source,**context)
+    return t.serialize(output='xhtml')
+
+# the most "important" method for rendering backwards compatible templates
+def render_to_pootleresponse(pootlepage):
+    templatename = pootlepage.templatename
+    template = open(os.path.join(OLD_TEMPLATEDIR, templatename+os.extsep+"html"), "r").read()
+    page = buildpage(template, pootlepage.templatevars or {})
+    return HttpResponse(page)
+
+def pootlesession(req):
+    """Make a wrapper around Django session object to make it work
+    with Pootle's page classes seamlessly."""
+    def localize(s, *args):
+        if args:
+            return _(s) % args
+        return s 
+    def nlocalize(s, s2, numarg, *args):
+        if args: 
+            return s % args
+        return s
+    session = req.session
+    session.localize = localize
+    session.nlocalize = nlocalize
+    session.username = req.user
+    session.instance = instance()
+    if not req.user.is_authenticated():
+        session.status = 'not logged in'
+    else:
+        session.status = 'logged in as <b>%s</b>' % req.user
+    session.isopen = req.user.is_authenticated()
+    session.prefs = req.user
+    
+    # user's projects
+    class getprojects:
+        def __call__(self):
+            userlanguages = getattr(session.prefs, "languages", "")
+            return [languagecode.strip() for languagecode in userlanguages.split(',') if languagecode.strip()]
+    session.getprojects = getprojects()
+    
+    def is_admin(req):
+        def _inner():
+            if not req.user.is_anonymous:
+                if req.user.is_authenticated and req.user.is_superuser:
+                    return True
+            return False
+        return _inner
+    session.issiteadmin = is_admin(req)
+
+    def getlanguages():
+        return []
+    session.getlanguages = getlanguages
+    
+    session.language = 'sl'
+    return session
+
+def css(req):
+    css = open('/home/hruske/Desktop/pootle/trunk/Pootle/html/pootle.css','r').read()
+    return HttpResponse(content=css, mimetype='text/css')
+
+### end backwards compatibility
+
+def robots(req):
+    return HttpResponse(content=generaterobotsfile(["login.html", "register.html", "activate.html"]), mimetype="text/plain")
+
+# indexpage.py
+def index(req):
+    if req.GET:
+        next_page = req.GET.get('next_page','/')
+        from django.contrib.auth import logout as djangologout
+        djangologout(req)
+        req.session.isopen = False
+        return HttpResponseRedirect(next_page)
+
+    return render_to_pootleresponse(indexpage.PootleIndex(potree(), pootlesession(req)))
+    
+def about(req):
+    return render_to_pootleresponse(indexpage.AboutPage(pootlesession(req)))
+
+def home(req):
+    return render_to_pootleresponse(indexpage.UserIndex(potree(), pootlesession(req)))
+
+def languagesindex(req):
+    return render_to_pootleresponse(indexpage.LanguagesIndex(potree(), pootlesession(req)))
+
+def projectlanguageindex(req, project):
+    return render_to_pootleresponse(indexpage.ProjectLanguageIndex(potree(), project, pootlesession(req)))
+
+def languageindex(req, language):
+    return render_to_pootleresponse(indexpage.LanguageIndex(potree(), language, pootlesession(req)))
+    
+def projectsindex(req):
+    return render_to_pootleresponse(indexpage.ProjectsIndex(potree(), pootlesession(req)))
+    
+def projectindex(req, language, project):
+    # important, handles 4 urls
+    argdict = {}
+
+    proj = potree().getproject(language, project)
+    return render_to_pootleresponse(indexpage.ProjectIndex(proj, pootlesession(req), argdict, dirfilter=None))
+
+# users.py
+
+def options(req):
+    message = None
+    return render_to_pootleresponse(users.UserOptions(potree(), pootlesession(req), message))
+
+def login(req):
+    message = None
+    redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
+    if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
+        redirect_to = '/home/'
+
+    if req.user.is_authenticated():
+        return HttpResponseRedirect(redirect_to)
+    else:
+        if req.POST:
+            # do login here
+            manipulator = AuthenticationForm(req)
+            errors = manipulator.get_validation_errors(req.POST)
+            if not errors:
+                from django.contrib.auth import login
+                login(req, manipulator.get_user())
+                req.session.delete_test_cookie()
+                req.session.isopen = True
+                return HttpResponseRedirect(redirect_to) 
+        else:
+            errors = {}
+        req.session.set_test_cookie()
+        return render_to_pootleresponse(users.LoginPage(pootlesession(req), languagenames=potree().getlanguages(), message=message))
+
+# users.py: registration, activation
+
+def register(req):
+    message = None
+    argdict = req.POST.copy()
+    return render_to_pootleresponse(users.RegisterPage(pootlesession(req), argdict, message))
+
+def activate(req):
+    argdict = req.POST.copy()
+    return render_to_pootleresponse(users.ActivatePage(pootlesession(req), argdict, title=None, message=None))
+
+# adminpages.py
+
+def projectadmin(req, project):
+    argdict = {}
+    return render_to_pootleresponse(adminpages.ProjectAdminPage(potree(), project, pootlesession(req), argdict))
+    
+def admin(req):
+    return render_to_pootleresponse(adminpages.AdminPage(potree(), pootlesession(req), instance))
+
+def adminusers(req):
+    return render_to_pootleresponse(adminpages.UsersAdminPage(None, pootleusers, pootlesession(req), instance))
+
+def adminlanguages(req):
+    return render_to_pootleresponse(adminpages.LanguagesAdminPage(potree(), pootlesession(req), instance))
+
+def adminprojects(req):
+    return render_to_pootleresponse(adminpages.ProjectsAdminPage(potree(), pootlesession(req), instance))
+
+def admintranslationproject(req):
+    return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project, pootlesession(req), argdict))
+
+# translatepage.py
+
+def translatepage(req):
+    # handles 2 urls
+    return render_to_pootleresponse(translatepage.TranslatePage(project, pootlesession(req), argdict={}, dirfilter=None))
+
+# spellui.py
+
+def spellcheck(req):
+    return render_to_pootleresponse(spellui.SpellingReview(pootlesession(req), argdict={}, js_url="/js/spellui.js"))
+
+def spellingstandby(req):
+    return render_to_pootleresponse(spellui.SpellingStandby())
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4215
          http://svn.sourceforge.net/translate/?rev=4215&view=rev
Author:   zejn
Date:     2006-11-07 16:11:55 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
[django-migration] urls.py and __init__.py serve as a fix for previous commit.
pootleauth.py has been extended to support adding users. conf.py now also has
user database. views.py has now working registration implemented in a typical
Django way - see http://www.djangoproject.com/documentation/forms/#manipulators

Modified Paths:
--------------
    src/branches/django-migration/Pootle/conf.py
    src/branches/django-migration/Pootle/instance.py
    src/branches/django-migration/Pootle/pootleauth.py
    src/branches/django-migration/Pootle/urls.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/web/__init__.py

Modified: src/branches/django-migration/Pootle/conf.py
===================================================================
--- src/branches/django-migration/Pootle/conf.py	2006-11-07 15:53:57 UTC (rev 4214)
+++ src/branches/django-migration/Pootle/conf.py	2006-11-08 00:11:55 UTC (rev 4215)
@@ -1,19 +1,32 @@
-# This file is meant as a container for global objects that are in use in 
-# Pootle, eg. Pootle instance, prefs, potree.
-#
+"""
+This file is meant as a container for global objects that are in use in 
+Pootle, eg. Pootle instance, prefs, potree. While instance provides a way
+to instantate them, conf.py provides a way to serve these global variables 
+to other files.
 
+This file is here because of necessity to be able to import first and set 
+variable later.
+
+"""
+
+
 _instance = None
 _potree = None
+_users = None
 
+def users():
+    return _users
+
 def instance():
     return _instance
 
 def potree():
     return _potree
 
-def set_instance(inst, potree):
-    global _instance, _potree
 
+def set_instance(inst, potree, users):
+    global _instance, _potree, _users
     _instance = inst
     _potree = potree
+    _users = users
 

Modified: src/branches/django-migration/Pootle/instance.py
===================================================================
--- src/branches/django-migration/Pootle/instance.py	2006-11-07 15:53:57 UTC (rev 4214)
+++ src/branches/django-migration/Pootle/instance.py	2006-11-08 00:11:55 UTC (rev 4215)
@@ -1,3 +1,14 @@
+"""
+This file is a bridge to enable some features, that were previously enabled by 
+jToolkit provided server. These include:
+ - instance, a python code representation of 'pootle.prefs' file 
+ - potree, the global object through which translations are accessed
+ - users, the python representation of 'users.prefs' user database
+
+Since these objects were previously instantiated in a way specific to 
+jToolkit server, this code acts as a bridge between these differences.
+"""
+
 from django.conf import settings
 from Pootle import potree
 from Pootle.conf import set_instance
@@ -19,9 +30,8 @@
     raise AttributeError(errormessage)
 
 
-# set instance and potree globally
-set_instance(instance, potree.POTree(instance))
-
-
 users = prefs.PrefsParser()
 users.parsefile(os.path.join(os.path.dirname(settings.POOTLE_PREFS), instance.userprefs))
+
+# set instance and potree globally
+set_instance(instance, potree.POTree(instance), users)

Modified: src/branches/django-migration/Pootle/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/pootleauth.py	2006-11-07 15:53:57 UTC (rev 4214)
+++ src/branches/django-migration/Pootle/pootleauth.py	2006-11-08 00:11:55 UTC (rev 4215)
@@ -3,8 +3,15 @@
 
 
 import md5
+import os
+from django.conf import settings
 from Pootle.instance import users
+from jToolkit import prefs
+from Pootle.conf import instance, users
 
+
+class UsersNotInitialized(Exception): pass
+
 def md5hexdigest(text):
   if isinstance(text, unicode): text = text.encode('utf8')
   return md5.md5(text).hexdigest()
@@ -42,3 +49,42 @@
         if users.__hasattr__(username):
             return UserWrapper(users.__getattr__(username), username)
         return None
+
+
+def check_password(usernode, password):
+    return usernode.passwdhash == md5hexdigest(password)
+
+def set_password(usernode, password):
+    usernode.passwdhash = md5hexdigest(password)
+
+def get_user(username):
+    """
+    Returns jToolkit user object if user found, 
+    else returns None
+    """
+
+    print "get_user: getting user", username
+    if not users():
+        raise UsersNotInitialized
+    try:
+        return users().__getattr__(username)
+    except AttributeError:
+        return None
+
+def create_user(username, email):
+    """
+    Creates a new user out of a username and email
+    """
+    print "creating user", username 
+    usernode = prefs.PrefNode(users(), username)
+    users().__setattr__(username, usernode)
+    usernode.name = ""
+    usernode.email = email
+    usernode.passwdhash = ""
+    save_users()
+    return usernode
+
+def save_users():
+    prefsfile = users().__root__.__dict__["_setvalue"].im_self
+    prefsfile.savefile()
+

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2006-11-07 15:53:57 UTC (rev 4214)
+++ src/branches/django-migration/Pootle/urls.py	2006-11-08 00:11:55 UTC (rev 4215)
@@ -6,7 +6,7 @@
     (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
 )
 
-urlpatterns += patterns('Pootle.views',
+urlpatterns += patterns('Pootle.web.views',
     (r'^$', 'index'),
     (r'^login.html$', 'login'),
     (r'^register.html$', 'register'),

Added: src/branches/django-migration/Pootle/web/__init__.py
===================================================================

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-07 15:53:57 UTC (rev 4214)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-08 00:11:55 UTC (rev 4215)
@@ -3,15 +3,14 @@
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth import REDIRECT_FIELD_NAME
 
+from Pootle.web.forms import RegistrationManipulator
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
+from Pootle.conf import users as pootleusers
 from Pootle.storage_client import generaterobotsfile
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 
-#from instance import instance
-from instance import users as pootleusers
-
 ### backwards compatiblity 
 import kid
 import os
@@ -119,6 +118,15 @@
     css = open('/home/hruske/Desktop/pootle/trunk/Pootle/html/pootle.css','r').read()
     return HttpResponse(content=css, mimetype='text/css')
 
+def errorlist_from_errors(errors):
+    # FIXME a rather ugly hack just to keep things jtoolkit-friendly
+    error_list = []
+    for e in errors:
+        error_list.extend([ str(a) for a in errors[e]])
+    return " ".join(error_list)
+
+    
+
 ### end backwards compatibility
 
 def robots(req):
@@ -194,6 +202,16 @@
 
 def register(req):
     message = None
+    manipulator = RegistrationManipulator() 
+    if req.POST:
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if errors:
+            message = errorlist_from_errors(errors)
+        else:
+            manipulator.do_html2python(new_data)
+            new_user = manipulator.save(new_data)
+            # FIXME return page with "sent mail & please activate"
     argdict = req.POST.copy()
     return render_to_pootleresponse(users.RegisterPage(pootlesession(req), argdict, message))
 
@@ -211,7 +229,7 @@
     return render_to_pootleresponse(adminpages.AdminPage(potree(), pootlesession(req), instance))
 
 def adminusers(req):
-    return render_to_pootleresponse(adminpages.UsersAdminPage(None, pootleusers, pootlesession(req), instance))
+    return render_to_pootleresponse(adminpages.UsersAdminPage(None, pootleusers(), pootlesession(req), instance))
 
 def adminlanguages(req):
     return render_to_pootleresponse(adminpages.LanguagesAdminPage(potree(), pootlesession(req), instance))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4218
          http://svn.sourceforge.net/translate/?rev=4218&view=rev
Author:   zejn
Date:     2006-11-08 01:57:56 -0800 (Wed, 08 Nov 2006)

Log Message:
-----------
[django-migration] Fixing a call to set_instance in pootle.py and adding forgotten forms.py, which holds form handling in Django Pootle.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/pootle.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/web/forms.py

Modified: src/branches/django-migration/Pootle/pootle.py
===================================================================
--- src/branches/django-migration/Pootle/pootle.py	2006-11-08 09:41:35 UTC (rev 4217)
+++ src/branches/django-migration/Pootle/pootle.py	2006-11-08 09:57:56 UTC (rev 4218)
@@ -58,7 +58,7 @@
       sessioncache = session.SessionCache(sessionclass=users.PootleSession)
     self.potree = potree.POTree(instance)
     # set Pootle-wide settings
-    set_instance(instance, self.potree)
+    set_instance(instance, self.potree, None)
     super(PootleServer, self).__init__(instance, webserver, sessioncache, errorhandler, loginpageclass)
     self.templatedir = filelocations.templatedir
     self.setdefaultoptions()

Added: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/web/forms.py	2006-11-08 09:57:56 UTC (rev 4218)
@@ -0,0 +1,48 @@
+from django import forms
+#from django.contrib.auth.models import User
+from django.utils.translation import gettext_lazy as _
+from django.core import validators
+from django.core.validators import ValidationError
+from Pootle.pootleauth import get_user, set_password, create_user, save_users
+
+class CallableWrapper:
+    """
+    This is needed here to make the validator an object, 
+    that has an attribute 'always_test' set to true.
+    """
+    def __init__(self, check):
+        self._callable = check
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        return self._callable(field_data, all_data)
+
+# checks for user manipulator
+def user_already_exists(field_data, all_data):
+    u = get_user(field_data.strip())
+    if u:
+        raise ValidationError, _("User with that username already exists. Please choose another username.")
+    
+class RegistrationManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="username", length=16, 
+                validator_list=[CallableWrapper(user_already_exists)]),
+            forms.TextField(field_name="first_name", length=16),
+            forms.TextField(field_name="last_name", length=16),
+            forms.TextField(field_name="email", length=16, 
+                validator_list=[validators.isValidEmail]),
+            forms.PasswordField(field_name="password", length=16),
+            forms.PasswordField(field_name="passwordconfirm", length=16,
+                validator_list=[validators.AlwaysMatchesOtherField('password', _("The two password fields didn't match."))])
+            )
+
+    def save(self, new_data):
+        usernode = get_user(new_data['username'])
+        if not usernode:
+            usernode = create_user(new_data['username'], new_data['email'])
+            usernode.name = u"%s %s" % (new_data['first_name'], new_data['last_name'])
+            set_password(usernode, new_data['password'])
+        save_users()
+        return usernode
+    


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4323
          http://svn.sourceforge.net/translate/?rev=4323&view=rev
Author:   zejn
Date:     2006-11-23 02:51:39 -0800 (Thu, 23 Nov 2006)

Log Message:
-----------
[django-migration] Moving pootleauth.py to Pootle.compat.pootleauth

Added Paths:
-----------
    src/branches/django-migration/Pootle/compat/pootleauth.py

Removed Paths:
-------------
    src/branches/django-migration/Pootle/pootleauth.py

Copied: src/branches/django-migration/Pootle/compat/pootleauth.py (from rev 4320, src/branches/django-migration/Pootle/pootleauth.py)
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-23 10:51:39 UTC (rev 4323)
@@ -0,0 +1,90 @@
+"""Pootle authentication backend for Django, users are saved in users.prefs 
+file, just like with Pootle."""
+
+
+import md5
+import os
+from django.conf import settings
+from Pootle.instance import users
+from jToolkit import prefs
+from Pootle.conf import instance, users
+
+
+class UsersNotInitialized(Exception): pass
+
+def md5hexdigest(text):
+  if isinstance(text, unicode): text = text.encode('utf8')
+  return md5.md5(text).hexdigest()
+
+class UserWrapper:
+    """A class to wrap user object in just to map different naming 
+    between jToolkit and Django"""
+    def __init__(self, user, username):
+        def istrue():
+            return True
+        self.user = user
+        self.mapping = {
+            'is_active': user.activated,
+            'is_authenticated': istrue,
+            'is_anonymous': False,
+            'id': username,
+            'is_superuser': user.rights.siteadmin
+            }
+    def __getattr__(self, key):
+        if key in self.mapping:
+            return self.mapping[key]
+        else:
+            return self.user.__getattr__(key)
+
+class PootleAuth:
+    "Authenticate against Pootle's users.prefs file"
+    def authenticate(self, username=None, password=None):
+        if users.__hasattr__(username):
+            user = users.__getattr__(username)
+            if md5hexdigest(password) == user.passwdhash:
+                return UserWrapper(user, username)
+        return None
+
+    def get_user(self, username):
+        if users.__hasattr__(username):
+            return UserWrapper(users.__getattr__(username), username)
+        return None
+
+
+def check_password(usernode, password):
+    return usernode.passwdhash == md5hexdigest(password)
+
+def set_password(usernode, password):
+    usernode.passwdhash = md5hexdigest(password)
+
+def get_user(username):
+    """
+    Returns jToolkit user object if user found, 
+    else returns None
+    """
+
+    print "get_user: getting user", username
+    if not users():
+        raise UsersNotInitialized
+    try:
+        return users().__getattr__(username)
+    except AttributeError:
+        return None
+
+def create_user(username, email):
+    """
+    Creates a new user out of a username and email
+    """
+    print "creating user", username 
+    usernode = prefs.PrefNode(users(), username)
+    users().__setattr__(username, usernode)
+    usernode.name = ""
+    usernode.email = email
+    usernode.passwdhash = ""
+    save_users()
+    return usernode
+
+def save_users():
+    prefsfile = users().__root__.__dict__["_setvalue"].im_self
+    prefsfile.savefile()
+

Deleted: src/branches/django-migration/Pootle/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/pootleauth.py	2006-11-23 10:50:27 UTC (rev 4322)
+++ src/branches/django-migration/Pootle/pootleauth.py	2006-11-23 10:51:39 UTC (rev 4323)
@@ -1,90 +0,0 @@
-"""Pootle authentication backend for Django, users are saved in users.prefs 
-file, just like with Pootle."""
-
-
-import md5
-import os
-from django.conf import settings
-from Pootle.instance import users
-from jToolkit import prefs
-from Pootle.conf import instance, users
-
-
-class UsersNotInitialized(Exception): pass
-
-def md5hexdigest(text):
-  if isinstance(text, unicode): text = text.encode('utf8')
-  return md5.md5(text).hexdigest()
-
-class UserWrapper:
-    """A class to wrap user object in just to map different naming 
-    between jToolkit and Django"""
-    def __init__(self, user, username):
-        def istrue():
-            return True
-        self.user = user
-        self.mapping = {
-            'is_active': user.activated,
-            'is_authenticated': istrue,
-            'is_anonymous': False,
-            'id': username,
-            'is_superuser': user.rights.siteadmin
-            }
-    def __getattr__(self, key):
-        if key in self.mapping:
-            return self.mapping[key]
-        else:
-            return self.user.__getattr__(key)
-
-class PootleAuth:
-    "Authenticate against Pootle's users.prefs file"
-    def authenticate(self, username=None, password=None):
-        if users.__hasattr__(username):
-            user = users.__getattr__(username)
-            if md5hexdigest(password) == user.passwdhash:
-                return UserWrapper(user, username)
-        return None
-
-    def get_user(self, username):
-        if users.__hasattr__(username):
-            return UserWrapper(users.__getattr__(username), username)
-        return None
-
-
-def check_password(usernode, password):
-    return usernode.passwdhash == md5hexdigest(password)
-
-def set_password(usernode, password):
-    usernode.passwdhash = md5hexdigest(password)
-
-def get_user(username):
-    """
-    Returns jToolkit user object if user found, 
-    else returns None
-    """
-
-    print "get_user: getting user", username
-    if not users():
-        raise UsersNotInitialized
-    try:
-        return users().__getattr__(username)
-    except AttributeError:
-        return None
-
-def create_user(username, email):
-    """
-    Creates a new user out of a username and email
-    """
-    print "creating user", username 
-    usernode = prefs.PrefNode(users(), username)
-    users().__setattr__(username, usernode)
-    usernode.name = ""
-    usernode.email = email
-    usernode.passwdhash = ""
-    save_users()
-    return usernode
-
-def save_users():
-    prefsfile = users().__root__.__dict__["_setvalue"].im_self
-    prefsfile.savefile()
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4324
          http://svn.sourceforge.net/translate/?rev=4324&view=rev
Author:   zejn
Date:     2006-11-23 02:57:40 -0800 (Thu, 23 Nov 2006)

Log Message:
-----------
[django-migration] Fixing import paths for Pootle.compat.pootleauth

Modified Paths:
--------------
    src/branches/django-migration/Pootle/settings.py
    src/branches/django-migration/Pootle/web/forms.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/compat/__init__.py

Added: src/branches/django-migration/Pootle/compat/__init__.py
===================================================================

Modified: src/branches/django-migration/Pootle/settings.py
===================================================================
--- src/branches/django-migration/Pootle/settings.py	2006-11-23 10:51:39 UTC (rev 4323)
+++ src/branches/django-migration/Pootle/settings.py	2006-11-23 10:57:40 UTC (rev 4324)
@@ -59,4 +59,4 @@
 from Pootle.utils import next_to_this_file
 POOTLE_PREFS = next_to_this_file(__file__,'pootle.prefs')
 
-AUTHENTICATION_BACKENDS = ('Pootle.pootleauth.PootleAuth', )
+AUTHENTICATION_BACKENDS = ('Pootle.compat.pootleauth.PootleAuth', )

Modified: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	2006-11-23 10:51:39 UTC (rev 4323)
+++ src/branches/django-migration/Pootle/web/forms.py	2006-11-23 10:57:40 UTC (rev 4324)
@@ -3,7 +3,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.core import validators
 from django.core.validators import ValidationError
-from Pootle.pootleauth import get_user, set_password, create_user, save_users
+from Pootle.compat.pootleauth import get_user, set_password, create_user, save_users
 
 class CallableWrapper:
     """


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4325
          http://svn.sourceforge.net/translate/?rev=4325&view=rev
Author:   zejn
Date:     2006-11-23 03:00:00 -0800 (Thu, 23 Nov 2006)

Log Message:
-----------
[django-migration] Registration form actually goes into Pootle.compat.auth

Modified Paths:
--------------
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/compat/authforms.py

Removed Paths:
-------------
    src/branches/django-migration/Pootle/web/forms.py

Copied: src/branches/django-migration/Pootle/compat/authforms.py (from rev 4324, src/branches/django-migration/Pootle/web/forms.py)
===================================================================
--- src/branches/django-migration/Pootle/compat/authforms.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/compat/authforms.py	2006-11-23 11:00:00 UTC (rev 4325)
@@ -0,0 +1,48 @@
+from django import forms
+#from django.contrib.auth.models import User
+from django.utils.translation import gettext_lazy as _
+from django.core import validators
+from django.core.validators import ValidationError
+from Pootle.compat.pootleauth import get_user, set_password, create_user, save_users
+
+class CallableWrapper:
+    """
+    This is needed here to make the validator an object, 
+    that has an attribute 'always_test' set to true.
+    """
+    def __init__(self, check):
+        self._callable = check
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        return self._callable(field_data, all_data)
+
+# checks for user manipulator
+def user_already_exists(field_data, all_data):
+    u = get_user(field_data.strip())
+    if u:
+        raise ValidationError, _("User with that username already exists. Please choose another username.")
+    
+class RegistrationManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="username", length=16, 
+                validator_list=[CallableWrapper(user_already_exists)]),
+            forms.TextField(field_name="first_name", length=16),
+            forms.TextField(field_name="last_name", length=16),
+            forms.TextField(field_name="email", length=16, 
+                validator_list=[validators.isValidEmail]),
+            forms.PasswordField(field_name="password", length=16),
+            forms.PasswordField(field_name="passwordconfirm", length=16,
+                validator_list=[validators.AlwaysMatchesOtherField('password', _("The two password fields didn't match."))])
+            )
+
+    def save(self, new_data):
+        usernode = get_user(new_data['username'])
+        if not usernode:
+            usernode = create_user(new_data['username'], new_data['email'])
+            usernode.name = u"%s %s" % (new_data['first_name'], new_data['last_name'])
+            set_password(usernode, new_data['password'])
+        save_users()
+        return usernode
+    

Deleted: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	2006-11-23 10:57:40 UTC (rev 4324)
+++ src/branches/django-migration/Pootle/web/forms.py	2006-11-23 11:00:00 UTC (rev 4325)
@@ -1,48 +0,0 @@
-from django import forms
-#from django.contrib.auth.models import User
-from django.utils.translation import gettext_lazy as _
-from django.core import validators
-from django.core.validators import ValidationError
-from Pootle.compat.pootleauth import get_user, set_password, create_user, save_users
-
-class CallableWrapper:
-    """
-    This is needed here to make the validator an object, 
-    that has an attribute 'always_test' set to true.
-    """
-    def __init__(self, check):
-        self._callable = check
-        self.always_test = True
-
-    def __call__(self, field_data, all_data):
-        return self._callable(field_data, all_data)
-
-# checks for user manipulator
-def user_already_exists(field_data, all_data):
-    u = get_user(field_data.strip())
-    if u:
-        raise ValidationError, _("User with that username already exists. Please choose another username.")
-    
-class RegistrationManipulator(forms.Manipulator):
-    def __init__(self):
-        self.fields = (
-            forms.TextField(field_name="username", length=16, 
-                validator_list=[CallableWrapper(user_already_exists)]),
-            forms.TextField(field_name="first_name", length=16),
-            forms.TextField(field_name="last_name", length=16),
-            forms.TextField(field_name="email", length=16, 
-                validator_list=[validators.isValidEmail]),
-            forms.PasswordField(field_name="password", length=16),
-            forms.PasswordField(field_name="passwordconfirm", length=16,
-                validator_list=[validators.AlwaysMatchesOtherField('password', _("The two password fields didn't match."))])
-            )
-
-    def save(self, new_data):
-        usernode = get_user(new_data['username'])
-        if not usernode:
-            usernode = create_user(new_data['username'], new_data['email'])
-            usernode.name = u"%s %s" % (new_data['first_name'], new_data['last_name'])
-            set_password(usernode, new_data['password'])
-        save_users()
-        return usernode
-    

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-23 10:57:40 UTC (rev 4324)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-23 11:00:00 UTC (rev 4325)
@@ -3,7 +3,7 @@
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth import REDIRECT_FIELD_NAME
 
-from Pootle.web.forms import RegistrationManipulator
+from Pootle.compat.authforms import RegistrationManipulator
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
 from Pootle.conf import users as pootleusers


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4326
          http://svn.sourceforge.net/translate/?rev=4326&view=rev
Author:   zejn
Date:     2006-11-23 03:14:07 -0800 (Thu, 23 Nov 2006)

Log Message:
-----------
[django-migration] Fixing a bug in pootleauth, where users were still used as a variable instead of a 
function. Also added an import in urls.py, which causes Pootle.conf to be set up immediately at server 
startup.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/urls.py

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-23 11:00:00 UTC (rev 4325)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-23 11:14:07 UTC (rev 4326)
@@ -5,7 +5,6 @@
 import md5
 import os
 from django.conf import settings
-from Pootle.instance import users
 from jToolkit import prefs
 from Pootle.conf import instance, users
 
@@ -39,15 +38,15 @@
 class PootleAuth:
     "Authenticate against Pootle's users.prefs file"
     def authenticate(self, username=None, password=None):
-        if users.__hasattr__(username):
-            user = users.__getattr__(username)
+        if users().__hasattr__(username):
+            user = users().__getattr__(username)
             if md5hexdigest(password) == user.passwdhash:
                 return UserWrapper(user, username)
         return None
 
     def get_user(self, username):
-        if users.__hasattr__(username):
-            return UserWrapper(users.__getattr__(username), username)
+        if users().__hasattr__(username):
+            return UserWrapper(users().__getattr__(username), username)
         return None
 
 

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2006-11-23 11:00:00 UTC (rev 4325)
+++ src/branches/django-migration/Pootle/urls.py	2006-11-23 11:14:07 UTC (rev 4326)
@@ -1,3 +1,6 @@
+# this is here to make sure Django Pootle sets up global variables
+import Pootle.instance
+
 from django.conf.urls.defaults import *
 from django.conf import settings
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4333
          http://svn.sourceforge.net/translate/?rev=4333&view=rev
Author:   zejn
Date:     2006-11-24 11:45:37 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
[django-migration] Index page fully Djangoized along with templates. options view is going to get split in more views.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/base.html
    src/branches/django-migration/Pootle/templates/index.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/base.html
===================================================================
--- src/branches/django-migration/Pootle/templates/base.html	2006-11-24 19:23:39 UTC (rev 4332)
+++ src/branches/django-migration/Pootle/templates/base.html	2006-11-24 19:45:37 UTC (rev 4333)
@@ -1,3 +1,4 @@
+{% load i18n %}
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <head>
@@ -17,6 +18,7 @@
   <div id="banner" over:include="pootlepage#banner"/>
 
   <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
+{% block content %}
     <div class="contents">
       <h3 class="title">{{ pagetitle }}</h3>
 
@@ -42,6 +44,7 @@
         {% endfor %}
       </div>
     </div>
+{% endblock %}
   </div>
 
   </div>

Modified: src/branches/django-migration/Pootle/templates/index.html
===================================================================
--- src/branches/django-migration/Pootle/templates/index.html	2006-11-24 19:23:39 UTC (rev 4332)
+++ src/branches/django-migration/Pootle/templates/index.html	2006-11-24 19:45:37 UTC (rev 4333)
@@ -1,52 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% load i18n %}
+{% extends "base.html" %}
 
-  <title py:content="pagetitle">Pootle</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="description" content="${meta_description}" />
-  <meta name="keywords" content="${', '.join(keywords)}" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
-
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
+{% block content %}
     <div class="contents">
-      <h3 class="title" py:content="pagetitle">Pootle</h3>
+      <h3 class="title">{{ pagetitle }}</h3>
 
-      <div class="intro" py:content="XML(description)">
-        this is a demo installation of pootle
+      <div class="intro">
+        {{ description }}
       </div>
 
-      <h3 class="title"><a href="languages/" py:content="languagelink">Languages</a></h3>
+      <h3 class="title"><a href="languages/">{% trans "Languages" %}</a></h3>
 
       <div class="item-description">
-        <span py:for="l in languages" py:strip="True"><a href="${l.code}/" py:content="l.name">Language</a>${l.sep}</span>
+        {% for l in languages %}
+        <a href="{{ l.code }}/">{{ l.name }}</a>{{ l.sep }}</span>
+        {% endfor %}
       </div>
     </div>
 
     <div class="contents">
-      <h3 class="title"><a href="projects/" py:content="projectlink">Projects</a></h3>
+      <h3 class="title"><a href="projects/">{% trans "Projects" %}</a></h3>
 
       <div class="item-description">
-        <span py:for="p in projects" py:strip="True">
-          <a href="projects/${p.code}/" title="${p.description}" py:content="p.name">Project</a>${p.sep}
-        </span>
+        {% for p in projects %}
+          <a href="projects/{{ p.code }}/" title="{{ p.description }}">{{ p.name }}</a>{{ p.sep }}
+        {% endfor %}
       </div>
     </div>
-  </div>
-
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endblock %}

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-24 19:23:39 UTC (rev 4332)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-24 19:45:37 UTC (rev 4333)
@@ -1,7 +1,9 @@
 from django.http import HttpResponse, HttpResponseRedirect
 from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth.decorators import login_required
 from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.shortcuts import render_to_response
 
 from Pootle.compat.authforms import RegistrationManipulator
 from Pootle import indexpage, adminpages, users, translatepage
@@ -135,19 +137,23 @@
 # indexpage.py
 def index(req):
     if req.GET:
-        next_page = req.GET.get('next_page','/')
-        from django.contrib.auth import logout as djangologout
-        djangologout(req)
-        req.session.isopen = False
-        return HttpResponseRedirect(next_page)
+        if 'islogout' in req.GET:
+            next_page = req.GET.get('next_page','/')
+            from django.contrib.auth import logout as djangologout
+            djangologout(req)
+            req.session.isopen = False
+            return HttpResponseRedirect(next_page)
 
-    return render_to_pootleresponse(indexpage.PootleIndex(potree(), pootlesession(req)))
+    pootlepage = indexpage.PootleIndex(potree(), pootlesession(req))
+    context = pootlepage.templatevars
+    return render_to_response("index.html", context)
     
 def about(req):
     return render_to_pootleresponse(indexpage.AboutPage(pootlesession(req)))
 
 def home(req):
     return render_to_pootleresponse(indexpage.UserIndex(potree(), pootlesession(req)))
+home = login_required(home)
 
 def languagesindex(req):
     return render_to_pootleresponse(indexpage.LanguagesIndex(potree(), pootlesession(req)))
@@ -171,7 +177,18 @@
 # users.py
 
 def options(req):
+    # use manipulator here
     message = None
+    if req.POST:
+        try:
+            if "changeoptions" in req.POST:
+                pass
+            elif "changepersonal" in req.POST:
+                pass
+            elif "changeinterface" in req.POST:
+                pass
+        except users.RegistrationError, errormessage:
+            message = errormessage
     return render_to_pootleresponse(users.UserOptions(potree(), pootlesession(req), message))
 
 def login(req):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4334
          http://svn.sourceforge.net/translate/?rev=4334&view=rev
Author:   zejn
Date:     2006-11-24 14:44:18 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
[django-migration] added context_processors in settings.py, web/views.py, web/context_processors.py. Also fixed pootleauth.py to act a little more as itself and less as PrefNode. Added overlayed divs from pootlepage.html to base.html.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/settings.py
    src/branches/django-migration/Pootle/templates/base.html
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/web/context_processors.py

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-24 19:45:37 UTC (rev 4333)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-24 22:44:18 UTC (rev 4334)
@@ -21,19 +21,34 @@
     def __init__(self, user, username):
         def istrue():
             return True
-        self.user = user
+        def get_and_delete_messages():
+            return []
+        self._user = user
+        self._username = username
         self.mapping = {
             'is_active': user.activated,
             'is_authenticated': istrue,
             'is_anonymous': False,
             'id': username,
-            'is_superuser': user.rights.siteadmin
+            'username': username,
+            'is_superuser': user.rights.siteadmin,
+            'get_and_delete_messages': get_and_delete_messages,
             }
+
+    def __repr__(self):
+        return "<PootleUser: %s>" % self._username
+
+    def __str__(self):
+        return str(self._username)
+
     def __getattr__(self, key):
         if key in self.mapping:
             return self.mapping[key]
         else:
-            return self.user.__getattr__(key)
+            try:
+                return self.__getattr__(key)
+            except:
+                return self._user.__getattr__(key)
 
 class PootleAuth:
     "Authenticate against Pootle's users.prefs file"

Modified: src/branches/django-migration/Pootle/settings.py
===================================================================
--- src/branches/django-migration/Pootle/settings.py	2006-11-24 19:45:37 UTC (rev 4333)
+++ src/branches/django-migration/Pootle/settings.py	2006-11-24 22:44:18 UTC (rev 4334)
@@ -46,6 +46,13 @@
     'django.middleware.doc.XViewMiddleware',
 )
 
+TEMPLATE_CONTEXT_PROCESSORS = (
+    "django.core.context_processors.auth",
+    "django.core.context_processors.debug",
+    "django.core.context_processors.i18n",
+    "Pootle.web.context_processors.global_template_vars",
+    )
+
 ROOT_URLCONF = 'Pootle.urls'
 
 INSTALLED_APPS = (
@@ -53,6 +60,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
+    'Pootle.web',
 )
 
 # This sets pootle.prefs file path to be in same dir as these settings.py

Modified: src/branches/django-migration/Pootle/templates/base.html
===================================================================
--- src/branches/django-migration/Pootle/templates/base.html	2006-11-24 19:45:37 UTC (rev 4333)
+++ src/branches/django-migration/Pootle/templates/base.html	2006-11-24 22:44:18 UTC (rev 4334)
@@ -15,8 +15,35 @@
 
 <body bgcolor="#FFFFFF">
   <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
+{% block banner %}
+  <div lang="und" id="banner">
+    <table cellpadding="0" width="100%" border="0" cellspacing="0">
+      <tr>
+        <td rowspan="1" colspan="1" align="left" width="98" valign="top">
+          <img src="/static/images/pootle.png" height="130" width="98" alt="Pootle Logo" style="padding-top:5px;" />
+        </td>
 
+        <td colspan="1" rowspan="1" width="5">
+          <img src="/static/images/gap.png" height="5" width="5" alt="" />
+        </td>
+
+        <td colspan="1" rowspan="1" width="100%">
+          <table cellspacing="0" style="height: 135px" width="100%" cellpadding="0" border="0" class="header">
+            <tr>
+              <td colspan="1" align="center" rowspan="1" valign="middle">
+                 <img src="/static/images/WordForge-white.png" height="135" width="244" alt="WordForge Translation Project" style="padding-top:5px;"/>
+              </td>
+            </tr>
+
+            <tr>
+              <td rowspan="1" colspan="1" align="right" valign="middle" class="border_top"/>
+            </tr>
+          </table>
+        </td>
+      </tr>
+    </table>
+  </div>
+{% endblock %}
   <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
 {% block content %}
     <div class="contents">
@@ -48,7 +75,42 @@
   </div>
 
   </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
+  <div id="links" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <!-- Account information -->
+    <div class="account">
+    <div class="side">
+      <img src="/static/images/person.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+    </div>
+    {% if user.is_authenticated %}
+    <div class="side">
+      <span>logged in as <b>{{ user }}</b></span> |
+      <a href="/?islogout=1">{% trans "Log Out" %}</a>
+    </div>
+    {% else %}
+    <div class="side">
+      <a href="/login.html">{% trans "Log In" %}</a> |
+      <a href="/register.html">{% trans "Register" %}</a> |
+      <a href="/activate.html">{% trans "Activate" %}</a>
+    </div>
+    {% endif %}
+    </div>
+    <br clear="all" />
+
+    <div class="sidetitle">
+      {{ instancetitle }}
+    </div>
+    <div class="side">
+      <a href="/">{% trans "Home" %}</a>
+      | <a href="/projects/">{% trans "All Projects" %}</a>
+      | <a href="/languages/">{% trans "All Languages" %}</a>
+      {% if user.is_authenticated %} | <a href="/home/">{% trans "My account" %}</a>
+      {% if user.is_superuser %} | <a href="/admin/">{% trans "Admin" %}</a>{% endif %}{% endif %} 
+      | <a href="/doc/index.html">{% trans "Docs &amp; Help" %}</a>
+    </div>
+  </div>
+
+  <div id="about" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <a href="/about.html">{% trans "About this Pootle server" %}</a>
+  </div>
 </body>
 </html>

Added: src/branches/django-migration/Pootle/web/context_processors.py
===================================================================
--- src/branches/django-migration/Pootle/web/context_processors.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/web/context_processors.py	2006-11-24 22:44:18 UTC (rev 4334)
@@ -0,0 +1,12 @@
+from Pootle.conf import instance
+from Pootle.utils import shortdescription
+
+def global_template_vars(request):
+    description = getattr(instance(), "description")
+
+    return {
+        'description' : description,
+        'meta_description' : shortdescription(description),
+        'pagetitle' : 'Pootle',
+        'keywords' : ["Pootle", "WordForge", "translate", "translation", "localisation", "localization", "l10n", "traduction", "traduire"],
+        }

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-24 19:45:37 UTC (rev 4333)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-24 22:44:18 UTC (rev 4334)
@@ -1,4 +1,5 @@
 from django.http import HttpResponse, HttpResponseRedirect
+from django.template import RequestContext
 from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.decorators import login_required
@@ -146,7 +147,7 @@
 
     pootlepage = indexpage.PootleIndex(potree(), pootlesession(req))
     context = pootlepage.templatevars
-    return render_to_response("index.html", context)
+    return render_to_response("index.html", context, context_instance=RequestContext(req))
     
 def about(req):
     return render_to_pootleresponse(indexpage.AboutPage(pootlesession(req)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4335
          http://svn.sourceforge.net/translate/?rev=4335&view=rev
Author:   zejn
Date:     2006-11-24 15:22:40 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
[django-migration] index and about are now Django.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/about.html
    src/branches/django-migration/Pootle/templates/index.html
    src/branches/django-migration/Pootle/web/context_processors.py
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/about.html
===================================================================
--- src/branches/django-migration/Pootle/templates/about.html	2006-11-24 22:44:18 UTC (rev 4334)
+++ src/branches/django-migration/Pootle/templates/about.html	2006-11-24 23:22:40 UTC (rev 4335)
@@ -1,61 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% extends "base.html" %}
+{% load i18n %}
 
-  <title>${pagetitle}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="description" content="${meta_description}" />
-  <meta name="keywords" content="${', '.join(keywords)}" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block content %}
+      <h3 class="title">{{ pagetitle }}</h3>
 
-<body bgcolor="#FFFFFF">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="contents">
-      <h3 class="title" py:content="pagetitle">Pootle</h3>
-
-      <div class="intro" py:content="XML(description)">
-        this is a demo installation of pootle
+      <div class="intro">
+        {{ description }}
       </div>
 
-      <h3 class="title" py:content="abouttitle">About Pootle</h3>
+      <h3 class="title">{% trans "About Pootle" %}</h3>
 
-      <div class="intro" py:content="XML(introtext)">
-        <strong>Pootle</strong> is a simple web portal that should allow you to <strong>translate</strong>! Since Pootle is <strong>Free Software</strong>, you
-        can download it and run your own copy if you like. You can also help participate in the development in many ways (you don't have to be able to
-        program).
+      <div class="intro">
+{% blocktrans %}<strong>Pootle</strong> is a simple web portal that should allow you to <strong>translate</strong>! Since Pootle is <strong>Free Software</strong>, you can download it and run your own copy if you like. You can also help participate in the development in many ways (you don't have to be able to program).{% endblocktrans %}
       </div>
 
-      <div class="intro" py:content="XML(hosttext)">
-        The Pootle project itself is hosted at <a href="http://translate.sourceforge.net/">translate.sourceforge.net</a> where you can find the details about
-        source code, mailing lists etc.
+      <div class="intro">
+{% blocktrans %}The Pootle project itself is hosted at <a href="http://translate.sourceforge.net/">translate.sourceforge.net</a> where you can find the details about source code, mailing lists etc.{% endblocktrans %}
       </div>
 
-      <div class="intro" py:content="XML(nametext)">
-        The name stands for <b>PO</b>-based <b>O</b>nline <b>T</b>ranslation / <b>L</b>ocalization <b>E</b>ngine, but you may need to read <a href=
-        "http://www.thechestnut.com/flumps.htm">this</a>.
+      <div class="intro">
+{% blocktrans %}The name stands for <b>PO</b>-based <b>O</b>nline <b>T</b>ranslation / <b>L</b>ocalization <b>E</b>ngine, but you may need to read <a href="http://www.thechestnut.com/flumps.htm">this</a>.{% endblocktrans %}
       </div>
 
-      <h3 class="title" py:content="versiontitle">Versions</h3>
+      <h3 class="title">{% trans "Versions" %}</h3>
 
-      <div class="intro" py:content="XML(versiontext)">
-        This site is running:<br />
-        Pootle<br />
-        Translate Toolkit<br />
-        jToolkit<br />
-        Python
+      <div class="intro">
+        {% trans "This site is running:"%}
+        <br />
+        Pootle {{ pootleversion }}<br />
+        Translate Toolkit {{ toolkitversion }}<br />
       </div>
-    </div>
-  </div>
-
-  <div id="links" over:include="pootlepage#links"/>
-</body>
-</html>
+{% endblock %}

Modified: src/branches/django-migration/Pootle/templates/index.html
===================================================================
--- src/branches/django-migration/Pootle/templates/index.html	2006-11-24 22:44:18 UTC (rev 4334)
+++ src/branches/django-migration/Pootle/templates/index.html	2006-11-24 23:22:40 UTC (rev 4335)
@@ -13,7 +13,7 @@
 
       <div class="item-description">
         {% for l in languages %}
-        <a href="{{ l.code }}/">{{ l.name }}</a>{{ l.sep }}</span>
+        <a href="{{ l.code }}/">{{ l.name }}</a>
         {% endfor %}
       </div>
     </div>
@@ -23,7 +23,7 @@
 
       <div class="item-description">
         {% for p in projects %}
-          <a href="projects/{{ p.code }}/" title="{{ p.description }}">{{ p.name }}</a>{{ p.sep }}
+          <a href="projects/{{ p.code }}/" title="{{ p.description }}">{{ p.name }}</a>
         {% endfor %}
       </div>
     </div>

Modified: src/branches/django-migration/Pootle/web/context_processors.py
===================================================================
--- src/branches/django-migration/Pootle/web/context_processors.py	2006-11-24 22:44:18 UTC (rev 4334)
+++ src/branches/django-migration/Pootle/web/context_processors.py	2006-11-24 23:22:40 UTC (rev 4335)
@@ -9,4 +9,5 @@
         'meta_description' : shortdescription(description),
         'pagetitle' : 'Pootle',
         'keywords' : ["Pootle", "WordForge", "translate", "translation", "localisation", "localization", "l10n", "traduction", "traduire"],
+        'instancetitle': getattr(instance(),'title'),
         }

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-24 22:44:18 UTC (rev 4334)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-24 23:22:40 UTC (rev 4335)
@@ -14,6 +14,11 @@
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 
+from Pootle.storage_client import getprojects
+
+from Pootle import __version__ as pootleversion
+from translate import __version__ as toolkitversion
+
 ### backwards compatiblity 
 import kid
 import os
@@ -145,12 +150,15 @@
             req.session.isopen = False
             return HttpResponseRedirect(next_page)
 
-    pootlepage = indexpage.PootleIndex(potree(), pootlesession(req))
-    context = pootlepage.templatevars
-    return render_to_response("index.html", context, context_instance=RequestContext(req))
+    context = {
+        'languages': [{"code": code, "name": name } for code, name in potree().getlanguages()],
+        'projects': getprojects(),
+        }
+    return render_to_response("index.html", RequestContext(req, context))
     
 def about(req):
-    return render_to_pootleresponse(indexpage.AboutPage(pootlesession(req)))
+    context = { 'pootleversion':pootleversion.ver, 'toolkitversion':toolkitversion.ver }
+    return render_to_response("about.html", RequestContext(req, context ))
 
 def home(req):
     return render_to_pootleresponse(indexpage.UserIndex(potree(), pootlesession(req)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4336
          http://svn.sourceforge.net/translate/?rev=4336&view=rev
Author:   zejn
Date:     2006-11-24 15:35:43 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
[django-migration] Condensed the three index views, PootleIndex, LanguagesIndex and ProjectsIndex into only one, Pootle.web.views.index.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/index.html
    src/branches/django-migration/Pootle/urls.py
    src/branches/django-migration/Pootle/web/views.py

Removed Paths:
-------------
    src/branches/django-migration/Pootle/templates/languages.html
    src/branches/django-migration/Pootle/templates/projects.html

Modified: src/branches/django-migration/Pootle/templates/index.html
===================================================================
--- src/branches/django-migration/Pootle/templates/index.html	2006-11-24 23:22:40 UTC (rev 4335)
+++ src/branches/django-migration/Pootle/templates/index.html	2006-11-24 23:35:43 UTC (rev 4336)
@@ -9,6 +9,7 @@
         {{ description }}
       </div>
 
+{% if languages %}
       <h3 class="title"><a href="languages/">{% trans "Languages" %}</a></h3>
 
       <div class="item-description">
@@ -17,7 +18,9 @@
         {% endfor %}
       </div>
     </div>
+{% endif %}
 
+{% if projects %}
     <div class="contents">
       <h3 class="title"><a href="projects/">{% trans "Projects" %}</a></h3>
 
@@ -27,4 +30,5 @@
         {% endfor %}
       </div>
     </div>
+{% endif %}
 {% endblock %}

Deleted: src/branches/django-migration/Pootle/templates/languages.html
===================================================================
--- src/branches/django-migration/Pootle/templates/languages.html	2006-11-24 23:22:40 UTC (rev 4335)
+++ src/branches/django-migration/Pootle/templates/languages.html	2006-11-24 23:35:43 UTC (rev 4336)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
-
-  <title py:content="pagetitle">Pootle</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
-
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="contents">
-      <h3 class="title" py:content="languagelink">Languages</h3>
-
-      <div class="item-description">
-        <span py:for="l in languages" py:strip="True"><a href="../${l.code}/" py:content="l.name">Language</a>${l.sep}</span>
-      </div>
-    </div>
-  </div>
-
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>

Deleted: src/branches/django-migration/Pootle/templates/projects.html
===================================================================
--- src/branches/django-migration/Pootle/templates/projects.html	2006-11-24 23:22:40 UTC (rev 4335)
+++ src/branches/django-migration/Pootle/templates/projects.html	2006-11-24 23:35:43 UTC (rev 4336)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
-
-  <title py:content="pagetitle">Pootle</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
-
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="contents">
-      <h3 class="title" py:content="projectlink">Projects</h3>
-
-      <div class="item-description">
-        <span py:for="p in projects" py:strip="True">
-          <a href="${p.code}/" title="${p.description}" py:content="p.name">Project</a>${p.sep}
-        </span>
-      </div>
-    </div>
-  </div>
-
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2006-11-24 23:22:40 UTC (rev 4335)
+++ src/branches/django-migration/Pootle/urls.py	2006-11-24 23:35:43 UTC (rev 4336)
@@ -18,9 +18,9 @@
     (r'^home/$', 'home'),
     (r'^home/index.html$', 'home'),
     (r'^home/options.html$', 'options'),
-    (r'^languages/$', 'languagesindex'),
+    (r'^(?P<what>languages)/$', 'index'),
     
-    (r'^projects/$', 'projectsindex'),
+    (r'^(?P<what>projects)/$', 'index'),
     (r'^projects/(?P<project>\w+)/$', 'projectlanguageindex'),
     (r'^projects/(?P<project>\w+)/index.html$', 'projectlanguageindex'),
     (r'^projects/(?P<project>\w+)/admin.html$', 'projectadmin'),

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-24 23:22:40 UTC (rev 4335)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-24 23:35:43 UTC (rev 4336)
@@ -141,7 +141,7 @@
     return HttpResponse(content=generaterobotsfile(["login.html", "register.html", "activate.html"]), mimetype="text/plain")
 
 # indexpage.py
-def index(req):
+def index(req, what):
     if req.GET:
         if 'islogout' in req.GET:
             next_page = req.GET.get('next_page','/')
@@ -150,10 +150,19 @@
             req.session.isopen = False
             return HttpResponseRedirect(next_page)
 
-    context = {
-        'languages': [{"code": code, "name": name } for code, name in potree().getlanguages()],
-        'projects': getprojects(),
-        }
+    if what == 'languages':
+        context = {
+            'languages': [{"code": code, "name": name } for code, name in potree().getlanguages()],
+            }
+    elif what == 'projects':
+        context = {
+            'projects': getprojects(),
+            }
+    else:
+        context = {
+            'languages': [{"code": code, "name": name } for code, name in potree().getlanguages()],
+            'projects': getprojects(),
+            }
     return render_to_response("index.html", RequestContext(req, context))
     
 def about(req):
@@ -164,18 +173,12 @@
     return render_to_pootleresponse(indexpage.UserIndex(potree(), pootlesession(req)))
 home = login_required(home)
 
-def languagesindex(req):
-    return render_to_pootleresponse(indexpage.LanguagesIndex(potree(), pootlesession(req)))
-
 def projectlanguageindex(req, project):
     return render_to_pootleresponse(indexpage.ProjectLanguageIndex(potree(), project, pootlesession(req)))
 
 def languageindex(req, language):
     return render_to_pootleresponse(indexpage.LanguageIndex(potree(), language, pootlesession(req)))
     
-def projectsindex(req):
-    return render_to_pootleresponse(indexpage.ProjectsIndex(potree(), pootlesession(req)))
-    
 def projectindex(req, language, project):
     # important, handles 4 urls
     argdict = {}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4337
          http://svn.sourceforge.net/translate/?rev=4337&view=rev
Author:   zejn
Date:     2006-11-24 15:41:37 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
[django-migration] index does not need exactly two arguments, and fixing a minor aesthetic bug in templates/index.html

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/index.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/index.html
===================================================================
--- src/branches/django-migration/Pootle/templates/index.html	2006-11-24 23:35:43 UTC (rev 4336)
+++ src/branches/django-migration/Pootle/templates/index.html	2006-11-24 23:41:37 UTC (rev 4337)
@@ -8,7 +8,6 @@
       <div class="intro">
         {{ description }}
       </div>
-
 {% if languages %}
       <h3 class="title"><a href="languages/">{% trans "Languages" %}</a></h3>
 
@@ -17,11 +16,9 @@
         <a href="{{ l.code }}/">{{ l.name }}</a>
         {% endfor %}
       </div>
-    </div>
+      <br />
 {% endif %}
-
 {% if projects %}
-    <div class="contents">
       <h3 class="title"><a href="projects/">{% trans "Projects" %}</a></h3>
 
       <div class="item-description">

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-24 23:35:43 UTC (rev 4336)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-24 23:41:37 UTC (rev 4337)
@@ -141,7 +141,7 @@
     return HttpResponse(content=generaterobotsfile(["login.html", "register.html", "activate.html"]), mimetype="text/plain")
 
 # indexpage.py
-def index(req, what):
+def index(req, what=None):
     if req.GET:
         if 'islogout' in req.GET:
             next_page = req.GET.get('next_page','/')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4338
          http://svn.sourceforge.net/translate/?rev=4338&view=rev
Author:   zejn
Date:     2006-11-24 16:05:17 -0800 (Fri, 24 Nov 2006)

Log Message:
-----------
[django-migration] Login is now Django, but the language selector still ties it to pootlesession.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/login.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/login.html
===================================================================
--- src/branches/django-migration/Pootle/templates/login.html	2006-11-24 23:41:37 UTC (rev 4337)
+++ src/branches/django-migration/Pootle/templates/login.html	2006-11-25 00:05:17 UTC (rev 4338)
@@ -1,60 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% extends "base.html" %}
+{% load i18n %}
 
-  <title py:content="pagetitle">Login to Pootle</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
-
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="intro" py:content="introtext">
-      Login failed
+{% block content %}
+    <div class="intro">
+      {{ introtext }}
     </div>
       <form action="" method="post" name="loginform" id="loginform">
         <table cellpadding="1" cellspacing="1">
           <tr>
-            <td colspan="1" rowspan="1" py:content="username_title">Username:</td>
+            <td colspan="1" rowspan="1">{% trans "Username:" %}</td>
 
-            <td colspan="1" rowspan="1"><input type="text" name="username" value="${username}" /></td>
+            <td colspan="1" rowspan="1">{{ form.username }}</td>
           </tr>
 
           <tr>
-            <td colspan="1" rowspan="1" py:content="password_title">Password:</td>
+            <td colspan="1" rowspan="1">{% trans "Password:" %}</td>
 
-            <td colspan="1" rowspan="1"><input type="password" name="password" value="" /></td>
+            <td colspan="1" rowspan="1">{{ form.password }}</td>
           </tr>
 
           <tr>
-            <td colspan="1" rowspan="1" py:content="language_title">Language:</td>
+            <td colspan="1" rowspan="1">{% trans "Language:" %}</td>
 
             <td colspan="1" rowspan="1">
               <select name="language">
-                <option py:for="l in languages" py:attrs="selected=l.selected" value="${l.code}" py:content="l.name">
-                  Language Name
-                </option>
+                {% for l in languages %}<option {% if l.selected %}selected="true" {% endif %}value="{{ l.code }}">{{ l.name }}</option>{% endfor %}
               </select>
             </td>
           </tr>
         </table>
-        <input type="submit" name="Login" value="${login_text}" />
+        <input type="submit" name="Login" value="{% trans "Login" %}" />
         <input type="hidden" name="islogin" value="true" />
       </form>
-  </div>
+    </div>
+{% endblock %}
 
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
-

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-24 23:41:37 UTC (rev 4337)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-25 00:05:17 UTC (rev 4338)
@@ -5,6 +5,7 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.shortcuts import render_to_response
+from django import forms
 
 from Pootle.compat.authforms import RegistrationManipulator
 from Pootle import indexpage, adminpages, users, translatepage
@@ -14,7 +15,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 
-from Pootle.storage_client import getprojects
+from Pootle.storage_client import getprojects, getlanguageselector
 
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -206,6 +207,7 @@
 def login(req):
     message = None
     redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
+    manipulator = AuthenticationForm(req)
     if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
         redirect_to = '/home/'
 
@@ -214,7 +216,6 @@
     else:
         if req.POST:
             # do login here
-            manipulator = AuthenticationForm(req)
             errors = manipulator.get_validation_errors(req.POST)
             if not errors:
                 from django.contrib.auth import login
@@ -225,7 +226,17 @@
         else:
             errors = {}
         req.session.set_test_cookie()
-        return render_to_pootleresponse(users.LoginPage(pootlesession(req), languagenames=potree().getlanguages(), message=message))
+        
+        # we don't want password
+        new_data = req.POST.copy()
+        del(new_data['password'])
+        
+        form = forms.FormWrapper(manipulator, new_data, errors)
+        context = { 
+            'languages': getlanguageselector(potree().getlanguages(), pootlesession(req)), # FIXME
+            'form': form,
+            }
+        return render_to_response("login.html", RequestContext(req, context))
 
 # users.py: registration, activation
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4339
          http://svn.sourceforge.net/translate/?rev=4339&view=rev
Author:   zejn
Date:     2006-11-25 00:47:17 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
[django-migration] registration djangoized

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/base.html
    src/branches/django-migration/Pootle/templates/login.html
    src/branches/django-migration/Pootle/templates/register.html
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/register_sent.html

Modified: src/branches/django-migration/Pootle/templates/base.html
===================================================================
--- src/branches/django-migration/Pootle/templates/base.html	2006-11-25 00:05:17 UTC (rev 4338)
+++ src/branches/django-migration/Pootle/templates/base.html	2006-11-25 08:47:17 UTC (rev 4339)
@@ -2,7 +2,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <head>
-  <title>{{ pagetitle }}</title>
+  <title>{% block title %}{{ pagetitle }}{% endblock %}</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="description" content="{{ meta_description }}" />
   <meta name="keywords" content="{{ keywords|join:", " }}" />

Modified: src/branches/django-migration/Pootle/templates/login.html
===================================================================
--- src/branches/django-migration/Pootle/templates/login.html	2006-11-25 00:05:17 UTC (rev 4338)
+++ src/branches/django-migration/Pootle/templates/login.html	2006-11-25 08:47:17 UTC (rev 4339)
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% load i18n %}
 
+{% block title %}Pootle - Login{% endblock %}
+
 {% block content %}
     <div class="intro">
       {{ introtext }}

Modified: src/branches/django-migration/Pootle/templates/register.html
===================================================================
--- src/branches/django-migration/Pootle/templates/register.html	2006-11-25 00:05:17 UTC (rev 4338)
+++ src/branches/django-migration/Pootle/templates/register.html	2006-11-25 08:47:17 UTC (rev 4339)
@@ -1,84 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% extends "base.html" %}
+{% load i18n %}
 
-  <title py:content="pagetitle">Pootle Registration</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block title %}Pootle - Registration{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="intro" py:content="introtext">
-      Please enter your registration details
+{% block content %}
+    <div class="intro">
+      {{ register_message }}
     </div>
 
     <form action="" enctype="multipart/form-data" method="post" name="register" id="register">
       <table cellpadding="1" width="100%" border="0" cellspacing="1">
         <tr>
           <td colspan="1" style="width: 33%" rowspan="1" valign="top">
-            <span title="${username_tooltip}" py:content="username_title">Username</span>
+            <span title="{% trans "Your requested username" %}">{% trans "Username" %}</span>
           </td>
 
           <td colspan="1" style="width: 66%" rowspan="1" valign="top">
-            <input style="width: 100%" type="text" name="username" value="${username}" />
+            {{ form.username }}
           </td>
         </tr>
 
         <tr>
           <td colspan="1" style="width: 33%" rowspan="1" valign="top">
-            <span title="${password_tooltip}" py:content="password_title">Password</span>
+            <span title="{% trans "Your desired password" %}">{% trans "Password" %}</span>
           </td>
 
           <td colspan="1" style="width: 66%" rowspan="1" valign="top">
-            <input style="width: 100%" type="password" name="password" value="${password}" />
+            {{ form.password }}
           </td>
         </tr>
 
         <tr>
           <td colspan="1" style="width: 33%" rowspan="1" valign="top">
-            <span title="${passwordconfirm_tooltip}" py:content="passwordconfirm_title">Password (Confirm)</span>
+            <span title="{% trans "Type your password again to ensure it is entered correctly" %}">{% trans "Password (Confirm)" %}</span>
           </td>
 
           <td colspan="1" style="width: 66%" rowspan="1" valign="top">
-            <input style="width: 100%" type="password" name="passwordconfirm" value="${passwordconfirm}" />
+            {{ form.passwordconfirm }}
           </td>
         </tr>
 
         <tr>
           <td colspan="1" style="width: 33%" rowspan="1" valign="top">
-            <span title="${fullname_tooltip}" py:content="fullname_title">Full Name</span>
+            <span title="{% trans "Your first name" %}">{% trans "First Name" %}</span>
           </td>
 
           <td colspan="1" style="width: 66%" rowspan="1" valign="top">
-            <input style="width: 100%" type="text" name="name" value="${fullname}" />
+            {{ form.first_name }}
           </td>
         </tr>
 
         <tr>
           <td colspan="1" style="width: 33%" rowspan="1" valign="top">
-            <span title="${email_tooltip}" py:content="email_title">Email Address</span>
+            <span title="{% trans "Your last name" %}">{% trans "Last Name" %}</span>
           </td>
 
           <td colspan="1" style="width: 66%" rowspan="1" valign="top">
-            <input style="width: 100%" type="text" name="email" value="${email}" />
+            {{ form.last_name }}
           </td>
         </tr>
-      </table><input type="submit" name="register" value="${register_text}" />
+
+        <tr>
+          <td colspan="1" style="width: 33%" rowspan="1" valign="top">
+            <span title="{% trans "You must supply a valid email address" %}">{% trans "Email Address" %}</span>
+          </td>
+
+          <td colspan="1" style="width: 66%" rowspan="1" valign="top">
+            {{ form.email }}
+          </td>
+        </tr>
+      </table><input type="submit" name="register" value="{% trans "Register Account" %}" />
     </form>
   </div>
-
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endblock %}

Added: src/branches/django-migration/Pootle/templates/register_sent.html
===================================================================
--- src/branches/django-migration/Pootle/templates/register_sent.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/register_sent.html	2006-11-25 08:47:17 UTC (rev 4339)
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}Pootle - Registered{% endblock %}
+
+{% block content %}
+    <div class="intro">
+      {% blocktrans %}An email with activation details has been sent to email you have provided. Please follow the instructions in email and activate at the <a href="/activate.html">activation page</a>.{% endblocktrans %}
+    </div>
+
+{% endblock %}

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-25 00:05:17 UTC (rev 4338)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-25 08:47:17 UTC (rev 4339)
@@ -208,6 +208,7 @@
     message = None
     redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
     manipulator = AuthenticationForm(req)
+    new_data = {}
     if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
         redirect_to = '/home/'
 
@@ -223,13 +224,13 @@
                 req.session.delete_test_cookie()
                 req.session.isopen = True
                 return HttpResponseRedirect(redirect_to) 
+            new_data = req.POST.copy()
+            del(new_data['password'])
         else:
             errors = {}
         req.session.set_test_cookie()
         
         # we don't want password
-        new_data = req.POST.copy()
-        del(new_data['password'])
         
         form = forms.FormWrapper(manipulator, new_data, errors)
         context = { 
@@ -241,7 +242,7 @@
 # users.py: registration, activation
 
 def register(req):
-    message = None
+    message = _("Please enter your registration details")
     manipulator = RegistrationManipulator() 
     if req.POST:
         new_data = req.POST.copy()
@@ -251,9 +252,17 @@
         else:
             manipulator.do_html2python(new_data)
             new_user = manipulator.save(new_data)
-            # FIXME return page with "sent mail & please activate"
-    argdict = req.POST.copy()
-    return render_to_pootleresponse(users.RegisterPage(pootlesession(req), argdict, message))
+            return render_to_response("register_sent.html", RequestContext(req))
+    else:
+        new_data = {}
+        errors = {}
+    
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    context = {
+        'register_message' : message, 
+        'form' : form,
+        }
+    return render_to_response("register.html", RequestContext(req, context)) 
 
 def activate(req):
     argdict = req.POST.copy()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4340
          http://svn.sourceforge.net/translate/?rev=4340&view=rev
Author:   zejn
Date:     2006-11-25 01:54:41 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
[django-migration] removing debug prints from pootleauth, finishing registration to make it send activation email.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/authforms.py
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/compat/authforms.py
===================================================================
--- src/branches/django-migration/Pootle/compat/authforms.py	2006-11-25 08:47:17 UTC (rev 4339)
+++ src/branches/django-migration/Pootle/compat/authforms.py	2006-11-25 09:54:41 UTC (rev 4340)
@@ -43,6 +43,9 @@
             usernode = create_user(new_data['username'], new_data['email'])
             usernode.name = u"%s %s" % (new_data['first_name'], new_data['last_name'])
             set_password(usernode, new_data['password'])
+        if 'activationcode' in new_data:
+            usernode.activationcode = new_data['activationcode']
+            usernode.activated = 0
         save_users()
         return usernode
     

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-25 08:47:17 UTC (rev 4339)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-25 09:54:41 UTC (rev 4340)
@@ -77,7 +77,6 @@
     else returns None
     """
 
-    print "get_user: getting user", username
     if not users():
         raise UsersNotInitialized
     try:
@@ -89,7 +88,6 @@
     """
     Creates a new user out of a username and email
     """
-    print "creating user", username 
     usernode = prefs.PrefNode(users(), username)
     users().__setattr__(username, usernode)
     usernode.name = ""

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-25 08:47:17 UTC (rev 4339)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-25 09:54:41 UTC (rev 4340)
@@ -1,11 +1,12 @@
 from django.http import HttpResponse, HttpResponseRedirect
-from django.template import RequestContext
+from django.template import Context, RequestContext, loader
 from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.shortcuts import render_to_response
 from django import forms
+from django.core.mail import send_mail
 
 from Pootle.compat.authforms import RegistrationManipulator
 from Pootle import indexpage, adminpages, users, translatepage
@@ -14,6 +15,7 @@
 from Pootle.storage_client import generaterobotsfile
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
+import random
 
 from Pootle.storage_client import getprojects, getlanguageselector
 
@@ -251,7 +253,22 @@
             message = errorlist_from_errors(errors)
         else:
             manipulator.do_html2python(new_data)
+            activation_code = "".join(["%02x" % int(random.random()*0x100) for i in range(16)])
+            new_data['activationcode'] = activation_code
             new_user = manipulator.save(new_data)
+            
+            # and email the activation details
+            email_contents = loader.get_template("email_register.txt")
+            context = Context({
+                'activationlink': '',
+                'activationcode': activation_code,
+                'username': new_data['username'],
+                'password': new_data['password'],
+                'email': new_data['email'],
+                })
+            send_mail("Pootle registration", email_contents.render(context), settings.DEFAULT_FROM_EMAIL, [new_data['email']],
+                fail_silently=False)
+
             return render_to_response("register_sent.html", RequestContext(req))
     else:
         new_data = {}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4341
          http://svn.sourceforge.net/translate/?rev=4341&view=rev
Author:   zejn
Date:     2006-11-25 02:59:44 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
[django-migration] Activation is now Django. Cleaned Pootleauth a bit.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/authforms.py
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/templates/activate.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/compat/authforms.py
===================================================================
--- src/branches/django-migration/Pootle/compat/authforms.py	2006-11-25 09:54:41 UTC (rev 4340)
+++ src/branches/django-migration/Pootle/compat/authforms.py	2006-11-25 10:59:44 UTC (rev 4341)
@@ -49,3 +49,26 @@
         save_users()
         return usernode
     
+
+class ActivationManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="username", length=16),
+            forms.TextField(field_name="activationcode", length=16),
+            )
+    
+    def save(self, data):
+        usernode = get_user(data['username'])
+        if usernode:
+            try:
+                if data['activationcode'] == usernode.activationcode:
+                    usernode.activated = 1
+                    usernode.__delattr__('activationcode')
+                    save_users()
+                return usernode.activated
+            except AttributeError:
+                return 0
+        else:
+            return 0
+
+

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-25 09:54:41 UTC (rev 4340)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2006-11-25 10:59:44 UTC (rev 4341)
@@ -19,19 +19,13 @@
     """A class to wrap user object in just to map different naming 
     between jToolkit and Django"""
     def __init__(self, user, username):
-        def istrue():
-            return True
         def get_and_delete_messages():
             return []
         self._user = user
         self._username = username
         self.mapping = {
-            'is_active': user.activated,
-            'is_authenticated': istrue,
-            'is_anonymous': False,
             'id': username,
             'username': username,
-            'is_superuser': user.rights.siteadmin,
             'get_and_delete_messages': get_and_delete_messages,
             }
 
@@ -40,7 +34,25 @@
 
     def __str__(self):
         return str(self._username)
+    
+    def is_authenticated(self):
+        return True
 
+    def is_anonymous(self):
+        return False
+        
+    def is_superuser(self):
+        try:
+            return self._user.rights.siteadmin
+        except AttributeError:
+            return False
+
+    def is_active(self):
+        try:
+            return self._user.activated
+        except AttributeError:
+            return False
+
     def __getattr__(self, key):
         if key in self.mapping:
             return self.mapping[key]

Modified: src/branches/django-migration/Pootle/templates/activate.html
===================================================================
--- src/branches/django-migration/Pootle/templates/activate.html	2006-11-25 09:54:41 UTC (rev 4340)
+++ src/branches/django-migration/Pootle/templates/activate.html	2006-11-25 10:59:44 UTC (rev 4341)
@@ -1,54 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% extends "base.html" %}
+{% load i18n %}
 
-  <title py:content="pagetitle">Pootle Account Activation</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block title %}Pootle - Activation{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="intro" py:content="introtext">
-      Please enter your activation details
+{% block content %}
+{% if activationmessage %}
+    <div class="intro">
+      {{ activationmessage }}
     </div>
-
+{% else %}
+    <div class="intro">
+      {% trans "Please enter your activation details" %}
+    </div>
     <form action="" enctype="multipart/form-data" method="post" name="activate" id="activate">
       <table cellpadding="1" width="100%" border="0" cellspacing="1">
         <tr>
           <td colspan="1" style="width: 33%" rowspan="1" valign="top">
-            <span title="${username_tooltip}" py:content="username_title">Username</span>
+            <span title="{% trans "Your requested username" %}">{% trans "Username" %}</span>
           </td>
 
           <td colspan="1" style="width: 66%" rowspan="1" valign="top">
-             <input style="width: 100%" type="text" name="username" value="${username}" />
+             {{ form.username }}
           </td>
         </tr>
 
         <tr>
           <td colspan="1" style="width: 33%" rowspan="1" valign="top">
-            <span title="${code_tooltip}" py:content="code_title">Activation Code</span>
+            <span title="{% trans "The activation code you received" %}">{% trans "Activation Code" %}</span>
           </td>
 
           <td colspan="1" style="width: 66%" rowspan="1" valign="top">
-            <input style="width: 100%" type="text" name="activationcode" value="${code}" />
+            {{ form.activationcode }}
           </td>
         </tr>
-      </table><input type="submit" name="activate" value="${activate_text}" />
+      </table><input type="submit" name="activate" value="{% trans "Activate Account" %}" />
     </form>
-  </div>
-
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endif %}
+{% endblock %}

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-25 09:54:41 UTC (rev 4340)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-25 10:59:44 UTC (rev 4341)
@@ -8,7 +8,7 @@
 from django import forms
 from django.core.mail import send_mail
 
-from Pootle.compat.authforms import RegistrationManipulator
+from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
 from Pootle.conf import users as pootleusers
@@ -282,9 +282,25 @@
     return render_to_response("register.html", RequestContext(req, context)) 
 
 def activate(req):
-    argdict = req.POST.copy()
-    return render_to_pootleresponse(users.ActivatePage(pootlesession(req), argdict, title=None, message=None))
+    manipulator = ActivationManipulator()
+    context = {}
+    if 'activationcode' in req.REQUEST and 'username' in req.REQUEST:
+        # FIXME: validation
+        errors = manipulator.get_validation_errors(req.REQUEST)
+        if not errors:
+            if manipulator.save(req.REQUEST):
+                context = { 'activationmessage': _("Your account has been activated!"), }
 
+    if 'username' in req.REQUEST:
+        new_data = {'username': req.REQUEST['username']} 
+    else:
+        new_data = {}
+    errors = {}
+    
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    context['form'] = form
+    return render_to_response("activate.html", RequestContext(req, context))
+
 # adminpages.py
 
 def projectadmin(req, project):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4342
          http://svn.sourceforge.net/translate/?rev=4342&view=rev
Author:   zejn
Date:     2006-11-25 04:15:59 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
[django-migration] /home/ is now Django.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/home.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/home.html
===================================================================
--- src/branches/django-migration/Pootle/templates/home.html	2006-11-25 10:59:44 UTC (rev 4341)
+++ src/branches/django-migration/Pootle/templates/home.html	2006-11-25 12:15:59 UTC (rev 4342)
@@ -1,54 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% extends "base.html" %}
+{% load i18n %}
 
-  <title py:content="pagetitle">User Page for: ${username}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block title %}Pootle - Home{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="contents"><h3 class="title" py:content="quicklinkstitle">Quick Links</h3>
-      <div py:for="language in quicklinks" py:strip="True">
+{% block content %}
+    <div class="contents"><h3 class="title">{% trans "Quick Links" %}</h3>
+{% if quicklinks %}
+{% for language in quicklinks %}
         <h3 class="title">
-          <a href="../${language.code}/" py:content="language.name">Language</a>
+          <a href="../{{ language.code }}/">{{ language.name }}</a>
         </h3>
-        <div py:if="language.projects" class="item-description">
-          <span py:for="project in language.projects" py:strip="True">
-            <a href="../${language.code}/${project.code}/" py:content="project.name">Language Project</a>
-            <span py:if="project.isprojectadmin" py:strip="True">
-              (<a href="../${language.code}/${project.code}/admin.html/" py:content="admintext">Admin</a>)
-            </span>
-            <span py:replace="XML(project.sep)"/>
-          </span>
+{% if language.projects %}      
+        <div class="item-description">
+{% for project in langugage.projects %}
+          <a href="../{{ language.code }}/{{ project.code }}/">{{ project.name }}</a>
+{% if project.isprojectadmin %}
+          (<a href="../{{ language.code }}/{{ project.code }}/admin.html/">{% trans "Admin" %}</a>)
+{% endif %}
+{% endfor %}
         </div>
+{% endif %}
+{% endfor %}
       </div>
-      <div py:if="not quicklinks" class="item-description" py:content="setoptionstext">
-        Please click on 'Change options' and select some languages and projects
+{% else %}
+      <div py:if="not quicklinks" class="item-description">
+        {% trans "Please click on 'Change options' and select some languages and projects" %}
       </div>
+{% endif %}
     </div>
     
     <div class="intro">
-      <a href="options.html" py:content="optionslink">Change options</a>
+      <a href="options.html">{% trans "Change options" %}</a>
     </div>
 
-    <div class="intro" py:if="session.issiteadmin">
-      <a href="../admin/" py:content="adminlink">Admin page</a>
+{% if user.is_superuser %}
+    <div class="intro">
+      <a href="../admin/">{% trans "Admin page" %}</a>
     </div>
-  </div>
-
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endif %}
+{% endblock %}

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-25 10:59:44 UTC (rev 4341)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-25 12:15:59 UTC (rev 4342)
@@ -17,7 +17,7 @@
 from django.utils.translation import ngettext
 import random
 
-from Pootle.storage_client import getprojects, getlanguageselector
+from Pootle.storage_client import getprojects, getlanguageselector, getquicklinks
 
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -173,7 +173,9 @@
     return render_to_response("about.html", RequestContext(req, context ))
 
 def home(req):
-    return render_to_pootleresponse(indexpage.UserIndex(potree(), pootlesession(req)))
+    context = {
+        'quicklinks': getquicklinks(pootlesession(req)), }
+    return render_to_response("home.html", RequestContext(req, context))
 home = login_required(home)
 
 def projectlanguageindex(req, project):
@@ -232,8 +234,6 @@
             errors = {}
         req.session.set_test_cookie()
         
-        # we don't want password
-        
         form = forms.FormWrapper(manipulator, new_data, errors)
         context = { 
             'languages': getlanguageselector(potree().getlanguages(), pootlesession(req)), # FIXME


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4343
          http://svn.sourceforge.net/translate/?rev=4343&view=rev
Author:   zejn
Date:     2006-11-25 05:38:10 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
[django-migration] projectlanguageindex - links like /projects/pootle/ are now Django. web/templatetags/pootle.py is where new pootle django tags are. Also fixed a bug with links in views.py - index.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/base.html
    src/branches/django-migration/Pootle/templates/index.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/node_item.html
    src/branches/django-migration/Pootle/web/templatetags/
    src/branches/django-migration/Pootle/web/templatetags/__init__.py
    src/branches/django-migration/Pootle/web/templatetags/pootle.py

Modified: src/branches/django-migration/Pootle/templates/base.html
===================================================================
--- src/branches/django-migration/Pootle/templates/base.html	2006-11-25 12:15:59 UTC (rev 4342)
+++ src/branches/django-migration/Pootle/templates/base.html	2006-11-25 13:38:10 UTC (rev 4343)
@@ -8,6 +8,7 @@
   <meta name="keywords" content="{{ keywords|join:", " }}" />
   <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
   <link rel="shortcut icon" href="/favicon.ico" />
+{% block head %}{% endblock %}
   <!--[if lt IE 7.]>
     <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
   <![endif]-->

Modified: src/branches/django-migration/Pootle/templates/index.html
===================================================================
--- src/branches/django-migration/Pootle/templates/index.html	2006-11-25 12:15:59 UTC (rev 4342)
+++ src/branches/django-migration/Pootle/templates/index.html	2006-11-25 13:38:10 UTC (rev 4343)
@@ -13,7 +13,7 @@
 
       <div class="item-description">
         {% for l in languages %}
-        <a href="{{ l.code }}/">{{ l.name }}</a>
+        <a href="/{{ l.code }}/">{{ l.name }}</a>
         {% endfor %}
       </div>
       <br />
@@ -23,7 +23,7 @@
 
       <div class="item-description">
         {% for p in projects %}
-          <a href="projects/{{ p.code }}/" title="{{ p.description }}">{{ p.name }}</a>
+          <a href="/projects/{{ p.code }}/" title="{{ p.description }}">{{ p.name }}</a>
         {% endfor %}
       </div>
     </div>

Added: src/branches/django-migration/Pootle/templates/node_item.html
===================================================================
--- src/branches/django-migration/Pootle/templates/node_item.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/node_item.html	2006-11-25 13:38:10 UTC (rev 4343)
@@ -0,0 +1,25 @@
+    <td class="stats-name">
+      <img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+      <a href="{{ item.href }}" lang="en" dir="ltr">{{ item.title }}</a>
+    </td>
+{% if item.data %}
+      <td class="stats">{{ item.data.translatedwords }}</td><td class="stats">{{ item.data.translatedpercentage }}%</td>
+      <td class="stats">{{ item.data.fuzzywords }}</td><td class="stats">{{ item.data.fuzzypercentage }}%</td>
+      <td class="stats">{{ item.data.untranslatedwords }}</td><td class="stats">{{ item.data.untranslatedpercentage }}%</td>
+      <td class="stats">{{ item.data.totalwords }}</td>
+      <td class="stats-graph">
+        <span class="sortkey">{{ item.data.translatedpercentage }}</span>
+        <table border="0" cellpadding="0" cellspacing="0"><tr>
+<!--!        <td bgcolor="green"><img src="/static/images/green.png" class="data" bgcolor="green" height="20" width="${item.data.translatedpercentage}" /></td>-->
+<!--!        <td bgcolor="grey"><img src="/static/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" /></td>-->
+<!--!        <td bgcolor="red"><img src="/static/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" /></td>-->
+            <td bgcolor="green" class="data" height="20" width="{{ item.data.translatedpercentage }}" />
+{% if item.data.fuzzypercentage %}<td bgcolor="lightgray" class="data" height="20" width="{{ item.data.fuzzypercentage }}" />{% endif %}
+{% if item.data.untranslatedpercentage %}<td bgcolor="red" class="data" height="20" width="{{ item.data.untranslatedpercentage }}" />{% endif %}
+        </tr></table>
+          
+        <!--! The following is simpler, but kid reformats the img tags which inserts spaces between them -->
+
+<!--!        <img src="/static/images/green.png" class="data" height="20" width="${item.data.translatedpercentage}" background="green" /><img src="/static/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" background="grey" /><img src="/static/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" background="red" />-->
+      </td>      
+{% endif %}

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2006-11-25 12:15:59 UTC (rev 4342)
+++ src/branches/django-migration/Pootle/templates/project.html	2006-11-25 13:38:10 UTC (rev 4343)
@@ -1,70 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% extends "base.html" %}
+{% load i18n %}
+{% load pootle %}
 
-  <title py:content="pagetitle">Pootle: ${project.name}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="description" content="${meta_description}" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
+{% block title %}Pootle{% endblock %}
+
+{% block head %}
   <script type="text/javascript" src="/static/js/sorttable.js"></script>
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
+{% block content %}
     <div class="navbar">
       <img src="/static/images/folder.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
 
-      <h3 class="title">[ <a href="/projects/${project.code}/" py:content="project.name">Project</a> ]</h3>
-
-      <div class="item-description" py:if="session.issiteadmin">
-        <a href="admin.html" py:content="adminlink">Admin</a>
+      <h3 class="title">[ <a href="/projects/{{ projectcode }}/">{{ projectname }}</a> ]</h3>
+{% if user.is_superuser %}
+      <div class="item-description">
+        <a href="admin.html">{% trans "Admin" %}</a>
       </div>
+{% endif %}
 
-      <div class="item-statistics" py:content="project.stats">
-        0 languages, average 0% translated
+      <div class="item-statistics">
+        {{ project.stats }}
       </div>
     </div>
 
-    <div class="intro" py:content="XML(description)">
-      This is the project description
+    <div class="intro">
+      {{ projectdescription }}
     </div>
 
       <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">
         <thead>
           <tr>
-            <th class="stats">${statsheadings.name}</th>
-            <th class="stats">${statsheadings.translated}</th>
-	    <th class="stats" title="${statsheadings.translatedpercentage}">%</th>
-            <th class="stats">${statsheadings.fuzzy}</th>
-            <th class="stats" title="${statsheadings.fuzzypercentage}">%</th>
-            <th class="stats">${statsheadings.untranslated}</th>
-            <th class="stats" title="${statsheadings.untranslatedpercentage}">%</th>
-            <th class="stats">${statsheadings.total}</th>
-            <th class="stats">${statsheadings.graph}</th>
+            <th class="stats">{% trans "Name" %}</th>
+            <th class="stats">{% trans "Translated" %}</th>
+	        <th class="stats" title="{% trans "Translated percentage" %}">%</th>
+            <th class="stats">{% trans "Fuzzy" %}</th>
+            <th class="stats" title="{% trans "Fuzzy percentage" %}">%</th>
+            <th class="stats">{% trans "Untranslated" %}</th>
+            <th class="stats" title="{% trans "Untranslated percentage" %}">%</th>
+            <th class="stats">{% trans "Total" %}</th>
+            <th class="stats">{% trans "Graph" %}</th>
         </tr>
       </thead>
       <tbody class="stats">
-        <div py:for="item in languages" py:strip="True">
-          <tr  class="item item-${item.parity}">
-            <div over:include="navbar#itemdata" />
+{% for item in languages %}
+          <tr  class="item item-{{ item.parity }}">
+            {% itemnode %}
           </tr>
-        </div>
+{% endfor %}
       </tbody>
     </table>
-
-  </div>
-
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endblock %}

Added: src/branches/django-migration/Pootle/web/templatetags/__init__.py
===================================================================

Added: src/branches/django-migration/Pootle/web/templatetags/pootle.py
===================================================================
--- src/branches/django-migration/Pootle/web/templatetags/pootle.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/web/templatetags/pootle.py	2006-11-25 13:38:10 UTC (rev 4343)
@@ -0,0 +1,15 @@
+from django.template import Library,Context,Node,loader,TemplateSyntaxError
+
+register = Library()
+
+class ItemNode(Node):
+    def __init__(self):
+        pass
+
+    def render(self, context):
+        t = loader.get_template('node_item.html')
+        return t.render(context)
+
+def itemnode(parser, token):
+    return ItemNode()
+itemnode = register.tag('itemnode',itemnode)

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-25 12:15:59 UTC (rev 4342)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-25 13:38:10 UTC (rev 4343)
@@ -17,7 +17,7 @@
 from django.utils.translation import ngettext
 import random
 
-from Pootle.storage_client import getprojects, getlanguageselector, getquicklinks
+from Pootle.storage_client import getprojects, getlanguageselector, getquicklinks, getlanguages
 
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -179,7 +179,21 @@
 home = login_required(home)
 
 def projectlanguageindex(req, project):
-    return render_to_pootleresponse(indexpage.ProjectLanguageIndex(potree(), project, pootlesession(req)))
+    languages = getlanguages(project)
+    print languages
+    context = {
+        'projectcode': project,
+        'projectname': potree().getprojectname(project),
+        'stats': ngettext(  "%(count)d language, average %(average)d%% translated", 
+                            "%(count)d languages, average %(average)d%% translated", 
+                            len(languages)) % { 
+                                'count': len(languages),
+                                'average': 0 #getpagestats(), }, 
+                                },
+        'projectdescription': potree().getprojectdescription(project),
+        'languages': languages,
+        }
+    return render_to_response("project.html", RequestContext(req, context))
 
 def languageindex(req, language):
     return render_to_pootleresponse(indexpage.LanguageIndex(potree(), language, pootlesession(req)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4344
          http://svn.sourceforge.net/translate/?rev=4344&view=rev
Author:   zejn
Date:     2006-11-25 05:46:36 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
[django-migration] remove a debug print and change a Name to Language to match previous behaviour.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2006-11-25 13:38:10 UTC (rev 4343)
+++ src/branches/django-migration/Pootle/templates/project.html	2006-11-25 13:46:36 UTC (rev 4344)
@@ -31,7 +31,7 @@
       <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">
         <thead>
           <tr>
-            <th class="stats">{% trans "Name" %}</th>
+            <th class="stats">{% trans "Language" %}</th>
             <th class="stats">{% trans "Translated" %}</th>
 	        <th class="stats" title="{% trans "Translated percentage" %}">%</th>
             <th class="stats">{% trans "Fuzzy" %}</th>

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-25 13:38:10 UTC (rev 4343)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-25 13:46:36 UTC (rev 4344)
@@ -180,7 +180,6 @@
 
 def projectlanguageindex(req, project):
     languages = getlanguages(project)
-    print languages
     context = {
         'projectcode': project,
         'projectname': potree().getprojectname(project),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4345
          http://svn.sourceforge.net/translate/?rev=4345&view=rev
Author:   zejn
Date:     2006-11-25 06:44:10 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
[django-migration] languageprojectindex (links like /af/, /sl/, /pt/) now works. One thing remains, the stats are not working.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2006-11-25 13:46:36 UTC (rev 4344)
+++ src/branches/django-migration/Pootle/templates/language.html	2006-11-25 14:44:10 UTC (rev 4345)
@@ -1,64 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% extends "base.html" %}
+{% load i18n %}
+{% load pootle %}
 
-  <title py:content="pagetitle">Pootle: ${language.name}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="/static/pootle.css" />
-  <link rel="shortcut icon" href="/favicon.ico" />
+{% block head %}
   <script type="text/javascript" src="/static/js/sorttable.js"></script>
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="/static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
+{% block content %}
     <div class="navbar">
-      <img src="/static/images/language.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
-
-      <h3 class="title">[ <a href="/${language.code}/" py:content="language.name">Language</a> ]</h3>
-
-      <div class="item-statistics" py:content="language.stats">
-        0 projects, average 0% translated
+      <img src="/static/images/language.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+      <h3 class="title">[ <a href="/{{ languagecode }}/">{{ languagename }}</a> ]</h3>
+      <div class="item-statistics">
+        {{ languagestats }}
       </div>
     </div>
 
     <div class="intro">
-      <span py:for="i in language.info" py:strip="True"><b>${i.title}</b>: ${i.value}<br/></span>
+{% for i in languageinfo %}
+      <b>{{ i.title }}</b>: {{ i.value }}<br/>
+{% endfor %}
     </div>
 
       <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">
         <thead>
           <tr>
-            <th class="stats">${statsheadings.name}</th>
-            <th class="stats">${statsheadings.translated}</th>
-            <th class="stats" title="${statsheadings.translatedpercentage}">%</th>
-            <th class="stats">${statsheadings.fuzzy}</th>
-            <th class="stats" title="${statsheadings.fuzzypercentage}">%</th>
-            <th class="stats">${statsheadings.untranslated}</th>
-            <th class="stats" title="${statsheadings.untranslatedpercentage}">%</th>
-            <th class="stats">${statsheadings.total}</th>
-            <th class="stats">${statsheadings.graph}</th>
+            <th class="stats">{% trans "Name" %}</th>
+            <th class="stats">{% trans "Translated" %}</th>
+            <th class="stats" title="{% trans "Translated percentage" %}">%</th>
+            <th class="stats">{% trans "Fuzzy" %}</th>
+            <th class="stats" title="{% trans "Fuzzy percentage" %}">%</th>
+            <th class="stats">{% trans "Untranslated" %}</th>
+            <th class="stats" title="{% trans "Untranslated percentage" %}">%</th>
+            <th class="stats">{% trans "Total" %}</th>
+            <th class="stats">{% trans "Graph" %}</th>
         </tr>
       </thead>
       <tbody class="stats">
-        <div py:for="item in projects" py:strip="True">
-          <tr class="item item-${item.parity}" title="${item.description}">
-            <div over:include="navbar#itemdata" />
+{% for item in projects %}
+          <tr class="item item-{{ item.parity }}" title="{{ item.description }}">
+            {% itemnode %}
           </tr>
-        </div>
+{% endfor %}
       </tbody>
     </table>
-  </div>
-
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endblock %}

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2006-11-25 13:46:36 UTC (rev 4344)
+++ src/branches/django-migration/Pootle/web/views.py	2006-11-25 14:44:10 UTC (rev 4345)
@@ -17,7 +17,7 @@
 from django.utils.translation import ngettext
 import random
 
-from Pootle.storage_client import getprojects, getlanguageselector, getquicklinks, getlanguages
+from Pootle.storage_client import getprojects, getlanguageselector, getquicklinks, getlanguages, getlanguageinfo, getprojects_languageindex, getstats
 
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -195,7 +195,14 @@
     return render_to_response("project.html", RequestContext(req, context))
 
 def languageindex(req, language):
-    return render_to_pootleresponse(indexpage.LanguageIndex(potree(), language, pootlesession(req)))
+    context = {
+        "languagecode": language,
+        "languagename": potree().getlanguagename(language),
+        "languagestats": '',
+        "languageinfo": getlanguageinfo(language),
+        "projects": getprojects_languageindex(language),
+        }
+    return render_to_response("language.html", RequestContext(req, context))
     
 def projectindex(req, language, project):
     # important, handles 4 urls


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4919
          http://svn.sourceforge.net/translate/?rev=4919&view=rev
Author:   zejn
Date:     2007-02-03 12:16:22 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
[django-migration] AdminPage works with Django.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/conf.py
    src/branches/django-migration/Pootle/templates/adminindex.html
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/web/forms.py

Modified: src/branches/django-migration/Pootle/conf.py
===================================================================
--- src/branches/django-migration/Pootle/conf.py	2007-02-03 18:37:20 UTC (rev 4918)
+++ src/branches/django-migration/Pootle/conf.py	2007-02-03 20:16:22 UTC (rev 4919)
@@ -23,6 +23,9 @@
 def potree():
     return _potree
 
+def saveprefs():
+    prefsfile = instance().__root__.__dict__["_setvalue"].im_self
+    prefsfile.savefile()
 
 def set_instance(inst, potree, users):
     global _instance, _potree, _users

Modified: src/branches/django-migration/Pootle/templates/adminindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminindex.html	2007-02-03 18:37:20 UTC (rev 4918)
+++ src/branches/django-migration/Pootle/templates/adminindex.html	2007-02-03 20:16:22 UTC (rev 4919)
@@ -1,71 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st January 2004), see http://www.w3.org" />
+{% load i18n %}
+{% extends "base.html" %}
 
-  <title>Pootle Admin Page</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="${baseurl}static/pootle.css" />
-  <link rel="shortcut icon" href="${baseurl}favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="${baseurl}static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block title %}Pootle Admin Page{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" py:if="not session.issiteadmin" dir="$uidir" lang="$uilanguage">
+{% block content %}
+  <div id="content" py:if="not session.issiteadmin" dir="{{ uidir }}" lang="{{ uilanguage }}">
+{% if user.is_authenticated and user.is_superuser %}
     <div class="intro">
-      You do not have the rights to administer Pootle
+      <a href="../home/">{% trans "Home" %}</a>
     </div>
-  </div>
-  <div id="content" py:if="session.issiteadmin" dir="$uidir" lang="$uilanguage">
     <div class="intro">
-      <a href="../home/" py:content="text.home">Home</a>
+      <a href="users.html">{% trans "Users" %}</a>
     </div>
-
     <div class="intro">
-      <a href="users.html" py:content="text.users">Users</a>
+      <a href="languages.html">{% trans "Languages" %}</a>
     </div>
-
     <div class="intro">
-      <a href="languages.html" py:content="text.languages">Languages</a>
+      <a href="projects.html">{% trans "Projects" %}</a>
     </div>
 
-    <div class="intro">
-      <a href="projects.html" py:content="text.projects">Projects</a>
-    </div>
-
     <div class="contents">
-      <h3 class="title" py:content="text.generaloptions">General Options</h3>
-
+      <h3 class="title">{% trans "General options" %}</h3>
       <form action="" method="post" name="general" id="general">
         <table cellpadding="1" cellspacing="1">
           <tr>
             <td colspan="1" rowspan="1">
-              <h3 class="title" py:content="text.option">Option</h3>
+              <h3 class="title">{% trans "Option" %}</h3>
             </td>
-
             <td colspan="1" rowspan="1">
-              <h3 class="title" py:content="text.currentvalue">Current value</h3>
+              <h3 class="title">{% trans "Current value" %}</h3>
             </td>
           </tr>
 
-          <tr py:for="option in options">
-            <td colspan="1" rowspan="1" py:content="option.title">Description</td>
-
-            <td colspan="1" rowspan="1"><input type="text" name="${option.name}" value="${option.value}"/></td>
+          <tr>
+            <td colspan="1" rowspan="1">{% trans "Title" %}</td>
+            <td colspan="1" rowspan="1">{{ form.title }}</td>
           </tr>
-
-        </table><input type="submit" name="changegeneral" value="${text.savechanges}" />
+          <tr>
+            <td colspan="1" rowspan="1">{% trans "Description" %}</td>
+            <td colspan="1" rowspan="1">{{ form.description }}</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1">{% trans "Base URL" %}</td>
+            <td colspan="1" rowspan="1">{{ form.baseurl }}</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1">{% trans "Home Page" %}</td>
+            <td colspan="1" rowspan="1">{{ form.homepage }}</td>
+          </tr>
+        </table><input type="submit" name="changegeneral" value="{% trans "Save changes" %}" />
       </form>
     </div>
+{% else %}
+    <div class="intro">
+      You do not have the rights to administer Pootle
+    </div>
+{% endif %}
   </div>
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endblock %}
+
+
+

Added: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/web/forms.py	2007-02-03 20:16:22 UTC (rev 4919)
@@ -0,0 +1,21 @@
+from django import forms
+from Pootle.conf import instance, saveprefs
+
+class SiteOptionsManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="title", length=40),
+            forms.LargeTextField(field_name="description"),
+            forms.TextField(field_name="baseurl", length=40),
+            forms.TextField(field_name="homepage", length=40),
+          )
+
+    def old_data(self):
+        return dict([ (optionname.field_name, getattr(instance(), optionname.field_name, "")) for optionname in self.fields])
+
+    def save(self, new_data):
+        for optionname in self.fields:
+            setattr(instance(), optionname.field_name, new_data[optionname.field_name])
+        saveprefs()
+        
+

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-03 18:37:20 UTC (rev 4918)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-03 20:16:22 UTC (rev 4919)
@@ -8,6 +8,7 @@
 from django import forms
 from django.core.mail import send_mail
 
+from Pootle.web.forms import SiteOptionsManipulator
 from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
@@ -328,7 +329,19 @@
     return render_to_pootleresponse(adminpages.ProjectAdminPage(potree(), project, pootlesession(req), argdict))
     
 def admin(req):
-    return render_to_pootleresponse(adminpages.AdminPage(potree(), pootlesession(req), instance))
+    manipulator = SiteOptionsManipulator()
+    if req.POST:
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            manipulator.do_html2python(new_data)
+            manipulator.save(new_data)
+            return HttpResponseRedirect(req.path)
+    else:
+        errors = {}
+        new_data = manipulator.old_data()
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    return render_to_response("adminindex.html", RequestContext(req, { 'form': form } ))
 
 def adminusers(req):
     return render_to_pootleresponse(adminpages.UsersAdminPage(None, pootleusers(), pootlesession(req), instance))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4920
          http://svn.sourceforge.net/translate/?rev=4920&view=rev
Author:   zejn
Date:     2007-02-03 18:02:48 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
[django-migration] User administration already works, but needs some final touches.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/authforms.py
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/templates/adminindex.html
    src/branches/django-migration/Pootle/templates/adminusers.html
    src/branches/django-migration/Pootle/urls.py
    src/branches/django-migration/Pootle/web/forms.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/admin_useredit.html

Modified: src/branches/django-migration/Pootle/compat/authforms.py
===================================================================
--- src/branches/django-migration/Pootle/compat/authforms.py	2007-02-03 20:16:22 UTC (rev 4919)
+++ src/branches/django-migration/Pootle/compat/authforms.py	2007-02-04 02:02:48 UTC (rev 4920)
@@ -3,7 +3,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.core import validators
 from django.core.validators import ValidationError
-from Pootle.compat.pootleauth import get_user, set_password, create_user, save_users
+from Pootle.compat.pootleauth import get_user, create_user, save_users, PootleAuth
 
 class CallableWrapper:
     """
@@ -38,17 +38,17 @@
             )
 
     def save(self, new_data):
-        usernode = get_user(new_data['username'])
-        if not usernode:
-            usernode = create_user(new_data['username'], new_data['email'])
-            usernode.name = u"%s %s" % (new_data['first_name'], new_data['last_name'])
-            set_password(usernode, new_data['password'])
-        if 'activationcode' in new_data:
-            usernode.activationcode = new_data['activationcode']
-            usernode.activated = 0
+        pa = PootleAuth()
+        user = pa.get_user(new_data['username'])
+        if not user:
+            user = create_user(new_data['username'], new_data['email'])
+            user.set_user({
+                'name': u"%s %s" % (new_data['first_name'], new_data['last_name']),
+                'password': new_data['password'],
+                'activationcode': new_data['activationcode'],
+                'activated': 0, })
         save_users()
-        return usernode
-    
+        return user
 
 class ActivationManipulator(forms.Manipulator):
     def __init__(self):
@@ -58,14 +58,14 @@
             )
     
     def save(self, data):
-        usernode = get_user(data['username'])
-        if usernode:
+        pa = PootleAuth()
+        user = pa.get_user(data['username'])
+        if user:
             try:
-                if data['activationcode'] == usernode.activationcode:
-                    usernode.activated = 1
-                    usernode.__delattr__('activationcode')
+                if data['activationcode'] == user.activationcode:
+                    user.activate()
                     save_users()
-                return usernode.activated
+                return user.activated
             except AttributeError:
                 return 0
         else:

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-03 20:16:22 UTC (rev 4919)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-04 02:02:48 UTC (rev 4920)
@@ -61,7 +61,27 @@
                 return self.__getattr__(key)
             except:
                 return self._user.__getattr__(key)
+    
+    def set_user(self, kwargs):
+        self._user.name = kwargs['name']
+        self._user.email = kwargs['email']
+        self._user.activated = kwargs['activated']
+        if 'activationcode' in kwargs:
+            self._user.activationcode = kwargs['activationcode']
+        if kwargs.get('password') != None:
+            self.set_password(kwargs['password'])
+        save_users()
+    
+    def activate(self):
+        self._user.activated = 1
+        self._user.__delattr__('activationcode')
 
+    def set_password(self, raw_password):
+        self._user.passwdhash = md5hexdigest(raw_password)
+
+    def check_password(self, raw_password):
+        return self._user.passwdhash == md5hexdigest(raw_password)
+
 class PootleAuth:
     "Authenticate against Pootle's users.prefs file"
     def authenticate(self, username=None, password=None):
@@ -76,13 +96,6 @@
             return UserWrapper(users().__getattr__(username), username)
         return None
 
-
-def check_password(usernode, password):
-    return usernode.passwdhash == md5hexdigest(password)
-
-def set_password(usernode, password):
-    usernode.passwdhash = md5hexdigest(password)
-
 def get_user(username):
     """
     Returns jToolkit user object if user found, 
@@ -96,8 +109,17 @@
     except AttributeError:
         return None
 
-def create_user(username, email):
+def get_users():
     """
+    Returns an iterable over all Pootle users.
+    """
+    if not users():
+        raise UsersNotInitialized
+    for u in users().iteritems(sorted=True):
+        yield UserWrapper(u[1], u[0])
+
+def create_usernode(username, email):
+    """
     Creates a new user out of a username and email
     """
     usernode = prefs.PrefNode(users(), username)
@@ -108,6 +130,14 @@
     save_users()
     return usernode
 
+def create_user(username, email):
+    """
+    Creates and returns user wrapped in UserWrapper
+    """
+    user = create_usernode(username,email)
+    if user:
+        return UserWrapper(user, username)
+
 def save_users():
     prefsfile = users().__root__.__dict__["_setvalue"].im_self
     prefsfile.savefile()

Added: src/branches/django-migration/Pootle/templates/admin_useredit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_useredit.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-04 02:02:48 UTC (rev 4920)
@@ -0,0 +1,52 @@
+{% load i18n %}
+{% extends "base.html" %}
+{% block title %}Pootle User Admin Page{% endblock %}
+
+{% block content %}
+{% if user.is_authenticated and user.is_superuser %}
+  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <div class="intro">
+      <a href="../home/">{% trans "Home" %}</a>
+    </div>
+
+    <div class="intro">
+      <a href="../../">{% trans "Main admin page" %}</a>
+    </div>
+
+    <div class="fullwidthcontents">
+      <h3 class="title">{% trans "Editing user " %}</h3>
+
+      <form action="" method="post" name="users" id="users">
+        <table cellpadding="1" cellspacing="1">
+          <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Username" %}</h3></td>
+            <td colspan="1" rowspan="1">{{ form.username }}</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
+            <td colspan="1" rowspan="1">{{ form.name }}</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Email Address" %}</h3></td>
+            <td colspan="1" rowspan="1">{{ form.email }}</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Password" %}</h3></td>
+            <td colspan="1" rowspan="1">{{ form.password }}</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Activated" %}</h3></td>
+            <td colspan="1" rowspan="1">{{ form.activated }}</td>
+          </tr>
+        </table><input type="submit" name="changeusers" value="{% trans "Save changes" %}" />
+      </form>
+    </div>
+  </div>
+{% else %}
+  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <div class="intro">
+      You do not have the rights to administer Pootle
+    </div>
+  </div>
+{% endif %}
+{% endblock %}

Modified: src/branches/django-migration/Pootle/templates/adminindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminindex.html	2007-02-03 20:16:22 UTC (rev 4919)
+++ src/branches/django-migration/Pootle/templates/adminindex.html	2007-02-04 02:02:48 UTC (rev 4920)
@@ -10,7 +10,7 @@
       <a href="../home/">{% trans "Home" %}</a>
     </div>
     <div class="intro">
-      <a href="users.html">{% trans "Users" %}</a>
+      <a href="users/">{% trans "Users" %}</a>
     </div>
     <div class="intro">
       <a href="languages.html">{% trans "Languages" %}</a>

Modified: src/branches/django-migration/Pootle/templates/adminusers.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-03 20:16:22 UTC (rev 4919)
+++ src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-04 02:02:48 UTC (rev 4920)
@@ -1,70 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st January 2004), see http://www.w3.org" />
+{% load i18n %}
+{% extends "base.html" %}
+{% block title %}Pootle User Admin Page{% endblock %}
 
-  <title>Pootle User Admin Page</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="${baseurl}static/pootle.css" />
-  <link rel="shortcut icon" href="${baseurl}favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="${baseurl}static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
-
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" py:if="not session.issiteadmin" dir="$uidir" lang="$uilanguage">
+{% block content %}
+{% if user.is_authenticated and user.is_superuser %}
+  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
     <div class="intro">
-      You do not have the rights to administer Pootle
+      <a href="../../home/">{% trans "Home" %}</a>
     </div>
-  </div>
-  <div id="fullwidthcontent" py:if="session.issiteadmin" dir="$uidir" lang="$uilanguage">
-    <div class="intro">
-      <a href="../home/" py:content="text.home">Home page</a>
-    </div>
 
     <div class="intro">
-      <a href="index.html" py:content="text.admin">Admin page</a>
+      <a href="index.html">{% trans "Main admin page" %}</a>
     </div>
 
     <div class="fullwidthcontents">
-      <h3 class="title" py:content="text.users">Users</h3>
+      <h3 class="title">{% trans "Users" %}</h3>
 
       <form action="" method="post" name="users" id="users">
         <table cellpadding="1" cellspacing="1">
           <tr>
-            <td colspan="1" rowspan="1" py:for="option in options">
-              <h3 class="title" py:content="option.title">Login</h3>
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Username" %}</h3>
             </td>
-          </tr>
-
-          <tr py:for="user in users">
-            <td colspan="1" rowspan="1" py:content="user.code">davidfraser</td>
-
-            <td colspan="1" rowspan="1" py:for="option in user.options">
-               <input name="${option.name}" type="${option.type}" value="${option.value}" checked="${option.checked}"/>
-               <span py:if="option.label" py:content="option.label"/>
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Full Name" %}</h3>
             </td>
-
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Email Address" %}</h3>
+            </td>
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Activated" %}</h3>
+            </td>
           </tr>
-
+{% for u in users %}
           <tr>
-            <td colspan="1" rowspan="1" py:for="option in options">
-              <input py:if="option.newname" name="${option.newname}" type="${option.type}" value="${option.newvalue}" size="${option.size}" checked="${option.checked}"/>
-              <span py:if="option.label" py:content="option.label"/>
-            </td>
+            <td colspan="1" rowspan="1"><a href="{{ u.username }}/">{{ u.username }}</a></td>
+            <td colspan="1" rowspan="1">{{ u.name }}</td>
+            <td colspan="1" rowspan="1">{{ u.email }}</td>
+            <td colspan="1" rowspan="1">{% if u.activated %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %}</td>
           </tr>
-        </table><input type="submit" name="changeusers" value="${text.savechanges}" />
+{% endfor %}
+        </table><input type="submit" name="changeusers" value="{% trans "Save changes" %}" />
       </form>
     </div>
   </div>
-
+{% else %}
+  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <div class="intro">
+      You do not have the rights to administer Pootle
+    </div>
   </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endif %}
+{% endblock %}

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2007-02-03 20:16:22 UTC (rev 4919)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-04 02:02:48 UTC (rev 4920)
@@ -27,7 +27,8 @@
     
     (r'^admin/$', 'admin'),
     (r'^admin/index.html$', 'admin'),
-    (r'^admin/users.html$', 'adminusers'),
+    (r'^admin/users/$', 'adminusers'),
+    (r'^admin/users/(?P<user>\w+)/$', 'admin_useredit'),
     (r'^admin/languages.html$', 'adminlanguages'),
     (r'^admin/projects.html$', 'adminprojects'),
     

Modified: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	2007-02-03 20:16:22 UTC (rev 4919)
+++ src/branches/django-migration/Pootle/web/forms.py	2007-02-04 02:02:48 UTC (rev 4920)
@@ -1,5 +1,6 @@
 from django import forms
 from Pootle.conf import instance, saveprefs
+from Pootle.compat.pootleauth import PootleAuth, create_user, save_users
 
 class SiteOptionsManipulator(forms.Manipulator):
     def __init__(self):
@@ -19,3 +20,30 @@
         saveprefs()
         
 
+class UserAdminManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="username", length=6),
+            forms.TextField(field_name="name", length=20),
+            forms.TextField(field_name="email", length=20),
+            forms.TextField(field_name="password", length=20),
+            forms.CheckboxField(field_name="activated"),
+            )
+
+    def old_data(self, user):
+        pa = PootleAuth()
+        u = pa.get_user(user)
+        if u:
+            return dict([ (k.field_name, getattr(u,k.field_name)) for k in self.fields if k.field_name != 'password'])
+        else:
+            return {}
+
+    def save(self, new_data):
+        pa = PootleAuth()
+        user = pa.get_user(new_data['username'])
+        if not user:
+            user = create_user(new_data['username'], new_data['email'])
+        user.set_user(new_data)
+        save_users()
+
+

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-03 20:16:22 UTC (rev 4919)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-04 02:02:48 UTC (rev 4920)
@@ -8,8 +8,9 @@
 from django import forms
 from django.core.mail import send_mail
 
-from Pootle.web.forms import SiteOptionsManipulator
+from Pootle.web.forms import SiteOptionsManipulator, UserAdminManipulator
 from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
+from Pootle.compat.pootleauth import get_users
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
 from Pootle.conf import users as pootleusers
@@ -343,8 +344,23 @@
     form = forms.FormWrapper(manipulator, new_data, errors)
     return render_to_response("adminindex.html", RequestContext(req, { 'form': form } ))
 
+def admin_useredit(req, user):
+    manipulator = UserAdminManipulator()
+    if req.POST:
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            manipulator.do_html2python(new_data)
+            manipulator.save(new_data)
+            return HttpResponseRedirect(req.path)
+    else:
+        errors = {}
+        new_data = manipulator.old_data(user)
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form } ))
+
 def adminusers(req):
-    return render_to_pootleresponse(adminpages.UsersAdminPage(None, pootleusers(), pootlesession(req), instance))
+    return render_to_response("adminusers.html", RequestContext(req, { 'users': get_users() } ))
 
 def adminlanguages(req):
     return render_to_pootleresponse(adminpages.LanguagesAdminPage(potree(), pootlesession(req), instance))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4921
          http://svn.sourceforge.net/translate/?rev=4921&view=rev
Author:   zejn
Date:     2007-02-04 02:11:56 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
[django-migration] Users admin page can now delete users.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/templates/admin_useredit.html
    src/branches/django-migration/Pootle/templates/adminusers.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-04 02:02:48 UTC (rev 4920)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-04 10:11:56 UTC (rev 4921)
@@ -82,6 +82,10 @@
     def check_password(self, raw_password):
         return self._user.passwdhash == md5hexdigest(raw_password)
 
+    def delete(self):
+        if users().__hasattr__(self._username):
+            users().removekey(self._username)
+
 class PootleAuth:
     "Authenticate against Pootle's users.prefs file"
     def authenticate(self, username=None, password=None):

Modified: src/branches/django-migration/Pootle/templates/admin_useredit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-04 02:02:48 UTC (rev 4920)
+++ src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-04 10:11:56 UTC (rev 4921)
@@ -20,7 +20,7 @@
         <table cellpadding="1" cellspacing="1">
           <tr>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Username" %}</h3></td>
-            <td colspan="1" rowspan="1">{{ form.username }}</td>
+            <td colspan="1" rowspan="1">{{ u }}</td>
           </tr>
           <tr>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>

Modified: src/branches/django-migration/Pootle/templates/adminusers.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-04 02:02:48 UTC (rev 4920)
+++ src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-04 10:11:56 UTC (rev 4921)
@@ -20,6 +20,9 @@
         <table cellpadding="1" cellspacing="1">
           <tr>
             <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Selected" %}</h3>
+            </td>
+            <td colspan="1" rowspan="1">
               <h3 class="title">{% trans "Username" %}</h3>
             </td>
             <td colspan="1" rowspan="1">
@@ -34,13 +37,14 @@
           </tr>
 {% for u in users %}
           <tr>
+            <td colspan="1" rowspan="1"><input type="checkbox" name="select-{{ u.username }}" /></a></td>
             <td colspan="1" rowspan="1"><a href="{{ u.username }}/">{{ u.username }}</a></td>
             <td colspan="1" rowspan="1">{{ u.name }}</td>
             <td colspan="1" rowspan="1">{{ u.email }}</td>
             <td colspan="1" rowspan="1">{% if u.activated %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %}</td>
           </tr>
 {% endfor %}
-        </table><input type="submit" name="changeusers" value="{% trans "Save changes" %}" />
+        </table><input type="submit" name="delete-selected" value="{% trans "Delete selected" %}" />
       </form>
     </div>
   </div>

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-04 02:02:48 UTC (rev 4920)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-04 10:11:56 UTC (rev 4921)
@@ -10,7 +10,7 @@
 
 from Pootle.web.forms import SiteOptionsManipulator, UserAdminManipulator
 from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
-from Pootle.compat.pootleauth import get_users
+from Pootle.compat import pootleauth
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
 from Pootle.conf import users as pootleusers
@@ -348,6 +348,7 @@
     manipulator = UserAdminManipulator()
     if req.POST:
         new_data = req.POST.copy()
+        new_data['username'] = user
         errors = manipulator.get_validation_errors(new_data)
         if not errors:
             manipulator.do_html2python(new_data)
@@ -357,10 +358,16 @@
         errors = {}
         new_data = manipulator.old_data(user)
     form = forms.FormWrapper(manipulator, new_data, errors)
-    return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form } ))
+    return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user} ))
 
 def adminusers(req):
-    return render_to_response("adminusers.html", RequestContext(req, { 'users': get_users() } ))
+    if req.POST:
+        selected = [ u for u in pootleauth.get_users() if "select-%s" % u.username in req.POST]
+        if 'delete-selected' in req.POST:
+            for u in selected:
+                u.delete()
+            pootleauth.save_users()
+    return render_to_response("adminusers.html", RequestContext(req, { 'users': pootleauth.get_users() } ))
 
 def adminlanguages(req):
     return render_to_pootleresponse(adminpages.LanguagesAdminPage(potree(), pootlesession(req), instance))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4922
          http://svn.sourceforge.net/translate/?rev=4922&view=rev
Author:   zejn
Date:     2007-02-04 02:49:47 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
[django-migration] Languages now listed, editing will be added soon.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/storage_client.py
    src/branches/django-migration/Pootle/templates/adminlanguages.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2007-02-04 10:11:56 UTC (rev 4921)
+++ src/branches/django-migration/Pootle/storage_client.py	2007-02-04 10:49:47 UTC (rev 4922)
@@ -193,3 +193,24 @@
     content.extend([ "Disallow: /%s/\n" % lc for lc in potree().getlanguagecodes() ])
     return ''.join(content)
 
+class LanguageWrapper(object):
+    def __init__(self, languagecode, languagename):
+        self.code = languagecode
+        self.name = languagename
+
+    def _get_specialchars(self):
+        return potree().getlanguagespecialchars(self.code)
+    specialchars = property(_get_specialchars)
+
+    def _get_plurals(self):
+        return potree().getlanguagenplurals(self.code)
+    plurals = property(_get_plurals)
+
+    def _get_plural_equation(self):
+        return potree().getlanguagepluralequation(self.code)
+    plural_equation = property(_get_plural_equation)
+
+def get_language_objects():
+    for lcode, lname in potree().getlanguages():
+        yield LanguageWrapper(lcode, lname)
+        

Modified: src/branches/django-migration/Pootle/templates/adminlanguages.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-04 10:11:56 UTC (rev 4921)
+++ src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-04 10:49:47 UTC (rev 4922)
@@ -1,68 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st January 2004), see http://www.w3.org" />
+{% load i18n %}
+{% extends "base.html" %}
 
-  <title>Pootle Languages Admin Page</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="${baseurl}static/pootle.css" />
-  <link rel="shortcut icon" href="${baseurl}favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="${baseurl}static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block title %}Pootle Languages Admin Page{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" py:if="not session.issiteadmin" dir="$uidir" lang="$uilanguage">
+{% block content %}
+{% if user.is_authenticated and user.is_superuser %}
+  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
     <div class="intro">
-      You do not have the rights to administer Pootle
+      <a href="../home/">{% trans "Home" %}</a>
     </div>
-  </div>
-  <div id="fullwidthcontent" py:if="session.issiteadmin" dir="$uidir" lang="$uilanguage">
-    <div class="intro">
-      <a href="../home/" py:content="text.home">Home page</a>
-    </div>
 
     <div class="intro">
-      <a href="index.html" py:content="text.admin">Main Admin page</a>
+      <a href="index.html">{% trans "Main admin page" %}</a>
     </div>
 
     <div class="fullwidthcontents">
-      <h3 class="title" py:content="text.languages">Languages</h3>
+      <h3 class="title">{% trans "Languages" %}</h3>
 
       <form action="" method="post" name="languages" id="languages">
         <table cellpadding="1" cellspacing="1">
           <tr>
-            <td colspan="1" rowspan="1" py:for="option in options">
-              <h3 class="title" py:content="option.title">ISO Code</h3>
-            </td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Selected" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "ISO Code" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Special Chars" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Number of Plurals" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Plural Equation" %}</h3></td>
           </tr>
 
-          <tr py:for="language in languages">
-            <td colspan="1" rowspan="1" py:content="language.code">code</td>
-
-            <td colspan="1" rowspan="1" py:for="option in language.options">
-               <input name="${option.name}" type="${option.type}" value="${option.value}"/>
-               <span py:if="option.label" py:content="option.label"/>
-            </td>
-          </tr>
-
+{% for lang in languages %}
           <tr>
-            <td colspan="1" rowspan="1" style="min-width: 6em;" py:for="option in options">
-              <input type="text" py:if="option.newname" name="${option.newname}" value="${option.newvalue}" size="${option.size}"/>
-            </td>
+            <td colspan="1" rowspan="1"><input type="checkbox" /></td>
+            <td colspan="1" rowspan="1">{{ lang.code }}</td>
+            <td colspan="1" rowspan="1">{{ lang.name }}</td>
+            <td colspan="1" rowspan="1">{{ lang.specialchars }}</td>
+            <td colspan="1" rowspan="1">{{ lang.plurals }}</td>
+            <td colspan="1" rowspan="1">{{ lang.plural_equation }}</td>
           </tr>
-        </table><input type="submit" name="changelanguages" value="${text.savechanges}" />
+{% endfor %}
+        </table><input type="submit" name="changelanguages" value="{% trans "Save changes" %}" />
       </form>
     </div>
   </div>
-
+{% else %}
+  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <div class="intro">
+      You do not have the rights to administer Pootle
+    </div>
   </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endif %}
+{% endblock %}

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-04 10:11:56 UTC (rev 4921)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-04 10:49:47 UTC (rev 4922)
@@ -14,7 +14,7 @@
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
 from Pootle.conf import users as pootleusers
-from Pootle.storage_client import generaterobotsfile
+from Pootle.storage_client import generaterobotsfile, get_language_objects
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 import random
@@ -370,7 +370,8 @@
     return render_to_response("adminusers.html", RequestContext(req, { 'users': pootleauth.get_users() } ))
 
 def adminlanguages(req):
-    return render_to_pootleresponse(adminpages.LanguagesAdminPage(potree(), pootlesession(req), instance))
+    context = { 'languages': get_language_objects() }
+    return render_to_response("adminlanguages.html", RequestContext(req, context))
 
 def adminprojects(req):
     return render_to_pootleresponse(adminpages.ProjectsAdminPage(potree(), pootlesession(req), instance))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4923
          http://svn.sourceforge.net/translate/?rev=4923&view=rev
Author:   zejn
Date:     2007-02-04 03:35:29 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
[django-migration] Added some tests for pootleauth module. Tests are executed when a browser is pointed to /test/

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/urls.py
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-04 10:49:47 UTC (rev 4922)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-04 11:35:29 UTC (rev 4923)
@@ -74,7 +74,8 @@
     
     def activate(self):
         self._user.activated = 1
-        self._user.__delattr__('activationcode')
+        if hasattr(self._user, 'activationcode'):
+            self._user.__delattr__('activationcode')
 
     def set_password(self, raw_password):
         self._user.passwdhash = md5hexdigest(raw_password)

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2007-02-04 10:49:47 UTC (rev 4922)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-04 11:35:29 UTC (rev 4923)
@@ -9,6 +9,11 @@
     (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
 )
 
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        (r'^test/$', 'Pootle.web.views.test'),
+    )
+
 urlpatterns += patterns('Pootle.web.views',
     (r'^$', 'index'),
     (r'^login.html$', 'login'),

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-04 10:49:47 UTC (rev 4922)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-04 11:35:29 UTC (rev 4923)
@@ -393,3 +393,39 @@
 def spellingstandby(req):
     return render_to_pootleresponse(spellui.SpellingStandby())
 
+
+def test(req):
+    tests = []
+    ta = tests.append
+    # Pootle.compat.pootleauth
+    ta(("<b>Pootle.compat.pootleauth</b>",))
+    # user created
+    testuser = pootleauth.create_user('testuser','test@...')
+    ta(('user created', pootleauth.get_user('testuser') == testuser._user))
+    # password set
+    testuser.set_password('testpassword')
+    try: t = testuser.check_password('testpassword')
+    except: t = False
+    ta(('password set', t))
+    # user authenticated
+    pa = pootleauth.PootleAuth()
+    u = pa.authenticate('testuser', 'testpassword')
+    ta(('user authenticated', u != None and type(u) == type(pootleauth.UserWrapper(testuser._user,'testuser'))))
+    # is_authenticated is true
+    ta(('is_authenticated is true', testuser.is_authenticated() == True))
+    # is_anonymous is false
+    ta(('is_anonymous is false', testuser.is_anonymous() == False))
+    # is_active is false
+    ta(('is_active is false', testuser.is_active() == False))
+    # activate 
+    testuser.activate()
+    ta(('activate', testuser.is_active() == True))
+    # is_superuser is false
+    ta(('is_superuser is false', testuser.is_superuser() == False))
+    # user deleted
+    testuser.delete()
+    pootleauth.save_users()
+    ta( ('user deleted', pootleauth.get_user('testuser') == None))
+
+
+    return render_to_response("test.html", RequestContext(req, {'tests': tests}))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4925
          http://svn.sourceforge.net/translate/?rev=4925&view=rev
Author:   zejn
Date:     2007-02-04 06:24:05 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
[django-migration] Project administration migrated.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/storage_client.py
    src/branches/django-migration/Pootle/templates/adminprojects.html
    src/branches/django-migration/Pootle/urls.py
    src/branches/django-migration/Pootle/web/forms.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/admin_projectedit.html

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2007-02-04 12:04:42 UTC (rev 4924)
+++ src/branches/django-migration/Pootle/storage_client.py	2007-02-04 14:24:05 UTC (rev 4925)
@@ -214,3 +214,47 @@
     for lcode, lname in potree().getlanguages():
         yield LanguageWrapper(lcode, lname)
         
+
+class ProjectWrapper(object):
+    def __init__(self, projectcode):
+        self.code = projectcode
+
+    def _get_name(self):
+        return potree().getprojectname(self.code)
+
+    def _set_name(self, name):
+        potree().setprojectname(self.code, name)
+    name = property(_get_name, _set_name)
+
+    def _get_description(self):
+        return potree().getprojectdescription(self.code)
+
+    def _set_description(self, desc):
+        potree().setprojectdescription(self.code, desc)
+    description = property(_get_description, _set_description)
+
+    def _get_checkerstyle(self):
+        return potree().getprojectcheckerstyle(self.code)
+
+    def _set_checkerstyle(self, checkerstyle):
+        potree().setprojectcheckerstyle(self.code, checkerstyle)
+    checkerstyle = property(_get_checkerstyle, _set_checkerstyle)
+
+    def _get_filetype(self):
+        return potree().getprojectlocalfiletype(self.code)
+
+    def _set_filetype(self, filetype):
+        potree().setprojectlocalfiletype(self.code, filetype)
+    filetype = property(_get_filetype, _set_filetype)
+
+    def _get_create_mo_files(self):
+        return potree().getprojectcreatemofiles(self.code)
+
+    def _set_create_mo_files(self, createmo):
+        potree().setprojectcreatemofiles(self.code, createmo)
+    create_mo_files = property(_get_create_mo_files, _set_create_mo_files)
+    
+def get_project_objects():
+    for pcode in potree().getprojectcodes():
+        yield ProjectWrapper(pcode)
+

Added: src/branches/django-migration/Pootle/templates/admin_projectedit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_projectedit.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/admin_projectedit.html	2007-02-04 14:24:05 UTC (rev 4925)
@@ -0,0 +1,39 @@
+{% load i18n %}
+{% extends "base.html" %}
+
+{% block title %}Pootle Projects Admin Page{% endblock %}
+
+{% block content %}
+{% if user.is_authenticated and user.is_superuser %}
+  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <div class="intro">
+      <a href="../home/">{% trans "Home" %}</a>
+    </div>
+
+    <div class="intro">
+      <a href="index.html">{% trans "Main admin page" %}</a>
+    </div>
+
+    <div class="fullwidthcontents">
+      <h3 class="title">{% trans "Projects" %}</h3>
+
+      <form action="" method="post" name="projects" id="projects">
+        <table cellpadding="1" cellspacing="1">
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Code" %}</h3></td><td>{{ project.code }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td><td>{{ form.name }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Description" %}</h3></td><td>{{ form.description }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Checker Style" %}</h3></td><td>{{ form.checkerstyle }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "File Type" %}</h3></td><td>{{ form.filetype }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Create MO Files" %}</h3></td><td>{{ form.create_mo_files }}</td></tr>
+        </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />
+      </form>
+    </div>
+  </div>
+{% else %}
+  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <div class="intro">
+      {% trans "You do not have the rights to administer Pootle" %}
+    </div>
+  </div>
+{% endif %}
+{% endblock %}

Modified: src/branches/django-migration/Pootle/templates/adminprojects.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminprojects.html	2007-02-04 12:04:42 UTC (rev 4924)
+++ src/branches/django-migration/Pootle/templates/adminprojects.html	2007-02-04 14:24:05 UTC (rev 4925)
@@ -1,79 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st January 2004), see http://www.w3.org" />
+{% load i18n %}
+{% extends "base.html" %}
 
-  <title>Pootle Projects Admin Page</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="${baseurl}static/pootle.css" />
-  <link rel="shortcut icon" href="${baseurl}favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="${baseurl}static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block title %}Pootle Projects Admin Page{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" py:if="not session.issiteadmin" dir="$uidir" lang="$uilanguage">
+{% block content %}
+{% if user.is_authenticated and user.is_superuser %}
+  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
     <div class="intro">
-      You do not have the rights to administer Pootle
+      <a href="../home/">{% trans "Home" %}</a>
     </div>
-  </div>
-  <div id="fullwidthcontent" py:if="session.issiteadmin" dir="$uidir" lang="$uilanguage">
-    <div class="intro">
-      <a href="../home/" py:content="text.home">Home page</a>
-    </div>
 
     <div class="intro">
-      <a href="index.html" py:content="text.admin">Main Admin page</a>
+      <a href="index.html">{% trans "Main admin page" %}</a>
     </div>
 
     <div class="fullwidthcontents">
-      <h3 class="title" py:content="text.projects">Projects</h3>
+      <h3 class="title">{% trans "Projects" %}</h3>
 
       <form action="" method="post" name="projects" id="projects">
         <table cellpadding="1" cellspacing="1">
           <tr>
-            <td colspan="1" rowspan="1" py:for="option in options">
-              <h3 class="title" py:content="option.title">Project Code</h3>
-            </td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Selected" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Code" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Description" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Checker Style" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "File Type" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Create MO Files" %}</h3></td>
           </tr>
-
-          <tr py:for="project in projects">
-            <td colspan="1" rowspan="1"><a href="${project.adminlink}" py:content="project.code">code</a></td>
-
-            <td colspan="1" rowspan="1" py:for="option in project.options">
-              <input type="${option.type}" name="${option.name}" value="${option.value}" checked="${option.checked}" py:if="not option.selectoptions"/>
-               <select name="${option.name}" value="${option.value}" py:if="'selectoptions' in option">
-                  <span py:for="o in option.selectoptions" py:strip="True">
-                    <option py:if="o.value == option.value" selected="selected" value="${o.value}" py:content="o.description"/>
-                    <option py:if="o.value != option.value" value="${o.value}" py:content="o.description"/>
-                  </span>
-               </select>
-               <span py:if="'label' in option" py:content="option.label"/>
-            </td>
-          </tr>
-
+{% for project in projects %}
           <tr>
-            <td colspan="1" rowspan="1" style="min-width: 6em;" py:for="option in options">
-              <span py:if="'newname' in option">
-                <input type="${option.type}" py:if="not option.selectoptions" value="${option.newvalue}" name="${option.newname}" size="${option.size}"/>
-                <select name="${option.newname}" value="${option.newvalue}" py:if="'selectoptions' in option">
-                  <option py:for="o in option.selectoptions" value="${o.value}" py:content="o.description"/>
-                </select>
-              </span>
-            </td>
+            <td colspan="1" rowspan="1"><input type="checkbox" name="select-{{ project.code }}" /></td>
+            <td colspan="1" rowspan="1"><a href="{{ project.code }}">{{ project.code }}</a></td>
+            <td colspan="1" rowspan="1">{{ project.name }}</td>
+            <td colspan="1" rowspan="1">{{ project.description }}</td>
+            <td colspan="1" rowspan="1">{{ project.checkerstyle }}</td>
+            <td colspan="1" rowspan="1">{{ project.filetype }}</td>
+            <td colspan="1" rowspan="1">{{ project.create_mo_files }}</td>
           </tr>
-        </table><input type="submit" name="changeprojects" value="${text.savechanges}" />
+{% endfor %}
+        </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />
       </form>
     </div>
   </div>
-
+{% else %}
+  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
+    <div class="intro">
+      {% trans "You do not have the rights to administer Pootle" %}
+    </div>
   </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% endif %}
+{% endblock %}

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2007-02-04 12:04:42 UTC (rev 4924)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-04 14:24:05 UTC (rev 4925)
@@ -35,7 +35,9 @@
     (r'^admin/users/$', 'adminusers'),
     (r'^admin/users/(?P<user>\w+)/$', 'admin_useredit'),
     (r'^admin/languages.html$', 'adminlanguages'),
-    (r'^admin/projects.html$', 'adminprojects'),
+    (r'^admin/projects/$', 'adminprojects'),
+    (r'^admin/projects/(?P<project>\w+)/$', 'admin_projectedit'),
+
     
     (r'^(?P<language>\w+)/$', 'languageindex'),
     (r'^(?P<language>\w+)/(?P<project>\w+)/$', 'projectindex'),

Modified: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	2007-02-04 12:04:42 UTC (rev 4924)
+++ src/branches/django-migration/Pootle/web/forms.py	2007-02-04 14:24:05 UTC (rev 4925)
@@ -1,7 +1,17 @@
 from django import forms
 from Pootle.conf import instance, saveprefs
 from Pootle.compat.pootleauth import PootleAuth, create_user, save_users
+from Pootle import storage_client
+from translate.filters import checks
 
+
+CHECKS = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
+# FIXME: Filetypes should probably be provided by translate-toolkit.
+FILETYPES = [
+    ('po', 'po'),
+    ('xliff','xliff'),
+    ]
+
 class SiteOptionsManipulator(forms.Manipulator):
     def __init__(self):
         self.fields = (
@@ -46,4 +56,22 @@
         user.set_user(new_data)
         save_users()
 
+class ProjectAdminManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="name", length=10),
+            forms.LargeTextField(field_name="description"),
+            forms.SelectField(field_name="checkerstyle", choices=CHECKS),
+            forms.SelectField(field_name="filetype", choices=FILETYPES),
+            forms.CheckboxField(field_name="create_mo_files"),
+            )
 
+    def old_data(self, project):
+        p = storage_client.ProjectWrapper(project)
+        return dict([ (k.field_name, getattr(p,k.field_name)) for k in self.fields ])
+
+    def save(self, new_data, projectcode):
+        p = storage_client.ProjectWrapper(projectcode)
+        for k in self.fields:
+            setattr(p, k.field_name, new_data[k.field_name])
+

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-04 12:04:42 UTC (rev 4924)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-04 14:24:05 UTC (rev 4925)
@@ -8,13 +8,14 @@
 from django import forms
 from django.core.mail import send_mail
 
-from Pootle.web.forms import SiteOptionsManipulator, UserAdminManipulator
+from Pootle.web.forms import SiteOptionsManipulator, UserAdminManipulator, ProjectAdminManipulator
 from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
 from Pootle.compat import pootleauth
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
 from Pootle.conf import users as pootleusers
-from Pootle.storage_client import generaterobotsfile, get_language_objects
+from Pootle import storage_client
+from Pootle.storage_client import generaterobotsfile, get_language_objects, get_project_objects
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 import random
@@ -374,8 +375,26 @@
     return render_to_response("adminlanguages.html", RequestContext(req, context))
 
 def adminprojects(req):
-    return render_to_pootleresponse(adminpages.ProjectsAdminPage(potree(), pootlesession(req), instance))
+    context = { 'projects' : get_project_objects() }
+    return render_to_response("adminprojects.html", RequestContext(req, context))
 
+def admin_projectedit(req, project):
+    manipulator = ProjectAdminManipulator()
+    if req.POST:
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            manipulator.do_html2python(new_data)
+            manipulator.save(new_data, project)
+            return HttpResponseRedirect(req.path)
+    else:
+        errors = {}
+        new_data = manipulator.old_data(project)
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    context = { 'project' : storage_client.ProjectWrapper(project),
+                'form': form }
+    return render_to_response("admin_projectedit.html", RequestContext(req, context))
+
 def admintranslationproject(req):
     return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project, pootlesession(req), argdict))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4926
          http://svn.sourceforge.net/translate/?rev=4926&view=rev
Author:   zejn
Date:     2007-02-04 07:05:42 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------
[django-migration] Reject POST on admin pages if it's not site admin who's posting. Improved layout, also admin templates now inherit 
from base_admin.html.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/admin_projectedit.html
    src/branches/django-migration/Pootle/templates/admin_useredit.html
    src/branches/django-migration/Pootle/templates/adminindex.html
    src/branches/django-migration/Pootle/templates/adminlanguages.html
    src/branches/django-migration/Pootle/templates/adminprojects.html
    src/branches/django-migration/Pootle/templates/adminusers.html
    src/branches/django-migration/Pootle/urls.py
    src/branches/django-migration/Pootle/web/forms.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/base_admin.html

Modified: src/branches/django-migration/Pootle/templates/admin_projectedit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_projectedit.html	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/templates/admin_projectedit.html	2007-02-04 15:05:42 UTC (rev 4926)
@@ -1,19 +1,9 @@
 {% load i18n %}
-{% extends "base.html" %}
+{% extends "base_admin.html" %}
 
 {% block title %}Pootle Projects Admin Page{% endblock %}
 
-{% block content %}
-{% if user.is_authenticated and user.is_superuser %}
-  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      <a href="../home/">{% trans "Home" %}</a>
-    </div>
-
-    <div class="intro">
-      <a href="index.html">{% trans "Main admin page" %}</a>
-    </div>
-
+{% block adminpanel %}
     <div class="fullwidthcontents">
       <h3 class="title">{% trans "Projects" %}</h3>
 
@@ -28,12 +18,4 @@
         </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />
       </form>
     </div>
-  </div>
-{% else %}
-  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      {% trans "You do not have the rights to administer Pootle" %}
-    </div>
-  </div>
-{% endif %}
 {% endblock %}

Modified: src/branches/django-migration/Pootle/templates/admin_useredit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-04 15:05:42 UTC (rev 4926)
@@ -1,18 +1,8 @@
 {% load i18n %}
-{% extends "base.html" %}
+{% extends "base_admin.html" %}
 {% block title %}Pootle User Admin Page{% endblock %}
 
-{% block content %}
-{% if user.is_authenticated and user.is_superuser %}
-  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      <a href="../home/">{% trans "Home" %}</a>
-    </div>
-
-    <div class="intro">
-      <a href="../../">{% trans "Main admin page" %}</a>
-    </div>
-
+{% block adminpanel %}
     <div class="fullwidthcontents">
       <h3 class="title">{% trans "Editing user " %}</h3>
 
@@ -41,12 +31,4 @@
         </table><input type="submit" name="changeusers" value="{% trans "Save changes" %}" />
       </form>
     </div>
-  </div>
-{% else %}
-  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      You do not have the rights to administer Pootle
-    </div>
-  </div>
-{% endif %}
 {% endblock %}

Modified: src/branches/django-migration/Pootle/templates/adminindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminindex.html	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/templates/adminindex.html	2007-02-04 15:05:42 UTC (rev 4926)
@@ -1,24 +1,9 @@
 {% load i18n %}
-{% extends "base.html" %}
+{% extends "base_admin.html" %}
 
 {% block title %}Pootle Admin Page{% endblock %}
 
-{% block content %}
-  <div id="content" py:if="not session.issiteadmin" dir="{{ uidir }}" lang="{{ uilanguage }}">
-{% if user.is_authenticated and user.is_superuser %}
-    <div class="intro">
-      <a href="../home/">{% trans "Home" %}</a>
-    </div>
-    <div class="intro">
-      <a href="users/">{% trans "Users" %}</a>
-    </div>
-    <div class="intro">
-      <a href="languages.html">{% trans "Languages" %}</a>
-    </div>
-    <div class="intro">
-      <a href="projects.html">{% trans "Projects" %}</a>
-    </div>
-
+{% block adminpanel %}
     <div class="contents">
       <h3 class="title">{% trans "General options" %}</h3>
       <form action="" method="post" name="general" id="general">
@@ -51,12 +36,6 @@
         </table><input type="submit" name="changegeneral" value="{% trans "Save changes" %}" />
       </form>
     </div>
-{% else %}
-    <div class="intro">
-      You do not have the rights to administer Pootle
-    </div>
-{% endif %}
-  </div>
 {% endblock %}
 
 

Modified: src/branches/django-migration/Pootle/templates/adminlanguages.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-04 15:05:42 UTC (rev 4926)
@@ -1,19 +1,9 @@
 {% load i18n %}
-{% extends "base.html" %}
+{% extends "base_admin.html" %}
 
 {% block title %}Pootle Languages Admin Page{% endblock %}
 
-{% block content %}
-{% if user.is_authenticated and user.is_superuser %}
-  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      <a href="../home/">{% trans "Home" %}</a>
-    </div>
-
-    <div class="intro">
-      <a href="index.html">{% trans "Main admin page" %}</a>
-    </div>
-
+{% block adminpanel %}
     <div class="fullwidthcontents">
       <h3 class="title">{% trans "Languages" %}</h3>
 
@@ -27,7 +17,6 @@
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Number of Plurals" %}</h3></td>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Plural Equation" %}</h3></td>
           </tr>
-
 {% for lang in languages %}
           <tr>
             <td colspan="1" rowspan="1"><input type="checkbox" /></td>
@@ -41,12 +30,4 @@
         </table><input type="submit" name="changelanguages" value="{% trans "Save changes" %}" />
       </form>
     </div>
-  </div>
-{% else %}
-  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      You do not have the rights to administer Pootle
-    </div>
-  </div>
-{% endif %}
 {% endblock %}

Modified: src/branches/django-migration/Pootle/templates/adminprojects.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminprojects.html	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/templates/adminprojects.html	2007-02-04 15:05:42 UTC (rev 4926)
@@ -1,19 +1,9 @@
 {% load i18n %}
-{% extends "base.html" %}
+{% extends "base_admin.html" %}
 
 {% block title %}Pootle Projects Admin Page{% endblock %}
 
-{% block content %}
-{% if user.is_authenticated and user.is_superuser %}
-  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      <a href="../home/">{% trans "Home" %}</a>
-    </div>
-
-    <div class="intro">
-      <a href="index.html">{% trans "Main admin page" %}</a>
-    </div>
-
+{% block adminpanel %}
     <div class="fullwidthcontents">
       <h3 class="title">{% trans "Projects" %}</h3>
 
@@ -42,12 +32,4 @@
         </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />
       </form>
     </div>
-  </div>
-{% else %}
-  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      {% trans "You do not have the rights to administer Pootle" %}
-    </div>
-  </div>
-{% endif %}
 {% endblock %}

Modified: src/branches/django-migration/Pootle/templates/adminusers.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-04 15:05:42 UTC (rev 4926)
@@ -1,18 +1,8 @@
 {% load i18n %}
-{% extends "base.html" %}
+{% extends "base_admin.html" %}
 {% block title %}Pootle User Admin Page{% endblock %}
 
-{% block content %}
-{% if user.is_authenticated and user.is_superuser %}
-  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      <a href="../../home/">{% trans "Home" %}</a>
-    </div>
-
-    <div class="intro">
-      <a href="index.html">{% trans "Main admin page" %}</a>
-    </div>
-
+{% block adminpanel %}
     <div class="fullwidthcontents">
       <h3 class="title">{% trans "Users" %}</h3>
 
@@ -47,12 +37,4 @@
         </table><input type="submit" name="delete-selected" value="{% trans "Delete selected" %}" />
       </form>
     </div>
-  </div>
-{% else %}
-  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <div class="intro">
-      You do not have the rights to administer Pootle
-    </div>
-  </div>
-{% endif %}
 {% endblock %}

Added: src/branches/django-migration/Pootle/templates/base_admin.html
===================================================================
--- src/branches/django-migration/Pootle/templates/base_admin.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/base_admin.html	2007-02-04 15:05:42 UTC (rev 4926)
@@ -0,0 +1,24 @@
+{% load i18n %}
+{% extends "base.html" %}
+
+{% block title %}Pootle Admin Page{% endblock %}
+
+{% block content %}
+  <div id="fullwidthcontent" dir="{{ uidir }}" lang="{{ uilanguage }}">
+{% if user.is_authenticated and user.is_superuser %}
+    <div class="intro">
+      <a href="{{ baseurl }}/admin/users/">{% trans "Users" %}</a>
+      <a href="{{ baseurl }}/admin/languages/">{% trans "Languages" %}</a>
+      <a href="{{ baseurl }}/admin/projects/">{% trans "Projects" %}</a>
+    </div>
+{% block adminpanel %}{% endblock %}
+{% else %}
+    <div class="intro">
+      {% trans "You do not have the rights to administer Pootle" %}
+    </div>
+{% endif %}
+  </div>
+{% endblock %}
+
+
+

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-04 15:05:42 UTC (rev 4926)
@@ -34,7 +34,7 @@
     (r'^admin/index.html$', 'admin'),
     (r'^admin/users/$', 'adminusers'),
     (r'^admin/users/(?P<user>\w+)/$', 'admin_useredit'),
-    (r'^admin/languages.html$', 'adminlanguages'),
+    (r'^admin/languages/$', 'adminlanguages'),
     (r'^admin/projects/$', 'adminprojects'),
     (r'^admin/projects/(?P<project>\w+)/$', 'admin_projectedit'),
 

Modified: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/web/forms.py	2007-02-04 15:05:42 UTC (rev 4926)
@@ -59,7 +59,7 @@
 class ProjectAdminManipulator(forms.Manipulator):
     def __init__(self):
         self.fields = (
-            forms.TextField(field_name="name", length=10),
+            forms.TextField(field_name="name", length=40),
             forms.LargeTextField(field_name="description"),
             forms.SelectField(field_name="checkerstyle", choices=CHECKS),
             forms.SelectField(field_name="filetype", choices=FILETYPES),

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-04 14:24:05 UTC (rev 4925)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-04 15:05:42 UTC (rev 4926)
@@ -332,7 +332,7 @@
     
 def admin(req):
     manipulator = SiteOptionsManipulator()
-    if req.POST:
+    if req.POST and req.user.is_superuser():
         new_data = req.POST.copy()
         errors = manipulator.get_validation_errors(new_data)
         if not errors:
@@ -347,14 +347,14 @@
 
 def admin_useredit(req, user):
     manipulator = UserAdminManipulator()
-    if req.POST:
+    if req.POST and req.user.is_superuser():
         new_data = req.POST.copy()
         new_data['username'] = user
         errors = manipulator.get_validation_errors(new_data)
         if not errors:
             manipulator.do_html2python(new_data)
             manipulator.save(new_data)
-            return HttpResponseRedirect(req.path)
+            return HttpResponseRedirect('/'.join(req.path.split("/")[:-2]) + '/')
     else:
         errors = {}
         new_data = manipulator.old_data(user)
@@ -362,7 +362,7 @@
     return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user} ))
 
 def adminusers(req):
-    if req.POST:
+    if req.POST and req.user.is_superuser():
         selected = [ u for u in pootleauth.get_users() if "select-%s" % u.username in req.POST]
         if 'delete-selected' in req.POST:
             for u in selected:
@@ -371,22 +371,26 @@
     return render_to_response("adminusers.html", RequestContext(req, { 'users': pootleauth.get_users() } ))
 
 def adminlanguages(req):
+    if req.POST and req.user.is_superuser():
+        pass
     context = { 'languages': get_language_objects() }
     return render_to_response("adminlanguages.html", RequestContext(req, context))
 
 def adminprojects(req):
+    if req.POST and req.user.is_superuser():
+        pass
     context = { 'projects' : get_project_objects() }
     return render_to_response("adminprojects.html", RequestContext(req, context))
 
 def admin_projectedit(req, project):
     manipulator = ProjectAdminManipulator()
-    if req.POST:
+    if req.POST and req.user.is_superuser():
         new_data = req.POST.copy()
         errors = manipulator.get_validation_errors(new_data)
         if not errors:
             manipulator.do_html2python(new_data)
             manipulator.save(new_data, project)
-            return HttpResponseRedirect(req.path)
+            return HttpResponseRedirect('/'.join(req.path.split("/")[:-2]) + '/')
     else:
         errors = {}
         new_data = manipulator.old_data(project)
@@ -396,6 +400,8 @@
     return render_to_response("admin_projectedit.html", RequestContext(req, context))
 
 def admintranslationproject(req):
+    if req.POST and req.user.is_superuser():
+        pass
     return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project, pootlesession(req), argdict))
 
 # translatepage.py


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4937
          http://svn.sourceforge.net/translate/?rev=4937&view=rev
Author:   zejn
Date:     2007-02-05 13:12:27 -0800 (Mon, 05 Feb 2007)

Log Message:
-----------
[django-migration] Moving Validator wrapper to utils, since it is reusable

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/authforms.py
    src/branches/django-migration/Pootle/utils.py

Modified: src/branches/django-migration/Pootle/compat/authforms.py
===================================================================
--- src/branches/django-migration/Pootle/compat/authforms.py	2007-02-05 11:16:22 UTC (rev 4936)
+++ src/branches/django-migration/Pootle/compat/authforms.py	2007-02-05 21:12:27 UTC (rev 4937)
@@ -4,19 +4,8 @@
 from django.core import validators
 from django.core.validators import ValidationError
 from Pootle.compat.pootleauth import get_user, create_user, save_users, PootleAuth
+from Pootle.utils import CallableValidatorWrapper
 
-class CallableWrapper:
-    """
-    This is needed here to make the validator an object, 
-    that has an attribute 'always_test' set to true.
-    """
-    def __init__(self, check):
-        self._callable = check
-        self.always_test = True
-
-    def __call__(self, field_data, all_data):
-        return self._callable(field_data, all_data)
-
 # checks for user manipulator
 def user_already_exists(field_data, all_data):
     u = get_user(field_data.strip())
@@ -27,7 +16,7 @@
     def __init__(self):
         self.fields = (
             forms.TextField(field_name="username", length=16, 
-                validator_list=[CallableWrapper(user_already_exists)]),
+                validator_list=[CallableValidatorWrapper(user_already_exists)]),
             forms.TextField(field_name="first_name", length=16),
             forms.TextField(field_name="last_name", length=16),
             forms.TextField(field_name="email", length=16, 

Modified: src/branches/django-migration/Pootle/utils.py
===================================================================
--- src/branches/django-migration/Pootle/utils.py	2007-02-05 11:16:22 UTC (rev 4936)
+++ src/branches/django-migration/Pootle/utils.py	2007-02-05 21:12:27 UTC (rev 4937)
@@ -13,3 +13,16 @@
 
 def next_to_this_file(this_file, additional_path):
     return os.path.join(os.path.dirname(os.path.abspath(this_file)), additional_path)
+
+class CallableValidatorWrapper:
+    """
+    This is needed here to make the validator an object,
+    that has an attribute 'always_test' set to true.
+    """
+    def __init__(self, check):
+        self._callable = check
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        return self._callable(field_data, all_data)
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4938
          http://svn.sourceforge.net/translate/?rev=4938&view=rev
Author:   zejn
Date:     2007-02-05 17:57:28 -0800 (Mon, 05 Feb 2007)

Log Message:
-----------
[django-migration] urls.py, templates/home.html: remove trailing .html from url. storage_client.py: encode in utf-8 to avoid errors. 
views.py, forms.py, options.html: implement user options. views.py, other templates: add error checking and display on pages. 
pootleauth.py: implement a full user profile.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/storage_client.py
    src/branches/django-migration/Pootle/templates/admin_projectedit.html
    src/branches/django-migration/Pootle/templates/admin_useredit.html
    src/branches/django-migration/Pootle/templates/adminindex.html
    src/branches/django-migration/Pootle/templates/home.html
    src/branches/django-migration/Pootle/templates/options.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/urls.py
    src/branches/django-migration/Pootle/web/forms.py
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-06 01:57:28 UTC (rev 4938)
@@ -7,6 +7,7 @@
 from django.conf import settings
 from jToolkit import prefs
 from Pootle.conf import instance, users
+from Pootle.storage_client import ProjectWrapper, LanguageWrapper, get_project_objects, get_language_objects
 
 
 class UsersNotInitialized(Exception): pass
@@ -15,32 +16,49 @@
   if isinstance(text, unicode): text = text.encode('utf8')
   return md5.md5(text).hexdigest()
 
-class UserWrapper:
+class UserWrapper(object):
     """A class to wrap user object in just to map different naming 
     between jToolkit and Django"""
     def __init__(self, user, username):
-        def get_and_delete_messages():
-            return []
         self._user = user
-        self._username = username
-        self.mapping = {
-            'id': username,
-            'username': username,
-            'get_and_delete_messages': get_and_delete_messages,
-            }
+        self.id = username
+        self.username = username
 
     def __repr__(self):
-        return "<PootleUser: %s>" % self._username
+        return "<PootleUser: %s>" % self.username
 
     def __str__(self):
-        return str(self._username)
+        return str(self.username)
+   
+    # properties
+    def __getattr__(self, key):
+        if key in ['name', 'email', 'uilanguage', 'inputheight', 'inputwidth', 'viewrows', 'translaterows']:
+            return getattr(self._user, key, None)
+
+    def _get_projects(self):
+        return getattr(self._user, 'projects', '').split(',')
+
+    def _set_projects(self, project_list):
+        setattr(self._user, 'projects', ",".join(list(project_list)))
+    projects = property(_get_projects, _set_projects)
+
+    def _get_languages(self):
+        return getattr(self._user, 'languages', '').split(',')
     
+    def _set_languages(self, language_list):
+        setattr(self._user, 'languages', ",".join(list(language_list)))
+    languages = property(_get_languages, _set_languages)
+    # end properties
+
     def is_authenticated(self):
         return True
 
     def is_anonymous(self):
         return False
         
+    def get_and_delete_messages(self):
+        return []
+
     def is_superuser(self):
         try:
             return self._user.rights.siteadmin
@@ -53,24 +71,16 @@
         except AttributeError:
             return False
 
-    def __getattr__(self, key):
-        if key in self.mapping:
-            return self.mapping[key]
-        else:
-            try:
-                return self.__getattr__(key)
-            except:
-                return self._user.__getattr__(key)
-    
     def set_user(self, kwargs):
-        self._user.name = kwargs['name']
-        self._user.email = kwargs['email']
-        self._user.activated = kwargs['activated']
+        for i in ['name', 'email', 'uilanguage', 'inputheight', 'inputwidth', 'viewrows', 'translaterows']:
+            if i in kwargs:
+                setattr(self._user, i, kwargs[i])
+        if 'activated' in kwargs:
+            self._user.activated = kwargs['activated']
         if 'activationcode' in kwargs:
             self._user.activationcode = kwargs['activationcode']
-        if kwargs.get('password') != None:
+        if kwargs['password']:
             self.set_password(kwargs['password'])
-        save_users()
     
     def activate(self):
         self._user.activated = 1
@@ -83,10 +93,29 @@
     def check_password(self, raw_password):
         return self._user.passwdhash == md5hexdigest(raw_password)
 
+    def save(self):
+        save_users()
+
     def delete(self):
-        if users().__hasattr__(self._username):
-            users().removekey(self._username)
+        if users().__hasattr__(self.username):
+            users().removekey(self.username)
 
+    def is_project_member(self, project):
+        return project in [i.strip() for i in getattr(self._user, 'projects', '').split(',')]
+
+    def project_list(self):
+        for p in getattr(self._user, 'projects', '').split(','):
+            if p.strip():
+                yield ProjectWrapper(p)
+
+    def is_language_member(self, language):
+        return language in [i.strip() for i in getattr(self._user, 'projects', '').split(',')]
+
+    def language_list(self):
+        for p in getattr(self._user, 'languages', '').split(','):
+            if p.strip():
+                yield LanguageWrapper(p)
+
 class PootleAuth:
     "Authenticate against Pootle's users.prefs file"
     def authenticate(self, username=None, password=None):

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/storage_client.py	2007-02-06 01:57:28 UTC (rev 4938)
@@ -194,9 +194,12 @@
     return ''.join(content)
 
 class LanguageWrapper(object):
-    def __init__(self, languagecode, languagename):
+    def __init__(self, languagecode, languagename=None):
         self.code = languagecode
-        self.name = languagename
+        if languagename:
+            self.name = languagename.encode("utf-8")
+        else:
+            self.name = potree().getlanguagename(languagecode).encode("utf-8")
 
     def _get_specialchars(self):
         return potree().getlanguagespecialchars(self.code)

Modified: src/branches/django-migration/Pootle/templates/admin_projectedit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_projectedit.html	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/templates/admin_projectedit.html	2007-02-06 01:57:28 UTC (rev 4938)
@@ -10,11 +10,11 @@
       <form action="" method="post" name="projects" id="projects">
         <table cellpadding="1" cellspacing="1">
           <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Code" %}</h3></td><td>{{ project.code }}</td></tr>
-          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td><td>{{ form.name }}</td></tr>
-          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Description" %}</h3></td><td>{{ form.description }}</td></tr>
-          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Checker Style" %}</h3></td><td>{{ form.checkerstyle }}</td></tr>
-          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "File Type" %}</h3></td><td>{{ form.filetype }}</td></tr>
-          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Create MO Files" %}</h3></td><td>{{ form.create_mo_files }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td><td>{{ form.name }} {{ errors.name|join:" " }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Description" %}</h3></td><td>{{ form.description }} {{ errors.description|join:" " }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Checker Style" %}</h3></td><td>{{ form.checkerstyle }} {{ errors.checkerstyle|join:" " }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "File Type" %}</h3></td><td>{{ form.filetype }} {{ errors.filetype|join:" " }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Create MO Files" %}</h3></td><td>{{ form.create_mo_files }} {{ errors.create_mo_files|join:" " }}</td></tr>
         </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />
       </form>
     </div>

Modified: src/branches/django-migration/Pootle/templates/admin_useredit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-06 01:57:28 UTC (rev 4938)
@@ -18,7 +18,7 @@
           </tr>
           <tr>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Email Address" %}</h3></td>
-            <td colspan="1" rowspan="1">{{ form.email }}</td>
+            <td colspan="1" rowspan="1">{{ form.email }} {{ errors.email|join:" " }}</td>
           </tr>
           <tr>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Password" %}</h3></td>

Modified: src/branches/django-migration/Pootle/templates/adminindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminindex.html	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/templates/adminindex.html	2007-02-06 01:57:28 UTC (rev 4938)
@@ -19,19 +19,19 @@
 
           <tr>
             <td colspan="1" rowspan="1">{% trans "Title" %}</td>
-            <td colspan="1" rowspan="1">{{ form.title }}</td>
+            <td colspan="1" rowspan="1">{{ form.title }} {{ errors.title|join:" " }}</td>
           </tr>
           <tr>
             <td colspan="1" rowspan="1">{% trans "Description" %}</td>
-            <td colspan="1" rowspan="1">{{ form.description }}</td>
+            <td colspan="1" rowspan="1">{{ form.description }} {{ errors.description|join:" " }}</td>
           </tr>
           <tr>
             <td colspan="1" rowspan="1">{% trans "Base URL" %}</td>
-            <td colspan="1" rowspan="1">{{ form.baseurl }}</td>
+            <td colspan="1" rowspan="1">{{ form.baseurl }} {{ errors.baseurl|join:" " }}</td>
           </tr>
           <tr>
             <td colspan="1" rowspan="1">{% trans "Home Page" %}</td>
-            <td colspan="1" rowspan="1">{{ form.homepage }}</td>
+            <td colspan="1" rowspan="1">{{ form.homepage }} {{ errors.homepage|join:" " }}</td>
           </tr>
         </table><input type="submit" name="changegeneral" value="{% trans "Save changes" %}" />
       </form>

Modified: src/branches/django-migration/Pootle/templates/home.html
===================================================================
--- src/branches/django-migration/Pootle/templates/home.html	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/templates/home.html	2007-02-06 01:57:28 UTC (rev 4938)
@@ -30,7 +30,7 @@
     </div>
     
     <div class="intro">
-      <a href="options.html">{% trans "Change options" %}</a>
+      <a href="options/">{% trans "Change options" %}</a>
     </div>
 
 {% if user.is_superuser %}

Modified: src/branches/django-migration/Pootle/templates/options.html
===================================================================
--- src/branches/django-migration/Pootle/templates/options.html	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/templates/options.html	2007-02-06 01:57:28 UTC (rev 4938)
@@ -1,138 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% load i18n %}
+{% extends "base.html" %}
 
-  <title py:content="pagetitle">Options for: ${username}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="${baseurl}static/pootle.css" />
-  <link rel="shortcut icon" href="${baseurl}favicon.ico" />
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="${baseurl}static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block title %}Options for: {{ user }}{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div py:if="introtext" class="intro" py:content="introtext">
-      Please edit your options as desired below.
-    </div>
-    
+{% block content %}
+  <div id="content" dir="{{ uidir }}" lang="{{ uilanguage }}">
     <div class="contents">
-      <h3 class="title" py:content="detailstitle">Personal Details</h3>
 
       <form action="" method="post" name="personal" id="personal">
         <table cellpadding="1" cellspacing="1">
+          <tr><td><h3 class="title">{% trans "Personal Details" %}</h3></td></tr>
           <tr>
-            <td colspan="1" rowspan="1">
-              <h3 class="title" py:content="option_heading">Option</h3>
-            </td>
-            <td colspan="1" rowspan="1">
-              <h3 class="title" py:content="value_heading">Current value</h3>
-            </td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Option" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Current value" %}</h3></td>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1" py:content="fullname_title">Name</td>
-            <td colspan="1" rowspan="1">
-              <input type="text" name="option-name" value="${fullname}"/>
-            </td>
+            <td colspan="1" rowspan="1">{% trans "Name" %}</td>
+            <td colspan="1" rowspan="1">{{ form.name }} {{ errors.name|join:" " }}</td>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1" py:content="email_title">Email</td>
-            <td colspan="1" rowspan="1">
-              <input type="text" name="option-email" value="${email}"/>
-            </td>
+            <td colspan="1" rowspan="1">{% trans "Email" %}</td>
+            <td colspan="1" rowspan="1">{{ form.email }} {{ errors.email|join:" " }}</td>
           </tr>
           <tr>
-            <td colspan="1" rowspan="1" py:content="password_title">Password</td>
-            <td colspan="1" rowspan="1">
-              <input type="password" name="option-password" value=""/>
-            </td>
+            <td colspan="1" rowspan="1">{% trans "Password" %}</td>
+            <td colspan="1" rowspan="1">{{ form.password }} {{ errors.password|join:" " }}</td>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1" py:content="passwordconfirm_title">Confirm Password</td>
-            <td colspan="1" rowspan="1">
-              <input type="password" name="option-passwordconfirm" value=""/>
-            </td>
+            <td colspan="1" rowspan="1">{% trans "Confirm password" %}</td>
+            <td colspan="1" rowspan="1">{{ form.password_confirm }} {{ errors.password_confirm|join:" " }}</td>
           </tr>
-        </table><input type="submit" name="changepersonal" value="${submit_button}" />
-      </form>
-
-      <h3 class="title" py:content="interface_title">Translation Interface Configuration</h3>
-
-      <form action="" method="post" name="interface" id="interface">
-        <table cellpadding="1" cellspacing="1">
+          <tr><td><h3 class="title">{% trans "My Projects" %}</h3></td></tr>
+          <tr><td>{{ form.projects }}</td></tr>
+          <tr><td><h3 class="title">{% trans "My Languages" %}</h3></td></tr>
+          <tr><td>{{ form.languages }}</td></tr>
+          <tr><td><h3 class="title">{% trans "Translation Interface Configuration" %}</h3></td></tr>
           <tr>
-            <td colspan="1" rowspan="1">
-              <h3 class="title" py:content="option_heading">Option</h3>
-            </td>
-            <td colspan="1" rowspan="1">
-              <h3 class="title" py:content="value_heading">Current value</h3>
-            </td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Option" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Current value" %}</h3></td>
           </tr>
-
+            <td colspan="1" rowspan="1">{% trans "User Interface language" %}</td>
+            <td colspan="1" rowspan="1">{{ form.uilanguage }} {{ errors.uilanguage|join:" " }}</td>
+          </tr>
           <tr>
-            <td colspan="1" rowspan="1" py:content="uilanguage_heading">User Interface language</td>
-            <td colspan="1" rowspan="1"><select name="option-uilanguage">
-              <option py:for="l in uilanguage_options" value="${l.code}" py:attrs="selected=l.selected" py:content="l.name">
-                Language
-              </option>
-            </select></td>
+            <td colspan="1" rowspan="1">{% trans "Input Height (in lines)" %}</td>
+            <td colspan="1" rowspan="1">{{ form.inputheight }} {{ errors.inputheight|join:" " }}</td>
           </tr>
-
-          <tr py:for="option in other_options">
-            <td colspan="1" rowspan="1" py:content="option.description">Option Name</td>
-            <td colspan="1" rowspan="1">
-              <input type="text" name="option-${option.code}" value="${option.value}"/>
-            </td>
+          <tr>
+            <td colspan="1" rowspan="1">{% trans "Input Width (in characters)" %}</td>
+            <td colspan="1" rowspan="1">{{ form.inputwidth }} {{ errors.inputwidth|join:" " }}</td>
           </tr>
-        </table><input type="submit" name="changeinterface" value="${submit_button}" />
+          <tr>
+            <td colspan="1" rowspan="1">{% trans "Number of rows in view mode" %}</td>
+            <td colspan="1" rowspan="1">{{ form.viewrows }} {{ errors.viewrows|join:" " }}</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1">{% trans "Number of rows in translate mode" %}</td>
+            <td colspan="1" rowspan="1">{{ form.translaterows }} {{ errors.translaterows|join:" " }}</td>
+          </tr>
+
+          <tr><td></td><td><br /><input type="submit" name="changepersonal" value="{% trans "Save changes" %}" /></td></tr>
+        </table>
       </form>
     </div>
-
-    <form action="" method="post" name="useroptions" id="useroptions">
-      <div class="contents">
-        <h3 class="title" py:content="projects_title">My Projects</h3>
-
-        <div class="item-description">
-          <select multiple="multiple" name="projects">
-            <option py:for="p in projects" value="${p.code}" py:attrs="selected=p.selected" py:content="p.name">
-              Project Name
-            </option>
-          </select>
-          <input type="hidden" name="allowmultikey" value="projects"/>
-        </div>
-      </div>
-
-      <div class="contents">
-        <h3 class="title" py:content="languages_title">My Languages</h3>
-
-        <div class="item-description">
-          <select multiple="multiple" name="languages">
-            <option py:for="l in languages" value="${l.code}" py:attrs="selected=l.selected" py:content="l.name">
-              Language Name
-            </option>
-          </select>
-          <input type="hidden" name="allowmultikey" value="languages" />
-        </div>
-      </div>
-      <input type="submit" name="changeoptions" value="${submit_button}" />
-    </form>
-
-    <div class="intro">
-      <a href="index.html" py:content="home_link">Home page</a>
-    </div>
   </div>
+{% endblock %}
 
-  </div>
-  <div id="links" over:include="pootlepage#links"/>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/templates/project.html	2007-02-06 01:57:28 UTC (rev 4938)
@@ -20,7 +20,7 @@
 {% endif %}
 
       <div class="item-statistics">
-        {{ project.stats }}
+        {{ project.stats }} FIXME
       </div>
     </div>
 

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-06 01:57:28 UTC (rev 4938)
@@ -22,7 +22,7 @@
     (r'^about.html$', 'about'),
     (r'^home/$', 'home'),
     (r'^home/index.html$', 'home'),
-    (r'^home/options.html$', 'options'),
+    (r'^home/options/$', 'options'),
     (r'^(?P<what>languages)/$', 'index'),
     
     (r'^(?P<what>projects)/$', 'index'),

Modified: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/web/forms.py	2007-02-06 01:57:28 UTC (rev 4938)
@@ -3,7 +3,11 @@
 from Pootle.compat.pootleauth import PootleAuth, create_user, save_users
 from Pootle import storage_client
 from translate.filters import checks
+from django.core import validators
+from django.core.validators import isOnlyDigits, isValidEmail
+from Pootle.utils import CallableValidatorWrapper
 
+isValidEmail = CallableValidatorWrapper(isValidEmail)
 
 CHECKS = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
 # FIXME: Filetypes should probably be provided by translate-toolkit.
@@ -35,7 +39,7 @@
         self.fields = (
             forms.TextField(field_name="username", length=6),
             forms.TextField(field_name="name", length=20),
-            forms.TextField(field_name="email", length=20),
+            forms.TextField(field_name="email", length=20, validator_list=[isValidEmail]),
             forms.TextField(field_name="password", length=20),
             forms.CheckboxField(field_name="activated"),
             )
@@ -75,3 +79,32 @@
         for k in self.fields:
             setattr(p, k.field_name, new_data[k.field_name])
 
+class UserProfileManipulator(forms.Manipulator):
+    def __init__(self, user):
+        self.user = user
+        project_choices = [(p.code, p.name) for p in storage_client.get_project_objects()]
+        language_choices = [(p.code, p.name) for p in storage_client.get_language_objects()]
+        self.fields = (
+            forms.TextField(field_name="name", length=40),
+            forms.TextField(field_name="email", length=40, validator_list=[isValidEmail]),
+            forms.PasswordField(field_name="password", length=40),
+            forms.PasswordField(field_name="password_confirm", length=40, validator_list=[validators.AlwaysMatchesOtherField('password')]),
+            forms.SelectField(field_name="uilanguage", choices=[]), # FIXME add choices
+            forms.TextField(field_name="inputheight", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="inputwidth", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="viewrows", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="translaterows", length=10, validator_list=[isOnlyDigits]),
+            forms.SelectMultipleField(field_name="projects", size=min(max(len(project_choices), 5), 15), choices=project_choices),
+            forms.SelectMultipleField(field_name="languages", size=min(max(len(language_choices), 5), 15), choices=language_choices),
+        )
+
+    def old_data(self):
+        return dict([ (k.field_name, getattr(self.user, k.field_name, None)) for k in self.fields if not k.field_name.startswith("password") ])
+
+    def save(self, new_data):
+        u = self.user
+        u.set_user(new_data)
+        u.projects = new_data.getlist('projects')
+        u.languages = new_data.getlist('languages')
+        u.save()
+        return u

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-05 21:12:27 UTC (rev 4937)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-06 01:57:28 UTC (rev 4938)
@@ -8,7 +8,7 @@
 from django import forms
 from django.core.mail import send_mail
 
-from Pootle.web.forms import SiteOptionsManipulator, UserAdminManipulator, ProjectAdminManipulator
+from Pootle.web import forms as pootleforms 
 from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
 from Pootle.compat import pootleauth
 from Pootle import indexpage, adminpages, users, translatepage
@@ -214,22 +214,21 @@
     proj = potree().getproject(language, project)
     return render_to_pootleresponse(indexpage.ProjectIndex(proj, pootlesession(req), argdict, dirfilter=None))
 
-# users.py
-
 def options(req):
-    # use manipulator here
-    message = None
+    manipulator = pootleforms.UserProfileManipulator(req.user)
     if req.POST:
-        try:
-            if "changeoptions" in req.POST:
-                pass
-            elif "changepersonal" in req.POST:
-                pass
-            elif "changeinterface" in req.POST:
-                pass
-        except users.RegistrationError, errormessage:
-            message = errormessage
-    return render_to_pootleresponse(users.UserOptions(potree(), pootlesession(req), message))
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            manipulator.do_html2python(new_data)
+            manipulator.save(new_data)
+            return HttpResponseRedirect(req.path)
+    else:
+        errors = {}
+        new_data = manipulator.old_data()
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    context = { 'form' : form, 'errors': errors }
+    return render_to_response("options.html", RequestContext(req, context))
 
 def login(req):
     message = None
@@ -331,7 +330,7 @@
     return render_to_pootleresponse(adminpages.ProjectAdminPage(potree(), project, pootlesession(req), argdict))
     
 def admin(req):
-    manipulator = SiteOptionsManipulator()
+    manipulator = pootleforms.SiteOptionsManipulator()
     if req.POST and req.user.is_superuser():
         new_data = req.POST.copy()
         errors = manipulator.get_validation_errors(new_data)
@@ -343,10 +342,10 @@
         errors = {}
         new_data = manipulator.old_data()
     form = forms.FormWrapper(manipulator, new_data, errors)
-    return render_to_response("adminindex.html", RequestContext(req, { 'form': form } ))
+    return render_to_response("adminindex.html", RequestContext(req, { 'form': form, 'errors': errors } ))
 
 def admin_useredit(req, user):
-    manipulator = UserAdminManipulator()
+    manipulator = pootleforms.UserAdminManipulator()
     if req.POST and req.user.is_superuser():
         new_data = req.POST.copy()
         new_data['username'] = user
@@ -359,7 +358,7 @@
         errors = {}
         new_data = manipulator.old_data(user)
     form = forms.FormWrapper(manipulator, new_data, errors)
-    return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user} ))
+    return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user, 'errors':errors} ))
 
 def adminusers(req):
     if req.POST and req.user.is_superuser():
@@ -383,7 +382,7 @@
     return render_to_response("adminprojects.html", RequestContext(req, context))
 
 def admin_projectedit(req, project):
-    manipulator = ProjectAdminManipulator()
+    manipulator = pootleforms.ProjectAdminManipulator()
     if req.POST and req.user.is_superuser():
         new_data = req.POST.copy()
         errors = manipulator.get_validation_errors(new_data)
@@ -396,7 +395,8 @@
         new_data = manipulator.old_data(project)
     form = forms.FormWrapper(manipulator, new_data, errors)
     context = { 'project' : storage_client.ProjectWrapper(project),
-                'form': form }
+                'form': form,
+                'errors': errors,}
     return render_to_response("admin_projectedit.html", RequestContext(req, context))
 
 def admintranslationproject(req):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4960
          http://svn.sourceforge.net/translate/?rev=4960&view=rev
Author:   zejn
Date:     2007-02-07 10:14:20 -0800 (Wed, 07 Feb 2007)

Log Message:
-----------
[django-migration] Fix listing of user's projects and languages on his 'My account' page.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/home.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/home.html
===================================================================
--- src/branches/django-migration/Pootle/templates/home.html	2007-02-07 16:39:44 UTC (rev 4959)
+++ src/branches/django-migration/Pootle/templates/home.html	2007-02-07 18:14:20 UTC (rev 4960)
@@ -5,29 +5,17 @@
 
 {% block content %}
     <div class="contents"><h3 class="title">{% trans "Quick Links" %}</h3>
-{% if quicklinks %}
-{% for language in quicklinks %}
-        <h3 class="title">
-          <a href="../{{ language.code }}/">{{ language.name }}</a>
-        </h3>
-{% if language.projects %}      
-        <div class="item-description">
-{% for project in langugage.projects %}
-          <a href="../{{ language.code }}/{{ project.code }}/">{{ project.name }}</a>
-{% if project.isprojectadmin %}
-          (<a href="../{{ language.code }}/{{ project.code }}/admin.html/">{% trans "Admin" %}</a>)
-{% endif %}
+
+{% for lang in user.language_list %}
+    <h3 class="title"><a href="../{{ lang.code }}/">{{ lang.name }}</a></h3>
+    <div class="item-description">
+{% for project in user.project_list %}
+          <a href="../{{ lang.code }}/{{ project.code }}/">{{ project.name }}</a>
+          (<a href="../{{ lang.code }}/{{ project.code }}/admin.html/">{% trans "Admin" %}</a>)
 {% endfor %}
-        </div>
-{% endif %}
-{% endfor %}
-      </div>
-{% else %}
-      <div py:if="not quicklinks" class="item-description">
-        {% trans "Please click on 'Change options' and select some languages and projects" %}
-      </div>
-{% endif %}
+
     </div>
+{% endfor %}
     
     <div class="intro">
       <a href="options/">{% trans "Change options" %}</a>

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-07 16:39:44 UTC (rev 4959)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-07 18:14:20 UTC (rev 4960)
@@ -85,6 +85,7 @@
 def pootlesession(req):
     """Make a wrapper around Django session object to make it work
     with Pootle's page classes seamlessly."""
+    print 'WARNING: This view uses pootlesession.'
     def localize(s, *args):
         if args:
             return _(s) % args
@@ -176,9 +177,7 @@
     return render_to_response("about.html", RequestContext(req, context ))
 
 def home(req):
-    context = {
-        'quicklinks': getquicklinks(pootlesession(req)), }
-    return render_to_response("home.html", RequestContext(req, context))
+    return render_to_response("home.html", RequestContext(req, {}))
 home = login_required(home)
 
 def projectlanguageindex(req, project):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4972
          http://svn.sourceforge.net/translate/?rev=4972&view=rev
Author:   zejn
Date:     2007-02-08 11:20:31 -0800 (Thu, 08 Feb 2007)

Log Message:
-----------
[django-migration] Made templatetag itemnode reusable.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/web/templatetags/pootle.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/node_item_stats.html

Removed Paths:
-------------
    src/branches/django-migration/Pootle/templates/node_item.html

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2007-02-08 09:42:07 UTC (rev 4971)
+++ src/branches/django-migration/Pootle/templates/language.html	2007-02-08 19:20:31 UTC (rev 4972)
@@ -38,7 +38,7 @@
       <tbody class="stats">
 {% for item in projects %}
           <tr class="item item-{{ item.parity }}" title="{{ item.description }}">
-            {% itemnode %}
+            {% itemnode stats %}
           </tr>
 {% endfor %}
       </tbody>

Deleted: src/branches/django-migration/Pootle/templates/node_item.html
===================================================================
--- src/branches/django-migration/Pootle/templates/node_item.html	2007-02-08 09:42:07 UTC (rev 4971)
+++ src/branches/django-migration/Pootle/templates/node_item.html	2007-02-08 19:20:31 UTC (rev 4972)
@@ -1,25 +0,0 @@
-    <td class="stats-name">
-      <img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
-      <a href="{{ item.href }}" lang="en" dir="ltr">{{ item.title }}</a>
-    </td>
-{% if item.data %}
-      <td class="stats">{{ item.data.translatedwords }}</td><td class="stats">{{ item.data.translatedpercentage }}%</td>
-      <td class="stats">{{ item.data.fuzzywords }}</td><td class="stats">{{ item.data.fuzzypercentage }}%</td>
-      <td class="stats">{{ item.data.untranslatedwords }}</td><td class="stats">{{ item.data.untranslatedpercentage }}%</td>
-      <td class="stats">{{ item.data.totalwords }}</td>
-      <td class="stats-graph">
-        <span class="sortkey">{{ item.data.translatedpercentage }}</span>
-        <table border="0" cellpadding="0" cellspacing="0"><tr>
-<!--!        <td bgcolor="green"><img src="/static/images/green.png" class="data" bgcolor="green" height="20" width="${item.data.translatedpercentage}" /></td>-->
-<!--!        <td bgcolor="grey"><img src="/static/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" /></td>-->
-<!--!        <td bgcolor="red"><img src="/static/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" /></td>-->
-            <td bgcolor="green" class="data" height="20" width="{{ item.data.translatedpercentage }}" />
-{% if item.data.fuzzypercentage %}<td bgcolor="lightgray" class="data" height="20" width="{{ item.data.fuzzypercentage }}" />{% endif %}
-{% if item.data.untranslatedpercentage %}<td bgcolor="red" class="data" height="20" width="{{ item.data.untranslatedpercentage }}" />{% endif %}
-        </tr></table>
-          
-        <!--! The following is simpler, but kid reformats the img tags which inserts spaces between them -->
-
-<!--!        <img src="/static/images/green.png" class="data" height="20" width="${item.data.translatedpercentage}" background="green" /><img src="/static/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" background="grey" /><img src="/static/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" background="red" />-->
-      </td>      
-{% endif %}

Copied: src/branches/django-migration/Pootle/templates/node_item_stats.html (from rev 4931, src/branches/django-migration/Pootle/templates/node_item.html)
===================================================================
--- src/branches/django-migration/Pootle/templates/node_item_stats.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/node_item_stats.html	2007-02-08 19:20:31 UTC (rev 4972)
@@ -0,0 +1,25 @@
+    <td class="stats-name">
+      <img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+      <a href="{{ item.href }}" lang="en" dir="ltr">{{ item.title }}</a>
+    </td>
+{% if item.data %}
+      <td class="stats">{{ item.data.translatedwords }}</td><td class="stats">{{ item.data.translatedpercentage }}%</td>
+      <td class="stats">{{ item.data.fuzzywords }}</td><td class="stats">{{ item.data.fuzzypercentage }}%</td>
+      <td class="stats">{{ item.data.untranslatedwords }}</td><td class="stats">{{ item.data.untranslatedpercentage }}%</td>
+      <td class="stats">{{ item.data.totalwords }}</td>
+      <td class="stats-graph">
+        <span class="sortkey">{{ item.data.translatedpercentage }}</span>
+        <table border="0" cellpadding="0" cellspacing="0"><tr>
+<!--!        <td bgcolor="green"><img src="/static/images/green.png" class="data" bgcolor="green" height="20" width="${item.data.translatedpercentage}" /></td>-->
+<!--!        <td bgcolor="grey"><img src="/static/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" /></td>-->
+<!--!        <td bgcolor="red"><img src="/static/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" /></td>-->
+            <td bgcolor="green" class="data" height="20" width="{{ item.data.translatedpercentage }}" />
+{% if item.data.fuzzypercentage %}<td bgcolor="lightgray" class="data" height="20" width="{{ item.data.fuzzypercentage }}" />{% endif %}
+{% if item.data.untranslatedpercentage %}<td bgcolor="red" class="data" height="20" width="{{ item.data.untranslatedpercentage }}" />{% endif %}
+        </tr></table>
+          
+        <!--! The following is simpler, but kid reformats the img tags which inserts spaces between them -->
+
+<!--!        <img src="/static/images/green.png" class="data" height="20" width="${item.data.translatedpercentage}" background="green" /><img src="/static/images/grey.png" class="data" height="20" width="${item.data.fuzzypercentage}" background="grey" /><img src="/static/images/red.png" class="data" height="20" width="${item.data.untranslatedpercentage}" background="red" />-->
+      </td>      
+{% endif %}

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2007-02-08 09:42:07 UTC (rev 4971)
+++ src/branches/django-migration/Pootle/templates/project.html	2007-02-08 19:20:31 UTC (rev 4972)
@@ -45,7 +45,7 @@
       <tbody class="stats">
 {% for item in languages %}
           <tr  class="item item-{{ item.parity }}">
-            {% itemnode %}
+            {% itemnode stats %}
           </tr>
 {% endfor %}
       </tbody>

Modified: src/branches/django-migration/Pootle/web/templatetags/pootle.py
===================================================================
--- src/branches/django-migration/Pootle/web/templatetags/pootle.py	2007-02-08 09:42:07 UTC (rev 4971)
+++ src/branches/django-migration/Pootle/web/templatetags/pootle.py	2007-02-08 19:20:31 UTC (rev 4972)
@@ -3,13 +3,14 @@
 register = Library()
 
 class ItemNode(Node):
-    def __init__(self):
-        pass
+    def __init__(self, template_name):
+        self.template = "node_item_%s.html" % template_name
 
     def render(self, context):
-        t = loader.get_template('node_item.html')
+        t = loader.get_template(self.template)
         return t.render(context)
 
 def itemnode(parser, token):
-    return ItemNode()
+    bits = token.split_contents()
+    return ItemNode(bits[1])
 itemnode = register.tag('itemnode',itemnode)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4977
          http://svn.sourceforge.net/translate/?rev=4977&view=rev
Author:   zejn
Date:     2007-02-09 03:24:54 -0800 (Fri, 09 Feb 2007)

Log Message:
-----------
[django-migration] Implemented objects Language and Project for easier access to properties and migrated code to use these two instead of LanguageWrapper and ProjectWrapper

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/potree.py
    src/branches/django-migration/Pootle/templates/admin_projectedit.html
    src/branches/django-migration/Pootle/templates/adminlanguages.html
    src/branches/django-migration/Pootle/templates/adminprojects.html
    src/branches/django-migration/Pootle/web/forms.py

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-09 10:20:29 UTC (rev 4976)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-09 11:24:54 UTC (rev 4977)
@@ -6,8 +6,7 @@
 import os
 from django.conf import settings
 from jToolkit import prefs
-from Pootle.conf import instance, users
-from Pootle.storage_client import ProjectWrapper, LanguageWrapper, get_project_objects, get_language_objects
+from Pootle.conf import instance, users, potree
 
 
 class UsersNotInitialized(Exception): pass
@@ -106,7 +105,7 @@
     def project_list(self):
         for p in getattr(self._user, 'projects', '').split(','):
             if p.strip():
-                yield ProjectWrapper(p)
+                yield potree().get_project(p)
 
     def is_language_member(self, language):
         return language in [i.strip() for i in getattr(self._user, 'projects', '').split(',')]
@@ -114,7 +113,7 @@
     def language_list(self):
         for p in getattr(self._user, 'languages', '').split(','):
             if p.strip():
-                yield LanguageWrapper(p)
+                yield potree().get_language(p)
 
 class PootleAuth:
     "Authenticate against Pootle's users.prefs file"

Modified: src/branches/django-migration/Pootle/potree.py
===================================================================
--- src/branches/django-migration/Pootle/potree.py	2007-02-09 10:20:29 UTC (rev 4976)
+++ src/branches/django-migration/Pootle/potree.py	2007-02-09 11:24:54 UTC (rev 4977)
@@ -31,6 +31,80 @@
 languagere = sre.compile("^[a-z]{2,3}([_-][A-Z]{2,3}|)$")
 regionre = sre.compile("^[_-][A-Z]{2,3}$")
 
+class Language(object):
+    """Language object
+    "mapping" is a dict of attributes that languages have and are saved to 
+    prefs.
+    "changed" returns True, if any attribute has changed.
+
+    Language attributes are accessed as object attributes, eg.:
+        >>> L = Language("en")
+        >>> L.name
+        'English'
+    """
+    mapping = {
+        'name':'fullname', 
+        'specialchars': 'specialchars',
+        'nplurals':'nplurals',
+        'plural_equation':'pluralequation',
+        }
+    def __init__(self, language_prefs):
+        self.prefs = language_prefs
+        self.changed = False
+        self.code = str(self.prefs).split('.')[-1]
+
+    def __repr__(self):
+        return "<%s>" % self.prefs
+
+    def __setattr__(self, key, value):
+        if key in self.mapping:
+            self.prefs.__setattr__(self.mapping[key], value)
+            self.changed = True
+        else:
+            super(Language,self).__setattr__(key, value)
+
+    def __getattr__(self, key):
+        if key in self.mapping:
+            return getattr(self.prefs, self.mapping[key])
+        else:
+            raise KeyError("Language object %s does not have %s attribute." % (self,key))
+
+class Project(object):
+    mapping = { 
+        'name':'fullname', 
+        'description': 'description',
+        'checkstyle': 'checkstyle',
+        'filetype': 'localfiletype', 
+        # 'createmofiles': 'createmofiles', need to set default false
+        }
+    def __init__(self, project_prefs):
+        self.prefs = project_prefs
+        self.code = str(project_prefs).split(".")[-1]
+        self.changed = False
+
+    def __repr__(self):
+        return "<Pootle Project: %s>" % self.name
+
+    def _get_createmofiles(self):
+        return getattr(self.prefs, 'createmofiles', False) and True 
+
+    def _set_createmofiles(self, value=1):
+        self.prefs.__setattr__('createmofiles', value)
+    createmofiles = property(_get_createmofiles, _set_createmofiles)
+
+    def __setattr__(self, key, value):
+        if key in self.mapping:
+            self.prefs.__setattr__(self.mapping[key], value)
+            self.changed = True
+        else:
+            super(Project,self).__setattr__(key, value)
+
+    def __getattr__(self, key):
+        if key in self.mapping:
+            return getattr(self.prefs, self.mapping[key])
+        else:
+            raise KeyError("Project %s does not have %s attribute." % (self,key))
+
 class POTree:
     """Manages the tree of projects and languages"""
     def __init__(self, instance):
@@ -49,7 +123,29 @@
         prefsfile = self.languages.__root__.__dict__["_setvalue"].im_self
         prefsfile.savefile()
 
-    def changelanguages(self, argdict):
+    def get_language(self, language_code):
+        return Language(getattr(self.languages, language_code))
+
+    def get_language_list(self, project_code=None):
+        if project_code:
+            for lang in [ code for code, name in self.languages.iteritems() if self.haslanguage(project_code, code)]:
+                yield self.get_language(lang)
+        else:
+            for lang, name in self.languages.iteritems():
+                yield self.get_language(lang)
+
+    def get_project(self, project_code):
+        return Project(getattr(self.projects, project_code))
+
+    def get_project_list(self, language_code=None):
+        if language_code: # if we are interested in specific translation
+            for project in [ code for code, name in self.projects.iteritems() if self.hasproject(language_code, code)]:
+                yield self.get_project(project)
+        else:
+            for project, name in self.projects.iteritems():
+                yield self.get_project(project)
+
+    def changelanguages(self, argdict): # FIXME obsoleted
         """changes language entries"""
         for key, value in argdict.iteritems():
             if key.startswith("languageremove-"):
@@ -119,7 +215,7 @@
                 setattr(self.languages, languagecode + ".pluralequation", languagepluralequation)
         self.saveprefs()
 
-    def changeprojects(self, argdict):
+    def changeprojects(self, argdict): # FIXME : obsoleted
         """changes project entries"""
         #Let's reset all "createmofiles" to 0, otherwise we can't disable one
         #since the key will never arrive
@@ -185,48 +281,13 @@
         """checks if this language exists"""
         return hasattr(self.languages, languagecode)
 
-    def getlanguageprefs(self, languagecode):
-        """returns the language object"""
-        return getattr(self.languages, languagecode)
-
-    def getlanguagename(self, languagecode):
-        """returns the language's full name"""
-        return getattr(self.getlanguageprefs(languagecode), "fullname", languagecode)
-
-    def setlanguagename(self, languagecode, languagename):
-        """stes the language's full name"""
-        setattr(self.getlanguageprefs(languagecode), "fullname", languagename)
-
-    def getlanguagespecialchars(self, languagecode):
-        """returns the language's special characters"""
-        return autoencode.autoencode(getattr(self.getlanguageprefs(languagecode), "specialchars", ""), "utf-8")
-
-    def setlanguagespecialchars(self, languagecode, languagespecialchars):
-        """sets the language's special characters"""
-        setattr(self.getlanguageprefs(languagecode), "specialchars", languagespecialchars)
-
-    def getlanguagenplurals(self, languagecode):
-        """returns the language's number of plural forms"""
-        return getattr(self.getlanguageprefs(languagecode), "nplurals", "")
-
-    def setlanguagenplurals(self, languagecode, languagenplurals):
-        """sets the language's number of plural forms"""
-        setattr(self.getlanguageprefs(languagecode), "nplurals", languagenplurals)
-
-    def getlanguagepluralequation(self, languagecode):
-        """returns the language's number of plural forms"""
-        return getattr(self.getlanguageprefs(languagecode), "pluralequation", "")
-
-    def setlanguagepluralequation(self, languagecode, languagepluralequation):
-        """sets the language's number of plural forms"""
-        setattr(self.getlanguageprefs(languagecode), "pluralequation", languagepluralequation)
-
-    def getlanguagecodes(self, projectcode=None):
+    def getlanguagecodes(self, projectcode=None): # FIXME : obsoleted, no need to get only codes
         """returns a list of valid languagecodes for a given project or all projects"""
         alllanguagecodes = [languagecode for languagecode, language in self.languages.iteritems()]
         if projectcode is None:
             languagecodes = alllanguagecodes
-        else:
+        else: # FIXME : does this need to be moved to hasproject/haslanguage
+            # project dir
             projectdir = os.path.join(self.podirectory, projectcode)
             if not os.path.exists(projectdir):
                 return []
@@ -250,25 +311,6 @@
         languagecodes.sort()
         return languagecodes
 
-    def getlanguages(self, projectcode=None, sortbyname=True):
-        """gets a list of (languagecode, languagename) tuples"""
-        languagecodes = self.getlanguagecodes(projectcode)
-        if sortbyname:
-            languages = [(self.getlanguagename(languagecode), languagecode) for languagecode in languagecodes]
-            languages.sort()
-            return [(languagecode, languagename) for languagename, languagecode in languages]
-        else:
-            return [(languagecode, self.getlanguagename(languagecode)) for languagecode in languagecodes]
-
-    def getprojectcodes(self, languagecode=None):
-        """returns a list of project codes that are valid for the given languagecode or all projects"""
-        projectcodes = [projectcode for projectcode, projectprefs in self.projects.iteritems()]
-        projectcodes.sort()
-        if languagecode is None:
-            return projectcodes
-        else:
-            return [projectcode for projectcode in projectcodes if self.hasproject(languagecode, projectcode)]
-
     def hasproject(self, languagecode, projectcode):
         """returns whether the project exists for the language"""
         if not hasattr(self.projects, projectcode):
@@ -278,7 +320,7 @@
         if not self.haslanguage(languagecode):
             return False
         try:
-            self.getpodir(languagecode, projectcode)
+            self.getpodir(languagecode, projectcode) # FIXME : is this still ok?
             return True
         except IndexError:
             return False
@@ -322,60 +364,6 @@
             raise ValueError("projects.TranslationProject for project %s, language %s already exists" % (projectcode, languagecode))
         self.projectcache[languagecode, projectcode] = projects.TranslationProject(languagecode, projectcode, self, create=True)
 
-    def getprojectname(self, projectcode):
-        """returns the full name of the project"""
-        projectprefs = getattr(self.projects, projectcode)
-        return getattr(projectprefs, "fullname", projectcode)
-
-    def setprojectname(self, projectcode, projectname):
-        """returns the full name of the project"""
-        projectprefs = getattr(self.projects, projectcode)
-        setattr(projectprefs, "fullname", projectname)
-
-    def getprojectdescription(self, projectcode):
-        """returns the project description"""
-        projectprefs = getattr(self.projects, projectcode)
-        return getattr(projectprefs, "description", projectcode)
-
-    def setprojectdescription(self, projectcode, projectdescription):
-        """returns the project description"""
-        projectprefs = getattr(self.projects, projectcode)
-        setattr(projectprefs, "description", projectdescription)
-
-    def getprojectlocalfiletype(self, projectcode):
-        """returns the project allowed file type. We assume it is .po if nothing
-        else is specified."""
-        projectprefs = getattr(self.projects, projectcode)
-        type = getattr(projectprefs, "localfiletype", "po")
-        if not type:
-            type = "po"
-        return type
-
-    def setprojectlocalfiletype(self, projectcode, projectfiletype):
-        """sets the allowed file type for the project"""
-        projectprefs = getattr(self.projects, projectcode)
-        setattr(projectprefs, "localfiletype", projectfiletype)
-
-    def getprojectcheckerstyle(self, projectcode):
-        """returns the project checker style"""
-        projectprefs = getattr(self.projects, projectcode)
-        return getattr(projectprefs, "checkerstyle", projectcode)
-
-    def setprojectcheckerstyle(self, projectcode, projectcheckerstyle):
-        """sets the project checker style"""
-        projectprefs = getattr(self.projects, projectcode)
-        setattr(projectprefs, "checkerstyle", projectcheckerstyle)
-
-    def getprojectcreatemofiles(self, projectcode):
-        """returns whether the project builds MO files"""
-        projectprefs = getattr(self.projects, projectcode)
-        return getattr(projectprefs, "createmofiles", False)
-
-    def setprojectcreatemofiles(self, projectcode, projectcreatemofiles):
-        """sets whether the project builds MO files"""
-        projectprefs = getattr(self.projects, projectcode)
-        setattr(projectprefs, "createmofiles", projectcreatemofiles)
-
     def hasgnufiles(self, podir, languagecode=None, depth=0, maxdepth=3, poext="po"):
         """returns whether this directory contains gnu-style PO filenames for the given language"""
         #Let's check to see if we specifically find the correct gnu file

Modified: src/branches/django-migration/Pootle/templates/admin_projectedit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_projectedit.html	2007-02-09 10:20:29 UTC (rev 4976)
+++ src/branches/django-migration/Pootle/templates/admin_projectedit.html	2007-02-09 11:24:54 UTC (rev 4977)
@@ -12,9 +12,9 @@
           <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Code" %}</h3></td><td>{{ project.code }}</td></tr>
           <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td><td>{{ form.name }} {{ errors.name|join:" " }}</td></tr>
           <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Description" %}</h3></td><td>{{ form.description }} {{ errors.description|join:" " }}</td></tr>
-          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Checker Style" %}</h3></td><td>{{ form.checkerstyle }} {{ errors.checkerstyle|join:" " }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Checker Style" %}</h3></td><td>{{ form.checkstyle }} {{ errors.checkstyle|join:" " }}</td></tr>
           <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "File Type" %}</h3></td><td>{{ form.filetype }} {{ errors.filetype|join:" " }}</td></tr>
-          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Create MO Files" %}</h3></td><td>{{ form.create_mo_files }} {{ errors.create_mo_files|join:" " }}</td></tr>
+          <tr><td colspan="1" rowspan="1"><h3 class="title">{% trans "Create MO Files" %}</h3></td><td>{{ form.createmofiles }} {{ errors.createmofiles|join:" " }}</td></tr>
         </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />
       </form>
     </div>

Modified: src/branches/django-migration/Pootle/templates/adminlanguages.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-09 10:20:29 UTC (rev 4976)
+++ src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-09 11:24:54 UTC (rev 4977)
@@ -23,7 +23,7 @@
             <td colspan="1" rowspan="1">{{ lang.code }}</td>
             <td colspan="1" rowspan="1">{{ lang.name }}</td>
             <td colspan="1" rowspan="1">{{ lang.specialchars }}</td>
-            <td colspan="1" rowspan="1">{{ lang.plurals }}</td>
+            <td colspan="1" rowspan="1">{{ lang.nplurals }}</td>
             <td colspan="1" rowspan="1">{{ lang.plural_equation }}</td>
           </tr>
 {% endfor %}

Modified: src/branches/django-migration/Pootle/templates/adminprojects.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminprojects.html	2007-02-09 10:20:29 UTC (rev 4976)
+++ src/branches/django-migration/Pootle/templates/adminprojects.html	2007-02-09 11:24:54 UTC (rev 4977)
@@ -24,9 +24,9 @@
             <td colspan="1" rowspan="1"><a href="{{ project.code }}">{{ project.code }}</a></td>
             <td colspan="1" rowspan="1">{{ project.name }}</td>
             <td colspan="1" rowspan="1">{{ project.description }}</td>
-            <td colspan="1" rowspan="1">{{ project.checkerstyle }}</td>
+            <td colspan="1" rowspan="1">{{ project.checkstyle }}</td>
             <td colspan="1" rowspan="1">{{ project.filetype }}</td>
-            <td colspan="1" rowspan="1">{{ project.create_mo_files }}</td>
+            <td colspan="1" rowspan="1">{{ project.createmofiles }}</td>
           </tr>
 {% endfor %}
         </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />

Modified: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	2007-02-09 10:20:29 UTC (rev 4976)
+++ src/branches/django-migration/Pootle/web/forms.py	2007-02-09 11:24:54 UTC (rev 4977)
@@ -1,7 +1,6 @@
 from django import forms
-from Pootle.conf import instance, saveprefs
+from Pootle.conf import instance, saveprefs, potree
 from Pootle.compat.pootleauth import PootleAuth, create_user, save_users
-from Pootle import storage_client
 from translate.filters import checks
 from django.core import validators
 from django.core.validators import isOnlyDigits, isValidEmail
@@ -65,25 +64,25 @@
         self.fields = (
             forms.TextField(field_name="name", length=40),
             forms.LargeTextField(field_name="description"),
-            forms.SelectField(field_name="checkerstyle", choices=CHECKS),
+            forms.SelectField(field_name="checkstyle", choices=CHECKS),
             forms.SelectField(field_name="filetype", choices=FILETYPES),
-            forms.CheckboxField(field_name="create_mo_files"),
+            forms.CheckboxField(field_name="createmofiles"),
             )
 
     def old_data(self, project):
-        p = storage_client.ProjectWrapper(project)
+        p = potree().get_project(project)
         return dict([ (k.field_name, getattr(p,k.field_name)) for k in self.fields ])
 
     def save(self, new_data, projectcode):
-        p = storage_client.ProjectWrapper(projectcode)
+        p = potree().get_project(projectcode)
         for k in self.fields:
             setattr(p, k.field_name, new_data[k.field_name])
 
 class UserProfileManipulator(forms.Manipulator):
     def __init__(self, user):
         self.user = user
-        project_choices = [(p.code, p.name) for p in storage_client.get_project_objects()]
-        language_choices = [(p.code, p.name) for p in storage_client.get_language_objects()]
+        project_choices = [(p.code, p.name) for p in potree().get_project_list()]
+        language_choices = [(p.code, p.name) for p in potree().get_language_list()]
         self.fields = (
             forms.TextField(field_name="name", length=40),
             forms.TextField(field_name="email", length=40, validator_list=[isValidEmail]),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4978
          http://svn.sourceforge.net/translate/?rev=4978&view=rev
Author:   zejn
Date:     2007-02-09 05:35:00 -0800 (Fri, 09 Feb 2007)

Log Message:
-----------
[django-migration] Changed views.py to use Language,Project instead of LanguageWrapper, ProjectWrapper. Started loosing ties in projects.py by adding potree() instead of self.potree.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/potree.py
    src/branches/django-migration/Pootle/projects.py
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/potree.py
===================================================================
--- src/branches/django-migration/Pootle/potree.py	2007-02-09 11:24:54 UTC (rev 4977)
+++ src/branches/django-migration/Pootle/potree.py	2007-02-09 13:35:00 UTC (rev 4978)
@@ -350,7 +350,7 @@
             if languagecode == "templates":
                 self.projectcache[languagecode, projectcode] = projects.TemplatesProject(projectcode, self)
             else:
-                self.projectcache[languagecode, projectcode] = projects.TranslationProject(languagecode, projectcode, self)
+                self.projectcache[languagecode, projectcode] = projects.TranslationProject(Language(languagecode), Project(projectcode))
         return self.projectcache[languagecode, projectcode]
 
     def isgnustyle(self, projectcode):
@@ -362,7 +362,7 @@
         """creates a new TranslationProject"""
         if self.hasproject(languagecode, projectcode):
             raise ValueError("projects.TranslationProject for project %s, language %s already exists" % (projectcode, languagecode))
-        self.projectcache[languagecode, projectcode] = projects.TranslationProject(languagecode, projectcode, self, create=True)
+        self.projectcache[languagecode, projectcode] = projects.TranslationProject(Language(languagecode), Project(projectcode), create=True)
 
     def hasgnufiles(self, podir, languagecode=None, depth=0, maxdepth=3, poext="po"):
         """returns whether this directory contains gnu-style PO filenames for the given language"""

Modified: src/branches/django-migration/Pootle/projects.py
===================================================================
--- src/branches/django-migration/Pootle/projects.py	2007-02-09 11:24:54 UTC (rev 4977)
+++ src/branches/django-migration/Pootle/projects.py	2007-02-09 13:35:00 UTC (rev 4978)
@@ -35,6 +35,7 @@
 from Pootle import statistics
 from Pootle import pootlefile
 from Pootle import versioncontrol
+from Pootle.conf import potree
 from jToolkit import timecache
 from jToolkit import prefs
 import time
@@ -86,26 +87,20 @@
 class TranslationProject(object):
   """Manages iterating through the translations in a particular project"""
   fileext = "po"
-  def __init__(self, languagecode, projectcode, potree, create=False):
-    self.languagecode = languagecode
-    self.projectcode = projectcode
-    self.potree = potree
-    self.languagename = self.potree.getlanguagename(self.languagecode)
-    self.projectname = self.potree.getprojectname(self.projectcode)
-    self.projectdescription = self.potree.getprojectdescription(self.projectcode)
-    self.pofiles = potimecache(15*60, self)
-    self.projectcheckerstyle = self.potree.getprojectcheckerstyle(self.projectcode)
+  def __init__(self, language, project, create=False):
+    self.language = language
+    self.project = project
+    self.pofiles = potimecache(15*60, self) 
     checkerclasses = [checks.projectcheckers.get(self.projectcheckerstyle, checks.StandardChecker), pofilter.StandardPOChecker]
     self.checker = pofilter.POTeeChecker(checkerclasses=checkerclasses, errorhandler=self.filtererrorhandler)
-    self.fileext = self.potree.getprojectlocalfiletype(self.projectcode)
     self.quickstats = {}
     # terminology matcher
     self.termmatcher = None
     self.termmatchermtime = None
     if create:
       self.converttemplates(InternalAdminSession())
-    self.podir = potree.getpodir(languagecode, projectcode)
-    if self.potree.hasgnufiles(self.podir, self.languagecode) == "gnu":
+    self.podir = potree().getpodir(languagecode, projectcode)
+    if potree().hasgnufiles(self.podir, self.languagecode) == "gnu": # will be obsoleted
       self.filestyle = "gnu"
     else:
       self.filestyle = "std"
@@ -116,7 +111,7 @@
 
   def readprefs(self):
     """reads the project preferences"""
-    self.prefs = prefs.PrefsParser()
+    self.prefs = prefs.PrefsParser() # FIXME is PrefsParser a bit too heavy for every project?
     self.prefsfile = os.path.join(self.podir, "pootle-%s-%s.prefs" % (self.projectcode, self.languagecode))
     if not os.path.exists(self.prefsfile):
       prefsfile = open(self.prefsfile, "w")
@@ -128,7 +123,7 @@
     """saves the project preferences"""
     self.prefs.savefile()
 
-  def getrightnames(self, session):
+  def getrightnames(self, session): # FIXME gettext
     """gets the available rights and their localized names"""
     localize = session.localize
     # l10n: Verb
@@ -146,7 +141,7 @@
             ("commit", localize("Commit")),
            ]
 
-  def getrights(self, session=None, username=None, usedefaults=True):
+  def getrights(self, session=None, username=None, usedefaults=True): # FIXME move to UserWrapper
     """gets the rights for the given user (name or session, or not-logged-in if username is None)
     if usedefaults is False then None will be returned if no rights are defined (useful for editing rights)"""
     # internal admin sessions have all rights
@@ -171,7 +166,7 @@
           if self.languagecode == "en":
             rights = "view, archive, pocompile"
           else:
-            rights = self.potree.getdefaultrights()
+            rights = potree().getdefaultrights()
         else:
           rights = getattr(rightstree, "default", None)
       else:
@@ -182,7 +177,7 @@
         rights.append("admin")
     return rights
 
-  def getuserswithinterest(self, session):
+  def getuserswithinterest(self, session): # FIXME Returns prefs instead of userwrapper
     """returns all the users who registered for this language and project"""
 
     def usableuser(user, userprefs):
@@ -451,7 +446,7 @@
 
   def scanpofiles(self):
     """sets the list of pofilenames by scanning the project directory"""
-    self.pofilenames = self.potree.getpofiles(self.languagecode, self.projectcode, poext=self.fileext)
+    self.pofilenames = potree().getpofiles(self.languagecode, self.projectcode, poext=self.fileext)
     for pofilename in self.pofilenames:
       if not pofilename in self.pofiles:
         self.pofiles[pofilename] = pootlefile.pootlefile(self, pofilename)
@@ -467,7 +462,7 @@
     if os.path.basename(localfilename) != localfilename or localfilename.startswith("."):
       raise ValueError("invalid/insecure file name: %s" % localfilename)
     if self.filestyle == "gnu":
-      if not self.potree.languagematch(self.languagecode, localfilename[:-len("."+self.fileext)]):
+      if not potree().languagematch(self.languagecode, localfilename[:-len("."+self.fileext)]):
         raise ValueError("invalid GNU-style file name %s: must match '%s.%s' or '%s[_-][A-Z]{2,3}.%s'" % (localfilename, self.fileext, self.languagecode, self.languagecode, self.fileext))
     dircheck = self.podir
     for part in dirname.split(os.sep):
@@ -596,7 +591,7 @@
 
   def converttemplates(self, session):
     """creates PO files from the templates"""
-    projectdir = os.path.join(self.potree.podirectory, self.projectcode)
+    projectdir = os.path.join(potree().podirectory, self.projectcode)
     if not os.path.exists(projectdir):
       os.mkdir(projectdir)
     templatesdir = os.path.join(projectdir, "templates")
@@ -604,11 +599,11 @@
       templatesdir = os.path.join(projectdir, "pot")
       if not os.path.exists(templatesdir):
         templatesdir = projectdir
-    if self.potree.isgnustyle(self.projectcode):
+    if potree().isgnustyle(self.projectcode):
       self.filestyle = "gnu"
     else:
       self.filestyle = "std"
-    templates = self.potree.gettemplates(self.projectcode)
+    templates = potree().gettemplates(self.projectcode)
     if self.filestyle == "gnu":
       self.podir = projectdir
       if not templates:
@@ -691,7 +686,7 @@
   def ootemplate(self):
     """Tests whether this project has an OpenOffice.org template SDF file in
     the templates directory."""
-    projectdir = os.path.join(self.potree.podirectory, self.projectcode)
+    projectdir = os.path.join(potree().podirectory, self.projectcode)
     templatefilename = os.path.join(projectdir, "templates", "en-US.sdf")
     if os.path.exists(templatefilename):
       return templatefilename
@@ -705,7 +700,7 @@
     if templateoo is None:
       return
     outputoo = os.path.join(self.podir, self.languagecode + ".sdf")
-    inputdir = os.path.join(self.potree.podirectory, self.projectcode, self.languagecode)
+    inputdir = os.path.join(potree().podirectory, self.projectcode, self.languagecode)
     po2oo.main(["-i%s"%inputdir, "-t%s"%templateoo, "-o%s"%outputoo, "-l%s"%self.languagecode, "--progress=none"])
     return file(os.path.join(self.podir, self.languagecode + ".sdf"), "r").read()
 
@@ -1226,8 +1221,8 @@
           self.termmatcher = match.terminologymatcher(self.pofiles.values())
         else:
           self.termmatcher = match.terminologymatcher(termbase)
-    elif not self.isterminologyproject() and self.potree.hasproject(self.languagecode, "terminology"):
-      termproject = self.potree.getproject(self.languagecode, "terminology")
+    elif not self.isterminologyproject() and potree().hasproject(self.languagecode, "terminology"):
+      termproject = potree().getproject(self.languagecode, "terminology")
       self.termmatcher = termproject.gettermmatcher()
       self.termmatchermtime = termproject.termmatchermtime
     else:
@@ -1356,9 +1351,9 @@
     else:
       return unicode(plural)
 
-  def hascreatemofiles(self, projectcode):
+  def hascreatemofiles(self, projectcode): # FIXME obsolete
     """returns whether the project has createmofile set"""
-    return self.potree.getprojectcreatemofiles(projectcode) == 1
+    return potree().getprojectcreatemofiles(projectcode) == 1
 
 class DummyProject(TranslationProject):
   """a project that is just being used for handling pootlefiles"""

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-09 11:24:54 UTC (rev 4977)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-09 13:35:00 UTC (rev 4978)
@@ -14,8 +14,6 @@
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
 from Pootle.conf import users as pootleusers
-from Pootle import storage_client
-from Pootle.storage_client import generaterobotsfile, get_language_objects, get_project_objects
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 import random
@@ -125,7 +123,13 @@
     def getlanguages():
         return []
     session.getlanguages = getlanguages
-    
+    from Pootle.conf import users as old_users
+    class LoginChecker:
+        def _get_users(self):
+            return old_users()
+        users = property(_get_users)
+
+    session.loginchecker = LoginChecker()
     session.language = 'sl'
     return session
 
@@ -154,21 +158,21 @@
             next_page = req.GET.get('next_page','/')
             from django.contrib.auth import logout as djangologout
             djangologout(req)
-            req.session.isopen = False
+            req.session.isopen = False # FIXME: will be obsoleted
             return HttpResponseRedirect(next_page)
 
     if what == 'languages':
         context = {
-            'languages': [{"code": code, "name": name } for code, name in potree().getlanguages()],
+            'languages': potree().get_language_list(),
             }
     elif what == 'projects':
         context = {
-            'projects': getprojects(),
+            'projects': potree().get_project_list(),
             }
     else:
         context = {
-            'languages': [{"code": code, "name": name } for code, name in potree().getlanguages()],
-            'projects': getprojects(),
+            'languages': potree().get_language_list(),
+            'projects': potree().get_project_list(),
             }
     return render_to_response("index.html", RequestContext(req, context))
     
@@ -185,7 +189,7 @@
     context = {
         'projectcode': project,
         'projectname': potree().getprojectname(project),
-        'stats': ngettext(  "%(count)d language, average %(average)d%% translated", 
+        'stats': ngettext(  "%(count)d language, average %(average)d%% translated", # FIXME
                             "%(count)d languages, average %(average)d%% translated", 
                             len(languages)) % { 
                                 'count': len(languages),
@@ -371,13 +375,13 @@
 def adminlanguages(req):
     if req.POST and req.user.is_superuser():
         pass
-    context = { 'languages': get_language_objects() }
+    context = { 'languages': potree().get_language_list() }
     return render_to_response("adminlanguages.html", RequestContext(req, context))
 
 def adminprojects(req):
     if req.POST and req.user.is_superuser():
         pass
-    context = { 'projects' : get_project_objects() }
+    context = { 'projects' : potree().get_project_list() }
     return render_to_response("adminprojects.html", RequestContext(req, context))
 
 def admin_projectedit(req, project):
@@ -393,15 +397,17 @@
         errors = {}
         new_data = manipulator.old_data(project)
     form = forms.FormWrapper(manipulator, new_data, errors)
-    context = { 'project' : storage_client.ProjectWrapper(project),
+    context = { 'project' : potree().get_project(project),
                 'form': form,
                 'errors': errors,}
     return render_to_response("admin_projectedit.html", RequestContext(req, context))
 
-def admintranslationproject(req):
+def admintranslationproject(req, language, project):
     if req.POST and req.user.is_superuser():
         pass
-    return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project, pootlesession(req), argdict))
+    argdict = {}
+    project_obj = potree().getproject(language, project)
+    return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project_obj, pootlesession(req), argdict))
 
 # translatepage.py
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4979
          http://svn.sourceforge.net/translate/?rev=4979&view=rev
Author:   zejn
Date:     2007-02-09 06:11:39 -0800 (Fri, 09 Feb 2007)

Log Message:
-----------
[django-migration] Transition from storage_client to improved potree.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/potree.py
    src/branches/django-migration/Pootle/storage_client.py
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/templates/node_item_stats.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/potree.py
===================================================================
--- src/branches/django-migration/Pootle/potree.py	2007-02-09 13:35:00 UTC (rev 4978)
+++ src/branches/django-migration/Pootle/potree.py	2007-02-09 14:11:39 UTC (rev 4979)
@@ -42,6 +42,8 @@
         >>> L.name
         'English'
     """
+    icon = 'language'
+    data = False # see templates/node_item_stats.html for more
     mapping = {
         'name':'fullname', 
         'specialchars': 'specialchars',
@@ -70,6 +72,9 @@
             raise KeyError("Language object %s does not have %s attribute." % (self,key))
 
 class Project(object):
+    icon = 'folder'
+    data = False # see templates/node_item_stats.html for structure
+    stats = False # see templates/project.html for more
     mapping = { 
         'name':'fullname', 
         'description': 'description',
@@ -128,7 +133,7 @@
 
     def get_language_list(self, project_code=None):
         if project_code:
-            for lang in [ code for code, name in self.languages.iteritems() if self.haslanguage(project_code, code)]:
+            for lang in [ code for code, name in self.languages.iteritems() if self.haslanguage(code)]:
                 yield self.get_language(lang)
         else:
             for lang, name in self.languages.iteritems():

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2007-02-09 13:35:00 UTC (rev 4978)
+++ src/branches/django-migration/Pootle/storage_client.py	2007-02-09 14:11:39 UTC (rev 4979)
@@ -90,75 +90,7 @@
     return {"uilanguage": uilanguage, "uilanguage_options": languageoptions, "other_options": optionlist}
 
 # indexpage.py
-def getprojects():
-    """gets the options for the projects"""
-    projects = []
-    for projectcode in potree().getprojectcodes():
-      projectname = potree().getprojectname(projectcode)
-      description = shortdescription(potree().getprojectdescription(projectcode))
-      projects.append({"code": projectcode, "name": projectname, "description": description, "sep": ", "})
-    if projects:
-      projects[-1]["sep"] = ""
-    return projects
-
-def getprojectnames():
-    return [potree().getprojectname(projectcode) for projectcode in potree().getprojectcodes()]
-
-def getquicklinks(session):
-    """gets a set of quick links to user's project-languages"""
-    quicklinks = []
-    for languagecode in session.getlanguages():
-      if not potree().haslanguage(languagecode):
-        continue
-      languagename = potree().getlanguagename(languagecode)
-      langlinks = []
-      for projectcode in instance().session.getprojects():
-        if potree().hasproject(languagecode, projectcode):
-          projectname = potree().getprojectname(projectcode)
-          projecttitle = projectname
-          langlinks.append({"code": projectcode, "name": projecttitle, "sep": "<br />"})
-      if langlinks:
-        langlinks[-1]["sep"] = ""
-      quicklinks.append({"code": languagecode, "name": languagename, "projects": langlinks})
-    return quicklinks
-
-def getprojects_languageindex(languagecode):
-    """gets the info on the projects"""
-    projectcodes = potree().getprojectcodes(languagecode)
-    projectcount = len(projectcodes)
-    projectitems = [getprojectitem(projectcode, languagecode) for projectcode in projectcodes]
-    for n, item in enumerate(projectitems):
-      item["parity"] = ["even", "odd"][n % 2]
-    return projectitems
-
-def getprojectcount(languagecode):
-    return len(potree().getprojectcodes(languagecode))
-
-def getlanguages(projectcode):
-    """gets the stats etc of the languages"""
-    languages = potree().getlanguages(projectcode)
-    languagecount = len(languages)
-    languageitems = [getlanguageitem(languagecode, languagename, projectcode) for languagecode, languagename in languages]
-    for n, item in enumerate(languageitems):
-      item["parity"] = ["even", "odd"][n % 2]
-    return languageitems
-
-def getlanguageinfo(languagecode):
-    try:
-        nplurals = potree().getlanguagenplurals(languagecode)
-    except AttributeError:
-        return ''
-    pluralequation = potree().getlanguagepluralequation(languagecode)
-    infoparts = [(_("Language Code"), languagecode),
-                 (_("Language Name"), potree().getlanguagename(languagecode)),
-                 # (_("Special Characters"), specialchars),
-                 (_("Number of Plurals"), str(nplurals)),
-                 (_("Plural Equation"), pluralequation),
-                ]
-    return [{"title": title, "value": value} for title, value in infoparts]
-
 def getprojectitem(projectcode, languagecode):
-
     href = '%s/' % projectcode
     projectname = potree().getprojectname(projectcode)
     projectdescription = shortdescription(potree().getprojectdescription(projectcode))
@@ -193,71 +125,4 @@
     content.extend([ "Disallow: /%s/\n" % lc for lc in potree().getlanguagecodes() ])
     return ''.join(content)
 
-class LanguageWrapper(object):
-    def __init__(self, languagecode, languagename=None):
-        self.code = languagecode
-        if languagename:
-            self.name = languagename.encode("utf-8")
-        else:
-            self.name = potree().getlanguagename(languagecode).encode("utf-8")
 
-    def _get_specialchars(self):
-        return potree().getlanguagespecialchars(self.code)
-    specialchars = property(_get_specialchars)
-
-    def _get_plurals(self):
-        return potree().getlanguagenplurals(self.code)
-    plurals = property(_get_plurals)
-
-    def _get_plural_equation(self):
-        return potree().getlanguagepluralequation(self.code)
-    plural_equation = property(_get_plural_equation)
-
-def get_language_objects():
-    for lcode, lname in potree().getlanguages():
-        yield LanguageWrapper(lcode, lname)
-        
-
-class ProjectWrapper(object):
-    def __init__(self, projectcode):
-        self.code = projectcode
-
-    def _get_name(self):
-        return potree().getprojectname(self.code)
-
-    def _set_name(self, name):
-        potree().setprojectname(self.code, name)
-    name = property(_get_name, _set_name)
-
-    def _get_description(self):
-        return potree().getprojectdescription(self.code)
-
-    def _set_description(self, desc):
-        potree().setprojectdescription(self.code, desc)
-    description = property(_get_description, _set_description)
-
-    def _get_checkerstyle(self):
-        return potree().getprojectcheckerstyle(self.code)
-
-    def _set_checkerstyle(self, checkerstyle):
-        potree().setprojectcheckerstyle(self.code, checkerstyle)
-    checkerstyle = property(_get_checkerstyle, _set_checkerstyle)
-
-    def _get_filetype(self):
-        return potree().getprojectlocalfiletype(self.code)
-
-    def _set_filetype(self, filetype):
-        potree().setprojectlocalfiletype(self.code, filetype)
-    filetype = property(_get_filetype, _set_filetype)
-
-    def _get_create_mo_files(self):
-        return potree().getprojectcreatemofiles(self.code)
-
-    def _set_create_mo_files(self, createmo):
-        potree().setprojectcreatemofiles(self.code, createmo)
-    create_mo_files = property(_get_create_mo_files, _set_create_mo_files)
-    
-def get_project_objects():
-    for pcode in potree().getprojectcodes():
-        yield ProjectWrapper(pcode)
-

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2007-02-09 13:35:00 UTC (rev 4978)
+++ src/branches/django-migration/Pootle/templates/language.html	2007-02-09 14:11:39 UTC (rev 4979)
@@ -37,7 +37,7 @@
       </thead>
       <tbody class="stats">
 {% for item in projects %}
-          <tr class="item item-{{ item.parity }}" title="{{ item.description }}">
+          <tr class="item item-{% cycle even,odd %}" title="{{ item.description }}">
             {% itemnode stats %}
           </tr>
 {% endfor %}

Modified: src/branches/django-migration/Pootle/templates/node_item_stats.html
===================================================================
--- src/branches/django-migration/Pootle/templates/node_item_stats.html	2007-02-09 13:35:00 UTC (rev 4978)
+++ src/branches/django-migration/Pootle/templates/node_item_stats.html	2007-02-09 14:11:39 UTC (rev 4979)
@@ -1,6 +1,6 @@
     <td class="stats-name">
       <img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
-      <a href="{{ item.href }}" lang="en" dir="ltr">{{ item.title }}</a>
+      <a href="{{ item.code }}" lang="en" dir="ltr">{{ item.name }}</a>
     </td>
 {% if item.data %}
       <td class="stats">{{ item.data.translatedwords }}</td><td class="stats">{{ item.data.translatedpercentage }}%</td>

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2007-02-09 13:35:00 UTC (rev 4978)
+++ src/branches/django-migration/Pootle/templates/project.html	2007-02-09 14:11:39 UTC (rev 4979)
@@ -10,9 +10,9 @@
 
 {% block content %}
     <div class="navbar">
-      <img src="/static/images/folder.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
+      <img src="/static/images/folder.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
 
-      <h3 class="title">[ <a href="/projects/{{ projectcode }}/">{{ projectname }}</a> ]</h3>
+      <h3 class="title">[ <a href="/projects/{{ project.code }}/">{{ project.name }}</a> ]</h3>
 {% if user.is_superuser %}
       <div class="item-description">
         <a href="admin.html">{% trans "Admin" %}</a>
@@ -25,7 +25,7 @@
     </div>
 
     <div class="intro">
-      {{ projectdescription }}
+      {{ project.description }}
     </div>
 
       <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">
@@ -44,7 +44,7 @@
       </thead>
       <tbody class="stats">
 {% for item in languages %}
-          <tr  class="item item-{{ item.parity }}">
+          <tr  class="item item-{% cycle even,odd %}">
             {% itemnode stats %}
           </tr>
 {% endfor %}

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-09 13:35:00 UTC (rev 4978)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-09 14:11:39 UTC (rev 4979)
@@ -18,7 +18,7 @@
 from django.utils.translation import ngettext
 import random
 
-from Pootle.storage_client import getprojects, getlanguageselector, getquicklinks, getlanguages, getlanguageinfo, getprojects_languageindex, getstats
+from Pootle.storage_client import getlanguageselector, getlanguageinfo
 
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -185,28 +185,25 @@
 home = login_required(home)
 
 def projectlanguageindex(req, project):
-    languages = getlanguages(project)
+    languages = list(potree().get_language_list(project))
     context = {
-        'projectcode': project,
-        'projectname': potree().getprojectname(project),
+        'project': potree().get_project(project),
         'stats': ngettext(  "%(count)d language, average %(average)d%% translated", # FIXME
                             "%(count)d languages, average %(average)d%% translated", 
                             len(languages)) % { 
                                 'count': len(languages),
                                 'average': 0 #getpagestats(), }, 
                                 },
-        'projectdescription': potree().getprojectdescription(project),
         'languages': languages,
         }
     return render_to_response("project.html", RequestContext(req, context))
 
 def languageindex(req, language):
     context = {
-        "languagecode": language,
-        "languagename": potree().getlanguagename(language),
+        "language": potree().get_language(language),
         "languagestats": '',
         "languageinfo": getlanguageinfo(language),
-        "projects": getprojects_languageindex(language),
+        "projects": potree().get_project_list(language),
         }
     return render_to_response("language.html", RequestContext(req, context))
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4982
          http://svn.sourceforge.net/translate/?rev=4982&view=rev
Author:   zejn
Date:     2007-02-10 01:59:15 -0800 (Sat, 10 Feb 2007)

Log Message:
-----------
[django-migration] Migrating TranslationProject.project and .language to objects, get rid of getlanguageselector in storage_client and fix login accordingly.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/indexpage.py
    src/branches/django-migration/Pootle/pagelayout.py
    src/branches/django-migration/Pootle/potree.py
    src/branches/django-migration/Pootle/projects.py
    src/branches/django-migration/Pootle/storage_client.py
    src/branches/django-migration/Pootle/templates/fileindex.html
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/templates/login.html
    src/branches/django-migration/Pootle/users.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/node_item_edit.html

Modified: src/branches/django-migration/Pootle/indexpage.py
===================================================================
--- src/branches/django-migration/Pootle/indexpage.py	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/indexpage.py	2007-02-10 09:59:15 UTC (rev 4982)
@@ -23,14 +23,14 @@
 from Pootle import projects
 from Pootle import pootlefile
 from Pootle import versioncontrol
-from Pootle.storage_client import getprojects as new_getprojects
-from Pootle.storage_client import getprojectnames as new_getprojectnames
-from Pootle.storage_client import getquicklinks as new_getquicklinks
-from Pootle.storage_client import getlanguageinfo as new_getlanguageinfo
-from Pootle.storage_client import getprojects_languageindex as new_getprojects_languageindex
-from Pootle.storage_client import getprojectitem as new_getprojectitem
-from Pootle.storage_client import getlanguages as new_getlanguages
-from Pootle.storage_client import getlanguageitem as new_getlanguageitem
+#from Pootle.storage_client import getprojects as new_getprojects
+#from Pootle.storage_client import getprojectnames as new_getprojectnames
+#from Pootle.storage_client import getquicklinks as new_getquicklinks
+#from Pootle.storage_client import getlanguageinfo as new_getlanguageinfo
+#from Pootle.storage_client import getprojects_languageindex as new_getprojects_languageindex
+#from Pootle.storage_client import getprojectitem as new_getprojectitem
+#from Pootle.storage_client import getlanguages as new_getlanguages
+#from Pootle.storage_client import getlanguageitem as new_getlanguageitem
 # Versioning information
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
@@ -288,12 +288,12 @@
       childitems = self.getchilditems(dirfilter)
     instancetitle = getattr(session.instance, "title", session.localize("Pootle Demo"))
     # l10n: The first parameter is the name of the installation (like "Pootle")
-    pagetitle = self.localize("%s: Project %s, Language %s", instancetitle, self.project.projectname, self.project.languagename)
+    pagetitle = self.localize("%s: Project %s, Language %s", instancetitle, self.project.project.name, self.project.language.name)
     templatename = "fileindex"
     sessionvars = {"status": session.status, "isopen": session.isopen, "issiteadmin": session.issiteadmin()}
     templatevars = {"pagetitle": pagetitle,
-        "project": {"code": self.project.projectcode, "name": self.project.projectname},
-        "language": {"code": self.project.languagecode, "name": self.project.languagename},
+        "project": {"code": self.project.project.code, "name": self.project.project.name},
+        "language": {"code": self.project.language.code, "name": self.project.language.name},
         # optional sections, will appear if these values are replaced
         "assign": None, "goals": None, "upload": None,
         "search": {"title": self.localize("Search")}, "message": message,
@@ -670,7 +670,7 @@
       csvlink = {"href": csvname, "text": self.localize('CSV file')}
       actionlinks.append(csvlink)
     if "mo" in linksrequired:
-      if self.project.hascreatemofiles(self.project.projectcode) and "pocompile" in self.rights:
+      if self.project.hascreatemofiles(self.project.project.code) and "pocompile" in self.rights:
         moname = basename.replace(".po", ".mo")
         molink = {"href": moname, "text": self.localize('MO file')}
         actionlinks.append(molink)
@@ -827,7 +827,7 @@
         currentfolder = "/".join(filepath.split("/")[:-1])
       else:
         currentfolder = filepath
-      archivename = "%s-%s" % (self.project.projectcode, self.project.languagecode)
+      archivename = "%s-%s" % (self.project.project.code, self.project.language.code)
       if currentfolder:
         archivename += "-%s" % currentfolder.replace("/", "-")
       if goal:

Modified: src/branches/django-migration/Pootle/pagelayout.py
===================================================================
--- src/branches/django-migration/Pootle/pagelayout.py	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/pagelayout.py	2007-02-10 09:59:15 UTC (rev 4982)
@@ -160,11 +160,11 @@
     if project:
       if isinstance(project, tuple):
         projectcode, projectname = project
-        links["project"] = {"href": "/projects/%s/%s" % (projectcode, paramstring), "text": projectname}
+        links["project"] = {"href": "/projects/%s/%s" % (projectcode, paramstring), "text": project.name}
       else:
-        links["language"] = {"href": rootlink + "../index.html", "text": project.languagename}
+        links["language"] = {"href": rootlink + "../index.html", "text": project.language.name}
         # don't getbrowseurl on the project link, so sticky options won't apply here
-        links["project"] = {"href": (rootlink or "index.html") + paramstring, "text": project.projectname}
+        links["project"] = {"href": (rootlink or "index.html") + paramstring, "text": project.project.name}
         if session:
           if "admin" in project.getrights(session) or session.issiteadmin():
             links["admin"] = {"href": rootlink + "admin.html", "text": self.localize("Admin")}

Modified: src/branches/django-migration/Pootle/potree.py
===================================================================
--- src/branches/django-migration/Pootle/potree.py	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/potree.py	2007-02-10 09:59:15 UTC (rev 4982)
@@ -43,6 +43,7 @@
         'English'
     """
     icon = 'language'
+    stats = False 
     data = False # see templates/node_item_stats.html for more
     mapping = {
         'name':'fullname', 
@@ -355,7 +356,7 @@
             if languagecode == "templates":
                 self.projectcache[languagecode, projectcode] = projects.TemplatesProject(projectcode, self)
             else:
-                self.projectcache[languagecode, projectcode] = projects.TranslationProject(Language(languagecode), Project(projectcode))
+                self.projectcache[languagecode, projectcode] = projects.TranslationProject(self.get_language(languagecode), self.get_project(projectcode))
         return self.projectcache[languagecode, projectcode]
 
     def isgnustyle(self, projectcode):
@@ -426,7 +427,7 @@
                     return projectcode, languagecode
         return None, None
 
-    def getpodir(self, languagecode, projectcode):
+    def getpodir(self, languagecode, projectcode): # FIXME differentiates gnu/std
         """returns the base directory containing po files for the project"""
         projectdir = os.path.join(self.podirectory, projectcode)
         if not os.path.exists(projectdir):

Modified: src/branches/django-migration/Pootle/projects.py
===================================================================
--- src/branches/django-migration/Pootle/projects.py	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/projects.py	2007-02-10 09:59:15 UTC (rev 4982)
@@ -48,6 +48,14 @@
 class RightsError(ValueError):
   pass
 
+class FSObject(object):
+    def __init__(self, path):
+        self.path = path
+
+    def __repr__(self):
+        return "<Pootle FS object: %s>" % self.path
+
+
 class InternalAdminSession:
   """A fake session used for doing internal admin jobs"""
   def __init__(self):
@@ -90,8 +98,9 @@
   def __init__(self, language, project, create=False):
     self.language = language
     self.project = project
+
     self.pofiles = potimecache(15*60, self) 
-    checkerclasses = [checks.projectcheckers.get(self.projectcheckerstyle, checks.StandardChecker), pofilter.StandardPOChecker]
+    checkerclasses = [checks.projectcheckers.get(self.project.checkstyle, checks.StandardChecker), pofilter.StandardPOChecker]
     self.checker = pofilter.POTeeChecker(checkerclasses=checkerclasses, errorhandler=self.filtererrorhandler)
     self.quickstats = {}
     # terminology matcher
@@ -99,8 +108,8 @@
     self.termmatchermtime = None
     if create:
       self.converttemplates(InternalAdminSession())
-    self.podir = potree().getpodir(languagecode, projectcode)
-    if potree().hasgnufiles(self.podir, self.languagecode) == "gnu": # will be obsoleted
+    self.podir = potree().getpodir(language.code, project.code)
+    if potree().hasgnufiles(self.podir, self.language.code) == "gnu": # will be obsoleted
       self.filestyle = "gnu"
     else:
       self.filestyle = "std"
@@ -112,10 +121,10 @@
   def readprefs(self):
     """reads the project preferences"""
     self.prefs = prefs.PrefsParser() # FIXME is PrefsParser a bit too heavy for every project?
-    self.prefsfile = os.path.join(self.podir, "pootle-%s-%s.prefs" % (self.projectcode, self.languagecode))
+    self.prefsfile = os.path.join(self.podir, "pootle-%s-%s.prefs" % (self.project.code, self.language.code))
     if not os.path.exists(self.prefsfile):
       prefsfile = open(self.prefsfile, "w")
-      prefsfile.write("# Pootle preferences for project %s, language %s\n\n" % (self.projectcode, self.languagecode))
+      prefsfile.write("# Pootle preferences for project %s, language %s\n\n" % (self.project.code, self.language.code))
       prefsfile.close()
     self.prefs.parsefile(self.prefsfile)
 
@@ -163,7 +172,7 @@
         if username == "nobody":
           rights = "view"
         elif rightstree is None:
-          if self.languagecode == "en":
+          if self.language.code == "en":
             rights = "view, archive, pocompile"
           else:
             rights = potree().getdefaultrights()
@@ -183,7 +192,7 @@
     def usableuser(user, userprefs):
       if user in ["__dummy__", "default", "nobody"]:
         return False
-      return self.languagecode in getattr(userprefs, "languages", [])
+      return self.language.code in getattr(userprefs, "languages", [])
 
     users = {}
     for username, userprefs in session.loginchecker.users.iteritems():
@@ -446,7 +455,7 @@
 
   def scanpofiles(self):
     """sets the list of pofilenames by scanning the project directory"""
-    self.pofilenames = potree().getpofiles(self.languagecode, self.projectcode, poext=self.fileext)
+    self.pofilenames = potree().getpofiles(self.language.code, self.project.code, poext=self.fileext)
     for pofilename in self.pofilenames:
       if not pofilename in self.pofiles:
         self.pofiles[pofilename] = pootlefile.pootlefile(self, pofilename)
@@ -462,8 +471,8 @@
     if os.path.basename(localfilename) != localfilename or localfilename.startswith("."):
       raise ValueError("invalid/insecure file name: %s" % localfilename)
     if self.filestyle == "gnu":
-      if not potree().languagematch(self.languagecode, localfilename[:-len("."+self.fileext)]):
-        raise ValueError("invalid GNU-style file name %s: must match '%s.%s' or '%s[_-][A-Z]{2,3}.%s'" % (localfilename, self.fileext, self.languagecode, self.languagecode, self.fileext))
+      if not potree().languagematch(self.language.code, localfilename[:-len("."+self.fileext)]):
+        raise ValueError("invalid GNU-style file name %s: must match '%s.%s' or '%s[_-][A-Z]{2,3}.%s'" % (localfilename, self.fileext, self.language.code, self.language.code, self.fileext))
     dircheck = self.podir
     for part in dirname.split(os.sep):
       dircheck = os.path.join(dircheck, part)
@@ -591,7 +600,7 @@
 
   def converttemplates(self, session):
     """creates PO files from the templates"""
-    projectdir = os.path.join(potree().podirectory, self.projectcode)
+    projectdir = os.path.join(potree().podirectory, self.project.code)
     if not os.path.exists(projectdir):
       os.mkdir(projectdir)
     templatesdir = os.path.join(projectdir, "templates")
@@ -599,24 +608,24 @@
       templatesdir = os.path.join(projectdir, "pot")
       if not os.path.exists(templatesdir):
         templatesdir = projectdir
-    if potree().isgnustyle(self.projectcode):
+    if potree().isgnustyle(self.project.code):
       self.filestyle = "gnu"
     else:
       self.filestyle = "std"
-    templates = potree().gettemplates(self.projectcode)
+    templates = potree().gettemplates(self.project.code)
     if self.filestyle == "gnu":
       self.podir = projectdir
       if not templates:
         raise NotImplementedError("Cannot create GNU-style translation project without templates")
     else:
-      self.podir = os.path.join(projectdir, self.languagecode)
+      self.podir = os.path.join(projectdir, self.language.code)
       if not os.path.exists(self.podir):
         os.mkdir(self.podir)
     for potfilename in templates:
       inputfile = open(os.path.join(templatesdir, potfilename), "rb")
       outputfile = cStringIO.StringIO()
       if self.filestyle == "gnu":
-        pofilename = self.languagecode + os.extsep + "po"
+        pofilename = self.language.code + os.extsep + "po"
       else:
         pofilename = potfilename[:-len(os.extsep+"pot")] + os.extsep + "po"
         pofilename = os.path.basename(pofilename)
@@ -686,7 +695,7 @@
   def ootemplate(self):
     """Tests whether this project has an OpenOffice.org template SDF file in
     the templates directory."""
-    projectdir = os.path.join(potree().podirectory, self.projectcode)
+    projectdir = os.path.join(potree().podirectory, self.project.code)
     templatefilename = os.path.join(projectdir, "templates", "en-US.sdf")
     if os.path.exists(templatefilename):
       return templatefilename
@@ -699,10 +708,10 @@
     templateoo = self.ootemplate()
     if templateoo is None:
       return
-    outputoo = os.path.join(self.podir, self.languagecode + ".sdf")
-    inputdir = os.path.join(potree().podirectory, self.projectcode, self.languagecode)
-    po2oo.main(["-i%s"%inputdir, "-t%s"%templateoo, "-o%s"%outputoo, "-l%s"%self.languagecode, "--progress=none"])
-    return file(os.path.join(self.podir, self.languagecode + ".sdf"), "r").read()
+    outputoo = os.path.join(self.podir, self.language.code + ".sdf")
+    inputdir = os.path.join(potree().podirectory, self.project.code, self.language.code)
+    po2oo.main(["-i%s"%inputdir, "-t%s"%templateoo, "-o%s"%outputoo, "-l%s"%self.language.code, "--progress=none"])
+    return file(os.path.join(self.podir, self.language.code + ".sdf"), "r").read()
 
   def browsefiles(self, dirfilter=None, depth=None, maxdepth=None, includedirs=False, includefiles=True):
     """gets a list of pofilenames, optionally filtering with the parent directory"""
@@ -752,7 +761,7 @@
     """initializes the search index"""
     if not indexer.HAVE_INDEXER:
       return
-    self.indexdir = os.path.join(self.podir, ".poindex-%s-%s" % (self.projectcode, self.languagecode))
+    self.indexdir = os.path.join(self.podir, ".poindex-%s-%s" % (self.project.code, self.language.code))
     class indexconfig:
       indexdir = self.indexdir
     self.analyzer = indexer.PerFieldAnalyzer([("pofilename", indexer.ExactAnalyzer())])
@@ -781,10 +790,10 @@
     if items is None:
       if len(gooditems) == len(allitems) == pofile.statistics.getitemslen():
         return
-      print "updating", self.projectcode, self.languagecode, "index for", pofilename
+      print "updating", self.project.code, self.language.code, "index for", pofilename
       self.searcher.deleteDoc({"pofilename": pofilename})
     else:
-      print "updating", self.languagecode, "index for", pofilename, "items", items
+      print "updating", self.language.code, "index for", pofilename, "items", items
       self.searcher.deleteDoc([pofilenamequery, itemsquery])
     pofile.pofreshen()
     addlist = []
@@ -976,7 +985,7 @@
 
   def savequickstats(self):
     """saves the quickstats"""
-    self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.projectcode, self.languagecode))
+    self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.project.code, self.language.code))
     quickstatsfile = open(self.quickstatsfilename, "w")
     sortedquickstats = self.quickstats.items()
     sortedquickstats.sort()
@@ -988,7 +997,7 @@
   def readquickstats(self):
     """reads the quickstats from disk"""
     self.quickstats = {}
-    self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.projectcode, self.languagecode))
+    self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.project.code, self.language.code))
     if os.path.exists(self.quickstatsfilename):
       quickstatsfile = open(self.quickstatsfilename, "r")
       for line in quickstatsfile:
@@ -1135,7 +1144,7 @@
       raise RightsError(session.localize("You do not have rights to change translations here"))
     pofile = self.pofiles[pofilename]
     pofile.track(item, "edited by %s" % session.username)
-    languageprefs = getattr(session.instance.languages, self.languagecode, None)
+    languageprefs = getattr(session.instance.languages, self.language.code, None)
     pofile.updateunit(item, newvalues, session.prefs, languageprefs)
     self.updateindex(pofilename, [item])
 
@@ -1194,7 +1203,7 @@
   def isterminologyproject(self):
     """returns whether this project is the main terminology project for a
     language. Currently it is indicated by the project code 'terminology'"""
-    return self.projectcode == "terminology"
+    return self.project.code == "terminology"
 
   def gettermbase(self):
     """returns this project's terminology store"""
@@ -1221,8 +1230,8 @@
           self.termmatcher = match.terminologymatcher(self.pofiles.values())
         else:
           self.termmatcher = match.terminologymatcher(termbase)
-    elif not self.isterminologyproject() and potree().hasproject(self.languagecode, "terminology"):
-      termproject = potree().getproject(self.languagecode, "terminology")
+    elif not self.isterminologyproject() and potree().hasproject(self.language.code, "terminology"):
+      termproject = potree().getproject(self.language.code, "terminology")
       self.termmatcher = termproject.gettermmatcher()
       self.termmatchermtime = termproject.termmatchermtime
     else:
@@ -1353,7 +1362,7 @@
 
   def hascreatemofiles(self, projectcode): # FIXME obsolete
     """returns whether the project has createmofile set"""
-    return potree().getprojectcreatemofiles(projectcode) == 1
+    return potree().get_project(projectcode).createmofiles == 1
 
 class DummyProject(TranslationProject):
   """a project that is just being used for handling pootlefiles"""
@@ -1364,8 +1373,8 @@
       self.checker = pofilter.POTeeChecker()
     else:
       self.checker = checker
-    self.projectcode = projectcode
-    self.languagecode = languagecode
+    self.project.code = projectcode
+    self.language.code = languagecode
     self.readquickstats()
 
   def scanpofiles(self):
@@ -1389,12 +1398,12 @@
   def readquickstats(self):
     """reads statistics from whatever files are available"""
     self.quickstats = {}
-    if self.projectcode is not None and self.languagecode is not None:
+    if self.project.code is not None and self.language.code is not None:
       TranslationProject.readquickstats(self)
 
   def savequickstats(self):
     """saves quickstats if possible"""
-    if self.projectcode is not None and self.languagecode is not None:
+    if self.project.code is not None and self.language.code is not None:
       TranslationProject.savequickstats(self)
 
 class TemplatesProject(TranslationProject):

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/storage_client.py	2007-02-10 09:59:15 UTC (rev 4982)
@@ -36,17 +36,6 @@
 
     return gotten
 
-## users.py
-def getlanguageselector(languagenames, session):
-    """returns the language selector..."""
-    # TODO: work out how we handle localization of language names...
-    languageoptions = [('', session.localize("Default"))]
-    if isinstance(languagenames, dict):
-        languageoptions += languagenames.items()
-    else:
-        languageoptions += languagenames
-    return [{"code": key, "name": value, "selected": key==session.language or None} for key, value in languageoptions if key != 'templates']
-
 def getprojectoptions(session):
     """gets the options box to change the user's projects"""
     projectoptions = []

Modified: src/branches/django-migration/Pootle/templates/fileindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/fileindex.html	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/templates/fileindex.html	2007-02-10 09:59:15 UTC (rev 4982)
@@ -1,145 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
+{% load i18n %}
+{% load pootle %}
+{% extends "base.html" %}
 
-  <title py:content="pagetitle">Pootle: Project ${project.name}, Language ${language.name}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="${baseurl}static/pootle.css" />
-  <link rel="shortcut icon" href="${baseurl}favicon.ico" />
-  <script type="text/javascript" src="${baseurl}static/js/sorttable.js"></script>
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="${baseurl}static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
+{% block head %}
+  <script type="text/javascript" src="{{ baseurl }}static/js/sorttable.js"></script>
+  <script type="text/javascript" src="{{ baseurl }}static/js/show-hide.js"></script>
+{% endblock %}
 
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
+{% block content %}
+    <div class="navbar">
+      <img src="/static/images/folder.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+      <h3 class="title">[ <a href="/{{ lang.code }}/">{{ lang.name }}</a> ] [ <a href="/{{ project.code }}/">{{ project.name }}</a> ]</h3>
+      <div class="item-description" id="actionlinks">
 
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="intro" py:if="message" py:content="message">Message</div>
-
-    <div class="navbar" py:for="item in navitems">
-      <!-- search form -->
-      <div py:if="search" class="searchform" dir="$uidir" lang="$uilanguage">
-        <form action="translate.html" method="post" name="searchform" id="searchform">
-          ${search.title}
-          <input type="text" size="15" name="searchtext" value="" />
-        </form>
       </div>
-      <!-- Navigation bar -->
-      <div over:include="navbar#item">
-        <h3 over:replace="itemtitle" class="title">
-          <span py:strip="True" py:if="item.path.language">[ <a href="${item.path.language.href}">${item.path.language.text}</a> ]</span>
-          <span py:strip="True" py:if="item.path.project">[ <a href="${item.path.project.href}">${item.path.project.text}</a> ]</span>
-          <span py:strip="True" py:for="pathlink in item.path.pathlinks">
-            <a href="${pathlink.href}">${pathlink.text}</a>${pathlink.sep}
-          </span>
-          <i py:if="item.path.goal"><a href="${item.path.goal.href}">${item.path.goal.text}</a></i>
-        </h3>
+        
+      <div class="item-description" id="hiddenchecks">{% trans "Show Checks" %}</div>
+      <div class="item-description" id="shownchecks" style="display:none;">{% trans "Hide Checks" %}
+      <div>FIXME: Checks go here!
       </div>
-      <div over:include="navbar#itemstats"/>
-    </div>
-
-    <!-- The statistics view -->
-    <div py:if="not editing and children">
-      <br clear="all" />     
-      <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">
-        <thead>
-          <tr>
-            <th class="stats">${statsheadings.name}</th>
-            <th class="stats">${statsheadings.translated}</th>
-	    <th class="stats" title="${statsheadings.translatedpercentage}">%</th>
-            <th class="stats">${statsheadings.fuzzy}</th>
-            <th class="stats" title="${statsheadings.fuzzypercentage}">%</th>
-            <th class="stats">${statsheadings.untranslated}</th>
-            <th class="stats" title="${statsheadings.untranslatedpercentage}">%</th>
-            <th class="stats">${statsheadings.total}</th>
-            <th class="stats">${statsheadings.graph}</th>
-          </tr>
-        </thead>
-        <tbody class="stats">
-          <div py:for="item in children" py:strip="True">
-            <tr  class="item item-${item.parity}">
-              <div over:include="navbar#itemdata"/>
-            </tr>
-          </div>
-        </tbody>
-      </table>
-    </div>
-
-    <!-- The editing view -->
-    <div py:if="editing" py:for="item in children" py:strip="True">
-      <div py:if="'isgoal' in item" class="goalitem">
-        <div over:include="navbar#item">
-          <div py:if="item.goal.users or item.goal.show_adduser">
-            <img src="${baseurl}static/images/person.png" class="icon" alt="" dir="$uidir" lang="$uilanguage" />
-            <span py:for="user in item.goal.users" py:strip="True">${user.name}${user.sep}</span>
-            <form py:if="item.goal.show_adduser" action="" method="post" name="goaluserform">
-              <input type="hidden" name="editgoalname" value="${item.goal.name}"/>
-              <select name="newgoaluser">
-                <option py:for="user in item.goal.otherusers" value="${user}" py:content="item.goal.otherusers[user].description">Username</option>
-              </select>
-              <input type="submit" name="doeditgoalusers" value="${item.goal.adduser_title}"/>
-            </form>
-          </div>
-        </div>
-        <div over:include="navbar#itemstats"/>
       </div>
 
-      <div py:if="'isdir' in item" class="item item-${item.parity}">
-        <div over:include="navbar#item"/>
-        <div over:include="navbar#itemstats"/>
+      <div class="item-statistics">
+        {{ languagestats }} FIXME
       </div>
-
-      <div py:if="'isfile' in item" class="item item-${item.parity}">
-        <div over:include="navbar#item"/>
-        <div over:include="navbar#itemstats"/>
-      </div>
     </div>
-  </div>
 
-  <div id="links" over:include="pootlepage#links">
-    <div class="sidetitle" py:if="assign" py:content="assign.title">
-      Assign Strings
-    </div>
-
-    <form py:if="assign" action="" method="post" name="assignform">
-      <select name="assignto" title="${assign.users_text}">
-        <option py:for="user in assign.users" value="${user}" py:content="assign.users[user].description">Username</option>
-      </select>
-      <input type="text" name="action" value="translate" title="${assign.action_text}" />
-      <input type="submit" name="doassign" value="${assign.button}" />
-    </form>
-
-    <div class="sidetitle" py:if="goals" py:content="goals.title">
-      Goals
-    </div>
-
-    <form py:if="goals" action="" method="post" name="goalform">
-      <input type="text" name="newgoal" title="${goals.name_title}" />
-      <input type="submit" name="doaddgoal" value="${goals.button}" />
-    </form>
-
-    <div class="sidetitle" py:if="upload" py:content="upload.title">
-      Upload File
-    </div>
-
-    <form py:if="upload" action="" method="post" name="uploadform" enctype="multipart/form-data">
-      <div>
-        <input type="file" name="uploadfile" size="15" class="upload" title="${upload.file_title}" />
-      </div>
-      <div py:if="upload.overwrite">
-        <input type="radio" name="dooverwrite" value="Yes" title="${upload.overwrite_title}" py:content="upload.overwrite"/>
-        <input type="radio" name="dooverwrite" checked="checked" value="No" title="${upload.merge_title}" py:content="upload.merge"/>
-      </div>
-      <input type="submit" name="doupload" value="${upload.upload_button}" />
-    </form>
-
-  </div>
-  </div>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>
+{% for item in items %}
+{% itemnode edit %}
+{% endfor %}
+{% endblock %}

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/templates/language.html	2007-02-10 09:59:15 UTC (rev 4982)
@@ -9,16 +9,17 @@
 {% block content %}
     <div class="navbar">
       <img src="/static/images/language.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
-      <h3 class="title">[ <a href="/{{ languagecode }}/">{{ languagename }}</a> ]</h3>
+      <h3 class="title">[ <a href="/{{ languagecode }}/">{{ language.name }}</a> ]</h3>
       <div class="item-statistics">
-        {{ languagestats }}
+        {{ language.stats }} FIXME
       </div>
     </div>
 
     <div class="intro">
-{% for i in languageinfo %}
-      <b>{{ i.title }}</b>: {{ i.value }}<br/>
-{% endfor %}
+      <b>{% trans "Language Code" %}</b>: {{ language.code }}<br />
+      <b>{% trans "Language Name" %}</b>: {{ language.name }}<br />
+      <b>{% trans "Number of Plurals" %}</b>: {{ language.nplurals }}<br />
+      <b>{% trans "Plural Equation" %}</b>: {{ language.plural_equation }}
     </div>
 
       <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">

Modified: src/branches/django-migration/Pootle/templates/login.html
===================================================================
--- src/branches/django-migration/Pootle/templates/login.html	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/templates/login.html	2007-02-10 09:59:15 UTC (rev 4982)
@@ -26,7 +26,7 @@
 
             <td colspan="1" rowspan="1">
               <select name="language">
-                {% for l in languages %}<option {% if l.selected %}selected="true" {% endif %}value="{{ l.code }}">{{ l.name }}</option>{% endfor %}
+                {% for l in languages %}<option {% if lang.selected %}selected="true" {% endif %}value="{{ l.code }}">{{ l.name }}</option>{% endfor %}
               </select>
             </td>
           </tr>

Added: src/branches/django-migration/Pootle/templates/node_item_edit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/node_item_edit.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/node_item_edit.html	2007-02-10 09:59:15 UTC (rev 4982)
@@ -0,0 +1,18 @@
+    <div id="item" class="contentsitem">
+    <img src="{{ baseurl }}static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+    <h3 id="itemtitle" class="title"><a href="{{ item.href }}">{{ item.title }}</a></h3>
+{% if item.actions %}
+    <div id="actionlinks" class="item-description">
+{% for link in item.actions.basic %}
+        <a href="{{ link.href }}" title="{{ link.title }}">{{ link.text }}</a>
+        ${link.sep}
+{% endfor %}
+{% for link in item.actions.extended %}
+        <a href="{{ link.href }}" title="{{ link.title }}">{{ link.text }}</a>
+        ${link.sep}
+{% endfor %}
+{% endif %}
+</div>
+
+
+

Modified: src/branches/django-migration/Pootle/users.py
===================================================================
--- src/branches/django-migration/Pootle/users.py	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/users.py	2007-02-10 09:59:15 UTC (rev 4982)
@@ -24,7 +24,6 @@
 from jToolkit import mailer
 from jToolkit import prefs
 from Pootle import pagelayout
-from Pootle.storage_client import getlanguageselector as new_getlanguageselector
 from Pootle.storage_client import getlanguageoptions as new_getlanguageoptions
 from Pootle.storage_client import getprojectoptions as new_getprojectoptions
 from Pootle.storage_client import getotheroptions as new_getotheroptions

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-10 07:15:36 UTC (rev 4981)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-10 09:59:15 UTC (rev 4982)
@@ -18,8 +18,6 @@
 from django.utils.translation import ngettext
 import random
 
-from Pootle.storage_client import getlanguageselector, getlanguageinfo
-
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
 
@@ -201,19 +199,21 @@
 def languageindex(req, language):
     context = {
         "language": potree().get_language(language),
-        "languagestats": '',
-        "languageinfo": getlanguageinfo(language),
         "projects": potree().get_project_list(language),
         }
     return render_to_response("language.html", RequestContext(req, context))
     
 def projectindex(req, language, project):
-    # important, handles 4 urls
-    argdict = {}
-
     proj = potree().getproject(language, project)
-    return render_to_pootleresponse(indexpage.ProjectIndex(proj, pootlesession(req), argdict, dirfilter=None))
+    print proj.browsefiles(dirfilter=None, depth=0)
 
+    context = {
+        'project': potree().get_project(project),
+        'lang': potree().get_language(language),
+        'items': [1,2,3]
+       }
+    return render_to_response("fileindex.html", RequestContext(req, context))
+
 def options(req):
     manipulator = pootleforms.UserProfileManipulator(req.user)
     if req.POST:
@@ -258,7 +258,7 @@
         
         form = forms.FormWrapper(manipulator, new_data, errors)
         context = { 
-            'languages': getlanguageselector(potree().getlanguages(), pootlesession(req)), # FIXME
+            'languages': potree().get_language_list(), # FIXME validation
             'form': form,
             }
         return render_to_response("login.html", RequestContext(req, context))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4985
          http://svn.sourceforge.net/translate/?rev=4985&view=rev
Author:   zejn
Date:     2007-02-10 03:17:35 -0800 (Sat, 10 Feb 2007)

Log Message:
-----------
[django-migration] Fix an utf-8 encode bug in forms.py and change indentation for projects.py

Modified Paths:
--------------
    src/branches/django-migration/Pootle/projects.py
    src/branches/django-migration/Pootle/web/forms.py

Modified: src/branches/django-migration/Pootle/projects.py
===================================================================
--- src/branches/django-migration/Pootle/projects.py	2007-02-10 10:47:30 UTC (rev 4984)
+++ src/branches/django-migration/Pootle/projects.py	2007-02-10 11:17:35 UTC (rev 4985)
@@ -12,12 +12,12 @@
 # 
 # translate is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with translate; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA    02111-1307    USA
 
 """manages projects and files and translations"""
 
@@ -46,7 +46,7 @@
 from jToolkit.data import indexer
 
 class RightsError(ValueError):
-  pass
+    pass
 
 class FSObject(object):
     def __init__(self, path):
@@ -57,1368 +57,1368 @@
 
 
 class InternalAdminSession:
-  """A fake session used for doing internal admin jobs"""
-  def __init__(self):
-    self.username = "internal"
-    self.isopen = True
+    """A fake session used for doing internal admin jobs"""
+    def __init__(self):
+        self.username = "internal"
+        self.isopen = True
 
-  def localize(self, message):
-    return message
+    def localize(self, message):
+        return message
 
-  def issiteadmin(self):
-    return True
+    def issiteadmin(self):
+        return True
 
 class potimecache(timecache.timecache):
-  """caches pootlefile objects, remembers time, and reverts back to statistics when neccessary..."""
-  def __init__(self, expiryperiod, project):
-    """initialises the cache to keep objects for the given expiryperiod, and point back to the project"""
-    timecache.timecache.__init__(self, expiryperiod)
-    self.project = project
+    """caches pootlefile objects, remembers time, and reverts back to statistics when neccessary..."""
+    def __init__(self, expiryperiod, project):
+        """initialises the cache to keep objects for the given expiryperiod, and point back to the project"""
+        timecache.timecache.__init__(self, expiryperiod)
+        self.project = project
 
-  def __getitem__(self, key):
-    """[] access of items"""
-    if key and not dict.__contains__(self, key):
-      popath = os.path.join(self.project.podir, key)
-      if os.path.exists(popath):
-        # update the index to pofiles...
-        self.project.scanpofiles()
-    return timecache.timecache.__getitem__(self, key)
+    def __getitem__(self, key):
+        """[] access of items"""
+        if key and not dict.__contains__(self, key):
+            popath = os.path.join(self.project.podir, key)
+            if os.path.exists(popath):
+                # update the index to pofiles...
+                self.project.scanpofiles()
+        return timecache.timecache.__getitem__(self, key)
 
-  def expire(self, pofilename):
-    """expires the given pofilename by recreating it (holding only stats)"""
-    timestamp, currentfile = dict.__getitem__(self, pofilename)
-    if currentfile.pomtime is not None:
-      # use the currentfile.pomtime as a timestamp as well, so any modifications will extend its life
-      if time.time() - currentfile.pomtime > self.expiryperiod.seconds:
-        self.__setitem__(pofilename, pootlefile.pootlefile(self.project, pofilename))
+    def expire(self, pofilename):
+        """expires the given pofilename by recreating it (holding only stats)"""
+        timestamp, currentfile = dict.__getitem__(self, pofilename)
+        if currentfile.pomtime is not None:
+            # use the currentfile.pomtime as a timestamp as well, so any modifications will extend its life
+            if time.time() - currentfile.pomtime > self.expiryperiod.seconds:
+                self.__setitem__(pofilename, pootlefile.pootlefile(self.project, pofilename))
 
 class TranslationProject(object):
-  """Manages iterating through the translations in a particular project"""
-  fileext = "po"
-  def __init__(self, language, project, create=False):
-    self.language = language
-    self.project = project
+    """Manages iterating through the translations in a particular project"""
+    fileext = "po"
+    def __init__(self, language, project, create=False):
+        self.language = language
+        self.project = project
 
-    self.pofiles = potimecache(15*60, self) 
-    checkerclasses = [checks.projectcheckers.get(self.project.checkstyle, checks.StandardChecker), pofilter.StandardPOChecker]
-    self.checker = pofilter.POTeeChecker(checkerclasses=checkerclasses, errorhandler=self.filtererrorhandler)
-    self.quickstats = {}
-    # terminology matcher
-    self.termmatcher = None
-    self.termmatchermtime = None
-    if create:
-      self.converttemplates(InternalAdminSession())
-    self.podir = potree().getpodir(language.code, project.code)
-    if potree().hasgnufiles(self.podir, self.language.code) == "gnu": # will be obsoleted
-      self.filestyle = "gnu"
-    else:
-      self.filestyle = "std"
-    self.readprefs()
-    self.scanpofiles()
-    self.readquickstats()
-    self.initindex()
+        self.pofiles = potimecache(15*60, self) 
+        checkerclasses = [checks.projectcheckers.get(self.project.checkstyle, checks.StandardChecker), pofilter.StandardPOChecker]
+        self.checker = pofilter.POTeeChecker(checkerclasses=checkerclasses, errorhandler=self.filtererrorhandler)
+        self.quickstats = {}
+        # terminology matcher
+        self.termmatcher = None
+        self.termmatchermtime = None
+        if create:
+            self.converttemplates(InternalAdminSession())
+        self.podir = potree().getpodir(language.code, project.code)
+        if potree().hasgnufiles(self.podir, self.language.code) == "gnu": # will be obsoleted
+            self.filestyle = "gnu"
+        else:
+            self.filestyle = "std"
+        self.readprefs()
+        self.scanpofiles()
+        self.readquickstats()
+        self.initindex()
 
-  def readprefs(self):
-    """reads the project preferences"""
-    self.prefs = prefs.PrefsParser() # FIXME is PrefsParser a bit too heavy for every project?
-    self.prefsfile = os.path.join(self.podir, "pootle-%s-%s.prefs" % (self.project.code, self.language.code))
-    if not os.path.exists(self.prefsfile):
-      prefsfile = open(self.prefsfile, "w")
-      prefsfile.write("# Pootle preferences for project %s, language %s\n\n" % (self.project.code, self.language.code))
-      prefsfile.close()
-    self.prefs.parsefile(self.prefsfile)
+    def readprefs(self):
+        """reads the project preferences"""
+        self.prefs = prefs.PrefsParser() # FIXME is PrefsParser a bit too heavy for every project?
+        self.prefsfile = os.path.join(self.podir, "pootle-%s-%s.prefs" % (self.project.code, self.language.code))
+        if not os.path.exists(self.prefsfile):
+            prefsfile = open(self.prefsfile, "w")
+            prefsfile.write("# Pootle preferences for project %s, language %s\n\n" % (self.project.code, self.language.code))
+            prefsfile.close()
+        self.prefs.parsefile(self.prefsfile)
 
-  def saveprefs(self):
-    """saves the project preferences"""
-    self.prefs.savefile()
+    def saveprefs(self):
+        """saves the project preferences"""
+        self.prefs.savefile()
 
-  def getrightnames(self, session): # FIXME gettext
-    """gets the available rights and their localized names"""
-    localize = session.localize
-    # l10n: Verb
-    return [("view", localize("View")),
-            ("suggest", localize("Suggest")),
-            ("translate", localize("Translate")),
-            ("overwrite", localize("Overwrite")),
-            # l10n: Verb
-            ("review", localize("Review")),
-            # l10n: Verb
-            ("archive", localize("Archive")),
-            ("pocompile", localize("Compile PO files")),
-            ("assign", localize("Assign")),
-            ("admin", localize("Administrate")),
-            ("commit", localize("Commit")),
-           ]
+    def getrightnames(self, session): # FIXME gettext
+        """gets the available rights and their localized names"""
+        localize = session.localize
+        # l10n: Verb
+        return [("view", localize("View")),
+                        ("suggest", localize("Suggest")),
+                        ("translate", localize("Translate")),
+                        ("overwrite", localize("Overwrite")),
+                        # l10n: Verb
+                        ("review", localize("Review")),
+                        # l10n: Verb
+                        ("archive", localize("Archive")),
+                        ("pocompile", localize("Compile PO files")),
+                        ("assign", localize("Assign")),
+                        ("admin", localize("Administrate")),
+                        ("commit", localize("Commit")),
+                     ]
 
-  def getrights(self, session=None, username=None, usedefaults=True): # FIXME move to UserWrapper
-    """gets the rights for the given user (name or session, or not-logged-in if username is None)
-    if usedefaults is False then None will be returned if no rights are defined (useful for editing rights)"""
-    # internal admin sessions have all rights
-    if isinstance(session, InternalAdminSession):
-      return [right for right, localizedright in self.getrightnames(session)]
-    if session is not None and session.isopen and username is None:
-      username = session.username
-    if username is None:
-      username = "nobody"
-    rights = None
-    rightstree = getattr(self.prefs, "rights", None)
-    if rightstree is not None:
-      if rightstree.__hasattr__(username):
-        rights = rightstree.__getattr__(username)
-      else:
+    def getrights(self, session=None, username=None, usedefaults=True): # FIXME move to UserWrapper
+        """gets the rights for the given user (name or session, or not-logged-in if username is None)
+        if usedefaults is False then None will be returned if no rights are defined (useful for editing rights)"""
+        # internal admin sessions have all rights
+        if isinstance(session, InternalAdminSession):
+            return [right for right, localizedright in self.getrightnames(session)]
+        if session is not None and session.isopen and username is None:
+            username = session.username
+        if username is None:
+            username = "nobody"
         rights = None
-    if rights is None:
-      if usedefaults:
-        if username == "nobody":
-          rights = "view"
-        elif rightstree is None:
-          if self.language.code == "en":
-            rights = "view, archive, pocompile"
-          else:
-            rights = potree().getdefaultrights()
-        else:
-          rights = getattr(rightstree, "default", None)
-      else:
+        rightstree = getattr(self.prefs, "rights", None)
+        if rightstree is not None:
+            if rightstree.__hasattr__(username):
+                rights = rightstree.__getattr__(username)
+            else:
+                rights = None
+        if rights is None:
+            if usedefaults:
+                if username == "nobody":
+                    rights = "view"
+                elif rightstree is None:
+                    if self.language.code == "en":
+                        rights = "view, archive, pocompile"
+                    else:
+                        rights = potree().getdefaultrights()
+                else:
+                    rights = getattr(rightstree, "default", None)
+            else:
+                return rights
+        rights = [right.strip() for right in rights.split(",")]
+        if session is not None and session.issiteadmin():
+            if "admin" not in rights:
+                rights.append("admin")
         return rights
-    rights = [right.strip() for right in rights.split(",")]
-    if session is not None and session.issiteadmin():
-      if "admin" not in rights:
-        rights.append("admin")
-    return rights
 
-  def getuserswithinterest(self, session): # FIXME Returns prefs instead of userwrapper
-    """returns all the users who registered for this language and project"""
+    def getuserswithinterest(self, session): # FIXME Returns prefs instead of userwrapper
+        """returns all the users who registered for this language and project"""
 
-    def usableuser(user, userprefs):
-      if user in ["__dummy__", "default", "nobody"]:
-        return False
-      return self.language.code in getattr(userprefs, "languages", [])
+        def usableuser(user, userprefs):
+            if user in ["__dummy__", "default", "nobody"]:
+                return False
+            return self.language.code in getattr(userprefs, "languages", [])
 
-    users = {}
-    for username, userprefs in session.loginchecker.users.iteritems():
-      if usableuser(username, userprefs):
-        # Let's build a nice descriptive name for use in the interface. It will
-        # contain both the username and the full name, if available.
-        name = getattr(userprefs, "name", None)
-        if name:
-          description = "%s (%s)" % (name, username)
-        else:
-          description = username
-        setattr(userprefs, "description", description)
-        users[username] = userprefs
-    return users
+        users = {}
+        for username, userprefs in session.loginchecker.users.iteritems():
+            if usableuser(username, userprefs):
+                # Let's build a nice descriptive name for use in the interface. It will
+                # contain both the username and the full name, if available.
+                name = getattr(userprefs, "name", None)
+                if name:
+                    description = "%s (%s)" % (name, username)
+                else:
+                    description = username
+                setattr(userprefs, "description", description)
+                users[username] = userprefs
+        return users
 
-  def getuserswithrights(self):
-    """gets all users that have rights defined for this project"""
-    return [username for username, user_rights in getattr(self.prefs, "rights", {}).iteritems()]
+    def getuserswithrights(self):
+        """gets all users that have rights defined for this project"""
+        return [username for username, user_rights in getattr(self.prefs, "rights", {}).iteritems()]
 
-  def setrights(self, username, rights):
-    """sets the rights for the given username... (or not-logged-in if username is None)"""
-    if username is None: username = "nobody"
-    if isinstance(rights, list):
-      rights = ", ".join(rights)
-    if not hasattr(self.prefs, "rights"):
-      self.prefs.rights = prefs.PrefNode(self.prefs, "rights")
-    self.prefs.rights.__setattr__(username, rights)
-    self.saveprefs()
+    def setrights(self, username, rights):
+        """sets the rights for the given username... (or not-logged-in if username is None)"""
+        if username is None: username = "nobody"
+        if isinstance(rights, list):
+            rights = ", ".join(rights)
+        if not hasattr(self.prefs, "rights"):
+            self.prefs.rights = prefs.PrefNode(self.prefs, "rights")
+        self.prefs.rights.__setattr__(username, rights)
+        self.saveprefs()
 
-  def delrights(self, session, username):
-    """deletes teh rights for the given username"""
-    # l10n: Don't translate "nobody" or "default"
-    if username == "nobody" or username == "default":
-      # l10n: Don't translate "nobody" or "default"
-      raise RightsError(session.localize('You cannot remove the "nobody" or "default" user'))
-    self.prefs.rights.__delattr__(username)
-    self.saveprefs()
+    def delrights(self, session, username):
+        """deletes teh rights for the given username"""
+        # l10n: Don't translate "nobody" or "default"
+        if username == "nobody" or username == "default":
+            # l10n: Don't translate "nobody" or "default"
+            raise RightsError(session.localize('You cannot remove the "nobody" or "default" user'))
+        self.prefs.rights.__delattr__(username)
+        self.saveprefs()
 
-  def getgoalnames(self):
-    """gets the goals and associated files for the project"""
-    goals = getattr(self.prefs, "goals", {})
-    goallist = []
-    for goalname, goalnode in goals.iteritems():
-      goallist.append(goalname.decode("utf-8"))
-    goallist.sort()
-    return goallist
+    def getgoalnames(self):
+        """gets the goals and associated files for the project"""
+        goals = getattr(self.prefs, "goals", {})
+        goallist = []
+        for goalname, goalnode in goals.iteritems():
+            goallist.append(goalname.decode("utf-8"))
+        goallist.sort()
+        return goallist
 
-  def getgoals(self):
-    """gets the goal, goalnode tuples"""
-    goals = getattr(self.prefs, "goals", {})
-    newgoals = {}
-    for goalname, goalnode in goals.iteritems():
-      newgoals[goalname.decode("utf-8")] = goalnode
-    return newgoals
-    
-  def getgoalfiles(self, goalname, dirfilter=None, maxdepth=None, includedirs=True, expanddirs=False, includepartial=False):
-    """gets the files for the given goal, with many options!
-    dirfilter limits to files in a certain subdirectory
-    maxdepth limits to files / directories of a certain depth
-    includedirs specifies whether to return directory names
-    expanddirs specifies whether to expand directories and return all files in them
-    includepartial specifies whether to return directories that are not in the goal, but have files below maxdepth in the goal"""
-    if not goalname:
-      return self.getnogoalfiles(dirfilter=dirfilter, maxdepth=maxdepth, includedirs=includedirs, expanddirs=expanddirs)
-    goals = getattr(self.prefs, "goals", {})
-    poext = os.extsep + self.fileext
-    pathsep = os.path.sep
-    unique = lambda filelist: dict.fromkeys(filelist).keys()
-    for testgoalname, goalnode in self.getgoals().iteritems():
-      if goalname != testgoalname: continue
-      goalmembers = getattr(goalnode, "files", "")
-      goalmembers = [goalfile.strip() for goalfile in goalmembers.split(",") if goalfile.strip()]
-      goaldirs = [goaldir for goaldir in goalmembers if goaldir.endswith(pathsep)]
-      goalfiles = [goalfile for goalfile in goalmembers if not goalfile.endswith(pathsep) and goalfile in self.pofilenames]
-      if expanddirs:
-        expandgoaldirs = []
-        expandgoalfiles = []
-        for goaldir in goaldirs:
-          expandedfiles = self.browsefiles(dirfilter=goaldir, includedirs=includedirs, includefiles=True)
-          expandgoalfiles.extend([expandfile for expandfile in expandedfiles if expandfile.endswith(poext)])
-          expandgoaldirs.extend([expanddir + pathsep for expanddir in expandedfiles if not expanddir.endswith(poext)])
-        goaldirs = unique(goaldirs + expandgoaldirs)
-        goalfiles = unique(goalfiles + expandgoalfiles)
-      if dirfilter:
-        if not dirfilter.endswith(pathsep) and not dirfilter.endswith(poext):
-          dirfilter += pathsep
-        goalfiles = [goalfile for goalfile in goalfiles if goalfile.startswith(dirfilter)]
-        goaldirs = [goaldir for goaldir in goaldirs if goaldir.startswith(dirfilter)]
-      if maxdepth is not None:
-        if includepartial:
-          partialdirs = [goalfile for goalfile in goalfiles if goalfile.count(pathsep) > maxdepth]
-          partialdirs += [goalfile for goalfile in goaldirs if goalfile.count(pathsep) > maxdepth]
-          makepartial = lambda goalfile: pathsep.join(goalfile.split(pathsep)[:maxdepth+1])+pathsep
-          partialdirs = [makepartial(goalfile) for goalfile in partialdirs]
-        goalfiles = [goalfile for goalfile in goalfiles if goalfile.count(pathsep) <= maxdepth]
-        goaldirs = [goaldir for goaldir in goaldirs if goaldir.count(pathsep) <= maxdepth+1]
-        if includepartial:
-          goaldirs += partialdirs
-      if includedirs:
-        return unique(goalfiles + goaldirs)
-      else:
-        return unique(goalfiles)
-    return []
+    def getgoals(self):
+        """gets the goal, goalnode tuples"""
+        goals = getattr(self.prefs, "goals", {})
+        newgoals = {}
+        for goalname, goalnode in goals.iteritems():
+            newgoals[goalname.decode("utf-8")] = goalnode
+        return newgoals
+        
+    def getgoalfiles(self, goalname, dirfilter=None, maxdepth=None, includedirs=True, expanddirs=False, includepartial=False):
+        """gets the files for the given goal, with many options!
+        dirfilter limits to files in a certain subdirectory
+        maxdepth limits to files / directories of a certain depth
+        includedirs specifies whether to return directory names
+        expanddirs specifies whether to expand directories and return all files in them
+        includepartial specifies whether to return directories that are not in the goal, but have files below maxdepth in the goal"""
+        if not goalname:
+            return self.getnogoalfiles(dirfilter=dirfilter, maxdepth=maxdepth, includedirs=includedirs, expanddirs=expanddirs)
+        goals = getattr(self.prefs, "goals", {})
+        poext = os.extsep + self.fileext
+        pathsep = os.path.sep
+        unique = lambda filelist: dict.fromkeys(filelist).keys()
+        for testgoalname, goalnode in self.getgoals().iteritems():
+            if goalname != testgoalname: continue
+            goalmembers = getattr(goalnode, "files", "")
+            goalmembers = [goalfile.strip() for goalfile in goalmembers.split(",") if goalfile.strip()]
+            goaldirs = [goaldir for goaldir in goalmembers if goaldir.endswith(pathsep)]
+            goalfiles = [goalfile for goalfile in goalmembers if not goalfile.endswith(pathsep) and goalfile in self.pofilenames]
+            if expanddirs:
+                expandgoaldirs = []
+                expandgoalfiles = []
+                for goaldir in goaldirs:
+                    expandedfiles = self.browsefiles(dirfilter=goaldir, includedirs=includedirs, includefiles=True)
+                    expandgoalfiles.extend([expandfile for expandfile in expandedfiles if expandfile.endswith(poext)])
+                    expandgoaldirs.extend([expanddir + pathsep for expanddir in expandedfiles if not expanddir.endswith(poext)])
+                goaldirs = unique(goaldirs + expandgoaldirs)
+                goalfiles = unique(goalfiles + expandgoalfiles)
+            if dirfilter:
+                if not dirfilter.endswith(pathsep) and not dirfilter.endswith(poext):
+                    dirfilter += pathsep
+                goalfiles = [goalfile for goalfile in goalfiles if goalfile.startswith(dirfilter)]
+                goaldirs = [goaldir for goaldir in goaldirs if goaldir.startswith(dirfilter)]
+            if maxdepth is not None:
+                if includepartial:
+                    partialdirs = [goalfile for goalfile in goalfiles if goalfile.count(pathsep) > maxdepth]
+                    partialdirs += [goalfile for goalfile in goaldirs if goalfile.count(pathsep) > maxdepth]
+                    makepartial = lambda goalfile: pathsep.join(goalfile.split(pathsep)[:maxdepth+1])+pathsep
+                    partialdirs = [makepartial(goalfile) for goalfile in partialdirs]
+                goalfiles = [goalfile for goalfile in goalfiles if goalfile.count(pathsep) <= maxdepth]
+                goaldirs = [goaldir for goaldir in goaldirs if goaldir.count(pathsep) <= maxdepth+1]
+                if includepartial:
+                    goaldirs += partialdirs
+            if includedirs:
+                return unique(goalfiles + goaldirs)
+            else:
+                return unique(goalfiles)
+        return []
 
-  def getnogoalfiles(self, dirfilter=None, maxdepth=None, includedirs=True, expanddirs=False):
-    """Returns the files that are not in a goal. This works with getgoalfiles
-    and therefre the API resembles that closely"""
-    all = self.browsefiles(dirfilter=dirfilter, maxdepth=maxdepth, includedirs=includedirs)
-    pathsep = os.path.sep
-    for testgoalname in self.getgoals():
-      goalfiles = self.getgoalfiles(testgoalname, dirfilter=dirfilter, maxdepth=maxdepth, includedirs=includedirs, expanddirs=expanddirs, includepartial=False)
-      for goalfile in goalfiles:
-        if goalfile.endswith(pathsep):
-          goalfile = goalfile[:-len(pathsep)]
-        all.remove(goalfile)
-    return all
+    def getnogoalfiles(self, dirfilter=None, maxdepth=None, includedirs=True, expanddirs=False):
+        """Returns the files that are not in a goal. This works with getgoalfiles
+        and therefre the API resembles that closely"""
+        all = self.browsefiles(dirfilter=dirfilter, maxdepth=maxdepth, includedirs=includedirs)
+        pathsep = os.path.sep
+        for testgoalname in self.getgoals():
+            goalfiles = self.getgoalfiles(testgoalname, dirfilter=dirfilter, maxdepth=maxdepth, includedirs=includedirs, expanddirs=expanddirs, includepartial=False)
+            for goalfile in goalfiles:
+                if goalfile.endswith(pathsep):
+                    goalfile = goalfile[:-len(pathsep)]
+                all.remove(goalfile)
+        return all
 
-  def getancestry(self, filename):
-    """returns parent directories of the file"""
-    ancestry = []
-    parts = filename.split(os.path.sep)
-    for i in range(1, len(parts)):
-      ancestor = os.path.join(*parts[:i]) + os.path.sep
-      ancestry.append(ancestor)
-    return ancestry
+    def getancestry(self, filename):
+        """returns parent directories of the file"""
+        ancestry = []
+        parts = filename.split(os.path.sep)
+        for i in range(1, len(parts)):
+            ancestor = os.path.join(*parts[:i]) + os.path.sep
+            ancestry.append(ancestor)
+        return ancestry
 
-  def getfilegoals(self, filename):
-    """gets the goals the given file is part of"""
-    goals = self.getgoals()
-    filegoals = []
-    ancestry = self.getancestry(filename)
-    for goalname, goalnode in goals.iteritems():
-      goalfiles = getattr(goalnode, "files", "")
-      goalfiles = [goalfile.strip() for goalfile in goalfiles.split(",") if goalfile.strip()]
-      if filename in goalfiles:
-        filegoals.append(goalname)
-        continue
-      for ancestor in ancestry:
-        if ancestor in goalfiles:
-          filegoals.append(goalname)
-          continue
-    return filegoals
+    def getfilegoals(self, filename):
+        """gets the goals the given file is part of"""
+        goals = self.getgoals()
+        filegoals = []
+        ancestry = self.getancestry(filename)
+        for goalname, goalnode in goals.iteritems():
+            goalfiles = getattr(goalnode, "files", "")
+            goalfiles = [goalfile.strip() for goalfile in goalfiles.split(",") if goalfile.strip()]
+            if filename in goalfiles:
+                filegoals.append(goalname)
+                continue
+            for ancestor in ancestry:
+                if ancestor in goalfiles:
+                    filegoals.append(goalname)
+                    continue
+        return filegoals
 
-  def setfilegoals(self, session, goalnames, filename):
-    """sets the given file to belong to the given goals exactly"""
-    filegoals = self.getfilegoals(filename)
-    for othergoalname in filegoals:
-      if othergoalname not in goalnames:
-        self.removefilefromgoal(session, othergoalname, filename)
-    for goalname in goalnames:
-      goalfiles = self.getgoalfiles(goalname)
-      if filename not in goalfiles:
-        goalfiles.append(filename)
-        self.setgoalfiles(session, goalname, goalfiles)
+    def setfilegoals(self, session, goalnames, filename):
+        """sets the given file to belong to the given goals exactly"""
+        filegoals = self.getfilegoals(filename)
+        for othergoalname in filegoals:
+            if othergoalname not in goalnames:
+                self.removefilefromgoal(session, othergoalname, filename)
+        for goalname in goalnames:
+            goalfiles = self.getgoalfiles(goalname)
+            if filename not in goalfiles:
+                goalfiles.append(filename)
+                self.setgoalfiles(session, goalname, goalfiles)
 
-  def removefilefromgoal(self, session, goalname, filename):
-    """removes the given file from the goal"""
-    goalfiles = self.getgoalfiles(goalname)
-    if filename in goalfiles:
-      goalfiles.remove(filename)
-      self.setgoalfiles(session, goalname, goalfiles)
-    else:
-      unique = lambda filelist: dict.fromkeys(filelist).keys()
-      ancestry = self.getancestry(filename)
-      for ancestor in ancestry:
-        if ancestor in goalfiles:
-          filedepth = filename.count(os.path.sep)
-          ancestordirs = self.getgoalfiles(goalname, ancestor, maxdepth=filedepth+1, includedirs=True, expanddirs=True)
-          ancestordirs = [ancestorfile for ancestorfile in ancestordirs if ancestorfile.endswith(os.path.sep)]
-          if filename.endswith(os.path.sep):
-            ancestorfiles = self.getgoalfiles(goalname, ancestor, maxdepth=filedepth-1, expanddirs=True)
-          else:
-            ancestorfiles = self.getgoalfiles(goalname, ancestor, maxdepth=filedepth, expanddirs=True)
-          ancestorfiles = unique(ancestordirs + ancestorfiles)
-          if not filename in ancestorfiles:
-            raise KeyError("expected to find file %s in ancestor %s files %r" % (filename, ancestor, ancestorfiles))
-          ancestorfiles.remove(filename)
-          ancestorfiles.remove(ancestor)
-          goalfiles.remove(ancestor)
-          goalfiles.extend(ancestorfiles)
-          self.setgoalfiles(session, goalname, goalfiles)
-          continue
+    def removefilefromgoal(self, session, goalname, filename):
+        """removes the given file from the goal"""
+        goalfiles = self.getgoalfiles(goalname)
+        if filename in goalfiles:
+            goalfiles.remove(filename)
+            self.setgoalfiles(session, goalname, goalfiles)
+        else:
+            unique = lambda filelist: dict.fromkeys(filelist).keys()
+            ancestry = self.getancestry(filename)
+            for ancestor in ancestry:
+                if ancestor in goalfiles:
+                    filedepth = filename.count(os.path.sep)
+                    ancestordirs = self.getgoalfiles(goalname, ancestor, maxdepth=filedepth+1, includedirs=True, expanddirs=True)
+                    ancestordirs = [ancestorfile for ancestorfile in ancestordirs if ancestorfile.endswith(os.path.sep)]
+                    if filename.endswith(os.path.sep):
+                        ancestorfiles = self.getgoalfiles(goalname, ancestor, maxdepth=filedepth-1, expanddirs=True)
+                    else:
+                        ancestorfiles = self.getgoalfiles(goalname, ancestor, maxdepth=filedepth, expanddirs=True)
+                    ancestorfiles = unique(ancestordirs + ancestorfiles)
+                    if not filename in ancestorfiles:
+                        raise KeyError("expected to find file %s in ancestor %s files %r" % (filename, ancestor, ancestorfiles))
+                    ancestorfiles.remove(filename)
+                    ancestorfiles.remove(ancestor)
+                    goalfiles.remove(ancestor)
+                    goalfiles.extend(ancestorfiles)
+                    self.setgoalfiles(session, goalname, goalfiles)
+                    continue
 
-  def setgoalfiles(self, session, goalname, goalfiles):
-    """sets the goalfiles for the given goalname"""
-    if "admin" not in self.getrights(session):
-      raise RightsError(session.localize("You do not have rights to alter goals here"))
-    if isinstance(goalfiles, list):
-      goalfiles = [goalfile.strip() for goalfile in goalfiles if goalfile.strip()]
-      goalfiles.sort()
-      goalfiles = ", ".join(goalfiles)
-    if not hasattr(self.prefs, "goals"):
-      self.prefs.goals = prefs.PrefNode(self.prefs, "goals")
-    goals = self.getgoals()
-    goalname = goalname.encode("utf-8")
-    if not goalname in goals:
-      # TODO: check that its a valid goalname (alphanumeric etc)
-      self.prefs.goals.__setattr__(goalname, prefs.PrefNode(self.prefs.goals, goalname))
-    goalnode = self.prefs.goals.__getattr__(goalname)
-    goalnode.files = goalfiles
-    self.saveprefs()
+    def setgoalfiles(self, session, goalname, goalfiles):
+        """sets the goalfiles for the given goalname"""
+        if "admin" not in self.getrights(session):
+            raise RightsError(session.localize("You do not have rights to alter goals here"))
+        if isinstance(goalfiles, list):
+            goalfiles = [goalfile.strip() for goalfile in goalfiles if goalfile.strip()]
+            goalfiles.sort()
+            goalfiles = ", ".join(goalfiles)
+        if not hasattr(self.prefs, "goals"):
+            self.prefs.goals = prefs.PrefNode(self.prefs, "goals")
+        goals = self.getgoals()
+        goalname = goalname.encode("utf-8")
+        if not goalname in goals:
+            # TODO: check that its a valid goalname (alphanumeric etc)
+            self.prefs.goals.__setattr__(goalname, prefs.PrefNode(self.prefs.goals, goalname))
+        goalnode = self.prefs.goals.__getattr__(goalname)
+        goalnode.files = goalfiles
+        self.saveprefs()
 
-  def getgoalusers(self, goalname):
-    """gets the users for the given goal"""
-    goals = self.getgoals()
-    for testgoalname, goalnode in goals.iteritems():
-      if goalname != testgoalname: continue
-      goalusers = getattr(goalnode, "users", "")
-      goalusers = [goaluser.strip() for goaluser in goalusers.split(",") if goaluser.strip()]
-      return goalusers
-    return []
+    def getgoalusers(self, goalname):
+        """gets the users for the given goal"""
+        goals = self.getgoals()
+        for testgoalname, goalnode in goals.iteritems():
+            if goalname != testgoalname: continue
+            goalusers = getattr(goalnode, "users", "")
+            goalusers = [goaluser.strip() for goaluser in goalusers.split(",") if goaluser.strip()]
+            return goalusers
+        return []
 
-  def getusergoals(self, username):
-    """gets the goals the given user is part of"""
-    goals = getattr(self.prefs, "goals", {})
-    usergoals = []
-    for goalname, goalnode in goals.iteritems():
-      goalusers = getattr(goalnode, "users", "")
-      goalusers = [goaluser.strip() for goaluser in goalusers.split(",") if goaluser.strip()]
-      if username in goalusers:
-        usergoals.append(goalname)
-        continue
-    return usergoals
+    def getusergoals(self, username):
+        """gets the goals the given user is part of"""
+        goals = getattr(self.prefs, "goals", {})
+        usergoals = []
+        for goalname, goalnode in goals.iteritems():
+            goalusers = getattr(goalnode, "users", "")
+            goalusers = [goaluser.strip() for goaluser in goalusers.split(",") if goaluser.strip()]
+            if username in goalusers:
+                usergoals.append(goalname)
+                continue
+        return usergoals
 
-  def addusertogoal(self, session, goalname, username, exclusive=False):
-    """adds the given user to the goal"""
-    if exclusive:
-      usergoals = self.getusergoals(username)
-      for othergoalname in usergoals:
-        if othergoalname != goalname:
-          self.removeuserfromgoal(session, othergoalname, username)
-    goalusers = self.getgoalusers(goalname)
-    if username not in goalusers:
-      goalusers.append(username)
-      self.setgoalusers(session, goalname, goalusers)
+    def addusertogoal(self, session, goalname, username, exclusive=False):
+        """adds the given user to the goal"""
+        if exclusive:
+            usergoals = self.getusergoals(username)
+            for othergoalname in usergoals:
+                if othergoalname != goalname:
+                    self.removeuserfromgoal(session, othergoalname, username)
+        goalusers = self.getgoalusers(goalname)
+        if username not in goalusers:
+            goalusers.append(username)
+            self.setgoalusers(session, goalname, goalusers)
 
-  def removeuserfromgoal(self, session, goalname, username):
-    """removes the given user from the goal"""
-    goalusers = self.getgoalusers(goalname)
-    if username in goalusers:
-      goalusers.remove(username)
-      self.setgoalusers(session, goalname, goalusers)
+    def removeuserfromgoal(self, session, goalname, username):
+        """removes the given user from the goal"""
+        goalusers = self.getgoalusers(goalname)
+        if username in goalusers:
+            goalusers.remove(username)
+            self.setgoalusers(session, goalname, goalusers)
 
-  def setgoalusers(self, session, goalname, goalusers):
-    """sets the goalusers for the given goalname"""
-    if isinstance(goalname, unicode):
-      goalname = goalname.encode('utf-8')
-    if "admin" not in self.getrights(session):
-      raise RightsError(session.localize("You do not have rights to alter goals here"))
-    if isinstance(goalusers, list):
-      goalusers = [goaluser.strip() for goaluser in goalusers if goaluser.strip()]
-      goalusers = ", ".join(goalusers)
-    if not hasattr(self.prefs, "goals"):
-      self.prefs.goals = prefs.PrefNode(self.prefs, "goals")
-    if not hasattr(self.prefs.goals, goalname):
-      self.prefs.goals.__setattr__(goalname, prefs.PrefNode(self.prefs.goals, goalname))
-    goalnode = self.prefs.goals.__getattr__(goalname)
-    goalnode.users = goalusers
-    self.saveprefs()
+    def setgoalusers(self, session, goalname, goalusers):
+        """sets the goalusers for the given goalname"""
+        if isinstance(goalname, unicode):
+            goalname = goalname.encode('utf-8')
+        if "admin" not in self.getrights(session):
+            raise RightsError(session.localize("You do not have rights to alter goals here"))
+        if isinstance(goalusers, list):
+            goalusers = [goaluser.strip() for goaluser in goalusers if goaluser.strip()]
+            goalusers = ", ".join(goalusers)
+        if not hasattr(self.prefs, "goals"):
+            self.prefs.goals = prefs.PrefNode(self.prefs, "goals")
+        if not hasattr(self.prefs.goals, goalname):
+            self.prefs.goals.__setattr__(goalname, prefs.PrefNode(self.prefs.goals, goalname))
+        goalnode = self.prefs.goals.__getattr__(goalname)
+        goalnode.users = goalusers
+        self.saveprefs()
 
-  def scanpofiles(self):
-    """sets the list of pofilenames by scanning the project directory"""
-    self.pofilenames = potree().getpofiles(self.language.code, self.project.code, poext=self.fileext)
-    for pofilename in self.pofilenames:
-      if not pofilename in self.pofiles:
-        self.pofiles[pofilename] = pootlefile.pootlefile(self, pofilename)
-    # remove any files that have been deleted since initialization
-    for pofilename in self.pofiles.keys():
-      if not pofilename in self.pofilenames:
-        del self.pofiles[pofilename]
+    def scanpofiles(self):
+        """sets the list of pofilenames by scanning the project directory"""
+        self.pofilenames = potree().getpofiles(self.language.code, self.project.code, poext=self.fileext)
+        for pofilename in self.pofilenames:
+            if not pofilename in self.pofiles:
+                self.pofiles[pofilename] = pootlefile.pootlefile(self, pofilename)
+        # remove any files that have been deleted since initialization
+        for pofilename in self.pofiles.keys():
+            if not pofilename in self.pofilenames:
+                del self.pofiles[pofilename]
 
-  def getuploadpath(self, dirname, localfilename):
-    """gets the path of a translation file being uploaded securely, creating directories as neccessary"""
-    if os.path.isabs(dirname) or dirname.startswith("."):
-      raise ValueError("invalid/insecure file path: %s" % dirname)
-    if os.path.basename(localfilename) != localfilename or localfilename.startswith("."):
-      raise ValueError("invalid/insecure file name: %s" % localfilename)
-    if self.filestyle == "gnu":
-      if not potree().languagematch(self.language.code, localfilename[:-len("."+self.fileext)]):
-        raise ValueError("invalid GNU-style file name %s: must match '%s.%s' or '%s[_-][A-Z]{2,3}.%s'" % (localfilename, self.fileext, self.language.code, self.language.code, self.fileext))
-    dircheck = self.podir
-    for part in dirname.split(os.sep):
-      dircheck = os.path.join(dircheck, part)
-      if dircheck and not os.path.isdir(dircheck):
-        os.mkdir(dircheck)
-    return os.path.join(self.podir, dirname, localfilename)
+    def getuploadpath(self, dirname, localfilename):
+        """gets the path of a translation file being uploaded securely, creating directories as neccessary"""
+        if os.path.isabs(dirname) or dirname.startswith("."):
+            raise ValueError("invalid/insecure file path: %s" % dirname)
+        if os.path.basename(localfilename) != localfilename or localfilename.startswith("."):
+            raise ValueError("invalid/insecure file name: %s" % localfilename)
+        if self.filestyle == "gnu":
+            if not potree().languagematch(self.language.code, localfilename[:-len("."+self.fileext)]):
+                raise ValueError("invalid GNU-style file name %s: must match '%s.%s' or '%s[_-][A-Z]{2,3}.%s'" % (localfilename, self.fileext, self.language.code, self.language.code, self.fileext))
+        dircheck = self.podir
+        for part in dirname.split(os.sep):
+            dircheck = os.path.join(dircheck, part)
+            if dircheck and not os.path.isdir(dircheck):
+                os.mkdir(dircheck)
+        return os.path.join(self.podir, dirname, localfilename)
 
-  def uploadfile(self, session, dirname, filename, contents, overwrite=False):
-    """uploads an individual file"""
-    pathname = self.getuploadpath(dirname, filename)
-    for extention in ["xliff", "xlf", "xlff"]:
-      if filename.endswith(extention):
-        pofilename = filename[:-len(os.extsep+extention)] + os.extsep + self.fileext
-        popathname = self.getuploadpath(dirname, pofilename)
-        break
-    else:
-      pofilename = filename
-      popathname = pathname
+    def uploadfile(self, session, dirname, filename, contents, overwrite=False):
+        """uploads an individual file"""
+        pathname = self.getuploadpath(dirname, filename)
+        for extention in ["xliff", "xlf", "xlff"]:
+            if filename.endswith(extention):
+                pofilename = filename[:-len(os.extsep+extention)] + os.extsep + self.fileext
+                popathname = self.getuploadpath(dirname, pofilename)
+                break
+        else:
+            pofilename = filename
+            popathname = pathname
 
-    rights = self.getrights(session)
+        rights = self.getrights(session)
 
-    if os.path.exists(popathname) and not overwrite:
-      origpofile = self.getpofile(os.path.join(dirname, pofilename))
-      newfileclass = factory.getclass(pathname)
-      infile = cStringIO.StringIO(contents)
-      newfile = newfileclass.parsefile(infile)
-      if "admin" in rights:
-        origpofile.mergefile(newfile, session.username)
-      elif "translate" in rights:
-        origpofile.mergefile(newfile, session.username, allownewstrings=False)
-      else:
-        raise RightsError(session.localize("You do not have rights to upload files here"))
-    else:
-      if overwrite and not ("admin" in rights or "overwrite" in rights):
-        raise RightsError(session.localize("You do not have rights to overwrite files here"))
-      elif not os.path.exists(popathname) and not ("admin" in rights or "overwrite" in rights):
-        raise RightsError(session.localize("You do not have rights to upload new files here"))
-      outfile = open(popathname, "wb")
-      outfile.write(contents)
-      outfile.close()
-      self.scanpofiles()
-
-  def updatepofile(self, session, dirname, pofilename):
-    """updates an individual PO file from version control"""
-    if "admin" not in self.getrights(session):
-      raise RightsError(session.localize("You do not have rights to update files here"))
-    pathname = self.getuploadpath(dirname, pofilename)
-    # read from version control
-    if os.path.exists(pathname):
-      popath = os.path.join(dirname, pofilename)
-      currentpofile = self.getpofile(popath)
-      # reading BASE version of file
-      origcontents = versioncontrol.getcleanfile(pathname, "BASE")
-      origpofile = pootlefile.pootlefile(self, popath)
-      originfile = cStringIO.StringIO(origcontents)
-      origpofile.parse(originfile)
-      # matching current file with BASE version
-      matches = origpofile.matchitems(currentpofile, uselocations=False)
-      # TODO: add some locking here...
-      # reading new version of file
-      versioncontrol.updatefile(pathname)
-      newpofile = pootlefile.pootlefile(self, popath)
-      newpofile.pofreshen()
-      if not hasattr(newpofile, "sourceindex"):
-        newpofile.makeindex()
-      newmatches = []
-      # sorting through old matches
-      for origpo, localpo in matches:
-        # we need to find the corresponding newpo to see what to merge
-        if localpo is None:
-          continue
-        if origpo is None:
-          # if it wasn't in the original, then use the addition for searching
-          origpo = localpo
+        if os.path.exists(popathname) and not overwrite:
+            origpofile = self.getpofile(os.path.join(dirname, pofilename))
+            newfileclass = factory.getclass(pathname)
+            infile = cStringIO.StringIO(contents)
+            newfile = newfileclass.parsefile(infile)
+            if "admin" in rights:
+                origpofile.mergefile(newfile, session.username)
+            elif "translate" in rights:
+                origpofile.mergefile(newfile, session.username, allownewstrings=False)
+            else:
+                raise RightsError(session.localize("You do not have rights to upload files here"))
         else:
-          origmsgstr = origpo.target
-          localmsgstr = localpo.target
-          if origmsgstr == localmsgstr:
-            continue
+            if overwrite and not ("admin" in rights or "overwrite" in rights):
+                raise RightsError(session.localize("You do not have rights to overwrite files here"))
+            elif not os.path.exists(popathname) and not ("admin" in rights or "overwrite" in rights):
+                raise RightsError(session.localize("You do not have rights to upload new files here"))
+            outfile = open(popathname, "wb")
+            outfile.write(contents)
+            outfile.close()
+            self.scanpofiles()
 
-        # FIXME: Figure out what this block does and why usesources is undefined.
-        foundsource = False
-        if usesources:
-          for location in origpo.getlocations():
-            if location in newpofile.locationindex:
-              newpo = newpofile.locationindex[location]
-              if newpo is not None:
-                foundsource = True
-                newmatches.append((newpo, localpo))
-                continue
-        if not foundsource:
-          source = origpo.source.strings
-          if source in newpofile.sourceindex:
-            newpo = newpofile.sourceindex[source]
-            newmatches.append((newpo, localpo))
-          else:
-            newmatches.append((None, localpo))
-      # finding new matches
-      for newpo, localpo in newmatches:
-        if newpo is None:
-          # TODO: include localpo as obsolete
-          continue
-        if localpo is None:
-          continue
-        newpofile.mergeitem(newpo, localpo, "versionmerge")
-      # saving
-      newpofile.savepofile()
-      self.pofiles[pofilename] = newpofile
-      # recalculate everything
-      newpofile.readpofile()
-    else:
-      versioncontrol.updatefile(pathname)
-      self.scanpofiles()
+    def updatepofile(self, session, dirname, pofilename):
+        """updates an individual PO file from version control"""
+        if "admin" not in self.getrights(session):
+            raise RightsError(session.localize("You do not have rights to update files here"))
+        pathname = self.getuploadpath(dirname, pofilename)
+        # read from version control
+        if os.path.exists(pathname):
+            popath = os.path.join(dirname, pofilename)
+            currentpofile = self.getpofile(popath)
+            # reading BASE version of file
+            origcontents = versioncontrol.getcleanfile(pathname, "BASE")
+            origpofile = pootlefile.pootlefile(self, popath)
+            originfile = cStringIO.StringIO(origcontents)
+            origpofile.parse(originfile)
+            # matching current file with BASE version
+            matches = origpofile.matchitems(currentpofile, uselocations=False)
+            # TODO: add some locking here...
+            # reading new version of file
+            versioncontrol.updatefile(pathname)
+            newpofile = pootlefile.pootlefile(self, popath)
+            newpofile.pofreshen()
+            if not hasattr(newpofile, "sourceindex"):
+                newpofile.makeindex()
+            newmatches = []
+            # sorting through old matches
+            for origpo, localpo in matches:
+                # we need to find the corresponding newpo to see what to merge
+                if localpo is None:
+                    continue
+                if origpo is None:
+                    # if it wasn't in the original, then use the addition for searching
+                    origpo = localpo
+                else:
+                    origmsgstr = origpo.target
+                    localmsgstr = localpo.target
+                    if origmsgstr == localmsgstr:
+                        continue
 
-  def commitpofile(self, session, dirname, pofilename):
-    """commits an individual PO file to version control"""
-    if "commit" not in self.getrights(session):
-      raise RightsError(session.localize("You do not have rights to commit files here"))
-    pathname = self.getuploadpath(dirname, pofilename)
-    stats = self.getquickstats([pofilename])
-    statsstring = "%d of %d messages translated (%d fuzzy)." % \
-        (stats["translated"], stats["total"], stats["fuzzy"])
-    versioncontrol.commitfile(pathname, message="Commit from %s by user %s. %s" % 
-        (session.server.instance.title, session.username, statsstring))
+                # FIXME: Figure out what this block does and why usesources is undefined.
+                foundsource = False
+                if usesources:
+                    for location in origpo.getlocations():
+                        if location in newpofile.locationindex:
+                            newpo = newpofile.locationindex[location]
+                            if newpo is not None:
+                                foundsource = True
+                                newmatches.append((newpo, localpo))
+                                continue
+                if not foundsource:
+                    source = origpo.source.strings
+                    if source in newpofile.sourceindex:
+                        newpo = newpofile.sourceindex[source]
+                        newmatches.append((newpo, localpo))
+                    else:
+                        newmatches.append((None, localpo))
+            # finding new matches
+            for newpo, localpo in newmatches:
+                if newpo is None:
+                    # TODO: include localpo as obsolete
+                    continue
+                if localpo is None:
+                    continue
+                newpofile.mergeitem(newpo, localpo, "versionmerge")
+            # saving
+            newpofile.savepofile()
+            self.pofiles[pofilename] = newpofile
+            # recalculate everything
+            newpofile.readpofile()
+        else:
+            versioncontrol.updatefile(pathname)
+            self.scanpofiles()
 
-  def converttemplates(self, session):
-    """creates PO files from the templates"""
-    projectdir = os.path.join(potree().podirectory, self.project.code)
-    if not os.path.exists(projectdir):
-      os.mkdir(projectdir)
-    templatesdir = os.path.join(projectdir, "templates")
-    if not os.path.exists(templatesdir):
-      templatesdir = os.path.join(projectdir, "pot")
-      if not os.path.exists(templatesdir):
-        templatesdir = projectdir
-    if potree().isgnustyle(self.project.code):
-      self.filestyle = "gnu"
-    else:
-      self.filestyle = "std"
-    templates = potree().gettemplates(self.project.code)
-    if self.filestyle == "gnu":
-      self.podir = projectdir
-      if not templates:
-        raise NotImplementedError("Cannot create GNU-style translation project without templates")
-    else:
-      self.podir = os.path.join(projectdir, self.language.code)
-      if not os.path.exists(self.podir):
-        os.mkdir(self.podir)
-    for potfilename in templates:
-      inputfile = open(os.path.join(templatesdir, potfilename), "rb")
-      outputfile = cStringIO.StringIO()
-      if self.filestyle == "gnu":
-        pofilename = self.language.code + os.extsep + "po"
-      else:
-        pofilename = potfilename[:-len(os.extsep+"pot")] + os.extsep + "po"
-        pofilename = os.path.basename(pofilename)
-      origpofilename = os.path.join(self.podir, pofilename)
-      if os.path.exists(origpofilename):
-        origpofile = open(origpofilename)
-      else:
-        origpofile = None
-      pot2po.convertpot(inputfile, outputfile, origpofile)
-      dirname, potfilename = os.path.dirname(potfilename), os.path.basename(potfilename)
-      self.uploadfile(session, dirname, pofilename, outputfile.getvalue())
+    def commitpofile(self, session, dirname, pofilename):
+        """commits an individual PO file to version control"""
+        if "commit" not in self.getrights(session):
+            raise RightsError(session.localize("You do not have rights to commit files here"))
+        pathname = self.getuploadpath(dirname, pofilename)
+        stats = self.getquickstats([pofilename])
+        statsstring = "%d of %d messages translated (%d fuzzy)." % \
+                (stats["translated"], stats["total"], stats["fuzzy"])
+        versioncontrol.commitfile(pathname, message="Commit from %s by user %s. %s" % 
+                (session.server.instance.title, session.username, statsstring))
 
-  def filtererrorhandler(self, functionname, str1, str2, e):
-    print "error in filter %s: %r, %r, %s" % (functionname, str1, str2, e)
-    return False
+    def converttemplates(self, session):
+        """creates PO files from the templates"""
+        projectdir = os.path.join(potree().podirectory, self.project.code)
+        if not os.path.exists(projectdir):
+            os.mkdir(projectdir)
+        templatesdir = os.path.join(projectdir, "templates")
+        if not os.path.exists(templatesdir):
+            templatesdir = os.path.join(projectdir, "pot")
+            if not os.path.exists(templatesdir):
+                templatesdir = projectdir
+        if potree().isgnustyle(self.project.code):
+            self.filestyle = "gnu"
+        else:
+            self.filestyle = "std"
+        templates = potree().gettemplates(self.project.code)
+        if self.filestyle == "gnu":
+            self.podir = projectdir
+            if not templates:
+                raise NotImplementedError("Cannot create GNU-style translation project without templates")
+        else:
+            self.podir = os.path.join(projectdir, self.language.code)
+            if not os.path.exists(self.podir):
+                os.mkdir(self.podir)
+        for potfilename in templates:
+            inputfile = open(os.path.join(templatesdir, potfilename), "rb")
+            outputfile = cStringIO.StringIO()
+            if self.filestyle == "gnu":
+                pofilename = self.language.code + os.extsep + "po"
+            else:
+                pofilename = potfilename[:-len(os.extsep+"pot")] + os.extsep + "po"
+                pofilename = os.path.basename(pofilename)
+            origpofilename = os.path.join(self.podir, pofilename)
+            if os.path.exists(origpofilename):
+                origpofile = open(origpofilename)
+            else:
+                origpofile = None
+            pot2po.convertpot(inputfile, outputfile, origpofile)
+            dirname, potfilename = os.path.dirname(potfilename), os.path.basename(potfilename)
+            self.uploadfile(session, dirname, pofilename, outputfile.getvalue())
 
-  def getarchive(self, pofilenames):
-    """returns an archive of the given filenames"""
-    tempzipfile = os.tmpnam()
-    try:
-      # using zip command line is fast
-      os.system("cd %s ; zip -r - %s > %s" % (self.podir, " ".join(pofilenames), tempzipfile))
-      return open(tempzipfile, "r").read()
-    finally:
-      if os.path.exists(tempzipfile):
-        os.remove(tempzipfile)
-    # but if it doesn't work, we can do it from python
-    import zipfile
-    archivecontents = cStringIO.StringIO()
-    archive = zipfile.ZipFile(archivecontents, 'w', zipfile.ZIP_DEFLATED)
-    for pofilename in pofilenames:
-      pofile = self.getpofile(pofilename)
-      archive.write(pofile.filename, pofilename)
-    archive.close()
-    return archivecontents.getvalue()
+    def filtererrorhandler(self, functionname, str1, str2, e):
+        print "error in filter %s: %r, %r, %s" % (functionname, str1, str2, e)
+        return False
 
-  def uploadarchive(self, session, dirname, archivecontents):
-    """uploads the files inside the archive"""
-    try:
-      tempzipfile = os.tmpnam()
-      # using zip command line is fast
-      # os.system("cd %s ; zip -r - %s > %s" % (self.podir, " ".join(pofilenames), tempzipfile))
-      # return open(tempzipfile, "r").read()
-      pass
-    finally:
-      if os.path.exists(tempzipfile):
-        os.remove(tempzipfile)
-    # but if it doesn't work, we can do it from python
-    import zipfile
-    archivefile = cStringIO.StringIO(archivecontents)
-    archive = zipfile.ZipFile(archivefile, 'r')
-    # TODO: find a better way to return errors...
-    for filename in archive.namelist():
-      if not filename.endswith(os.extsep + self.fileext):
-        print "error adding %s: not a %s file" % (filename, os.extsep + self.fileext)
-        continue
-      contents = archive.read(filename)
-      subdirname, pofilename = os.path.dirname(filename), os.path.basename(filename)
-      try:
-        # TODO: use zipfile info to set the time and date of the file
-        self.uploadfile(session, os.path.join(dirname, subdirname), pofilename, contents)
-      except ValueError, e:
-        print "error adding %s" % filename, e
-        continue
-    archive.close()
+    def getarchive(self, pofilenames):
+        """returns an archive of the given filenames"""
+        tempzipfile = os.tmpnam()
+        try:
+            # using zip command line is fast
+            os.system("cd %s ; zip -r - %s > %s" % (self.podir, " ".join(pofilenames), tempzipfile))
+            return open(tempzipfile, "r").read()
+        finally:
+            if os.path.exists(tempzipfile):
+                os.remove(tempzipfile)
+        # but if it doesn't work, we can do it from python
+        import zipfile
+        archivecontents = cStringIO.StringIO()
+        archive = zipfile.ZipFile(archivecontents, 'w', zipfile.ZIP_DEFLATED)
+        for pofilename in pofilenames:
+            pofile = self.getpofile(pofilename)
+            archive.write(pofile.filename, pofilename)
+        archive.close()
+        return archivecontents.getvalue()
 
-  def ootemplate(self):
-    """Tests whether this project has an OpenOffice.org template SDF file in
-    the templates directory."""
-    projectdir = os.path.join(potree().podirectory, self.project.code)
-    templatefilename = os.path.join(projectdir, "templates", "en-US.sdf")
-    if os.path.exists(templatefilename):
-      return templatefilename
-    else:
-      return None
+    def uploadarchive(self, session, dirname, archivecontents):
+        """uploads the files inside the archive"""
+        try:
+            tempzipfile = os.tmpnam()
+            # using zip command line is fast
+            # os.system("cd %s ; zip -r - %s > %s" % (self.podir, " ".join(pofilenames), tempzipfile))
+            # return open(tempzipfile, "r").read()
+            pass
+        finally:
+            if os.path.exists(tempzipfile):
+                os.remove(tempzipfile)
+        # but if it doesn't work, we can do it from python
+        import zipfile
+        archivefile = cStringIO.StringIO(archivecontents)
+        archive = zipfile.ZipFile(archivefile, 'r')
+        # TODO: find a better way to return errors...
+        for filename in archive.namelist():
+            if not filename.endswith(os.extsep + self.fileext):
+                print "error adding %s: not a %s file" % (filename, os.extsep + self.fileext)
+                continue
+            contents = archive.read(filename)
+            subdirname, pofilename = os.path.dirname(filename), os.path.basename(filename)
+            try:
+                # TODO: use zipfile info to set the time and date of the file
+                self.uploadfile(session, os.path.join(dirname, subdirname), pofilename, contents)
+            except ValueError, e:
+                print "error adding %s" % filename, e
+                continue
+        archive.close()
 
-  def getoo(self):
-    """Returns an OpenOffice.org gsi file"""
-    #TODO: implement caching
-    templateoo = self.ootemplate()
-    if templateoo is None:
-      return
-    outputoo = os.path.join(self.podir, self.language.code + ".sdf")
-    inputdir = os.path.join(potree().podirectory, self.project.code, self.language.code)
-    po2oo.main(["-i%s"%inputdir, "-t%s"%templateoo, "-o%s"%outputoo, "-l%s"%self.language.code, "--progress=none"])
-    return file(os.path.join(self.podir, self.language.code + ".sdf"), "r").read()
+    def ootemplate(self):
+        """Tests whether this project has an OpenOffice.org template SDF file in
+        the templates directory."""
+        projectdir = os.path.join(potree().podirectory, self.project.code)
+        templatefilename = os.path.join(projectdir, "templates", "en-US.sdf")
+        if os.path.exists(templatefilename):
+            return templatefilename
+        else:
+            return None
 
-  def browsefiles(self, dirfilter=None, depth=None, maxdepth=None, includedirs=False, includefiles=True):
-    """gets a list of pofilenames, optionally filtering with the parent directory"""
-    if dirfilter is None:
-      pofilenames = self.pofilenames
-    else:
-      if not dirfilter.endswith(os.path.sep) and not dirfilter.endswith(os.extsep + self.fileext):
-        dirfilter += os.path.sep
-      pofilenames = [pofilename for pofilename in self.pofilenames if pofilename.startswith(dirfilter)]
-    if includedirs:
-      podirs = {}
-      for pofilename in pofilenames:
-        dirname = os.path.dirname(pofilename)
-        if not dirname:
-          continue
-        podirs[dirname] = True
-        while dirname:
-          dirname = os.path.dirname(dirname)
-          if dirname:
-            podirs[dirname] = True
-      podirs = podirs.keys()
-    else:
-      podirs = []
-    if not includefiles:
-      pofilenames = []
-    if maxdepth is not None:
-      pofilenames = [pofilename for pofilename in pofilenames if pofilename.count(os.path.sep) <= maxdepth]
-      podirs = [podir for podir in podirs if podir.count(os.path.sep) <= maxdepth]
-    if depth is not None:
-      pofilenames = [pofilename for pofilename in pofilenames if pofilename.count(os.path.sep) == depth]
-      podirs = [podir for podir in podirs if podir.count(os.path.sep) == depth]
-    return pofilenames + podirs
+    def getoo(self):
+        """Returns an OpenOffice.org gsi file"""
+        #TODO: implement caching
+        templateoo = self.ootemplate()
+        if templateoo is None:
+            return
+        outputoo = os.path.join(self.podir, self.language.code + ".sdf")
+        inputdir = os.path.join(potree().podirectory, self.project.code, self.language.code)
+        po2oo.main(["-i%s"%inputdir, "-t%s"%templateoo, "-o%s"%outputoo, "-l%s"%self.language.code, "--progress=none"])
+        return file(os.path.join(self.podir, self.language.code + ".sdf"), "r").read()
 
-  def iterpofilenames(self, lastpofilename=None, includelast=False):
-    """iterates through the pofilenames starting after the given pofilename"""
-    if not lastpofilename:
-      index = 0
-    else:
-      index = self.pofilenames.index(lastpofilename)
-      if not includelast:
-        index += 1
-    while index < len(self.pofilenames):
-      yield self.pofilenames[index]
-      index += 1
+    def browsefiles(self, dirfilter=None, depth=None, maxdepth=None, includedirs=False, includefiles=True):
+        """gets a list of pofilenames, optionally filtering with the parent directory"""
+        if dirfilter is None:
+            pofilenames = self.pofilenames
+        else:
+            if not dirfilter.endswith(os.path.sep) and not dirfilter.endswith(os.extsep + self.fileext):
+                dirfilter += os.path.sep
+            pofilenames = [pofilename for pofilename in self.pofilenames if pofilename.startswith(dirfilter)]
+        if includedirs:
+            podirs = {}
+            for pofilename in pofilenames:
+                dirname = os.path.dirname(pofilename)
+                if not dirname:
+                    continue
+                podirs[dirname] = True
+                while dirname:
+                    dirname = os.path.dirname(dirname)
+                    if dirname:
+                        podirs[dirname] = True
+            podirs = podirs.keys()
+        else:
+            podirs = []
+        if not includefiles:
+            pofilenames = []
+        if maxdepth is not None:
+            pofilenames = [pofilename for pofilename in pofilenames if pofilename.count(os.path.sep) <= maxdepth]
+            podirs = [podir for podir in podirs if podir.count(os.path.sep) <= maxdepth]
+        if depth is not None:
+            pofilenames = [pofilename for pofilename in pofilenames if pofilename.count(os.path.sep) == depth]
+            podirs = [podir for podir in podirs if podir.count(os.path.sep) == depth]
+        return pofilenames + podirs
 
-  def initindex(self):
-    """initializes the search index"""
-    if not indexer.HAVE_INDEXER:
-      return
-    self.indexdir = os.path.join(self.podir, ".poindex-%s-%s" % (self.project.code, self.language.code))
-    class indexconfig:
-      indexdir = self.indexdir
-    self.analyzer = indexer.PerFieldAnalyzer([("pofilename", indexer.ExactAnalyzer())])
-    self.indexer = indexer.Indexer(indexconfig, analyzer=self.analyzer)
-    self.searcher = indexer.Searcher(self.indexdir, analyzer=self.analyzer)
-    pofilenames = self.pofiles.keys()
-    pofilenames.sort()
-    for pofilename in pofilenames:
-      self.updateindex(pofilename, optimize=False)
-    self.indexer.optimizeIndex()
+    def iterpofilenames(self, lastpofilename=None, includelast=False):
+        """iterates through the pofilenames starting after the given pofilename"""
+        if not lastpofilename:
+            index = 0
+        else:
+            index = self.pofilenames.index(lastpofilename)
+            if not includelast:
+                index += 1
+        while index < len(self.pofilenames):
+            yield self.pofilenames[index]
+            index += 1
 
-  def updateindex(self, pofilename, items=None, optimize=True):
-    """updates the index with the contents of pofilename (limit to items if given)"""
-    if not indexer.HAVE_INDEXER:
-      return
-    pofile = self.pofiles[pofilename]
-    # check if the pomtime in the index == the latest pomtime
-    pomtime = statistics.getmodtime(pofile.filename)
-    pofilenamequery = self.searcher.makeQuery([("pofilename", pofilename)], True)
-    pomtimequery = self.searcher.makeQuery([("pomtime", str(pomtime))], True)
-    if items is not None:
-      itemsquery = self.searcher.makeQuery([("itemno", str(itemno)) for itemno in items], False)
-    gooditemsquery = self.searcher.makeQuery([pofilenamequery, pomtimequery], True)
-    gooditems = self.searcher.search(gooditemsquery, "itemno")
-    allitems = self.searcher.search(pofilenamequery, "itemno")
-    if items is None:
-      if len(gooditems) == len(allitems) == pofile.statistics.getitemslen():
-        return
-      print "updating", self.project.code, self.language.code, "index for", pofilename
-      self.searcher.deleteDoc({"pofilename": pofilename})
-    else:
-      print "updating", self.language.code, "index for", pofilename, "items", items
-      self.searcher.deleteDoc([pofilenamequery, itemsquery])
-    pofile.pofreshen()
-    addlist = []
-    if items is None:
-      items = range(len(pofile.transunits))
-    for itemno in items:
-      thepo = pofile.transunits[itemno]
-      doc = {"pofilename": pofilename, "pomtime": str(pomtime), "itemno": str(itemno)}
-      orig = "\n".join(thepo.source.strings)
-      trans = "\n".join(thepo.target.strings)
-      doc["msgid"] = orig
-      doc["msgstr"] = trans
-      addlist.append(doc)
-    if addlist:
-      self.indexer.startIndex()
-      try:
-        self.indexer.indexFields(addlist)
-      finally:
-        self.indexer.commitIndex(optimize=optimize)
+    def initindex(self):
+        """initializes the search index"""
+        if not indexer.HAVE_INDEXER:
+            return
+        self.indexdir = os.path.join(self.podir, ".poindex-%s-%s" % (self.project.code, self.language.code))
+        class indexconfig:
+            indexdir = self.indexdir
+        self.analyzer = indexer.PerFieldAnalyzer([("pofilename", indexer.ExactAnalyzer())])
+        self.indexer = indexer.Indexer(indexconfig, analyzer=self.analyzer)
+        self.searcher = indexer.Searcher(self.indexdir, analyzer=self.analyzer)
+        pofilenames = self.pofiles.keys()
+        pofilenames.sort()
+        for pofilename in pofilenames:
+            self.updateindex(pofilename, optimize=False)
+        self.indexer.optimizeIndex()
 
-  def matchessearch(self, pofilename, search):
-    """returns whether any items in the pofilename match the search (based on collected stats etc)"""
-    if search.dirfilter is not None and not pofilename.startswith(search.dirfilter):
-      return False
-    # search.assignedto == [None] means assigned to nobody
-    if search.assignedto or search.assignedaction:
-      if search.assignedto == [None]:
-        assigns = self.pofiles[pofilename].assigns.getunassigned(search.assignedaction)
-      else:
-        assigns = self.pofiles[pofilename].assigns.getassigns()
-        if search.assignedto is not None:
-          if search.assignedto not in assigns:
-            return False
-          assigns = assigns[search.assignedto]
+    def updateindex(self, pofilename, items=None, optimize=True):
+        """updates the index with the contents of pofilename (limit to items if given)"""
+        if not indexer.HAVE_INDEXER:
+            return
+        pofile = self.pofiles[pofilename]
+        # check if the pomtime in the index == the latest pomtime
+        pomtime = statistics.getmodtime(pofile.filename)
+        pofilenamequery = self.searcher.makeQuery([("pofilename", pofilename)], True)
+        pomtimequery = self.searcher.makeQuery([("pomtime", str(pomtime))], True)
+        if items is not None:
+            itemsquery = self.searcher.makeQuery([("itemno", str(itemno)) for itemno in items], False)
+        gooditemsquery = self.searcher.makeQuery([pofilenamequery, pomtimequery], True)
+        gooditems = self.searcher.search(gooditemsquery, "itemno")
+        allitems = self.searcher.search(pofilenamequery, "itemno")
+        if items is None:
+            if len(gooditems) == len(allitems) == pofile.statistics.getitemslen():
+                return
+            print "updating", self.project.code, self.language.code, "index for", pofilename
+            self.searcher.deleteDoc({"pofilename": pofilename})
         else:
-          assigns = reduce(lambda x, y: x+y, [userassigns.keys() for userassigns in assigns.values()], [])
-        if search.assignedaction is not None:
-          if search.assignedaction not in assigns:
+            print "updating", self.language.code, "index for", pofilename, "items", items
+            self.searcher.deleteDoc([pofilenamequery, itemsquery])
+        pofile.pofreshen()
+        addlist = []
+        if items is None:
+            items = range(len(pofile.transunits))
+        for itemno in items:
+            thepo = pofile.transunits[itemno]
+            doc = {"pofilename": pofilename, "pomtime": str(pomtime), "itemno": str(itemno)}
+            orig = "\n".join(thepo.source.strings)
+            trans = "\n".join(thepo.target.strings)
+            doc["msgid"] = orig
+            doc["msgstr"] = trans
+            addlist.append(doc)
+        if addlist:
+            self.indexer.startIndex()
+            try:
+                self.indexer.indexFields(addlist)
+            finally:
+                self.indexer.commitIndex(optimize=optimize)
+
+    def matchessearch(self, pofilename, search):
+        """returns whether any items in the pofilename match the search (based on collected stats etc)"""
+        if search.dirfilter is not None and not pofilename.startswith(search.dirfilter):
             return False
-    if search.matchnames:
-      postats = self.getpostats(pofilename)
-      matches = False
-      for name in search.matchnames:
-        if postats[name]:
-          matches = True
-      if not matches:
-        return False
-    return True
+        # search.assignedto == [None] means assigned to nobody
+        if search.assignedto or search.assignedaction:
+            if search.assignedto == [None]:
+                assigns = self.pofiles[pofilename].assigns.getunassigned(search.assignedaction)
+            else:
+                assigns = self.pofiles[pofilename].assigns.getassigns()
+                if search.assignedto is not None:
+                    if search.assignedto not in assigns:
+                        return False
+                    assigns = assigns[search.assignedto]
+                else:
+                    assigns = reduce(lambda x, y: x+y, [userassigns.keys() for userassigns in assigns.values()], [])
+                if search.assignedaction is not None:
+                    if search.assignedaction not in assigns:
+                        return False
+        if search.matchnames:
+            postats = self.getpostats(pofilename)
+            matches = False
+            for name in search.matchnames:
+                if postats[name]:
+                    matches = True
+            if not matches:
+                return False
+        return True
 
-  def indexsearch(self, search, returnfields):
-    """returns the results from searching the index with the given search"""
-    if not indexer.HAVE_INDEXER:
-      return False
-    searchparts = []
-    if search.searchtext:
-      textquery = self.searcher.makeQuery([("msgid", search.searchtext), ("msgstr", search.searchtext)], False)
-      searchparts.append(textquery)
-    if search.dirfilter:
-      pofilenames = self.browsefiles(dirfilter=search.dirfilter)
-      filequery = self.searcher.makeQuery([("pofilename", pofilename) for pofilename in pofilenames], False)
-      searchparts.append(filequery)
-    # TODO: add other search items
-    limitedquery = self.searcher.makeQuery(searchparts, True)
-    return self.searcher.search(limitedquery, returnfields)
+    def indexsearch(self, search, returnfields):
+        """returns the results from searching the index with the given search"""
+        if not indexer.HAVE_INDEXER:
+            return False
+        searchparts = []
+        if search.searchtext:
+            textquery = self.searcher.makeQuery([("msgid", search.searchtext), ("msgstr", search.searchtext)], False)
+            searchparts.append(textquery)
+        if search.dirfilter:
+            pofilenames = self.browsefiles(dirfilter=search.dirfilter)
+            filequery = self.searcher.makeQuery([("pofilename", pofilename) for pofilename in pofilenames], False)
+            searchparts.append(filequery)
+        # TODO: add other search items
+        limitedquery = self.searcher.makeQuery(searchparts, True)
+        return self.searcher.search(limitedquery, returnfields)
 
-  def searchpofilenames(self, lastpofilename, search, includelast=False):
-    """find the next pofilename that has items matching the given search"""
-    if lastpofilename and not lastpofilename in self.pofiles:
-      # accessing will autoload this file...
-      self.pofiles[lastpofilename]
-    if indexer.HAVE_INDEXER and search.searchtext:
-      # TODO: move this up a level, use index to manage whole search, so we don't do this twice
-      hits = self.indexsearch(search, "pofilename")
-      searchpofilenames = dict.fromkeys([hit["pofilename"] for hit in hits])
-    else:
-      searchpofilenames = None
-    for pofilename in self.iterpofilenames(lastpofilename, includelast):
-      if searchpofilenames is not None:
-        if pofilename not in searchpofilenames:
-          continue
-      if self.matchessearch(pofilename, search):
-        yield pofilename
+    def searchpofilenames(self, lastpofilename, search, includelast=False):
+        """find the next pofilename that has items matching the given search"""
+        if lastpofilename and not lastpofilename in self.pofiles:
+            # accessing will autoload this file...
+            self.pofiles[lastpofilename]
+        if indexer.HAVE_INDEXER and search.searchtext:
+            # TODO: move this up a level, use index to manage whole search, so we don't do this twice
+            hits = self.indexsearch(search, "pofilename")
+            searchpofilenames = dict.fromkeys([hit["pofilename"] for hit in hits])
+        else:
+            searchpofilenames = None
+        for pofilename in self.iterpofilenames(lastpofilename, includelast):
+            if searchpofilenames is not None:
+                if pofilename not in searchpofilenames:
+                    continue
+            if self.matchessearch(pofilename, search):
+                yield pofilename
 
-  def searchpoitems(self, pofilename, item, search):
-    """finds the next item matching the given search"""
-    if search.searchtext:
-      pogrepfilter = pogrep.pogrepfilter(search.searchtext, None, ignorecase=True)
-    for pofilename in self.searchpofilenames(pofilename, search, includelast=True):
-      pofile = self.getpofile(pofilename)
-      if indexer.HAVE_INDEXER:
-        filesearch = search.copy()
-        filesearch.dirfilter = pofilename
-        hits = self.indexsearch(filesearch, "itemno")
-        items = [int(doc["itemno"]) for doc in hits]
-        items = [searchitem for searchitem in items if searchitem > item]
-        items.sort()
-        notextsearch = search.copy()
-        notextsearch.searchtext = None
-        matchitems = list(pofile.iteritems(notextsearch, item))
-      else:
-        items = pofile.iteritems(search, item)
-        matchitems = items
-      for item in items:
-        if items != matchitems:
-          if item not in matchitems:
-            continue
-        # TODO: move this to iteritems
+    def searchpoitems(self, pofilename, item, search):
+        """finds the next item matching the given search"""
         if search.searchtext:
-          thepo = pofile.transunits[item]
-          if pogrepfilter.filterelement(thepo):
-            yield pofilename, item
-        else:
-          yield pofilename, item
-      item = None
+            pogrepfilter = pogrep.pogrepfilter(search.searchtext, None, ignorecase=True)
+        for pofilename in self.searchpofilenames(pofilename, search, includelast=True):
+            pofile = self.getpofile(pofilename)
+            if indexer.HAVE_INDEXER:
+                filesearch = search.copy()
+                filesearch.dirfilter = pofilename
+                hits = self.indexsearch(filesearch, "itemno")
+                items = [int(doc["itemno"]) for doc in hits]
+                items = [searchitem for searchitem in items if searchitem > item]
+                items.sort()
+                notextsearch = search.copy()
+                notextsearch.searchtext = None
+                matchitems = list(pofile.iteritems(notextsearch, item))
+            else:
+                items = pofile.iteritems(search, item)
+                matchitems = items
+            for item in items:
+                if items != matchitems:
+                    if item not in matchitems:
+                        continue
+                # TODO: move this to iteritems
+                if search.searchtext:
+                    thepo = pofile.transunits[item]
+                    if pogrepfilter.filterelement(thepo):
+                        yield pofilename, item
+                else:
+                    yield pofilename, item
+            item = None
 
-  def reassignpoitems(self, session, search, assignto, action):
-    """reassign all the items matching the search to the assignto user(s) evenly, with the given action"""
-    # remove all assignments for the given action
-    self.unassignpoitems(session, search, None, action)
-    assigncount = self.assignpoitems(session, search, assignto, action)
-    return assigncount
+    def reassignpoitems(self, session, search, assignto, action):
+        """reassign all the items matching the search to the assignto user(s) evenly, with the given action"""
+        # remove all assignments for the given action
+        self.unassignpoitems(session, search, None, action)
+        assigncount = self.assignpoitems(session, search, assignto, action)
+        return assigncount
 
-  def assignpoitems(self, session, search, assignto, action):
-    """assign all the items matching the search to the assignto user(s) evenly, with the given action"""
-    if not "assign" in self.getrights(session):
-      raise RightsError(session.localize("You do not have rights to alter assignments here"))
-    if search.searchtext:
-      pogrepfilter = pogrep.pogrepfilter(search.searchtext, None, ignorecase=True)
-    if not isinstance(assignto, list):
-      assignto = [assignto]
-    usercount = len(assignto)
-    assigncount = 0
-    if not usercount:
-      return assigncount
-    docountwords = lambda pofilename: self.countwords([(pofilename, item) for item in range(self.pofiles[pofilename].statistics.getitemslen())])
-    pofilenames = [pofilename for pofilename in self.searchpofilenames(None, search, includelast=True)]
-    wordcounts = [(pofilename, docountwords(pofilename)) for pofilename in pofilenames]
-    totalwordcount = sum([wordcount for pofilename, wordcount in wordcounts])
-
-    wordsperuser = totalwordcount / usercount
-    print "assigning", totalwordcount, "words to", usercount, "user(s)", wordsperuser, "words per user"
-    usernum = 0
-    userwords = 0
-    for pofilename, wordcount in wordcounts:
-      pofile = self.getpofile(pofilename)
-      for item in pofile.iteritems(search, None):
-        # TODO: move this to iteritems
+    def assignpoitems(self, session, search, assignto, action):
+        """assign all the items matching the search to the assignto user(s) evenly, with the given action"""
+        if not "assign" in self.getrights(session):
+            raise RightsError(session.localize("You do not have rights to alter assignments here"))
         if search.searchtext:
-          validitem = False
-          thepo = pofile.transunits[item]
-          if pogrepfilter.filterelement(thepo):
-            validitem = True
-          if not validitem:
-            continue
-        itemwordcount = self.countwords([(pofilename, item)])
-        if userwords + itemwordcount > wordsperuser:
-          usernum = min(usernum+1, len(assignto)-1)
-          userwords = 0
-        userwords += itemwordcount
-        pofile.assigns.assignto(item, assignto[usernum], action)
-        assigncount += 1
-    return assigncount
+            pogrepfilter = pogrep.pogrepfilter(search.searchtext, None, ignorecase=True)
+        if not isinstance(assignto, list):
+            assignto = [assignto]
+        usercount = len(assignto)
+        assigncount = 0
+        if not usercount:
+            return assigncount
+        docountwords = lambda pofilename: self.countwords([(pofilename, item) for item in range(self.pofiles[pofilename].statistics.getitemslen())])
+        pofilenames = [pofilename for pofilename in self.searchpofilenames(None, search, includelast=True)]
+        wordcounts = [(pofilename, docountwords(pofilename)) for pofilename in pofilenames]
+        totalwordcount = sum([wordcount for pofilename, wordcount in wordcounts])
 
-  def unassignpoitems(self, session, search, assignedto, action=None):
-    """unassigns all the items matching the search to the assignedto user"""
-    if not "assign" in self.getrights(session):
-      raise RightsError(session.localize("You do not have rights to alter assignments here"))
-    if search.searchtext:
-      pogrepfilter = pogrep.pogrepfilter(search.searchtext, None, ignorecase=True)
-    assigncount = 0
-    for pofilename in self.searchpofilenames(None, search, includelast=True):
-      pofile = self.getpofile(pofilename)
-      for item in pofile.iteritems(search, None):
-        # TODO: move this to iteritems
+        wordsperuser = totalwordcount / usercount
+        print "assigning", totalwordcount, "words to", usercount, "user(s)", wordsperuser, "words per user"
+        usernum = 0
+        userwords = 0
+        for pofilename, wordcount in wordcounts:
+            pofile = self.getpofile(pofilename)
+            for item in pofile.iteritems(search, None):
+                # TODO: move this to iteritems
+                if search.searchtext:
+                    validitem = False
+                    thepo = pofile.transunits[item]
+                    if pogrepfilter.filterelement(thepo):
+                        validitem = True
+                    if not validitem:
+                        continue
+                itemwordcount = self.countwords([(pofilename, item)])
+                if userwords + itemwordcount > wordsperuser:
+                    usernum = min(usernum+1, len(assignto)-1)
+                    userwords = 0
+                userwords += itemwordcount
+                pofile.assigns.assignto(item, assignto[usernum], action)
+                assigncount += 1
+        return assigncount
+
+    def unassignpoitems(self, session, search, assignedto, action=None):
+        """unassigns all the items matching the search to the assignedto user"""
+        if not "assign" in self.getrights(session):
+            raise RightsError(session.localize("You do not have rights to alter assignments here"))
         if search.searchtext:
-          thepo = pofile.transunits[item]
-          if pogrepfilter.filterelement(thepo):
-            pofile.assigns.unassign(item, assignedto, action)
-            assigncount += 1
-        else:
-          pofile.assigns.unassign(item, assignedto, action)
-          assigncount += 1
-    return assigncount
+            pogrepfilter = pogrep.pogrepfilter(search.searchtext, None, ignorecase=True)
+        assigncount = 0
+        for pofilename in self.searchpofilenames(None, search, includelast=True):
+            pofile = self.getpofile(pofilename)
+            for item in pofile.iteritems(search, None):
+                # TODO: move this to iteritems
+                if search.searchtext:
+                    thepo = pofile.transunits[item]
+                    if pogrepfilter.filterelement(thepo):
+                        pofile.assigns.unassign(item, assignedto, action)
+                        assigncount += 1
+                else:
+                    pofile.assigns.unassign(item, assignedto, action)
+                    assigncount += 1
+        return assigncount
 
-  def updatequickstats(self, pofilename, translatedwords, translated, fuzzywords, fuzzy, totalwords, total):
-    """updates the quick stats on the given file"""
-    self.quickstats[pofilename] = (translatedwords, translated, fuzzywords, fuzzy, totalwords, total)
-    self.savequickstats()
+    def updatequickstats(self, pofilename, translatedwords, translated, fuzzywords, fuzzy, totalwords, total):
+        """updates the quick stats on the given file"""
+        self.quickstats[pofilename] = (translatedwords, translated, fuzzywords, fuzzy, totalwords, total)
+        self.savequickstats()
 
-  def savequickstats(self):
-    """saves the quickstats"""
-    self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.project.code, self.language.code))
-    quickstatsfile = open(self.quickstatsfilename, "w")
-    sortedquickstats = self.quickstats.items()
-    sortedquickstats.sort()
-    for pofilename, (translatedwords, translated, fuzzywords, fuzzy, totalwords, total) in sortedquickstats:
-      quickstatsfile.write("%s, %d, %d, %d, %d, %d, %d\n" % \
-          (pofilename, translatedwords, translated, fuzzywords, fuzzy, totalwords, total))
-    quickstatsfile.close()
+    def savequickstats(self):
+        """saves the quickstats"""
+        self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.project.code, self.language.code))
+        quickstatsfile = open(self.quickstatsfilename, "w")
+        sortedquickstats = self.quickstats.items()
+        sortedquickstats.sort()
+        for pofilename, (translatedwords, translated, fuzzywords, fuzzy, totalwords, total) in sortedquickstats:
+            quickstatsfile.write("%s, %d, %d, %d, %d, %d, %d\n" % \
+                    (pofilename, translatedwords, translated, fuzzywords, fuzzy, totalwords, total))
+        quickstatsfile.close()
 
-  def readquickstats(self):
-    """reads the quickstats from disk"""
-    self.quickstats = {}
-    self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.project.code, self.language.code))
-    if os.path.exists(self.quickstatsfilename):
-      quickstatsfile = open(self.quickstatsfilename, "r")
-      for line in quickstatsfile:
-        items = line.split(",")
-        if len(items) != 7:
-          #Must be an old format style without the fuzzy stats
-          self.quickstats = self.getquickstats()
-          self.savequickstats()
-          break
-        else:
-          pofilename, translatedwords, translated, fuzzywords, fuzzy, totalwords, total = items
-          self.quickstats[pofilename] = tuple([int(a.strip()) for a in \
-              translatedwords, translated, fuzzywords, fuzzy, totalwords, total])
+    def readquickstats(self):
+        """reads the quickstats from disk"""
+        self.quickstats = {}
+        self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.project.code, self.language.code))
+        if os.path.exists(self.quickstatsfilename):
+            quickstatsfile = open(self.quickstatsfilename, "r")
+            for line in quickstatsfile:
+                items = line.split(",")
+                if len(items) != 7:
+                    #Must be an old format style without the fuzzy stats
+                    self.quickstats = self.getquickstats()
+                    self.savequickstats()
+                    break
+                else:
+                    pofilename, translatedwords, translated, fuzzywords, fuzzy, totalwords, total = items
+                    self.quickstats[pofilename] = tuple([int(a.strip()) for a in \
+                            translatedwords, translated, fuzzywords, fuzzy, totalwords, total])
 
-  def getquickstats(self, pofilenames=None):
-    """gets translated and total stats and wordcouts without doing calculations returning dictionary"""
-    if pofilenames is None:
-      pofilenames = self.pofilenames
-    alltranslatedwords, alltranslated, allfuzzywords, allfuzzy, alltotalwords, alltotal = 0, 0, 0, 0, 0, 0
-    slowfiles = []
-    for pofilename in pofilenames:
-      if pofilename not in self.quickstats:
-        slowfiles.append(pofilename)
-        continue
-      translatedwords, translated, fuzzywords, fuzzy, totalwords, total = self.quickstats[pofilename]
-      alltranslatedwords += translatedwords
-      alltranslated += translated
-      allfuzzywords += fuzzywords
-      allfuzzy += fuzzy
-      alltotalwords += totalwords
-      alltotal += total
-    for pofilename in slowfiles:
-      self.pofiles[pofilename].statistics.updatequickstats()
-      translatedwords, translated, fuzzywords, fuzzy, totalwords, total = self.quickstats[pofilename]
-      alltranslatedwords += translatedwords
-      alltranslated += translated
-      allfuzzywords += fuzzywords
-      allfuzzy += fuzzy
-      alltotalwords += totalwords
-      alltotal += total
-    return {"translatedwords": alltranslatedwords, "translated": alltranslated, 
-            "fuzzywords": allfuzzywords, "fuzzy": allfuzzy, 
-            "totalwords": alltotalwords, "total": alltotal}
+    def getquickstats(self, pofilenames=None):
+        """gets translated and total stats and wordcouts without doing calculations returning dictionary"""
+        if pofilenames is None:
+            pofilenames = self.pofilenames
+        alltranslatedwords, alltranslated, allfuzzywords, allfuzzy, alltotalwords, alltotal = 0, 0, 0, 0, 0, 0
+        slowfiles = []
+        for pofilename in pofilenames:
+            if pofilename not in self.quickstats:
+                slowfiles.append(pofilename)
+                continue
+            translatedwords, translated, fuzzywords, fuzzy, totalwords, total = self.quickstats[pofilename]
+            alltranslatedwords += translatedwords
+            alltranslated += translated
+            allfuzzywords += fuzzywords
+            allfuzzy += fuzzy
+            alltotalwords += totalwords
+            alltotal += total
+        for pofilename in slowfiles:
+            self.pofiles[pofilename].statistics.updatequickstats()
+            translatedwords, translated, fuzzywords, fuzzy, totalwords, total = self.quickstats[pofilename]
+            alltranslatedwords += translatedwords
+            alltranslated += translated
+            allfuzzywords += fuzzywords
+            allfuzzy += fuzzy
+            alltotalwords += totalwords
+            alltotal += total
+        return {"translatedwords": alltranslatedwords, "translated": alltranslated, 
+                        "fuzzywords": allfuzzywords, "fuzzy": allfuzzy, 
+                        "totalwords": alltotalwords, "total": alltotal}
 
-  def combinestats(self, pofilenames=None):
-    """combines translation statistics for the given po files (or all if None given)"""
-    totalstats = {}
-    if pofilenames is None:
-      pofilenames = self.pofilenames
-    for pofilename in pofilenames:
-      if not pofilename or os.path.isdir(pofilename):
-        continue
-      postats = self.getpostats(pofilename)
-      for name, items in postats.iteritems():
-        totalstats[name] = totalstats.get(name, []) + [(pofilename, item) for item in items]
-    assignstats = self.combineassignstats(pofilenames)
-    totalstats.update(assignstats)
-    return totalstats
+    def combinestats(self, pofilenames=None):
+        """combines translation statistics for the given po files (or all if None given)"""
+        totalstats = {}
+        if pofilenames is None:
+            pofilenames = self.pofilenames
+        for pofilename in pofilenames:
+            if not pofilename or os.path.isdir(pofilename):
+                continue
+            postats = self.getpostats(pofilename)
+            for name, items in postats.iteritems():
+                totalstats[name] = totalstats.get(name, []) + [(pofilename, item) for item in items]
+        assignstats = self.combineassignstats(pofilenames)
+        totalstats.update(assignstats)
+        return totalstats
 
-  def combineassignstats(self, pofilenames=None, action=None):
-    """combines assign statistics for the given po files (or all if None given)"""
-    totalstats = {}
-    if pofilenames is None:
-      pofilenames = self.pofilenames
-    for pofilename in pofilenames:
-      assignstats = self.getassignstats(pofilename, action)
-      for name, items in assignstats.iteritems():
-        totalstats["assign-"+name] = totalstats.get("assign-"+name, []) + [(pofilename, item) for item in items]
-    return totalstats
+    def combineassignstats(self, pofilenames=None, action=None):
+        """combines assign statistics for the given po files (or all if None given)"""
+        totalstats = {}
+        if pofilenames is None:
+            pofilenames = self.pofilenames
+        for pofilename in pofilenames:
+            assignstats = self.getassignstats(pofilename, action)
+            for name, items in assignstats.iteritems():
+                totalstats["assign-"+name] = totalstats.get("assign-"+name, []) + [(pofilename, item) for item in items]
+        return totalstats
 
-  def countwords(self, stats):
-    """counts the number of words in the items represented by the stats list"""
-    wordcount = 0
-    for pofilename, item in stats:
-      pofile = self.pofiles[pofilename]
-      if 0 <= item < len(pofile.statistics.sourcewordcounts):
-        wordcount += sum(pofile.statistics.sourcewordcounts[item])
-    return wordcount
+    def countwords(self, stats):
+        """counts the number of words in the items represented by the stats list"""
+        wordcount = 0
+        for pofilename, item in stats:
+            pofile = self.pofiles[pofilename]
+            if 0 <= item < len(pofile.statistics.sourcewordcounts):
+                wordcount += sum(pofile.statistics.sourcewordcounts[item])
+        return wordcount
 
-  def getpomtime(self):
-    """returns the modification time of the last modified file in the project"""
-    return max([pofile.pomtime for pofile in self.pofiles.values()])
-  pomtime = property(getpomtime)
+    def getpomtime(self):
+        """returns the modification time of the last modified file in the project"""
+        return max([pofile.pomtime for pofile in self.pofiles.values()])
+    pomtime = property(getpomtime)
 
-  def track(self, pofilename, item, message):
-    """sends a track message to the pofile"""
-    self.pofiles[pofilename].track(item, message)
+    def track(self, pofilename, item, message):
+        """sends a track message to the pofile"""
+        self.pofiles[pofilename].track(item, message)
 
-  def gettracks(self, pofilenames=None):
-    """calculates translation statistics for the given po files (or all if None given)"""
-    alltracks = []
-    if pofilenames is None:
-      pofilenames = self.pofilenames
-    for pofilename in pofilenames:
-      if not pofilename or os.path.isdir(pofilename):
-        continue
-      tracker = self.pofiles[pofilename].tracker
-      items = tracker.keys()
-      items.sort()
-      for item in items:
-        alltracks.append("%s item %d: %s" % (pofilename, item, tracker[item]))
-    return alltracks
+    def gettracks(self, pofilenames=None):
+        """calculates translation statistics for the given po files (or all if None given)"""
+        alltracks = []
+        if pofilenames is None:
+            pofilenames = self.pofilenames
+        for pofilename in pofilenames:
+            if not pofilename or os.path.isdir(pofilename):
+                continue
+            tracker = self.pofiles[pofilename].tracker
+            items = tracker.keys()
+            items.sort()
+            for item in items:
+                alltracks.append("%s item %d: %s" % (pofilename, item, tracker[item]))
+        return alltracks
 
-  def getpostats(self, pofilename):
-    """calculates translation statistics for the given po file"""
-    return self.pofiles[pofilename].statistics.getstats()
+    def getpostats(self, pofilename):
+        """calculates translation statistics for the given po file"""
+        return self.pofiles[pofilename].statistics.getstats()
 
-  def getassignstats(self, pofilename, action=None):
-    """calculates translation statistics for the given po file (can filter by action if given)"""
-    polen = len(self.getpostats(pofilename)["total"])
-    assigns = self.pofiles[pofilename].assigns.getassigns()
-    assignstats = {}
-    for username, userassigns in assigns.iteritems():
-      allitems = []
-      for assignaction, items in userassigns.iteritems():
-        if action is None or assignaction == action:
-          allitems += [item for item in items if 0 <= item < polen and item not in allitems]
-      if allitems:
-        assignstats[username] = allitems
-    return assignstats
+    def getassignstats(self, pofilename, action=None):
+        """calculates translation statistics for the given po file (can filter by action if given)"""
+        polen = len(self.getpostats(pofilename)["total"])
+        assigns = self.pofiles[pofilename].assigns.getassigns()
+        assignstats = {}

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4988
          http://svn.sourceforge.net/translate/?rev=4988&view=rev
Author:   zejn
Date:     2007-02-10 05:56:00 -0800 (Sat, 10 Feb 2007)

Log Message:
-----------
[django-migration] Made quickstats load on demand, not on init and added module path which is now superclass for FSObject.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/potree.py
    src/branches/django-migration/Pootle/projects.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/path.py

Added: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/path.py	2007-02-10 13:56:00 UTC (rev 4988)
@@ -0,0 +1,971 @@
+""" path.py - An object representing a path to a file or directory.
+
+Example:
+
+from path import path
+d = path('/home/guido/bin')
+for f in d.files('*.py'):
+    f.chmod(0755)
+
+This module requires Python 2.2 or later.
+
+
+URL:     http://www.jorendorff.com/articles/python/path
+Author:  Jason Orendorff <jason.orendorff\x40gmail\x2ecom> (and others - see the url!)
+Date:    7 Mar 2004
+"""
+
+
+# TODO
+#   - Tree-walking functions don't avoid symlink loops.  Matt Harrison sent me a patch for this.
+#   - Tree-walking functions can't ignore errors.  Matt Harrison asked for this.
+#
+#   - Two people asked for path.chdir().  This just seems wrong to me,
+#     I dunno.  chdir() is moderately evil anyway.
+#
+#   - Bug in write_text().  It doesn't support Universal newline mode.
+#   - Better error message in listdir() when self isn't a
+#     directory. (On Windows, the error message really sucks.)
+#   - Make sure everything has a good docstring.
+#   - Add methods for regex find and replace.
+#   - guess_content_type() method?
+#   - Perhaps support arguments to touch().
+#   - Could add split() and join() methods that generate warnings.
+
+from __future__ import generators
+
+import sys, warnings, os, fnmatch, glob, shutil, codecs, md5
+
+__version__ = '2.1'
+__all__ = ['path']
+
+# Platform-specific support for path.owner
+if os.name == 'nt':
+    try:
+        import win32security
+    except ImportError:
+        win32security = None
+else:
+    try:
+        import pwd
+    except ImportError:
+        pwd = None
+
+# Pre-2.3 support.  Are unicode filenames supported?
+_base = str
+_getcwd = os.getcwd
+try:
+    if os.path.supports_unicode_filenames:
+        _base = unicode
+        _getcwd = os.getcwdu
+except AttributeError:
+    pass
+
+# Pre-2.3 workaround for booleans
+try:
+    True, False
+except NameError:
+    True, False = 1, 0
+
+# Pre-2.3 workaround for basestring.
+try:
+    basestring
+except NameError:
+    basestring = (str, unicode)
+
+# Universal newline support
+_textmode = 'r'
+if hasattr(file, 'newlines'):
+    _textmode = 'U'
+
+
+class TreeWalkWarning(Warning):
+    pass
+
+class path(_base):
+    """ Represents a filesystem path.
+
+    For documentation on individual methods, consult their
+    counterparts in os.path.
+    """
+
+    # --- Special Python methods.
+
+    def __repr__(self):
+        return 'path(%s)' % _base.__repr__(self)
+
+    # Adding a path and a string yields a path.
+    def __add__(self, more):
+        try:
+            resultStr = _base.__add__(self, more)
+        except TypeError:  #Python bug
+            resultStr = NotImplemented
+        if resultStr is NotImplemented:
+            return resultStr
+        return self.__class__(resultStr)
+
+    def __radd__(self, other):
+        if isinstance(other, basestring):
+            return self.__class__(other.__add__(self))
+        else:
+            return NotImplemented
+
+    # The / operator joins paths.
+    def __div__(self, rel):
+        """ fp.__div__(rel) == fp / rel == fp.joinpath(rel)
+
+        Join two path components, adding a separator character if
+        needed.
+        """
+        return self.__class__(os.path.join(self, rel))
+
+    # Make the / operator work even when true division is enabled.
+    __truediv__ = __div__
+
+    def getcwd(cls):
+        """ Return the current working directory as a path object. """
+        return cls(_getcwd())
+    getcwd = classmethod(getcwd)
+
+
+    # --- Operations on path strings.
+
+    isabs = os.path.isabs
+    def abspath(self):       return self.__class__(os.path.abspath(self))
+    def normcase(self):      return self.__class__(os.path.normcase(self))
+    def normpath(self):      return self.__class__(os.path.normpath(self))
+    def realpath(self):      return self.__class__(os.path.realpath(self))
+    def expanduser(self):    return self.__class__(os.path.expanduser(self))
+    def expandvars(self):    return self.__class__(os.path.expandvars(self))
+    def dirname(self):       return self.__class__(os.path.dirname(self))
+    basename = os.path.basename
+
+    def expand(self):
+        """ Clean up a filename by calling expandvars(),
+        expanduser(), and normpath() on it.
+
+        This is commonly everything needed to clean up a filename
+        read from a configuration file, for example.
+        """
+        return self.expandvars().expanduser().normpath()
+
+    def _get_namebase(self):
+        base, ext = os.path.splitext(self.name)
+        return base
+
+    def _get_ext(self):
+        f, ext = os.path.splitext(_base(self))
+        return ext
+
+    def _get_drive(self):
+        drive, r = os.path.splitdrive(self)
+        return self.__class__(drive)
+
+    parent = property(
+        dirname, None, None,
+        """ This path's parent directory, as a new path object.
+
+        For example, path('/usr/local/lib/libpython.so').parent == path('/usr/local/lib')
+        """)
+
+    name = property(
+        basename, None, None,
+        """ The name of this file or directory without the full path.
+
+        For example, path('/usr/local/lib/libpython.so').name == 'libpython.so'
+        """)
+
+    namebase = property(
+        _get_namebase, None, None,
+        """ The same as path.name, but with one file extension stripped off.
+
+        For example, path('/home/guido/python.tar.gz').name     == 'python.tar.gz',
+        but          path('/home/guido/python.tar.gz').namebase == 'python.tar'
+        """)
+
+    ext = property(
+        _get_ext, None, None,
+        """ The file extension, for example '.py'. """)
+
+    drive = property(
+        _get_drive, None, None,
+        """ The drive specifier, for example 'C:'.
+        This is always empty on systems that don't use drive specifiers.
+        """)
+
+    def splitpath(self):
+        """ p.splitpath() -> Return (p.parent, p.name). """
+        parent, child = os.path.split(self)
+        return self.__class__(parent), child
+
+    def splitdrive(self):
+        """ p.splitdrive() -> Return (p.drive, <the rest of p>).
+
+        Split the drive specifier from this path.  If there is
+        no drive specifier, p.drive is empty, so the return value
+        is simply (path(''), p).  This is always the case on Unix.
+        """
+        drive, rel = os.path.splitdrive(self)
+        return self.__class__(drive), rel
+
+    def splitext(self):
+        """ p.splitext() -> Return (p.stripext(), p.ext).
+
+        Split the filename extension from this path and return
+        the two parts.  Either part may be empty.
+
+        The extension is everything from '.' to the end of the
+        last path segment.  This has the property that if
+        (a, b) == p.splitext(), then a + b == p.
+        """
+        filename, ext = os.path.splitext(self)
+        return self.__class__(filename), ext
+
+    def stripext(self):
+        """ p.stripext() -> Remove one file extension from the path.
+
+        For example, path('/home/guido/python.tar.gz').stripext()
+        returns path('/home/guido/python.tar').
+        """
+        return self.splitext()[0]
+
+    if hasattr(os.path, 'splitunc'):
+        def splitunc(self):
+            unc, rest = os.path.splitunc(self)
+            return self.__class__(unc), rest
+
+        def _get_uncshare(self):
+            unc, r = os.path.splitunc(self)
+            return self.__class__(unc)
+
+        uncshare = property(
+            _get_uncshare, None, None,
+            """ The UNC mount point for this path.
+            This is empty for paths on local drives. """)
+
+    def joinpath(self, *args):
+        """ Join two or more path components, adding a separator
+        character (os.sep) if needed.  Returns a new path
+        object.
+        """
+        return self.__class__(os.path.join(self, *args))
+
+    def splitall(self):
+        r""" Return a list of the path components in this path.
+
+        The first item in the list will be a path.  Its value will be
+        either os.curdir, os.pardir, empty, or the root directory of
+        this path (for example, '/' or 'C:\\').  The other items in
+        the list will be strings.
+
+        path.path.joinpath(*result) will yield the original path.
+        """
+        parts = []
+        loc = self
+        while loc != os.curdir and loc != os.pardir:
+            prev = loc
+            loc, child = prev.splitpath()
+            if loc == prev:
+                break
+            parts.append(child)
+        parts.append(loc)
+        parts.reverse()
+        return parts
+
+    def relpath(self):
+        """ Return this path as a relative path,
+        based from the current working directory.
+        """
+        cwd = self.__class__(os.getcwd())
+        return cwd.relpathto(self)
+
+    def relpathto(self, dest):
+        """ Return a relative path from self to dest.
+
+        If there is no relative path from self to dest, for example if
+        they reside on different drives in Windows, then this returns
+        dest.abspath().
+        """
+        origin = self.abspath()
+        dest = self.__class__(dest).abspath()
+
+        orig_list = origin.normcase().splitall()
+        # Don't normcase dest!  We want to preserve the case.
+        dest_list = dest.splitall()
+
+        if orig_list[0] != os.path.normcase(dest_list[0]):
+            # Can't get here from there.
+            return dest
+
+        # Find the location where the two paths start to differ.
+        i = 0
+        for start_seg, dest_seg in zip(orig_list, dest_list):
+            if start_seg != os.path.normcase(dest_seg):
+                break
+            i += 1
+
+        # Now i is the point where the two paths diverge.
+        # Need a certain number of "os.pardir"s to work up
+        # from the origin to the point of divergence.
+        segments = [os.pardir] * (len(orig_list) - i)
+        # Need to add the diverging part of dest_list.
+        segments += dest_list[i:]
+        if len(segments) == 0:
+            # If they happen to be identical, use os.curdir.
+            relpath = os.curdir
+        else:
+            relpath = os.path.join(*segments)
+        return self.__class__(relpath)
+
+    # --- Listing, searching, walking, and matching
+
+    def listdir(self, pattern=None):
+        """ D.listdir() -> List of items in this directory.
+
+        Use D.files() or D.dirs() instead if you want a listing
+        of just files or just subdirectories.
+
+        The elements of the list are path objects.
+
+        With the optional 'pattern' argument, this only lists
+        items whose names match the given pattern.
+        """
+        names = os.listdir(self)
+        if pattern is not None:
+            names = fnmatch.filter(names, pattern)
+        return [self / child for child in names]
+
+    def dirs(self, pattern=None):
+        """ D.dirs() -> List of this directory's subdirectories.
+
+        The elements of the list are path objects.
+        This does not walk recursively into subdirectories
+        (but see path.walkdirs).
+
+        With the optional 'pattern' argument, this only lists
+        directories whose names match the given pattern.  For
+        example, d.dirs('build-*').
+        """
+        return [p for p in self.listdir(pattern) if p.isdir()]
+
+    def files(self, pattern=None):
+        """ D.files() -> List of the files in this directory.
+
+        The elements of the list are path objects.
+        This does not walk into subdirectories (see path.walkfiles).
+
+        With the optional 'pattern' argument, this only lists files
+        whose names match the given pattern.  For example,
+        d.files('*.pyc').
+        """
+        
+        return [p for p in self.listdir(pattern) if p.isfile()]
+
+    def walk(self, pattern=None, errors='strict'):
+        """ D.walk() -> iterator over files and subdirs, recursively.
+
+        The iterator yields path objects naming each child item of
+        this directory and its descendants.  This requires that
+        D.isdir().
+
+        This performs a depth-first traversal of the directory tree.
+        Each directory is returned just before all its children.
+
+        The errors= keyword argument controls behavior when an
+        error occurs.  The default is 'strict', which causes an
+        exception.  The other allowed values are 'warn', which
+        reports the error via warnings.warn(), and 'ignore'.
+        """
+        if errors not in ('strict', 'warn', 'ignore'):
+            raise ValueError("invalid errors parameter")
+
+        try:
+            childList = self.listdir()
+        except Exception:
+            if errors == 'ignore':
+                return
+            elif errors == 'warn':
+                warnings.warn(
+                    "Unable to list directory '%s': %s"
+                    % (self, sys.exc_info()[1]),
+                    TreeWalkWarning)
+            else:
+                raise
+
+        for child in childList:
+            if pattern is None or child.fnmatch(pattern):
+                yield child
+            try:
+                isdir = child.isdir()
+            except Exception:
+                if errors == 'ignore':
+                    isdir = False
+                elif errors == 'warn':
+                    warnings.warn(
+                        "Unable to access '%s': %s"
+                        % (child, sys.exc_info()[1]),
+                        TreeWalkWarning)
+                    isdir = False
+                else:
+                    raise
+
+            if isdir:
+                for item in child.walk(pattern, errors):
+                    yield item
+
+    def walkdirs(self, pattern=None, errors='strict'):
+        """ D.walkdirs() -> iterator over subdirs, recursively.
+
+        With the optional 'pattern' argument, this yields only
+        directories whose names match the given pattern.  For
+        example, mydir.walkdirs('*test') yields only directories
+        with names ending in 'test'.
+
+        The errors= keyword argument controls behavior when an
+        error occurs.  The default is 'strict', which causes an
+        exception.  The other allowed values are 'warn', which
+        reports the error via warnings.warn(), and 'ignore'.
+        """
+        if errors not in ('strict', 'warn', 'ignore'):
+            raise ValueError("invalid errors parameter")
+
+        try:
+            dirs = self.dirs()
+        except Exception:
+            if errors == 'ignore':
+                return
+            elif errors == 'warn':
+                warnings.warn(
+                    "Unable to list directory '%s': %s"
+                    % (self, sys.exc_info()[1]),
+                    TreeWalkWarning)
+            else:
+                raise
+
+        for child in dirs:
+            if pattern is None or child.fnmatch(pattern):
+                yield child
+            for subsubdir in child.walkdirs(pattern, errors):
+                yield subsubdir
+
+    def walkfiles(self, pattern=None, errors='strict'):
+        """ D.walkfiles() -> iterator over files in D, recursively.
+
+        The optional argument, pattern, limits the results to files
+        with names that match the pattern.  For example,
+        mydir.walkfiles('*.tmp') yields only files with the .tmp
+        extension.
+        """
+        if errors not in ('strict', 'warn', 'ignore'):
+            raise ValueError("invalid errors parameter")
+
+        try:
+            childList = self.listdir()
+        except Exception:
+            if errors == 'ignore':
+                return
+            elif errors == 'warn':
+                warnings.warn(
+                    "Unable to list directory '%s': %s"
+                    % (self, sys.exc_info()[1]),
+                    TreeWalkWarning)
+            else:
+                raise
+
+        for child in childList:
+            try:
+                isfile = child.isfile()
+                isdir = not isfile and child.isdir()
+            except:
+                if errors == 'ignore':
+                    return
+                elif errors == 'warn':
+                    warnings.warn(
+                        "Unable to access '%s': %s"
+                        % (self, sys.exc_info()[1]),
+                        TreeWalkWarning)
+                else:
+                    raise
+
+            if isfile:
+                if pattern is None or child.fnmatch(pattern):
+                    yield child
+            elif isdir:
+                for f in child.walkfiles(pattern, errors):
+                    yield f
+
+    def fnmatch(self, pattern):
+        """ Return True if self.name matches the given pattern.
+
+        pattern - A filename pattern with wildcards,
+            for example '*.py'.
+        """
+        return fnmatch.fnmatch(self.name, pattern)
+
+    def glob(self, pattern):
+        """ Return a list of path objects that match the pattern.
+
+        pattern - a path relative to this directory, with wildcards.
+
+        For example, path('/users').glob('*/bin/*') returns a list
+        of all the files users have in their bin directories.
+        """
+        cls = self.__class__
+        return [cls(s) for s in glob.glob(_base(self / pattern))]
+
+
+    # --- Reading or writing an entire file at once.
+
+    def open(self, mode='r'):
+        """ Open this file.  Return a file object. """
+        return file(self, mode)
+
+    def bytes(self):
+        """ Open this file, read all bytes, return them as a string. """
+        f = self.open('rb')
+        try:
+            return f.read()
+        finally:
+            f.close()
+
+    def write_bytes(self, bytes, append=False):
+        """ Open this file and write the given bytes to it.
+
+        Default behavior is to overwrite any existing file.
+        Call p.write_bytes(bytes, append=True) to append instead.
+        """
+        if append:
+            mode = 'ab'
+        else:
+            mode = 'wb'
+        f = self.open(mode)
+        try:
+            f.write(bytes)
+        finally:
+            f.close()
+
+    def text(self, encoding=None, errors='strict'):
+        r""" Open this file, read it in, return the content as a string.
+
+        This uses 'U' mode in Python 2.3 and later, so '\r\n' and '\r'
+        are automatically translated to '\n'.
+
+        Optional arguments:
+
+        encoding - The Unicode encoding (or character set) of
+            the file.  If present, the content of the file is
+            decoded and returned as a unicode object; otherwise
+            it is returned as an 8-bit str.
+        errors - How to handle Unicode errors; see help(str.decode)
+            for the options.  Default is 'strict'.
+        """
+        if encoding is None:
+            # 8-bit
+            f = self.open(_textmode)
+            try:
+                return f.read()
+            finally:
+                f.close()
+        else:
+            # Unicode
+            f = codecs.open(self, 'r', encoding, errors)
+            # (Note - Can't use 'U' mode here, since codecs.open
+            # doesn't support 'U' mode, even in Python 2.3.)
+            try:
+                t = f.read()
+            finally:
+                f.close()
+            return (t.replace(u'\r\n', u'\n')
+                     .replace(u'\r\x85', u'\n')
+                     .replace(u'\r', u'\n')
+                     .replace(u'\x85', u'\n')
+                     .replace(u'\u2028', u'\n'))
+
+    def write_text(self, text, encoding=None, errors='strict', linesep=os.linesep, append=False):
+        r""" Write the given text to this file.
+
+        The default behavior is to overwrite any existing file;
+        to append instead, use the 'append=True' keyword argument.
+
+        There are two differences between path.write_text() and
+        path.write_bytes(): newline handling and Unicode handling.
+        See below.
+
+        Parameters:
+
+          - text - str/unicode - The text to be written.
+
+          - encoding - str - The Unicode encoding that will be used.
+            This is ignored if 'text' isn't a Unicode string.
+
+          - errors - str - How to handle Unicode encoding errors.
+            Default is 'strict'.  See help(unicode.encode) for the
+            options.  This is ignored if 'text' isn't a Unicode
+            string.
+
+          - linesep - keyword argument - str/unicode - The sequence of
+            characters to be used to mark end-of-line.  The default is
+            os.linesep.  You can also specify None; this means to
+            leave all newlines as they are in 'text'.
+
+          - append - keyword argument - bool - Specifies what to do if
+            the file already exists (True: append to the end of it;
+            False: overwrite it.)  The default is False.
+
+
+        --- Newline handling.
+
+        write_text() converts all standard end-of-line sequences
+        ('\n', '\r', and '\r\n') to your platform's default end-of-line
+        sequence (see os.linesep; on Windows, for example, the
+        end-of-line marker is '\r\n').
+
+        If you don't like your platform's default, you can override it
+        using the 'linesep=' keyword argument.  If you specifically want
+        write_text() to preserve the newlines as-is, use 'linesep=None'.
+
+        This applies to Unicode text the same as to 8-bit text, except
+        there are three additional standard Unicode end-of-line sequences:
+        u'\x85', u'\r\x85', and u'\u2028'.
+
+        (This is slightly different from when you open a file for
+        writing with fopen(filename, "w") in C or file(filename, 'w')
+        in Python.)
+
+
+        --- Unicode
+
+        If 'text' isn't Unicode, then apart from newline handling, the
+        bytes are written verbatim to the file.  The 'encoding' and
+        'errors' arguments are not used and must be omitted.
+
+        If 'text' is Unicode, it is first converted to bytes using the
+        specified 'encoding' (or the default encoding if 'encoding'
+        isn't specified).  The 'errors' argument applies only to this
+        conversion.
+
+        """
+        if isinstance(text, unicode):
+            if linesep is not None:
+                # Convert all standard end-of-line sequences to
+                # ordinary newline characters.
+                text = (text.replace(u'\r\n', u'\n')
+                            .replace(u'\r\x85', u'\n')
+                            .replace(u'\r', u'\n')
+                            .replace(u'\x85', u'\n')
+                            .replace(u'\u2028', u'\n'))
+                text = text.replace(u'\n', linesep)
+            if encoding is None:
+                encoding = sys.getdefaultencoding()
+            bytes = text.encode(encoding, errors)
+        else:
+            # It is an error to specify an encoding if 'text' is
+            # an 8-bit string.
+            assert encoding is None
+
+            if linesep is not None:
+                text = (text.replace('\r\n', '\n')
+                            .replace('\r', '\n'))
+                bytes = text.replace('\n', linesep)
+
+        self.write_bytes(bytes, append)
+
+    def lines(self, encoding=None, errors='strict', retain=True):
+        r""" Open this file, read all lines, return them in a list.
+
+        Optional arguments:
+            encoding - The Unicode encoding (or character set) of
+                the file.  The default is None, meaning the content
+                of the file is read as 8-bit characters and returned
+                as a list of (non-Unicode) str objects.
+            errors - How to handle Unicode errors; see help(str.decode)
+                for the options.  Default is 'strict'
+            retain - If true, retain newline characters; but all newline
+                character combinations ('\r', '\n', '\r\n') are
+                translated to '\n'.  If false, newline characters are
+                stripped off.  Default is True.
+
+        This uses 'U' mode in Python 2.3 and later.
+        """
+        if encoding is None and retain:
+            f = self.open(_textmode)
+            try:
+                return f.readlines()
+            finally:
+                f.close()
+        else:
+            return self.text(encoding, errors).splitlines(retain)
+
+    def write_lines(self, lines, encoding=None, errors='strict',
+                    linesep=os.linesep, append=False):
+        r""" Write the given lines of text to this file.
+
+        By default this overwrites any existing file at this path.
+
+        This puts a platform-specific newline sequence on every line.
+        See 'linesep' below.
+
+        lines - A list of strings.
+
+        encoding - A Unicode encoding to use.  This applies only if
+            'lines' contains any Unicode strings.
+
+        errors - How to handle errors in Unicode encoding.  This
+            also applies only to Unicode strings.
+
+        linesep - The desired line-ending.  This line-ending is
+            applied to every line.  If a line already has any
+            standard line ending ('\r', '\n', '\r\n', u'\x85',
+            u'\r\x85', u'\u2028'), that will be stripped off and
+            this will be used instead.  The default is os.linesep,
+            which is platform-dependent ('\r\n' on Windows, '\n' on
+            Unix, etc.)  Specify None to write the lines as-is,
+            like file.writelines().
+
+        Use the keyword argument append=True to append lines to the
+        file.  The default is to overwrite the file.  Warning:
+        When you use this with Unicode data, if the encoding of the
+        existing data in the file is different from the encoding
+        you specify with the encoding= parameter, the result is
+        mixed-encoding data, which can really confuse someone trying
+        to read the file later.
+        """
+        if append:
+            mode = 'ab'
+        else:
+            mode = 'wb'
+        f = self.open(mode)
+        try:
+            for line in lines:
+                isUnicode = isinstance(line, unicode)
+                if linesep is not None:
+                    # Strip off any existing line-end and add the
+                    # specified linesep string.
+                    if isUnicode:
+                        if line[-2:] in (u'\r\n', u'\x0d\x85'):
+                            line = line[:-2]
+                        elif line[-1:] in (u'\r', u'\n',
+                                           u'\x85', u'\u2028'):
+                            line = line[:-1]
+                    else:
+                        if line[-2:] == '\r\n':
+                            line = line[:-2]
+                        elif line[-1:] in ('\r', '\n'):
+                            line = line[:-1]
+                    line += linesep
+                if isUnicode:
+                    if encoding is None:
+                        encoding = sys.getdefaultencoding()
+                    line = line.encode(encoding, errors)
+                f.write(line)
+        finally:
+            f.close()
+
+    def read_md5(self):
+        """ Calculate the md5 hash for this file.
+
+        This reads through the entire file.
+        """
+        f = self.open('rb')
+        try:
+            m = md5.new()
+            while True:
+                d = f.read(8192)
+                if not d:
+                    break
+                m.update(d)
+        finally:
+            f.close()
+        return m.digest()
+
+    # --- Methods for querying the filesystem.
+
+    exists = os.path.exists
+    isdir = os.path.isdir
+    isfile = os.path.isfile
+    islink = os.path.islink
+    ismount = os.path.ismount
+
+    if hasattr(os.path, 'samefile'):
+        samefile = os.path.samefile
+
+    getatime = os.path.getatime
+    atime = property(
+        getatime, None, None,
+        """ Last access time of the file. """)
+
+    getmtime = os.path.getmtime
+    mtime = property(
+        getmtime, None, None,
+        """ Last-modified time of the file. """)
+
+    if hasattr(os.path, 'getctime'):
+        getctime = os.path.getctime
+        ctime = property(
+            getctime, None, None,
+            """ Creation time of the file. """)
+
+    getsize = os.path.getsize
+    size = property(
+        getsize, None, None,
+        """ Size of the file, in bytes. """)
+
+    if hasattr(os, 'access'):
+        def access(self, mode):
+            """ Return true if current user has access to this path.
+
+            mode - One of the constants os.F_OK, os.R_OK, os.W_OK, os.X_OK
+            """
+            return os.access(self, mode)
+
+    def stat(self):
+        """ Perform a stat() system call on this path. """
+        return os.stat(self)
+
+    def lstat(self):
+        """ Like path.stat(), but do not follow symbolic links. """
+        return os.lstat(self)
+
+    def get_owner(self):
+        r""" Return the name of the owner of this file or directory.
+
+        This follows symbolic links.
+
+        On Windows, this returns a name of the form ur'DOMAIN\User Name'.
+        On Windows, a group can own a file or directory.
+        """
+        if os.name == 'nt':
+            if win32security is None:
+                raise Exception("path.owner requires win32all to be installed")
+            desc = win32security.GetFileSecurity(
+                self, win32security.OWNER_SECURITY_INFORMATION)
+            sid = desc.GetSecurityDescriptorOwner()
+            account, domain, typecode = win32security.LookupAccountSid(None, sid)
+            return domain + u'\\' + account
+        else:
+            if pwd is None:
+                raise NotImplementedError("path.owner is not implemented on this platform.")
+            st = self.stat()
+            return pwd.getpwuid(st.st_uid).pw_name
+
+    owner = property(
+        get_owner, None, None,
+        """ Name of the owner of this file or directory. """)
+
+    if hasattr(os, 'statvfs'):
+        def statvfs(self):
+            """ Perform a statvfs() system call on this path. """
+            return os.statvfs(self)
+
+    if hasattr(os, 'pathconf'):
+        def pathconf(self, name):
+            return os.pathconf(self, name)
+
+
+    # --- Modifying operations on files and directories
+
+    def utime(self, times):
+        """ Set the access and modified times of this file. """
+        os.utime(self, times)
+
+    def chmod(self, mode):
+        os.chmod(self, mode)
+
+    if hasattr(os, 'chown'):
+        def chown(self, uid, gid):
+            os.chown(self, uid, gid)
+
+    def rename(self, new):
+        os.rename(self, new)
+
+    def renames(self, new):
+        os.renames(self, new)
+
+
+    # --- Create/delete operations on directories
+
+    def mkdir(self, mode=0777):
+        os.mkdir(self, mode)
+
+    def makedirs(self, mode=0777):
+        os.makedirs(self, mode)
+
+    def rmdir(self):
+        os.rmdir(self)
+
+    def removedirs(self):
+        os.removedirs(self)
+
+
+    # --- Modifying operations on files
+
+    def touch(self):
+        """ Set the access/modified times of this file to the current time.
+        Create the file if it does not exist.
+        """
+        fd = os.open(self, os.O_WRONLY | os.O_CREAT, 0666)
+        os.close(fd)
+        os.utime(self, None)
+
+    def remove(self):
+        os.remove(self)
+
+    def unlink(self):
+        os.unlink(self)
+
+
+    # --- Links
+
+    if hasattr(os, 'link'):
+        def link(self, newpath):
+            """ Create a hard link at 'newpath', pointing to this file. """
+            os.link(self, newpath)
+
+    if hasattr(os, 'symlink'):
+        def symlink(self, newlink):
+            """ Create a symbolic link at 'newlink', pointing here. """
+            os.symlink(self, newlink)
+
+    if hasattr(os, 'readlink'):
+        def readlink(self):
+            """ Return the path to which this symbolic link points.
+
+            The result may be an absolute or a relative path.
+            """
+            return self.__class__(os.readlink(self))
+
+        def readlinkabs(self):
+            """ Return the path to which this symbolic link points.
+
+            The result is always an absolute path.
+            """
+            p = self.readlink()
+            if p.isabs():
+                return p
+            else:
+                return (self.parent / p).abspath()
+
+
+    # --- High-level functions from shutil
+
+    copyfile = shutil.copyfile
+    copymode = shutil.copymode
+    copystat = shutil.copystat
+    copy = shutil.copy
+    copy2 = shutil.copy2
+    copytree = shutil.copytree
+    if hasattr(shutil, 'move'):
+        move = shutil.move
+    rmtree = shutil.rmtree
+
+
+    # --- Special stuff from os
+
+    if hasattr(os, 'chroot'):
+        def chroot(self):
+            os.chroot(self)
+
+    if hasattr(os, 'startfile'):
+        def startfile(self):
+            os.startfile(self)
+

Modified: src/branches/django-migration/Pootle/potree.py
===================================================================
--- src/branches/django-migration/Pootle/potree.py	2007-02-10 11:22:50 UTC (rev 4987)
+++ src/branches/django-migration/Pootle/potree.py	2007-02-10 13:56:00 UTC (rev 4988)
@@ -24,6 +24,7 @@
 from Pootle import projects
 from Pootle import pootlefile
 from Pootle import pagelayout
+from Pootle.path import path
 from translate.misc import autoencode
 import os
 import sre
@@ -111,6 +112,20 @@
         else:
             raise KeyError("Project %s does not have %s attribute." % (self,key))
 
+class FSObject(path):
+    icon = 'folder'
+    href = 'FIXME'
+    title = 'FIXME'
+
+    def __repr__(self):
+        return "<PootleFS object: %s>" % path.__repr__(self)
+
+    def _get_stats(self):
+        return {}
+    stats = property(_get_stats)
+
+
+
 class POTree:
     """Manages the tree of projects and languages"""
     def __init__(self, instance):
@@ -119,7 +134,7 @@
             setattr(self.languages, "templates.fullname", "Templates")
             self.saveprefs()
         self.projects = instance.projects
-        self.podirectory = instance.podirectory
+        self.podirectory = path(instance.podirectory)
         self.instance = instance
         self.projectcache = {}
 
@@ -429,12 +444,12 @@
 
     def getpodir(self, languagecode, projectcode): # FIXME differentiates gnu/std
         """returns the base directory containing po files for the project"""
-        projectdir = os.path.join(self.podirectory, projectcode)
-        if not os.path.exists(projectdir):
+        projectdir = self.podirectory / projectcode
+        if not projectdir.exists():
             raise IndexError("directory not found for project %s" % (projectcode))
-        languagedir = os.path.join(projectdir, languagecode)
-        if not os.path.exists(languagedir):
-            languagedirs = [languagedir for languagedir in os.listdir(projectdir) if self.languagematch(languagecode, languagedir)]
+        languagedir = projectdir / languagecode
+        if not languagedir.exists():
+            languagedirs = [languagedir for languagedir in projectdir.listdir() if self.languagematch(languagecode, languagedir)]
             if not languagedirs:
                 # if no matching directories can be found, check if it is a GNU-style project
                 if self.hasgnufiles(projectdir, languagecode) == "gnu":
@@ -443,8 +458,8 @@
             # TODO: handle multiple regions
             if len(languagedirs) > 1:
                 raise IndexError("multiple regions defined for language %s, project %s" % (languagecode, projectcode))
-            languagedir = os.path.join(projectdir, languagedirs[0])
-        return languagedir
+            languagedir = projectdir / languagedirs[0]
+        return FSObject(languagedir)
 
     def languagematch(self, languagecode, otherlanguagecode):
         """matches a languagecode to another, ignoring regions in the second"""

Modified: src/branches/django-migration/Pootle/projects.py
===================================================================
--- src/branches/django-migration/Pootle/projects.py	2007-02-10 11:22:50 UTC (rev 4987)
+++ src/branches/django-migration/Pootle/projects.py	2007-02-10 13:56:00 UTC (rev 4988)
@@ -48,14 +48,6 @@
 class RightsError(ValueError):
     pass
 
-class FSObject(object):
-    def __init__(self, path):
-        self.path = path
-
-    def __repr__(self):
-        return "<Pootle FS object: %s>" % self.path
-
-
 class InternalAdminSession:
     """A fake session used for doing internal admin jobs"""
     def __init__(self):
@@ -114,6 +106,8 @@
         else:
             self.filestyle = "std"
         self._prefs = None
+        self._quickstats = {}
+        
         self.scanpofiles()
         self.readquickstats()
         self.initindex()
@@ -717,35 +711,8 @@
 
     def browsefiles(self, dirfilter=None, depth=None, maxdepth=None, includedirs=False, includefiles=True):
         """gets a list of pofilenames, optionally filtering with the parent directory"""
-        if dirfilter is None:
-            pofilenames = self.pofilenames
-        else:
-            if not dirfilter.endswith(os.path.sep) and not dirfilter.endswith(os.extsep + self.fileext):
-                dirfilter += os.path.sep
-            pofilenames = [pofilename for pofilename in self.pofilenames if pofilename.startswith(dirfilter)]
-        if includedirs:
-            podirs = {}
-            for pofilename in pofilenames:
-                dirname = os.path.dirname(pofilename)
-                if not dirname:
-                    continue
-                podirs[dirname] = True
-                while dirname:
-                    dirname = os.path.dirname(dirname)
-                    if dirname:
-                        podirs[dirname] = True
-            podirs = podirs.keys()
-        else:
-            podirs = []
-        if not includefiles:
-            pofilenames = []
-        if maxdepth is not None:
-            pofilenames = [pofilename for pofilename in pofilenames if pofilename.count(os.path.sep) <= maxdepth]
-            podirs = [podir for podir in podirs if podir.count(os.path.sep) <= maxdepth]
-        if depth is not None:
-            pofilenames = [pofilename for pofilename in pofilenames if pofilename.count(os.path.sep) == depth]
-            podirs = [podir for podir in podirs if podir.count(os.path.sep) == depth]
-        return pofilenames + podirs
+        print 'Warning, using browsefiles'
+        return self.podir.listdir('*.po')
 
     def iterpofilenames(self, lastpofilename=None, includelast=False):
         """iterates through the pofilenames starting after the given pofilename"""
@@ -987,32 +954,32 @@
 
     def savequickstats(self):
         """saves the quickstats"""
-        self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.project.code, self.language.code))
-        quickstatsfile = open(self.quickstatsfilename, "w")
+        qstatsfilename = self.podir / "pootle-%s-%s.stats" % (self.project.code, self.language.code)
+        qstatsfile = open(qstatsfilename, "w")
         sortedquickstats = self.quickstats.items()
         sortedquickstats.sort()
         for pofilename, (translatedwords, translated, fuzzywords, fuzzy, totalwords, total) in sortedquickstats:
-            quickstatsfile.write("%s, %d, %d, %d, %d, %d, %d\n" % \
+            qstatsfile.write("%s, %d, %d, %d, %d, %d, %d\n" % \
                     (pofilename, translatedwords, translated, fuzzywords, fuzzy, totalwords, total))
-        quickstatsfile.close()
+        qstatsfile.close()
 
-    def readquickstats(self):
-        """reads the quickstats from disk"""
-        self.quickstats = {}
-        self.quickstatsfilename = os.path.join(self.podir, "pootle-%s-%s.stats" % (self.project.code, self.language.code))
-        if os.path.exists(self.quickstatsfilename):
-            quickstatsfile = open(self.quickstatsfilename, "r")
-            for line in quickstatsfile:
-                items = line.split(",")
-                if len(items) != 7:
-                    #Must be an old format style without the fuzzy stats
-                    self.quickstats = self.getquickstats()
-                    self.savequickstats()
-                    break
-                else:
-                    pofilename, translatedwords, translated, fuzzywords, fuzzy, totalwords, total = items
-                    self.quickstats[pofilename] = tuple([int(a.strip()) for a in \
-                            translatedwords, translated, fuzzywords, fuzzy, totalwords, total])
+    def _get_quickstats(self):
+        if not self._quickstats:
+            qstats = {}
+            qstatsfile = self.podir / "pootle-%s-%s.stats" % (self.project.code, self.language.code)
+            if qstatsfile.exists():
+                file = open(qstatsfile,'r')
+                for line in file:
+                    items = line.split(",")
+                    if len(items) != 7:
+                        # in case it's an old format
+                        self._quickstats = self.getquickstats()
+                        self.savequickstats()
+                        break
+                    else:
+                        self.quickstats[items[0]] = tuple([int(a.strip()) for a in items[1:]])
+        return self._quickstats
+    quickstats = property(_get_quickstats)
 
     def getquickstats(self, pofilenames=None):
         """gets translated and total stats and wordcouts without doing calculations returning dictionary"""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5001
          http://svn.sourceforge.net/translate/?rev=5001&view=rev
Author:   zejn
Date:     2007-02-11 14:26:14 -0800 (Sun, 11 Feb 2007)

Log Message:
-----------
[django-migration] Add a stats property to TranslationProject and fix templates.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/projects.py
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/projects.py
===================================================================
--- src/branches/django-migration/Pootle/projects.py	2007-02-11 10:38:05 UTC (rev 5000)
+++ src/branches/django-migration/Pootle/projects.py	2007-02-11 22:26:14 UTC (rev 5001)
@@ -35,6 +35,7 @@
 from Pootle import statistics
 from Pootle import pootlefile
 from Pootle import versioncontrol
+from Pootle.path import path
 from Pootle.conf import potree
 from jToolkit import timecache
 from jToolkit import prefs
@@ -94,7 +95,6 @@
         self.pofiles = potimecache(15*60, self) 
         checkerclasses = [checks.projectcheckers.get(self.project.checkstyle, checks.StandardChecker), pofilter.StandardPOChecker]
         self.checker = pofilter.POTeeChecker(checkerclasses=checkerclasses, errorhandler=self.filtererrorhandler)
-        self.quickstats = {}
         # terminology matcher
         self.termmatcher = None
         self.termmatchermtime = None
@@ -107,11 +107,14 @@
             self.filestyle = "std"
         self._prefs = None
         self._quickstats = {}
+        self._stats = None   # cumulative statistics for project
         
         self.scanpofiles()
-        self.readquickstats()
         self.initindex()
 
+    def __repr__(self):
+        return "<TranslationProject /%s/%s/>" % (self.project.code, self.language.code)
+
     def _get_prefs(self):
         if not self._prefs:
             self._prefs = prefs.PrefsParser() # FIXME is PrefsParser a bit too heavy for every project?
@@ -966,7 +969,7 @@
     def _get_quickstats(self):
         if not self._quickstats:
             qstats = {}
-            qstatsfile = self.podir / "pootle-%s-%s.stats" % (self.project.code, self.language.code)
+            qstatsfile = path(self.podir / "pootle-%s-%s.stats" % (self.project.code, self.language.code))
             if qstatsfile.exists():
                 file = open(qstatsfile,'r')
                 for line in file:
@@ -977,10 +980,25 @@
                         self.savequickstats()
                         break
                     else:
-                        self.quickstats[items[0]] = tuple([int(a.strip()) for a in items[1:]])
+                        self._quickstats[items[0]] = tuple([int(a.strip()) for a in items[1:]])
         return self._quickstats
     quickstats = property(_get_quickstats)
 
+    def _get_stats(self):
+        if not self._stats:
+            tw, ts, fw, fs, allw, alls = 0, 0, 0, 0, 0, 0
+            for transw, transs, fuzzyw, fuzzys, allwords, allstring in self.quickstats.itervalues():
+                tw, ts, fw, fs, allw, alls = tw+transw, ts+transs, fw+fuzzyw, fs+fuzzys, allw+allwords, alls+allstring
+            # 'data' property format is translated, fuzzy, untranslated; for each wordcount, stringcount, percentage
+            uw, us = allw-tw-fw, alls-ts-fs
+            perc = alls/100.0
+            if perc: # in case of zero division error
+                self._stats = (tw, ts, int(ts/perc), fw, fs, int(fs/perc), uw, us, int(us/perc), allw, alls)
+            else:
+                self._stats = (0,0,0,0,0,0,0,0,0,0,0)
+        return self._stats
+    stats = property(_get_stats)
+                 
     def getquickstats(self, pofilenames=None):
         """gets translated and total stats and wordcouts without doing calculations returning dictionary"""
         if pofilenames is None:

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2007-02-11 10:38:05 UTC (rev 5000)
+++ src/branches/django-migration/Pootle/templates/language.html	2007-02-11 22:26:14 UTC (rev 5001)
@@ -39,7 +39,22 @@
       <tbody class="stats">
 {% for item in projects %}
           <tr class="item item-{% cycle even,odd %}" title="{{ item.description }}">
-            {% itemnode stats %}
+            <td class="stats-name">
+              <img src="/static/images/{{ item.project.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+      <a href="{{ item.project.code }}" lang="en" dir="ltr">{{ item.project.name }}</a>
+    </td>
+{# data:   0,  1, 2 translated words, string, percentage    #}
+{#         3,  4, 5 fuzzy words, string, percentage         #}
+{#         6,  7, 8 untranslated words, string, percentage  #}
+{#         9, 10    all words, string                       #}
+      <td class="stats">{{ item.stats.0 }}</td><td class="stats">{{ item.stats.2 }}%</td>
+      <td class="stats">{{ item.stats.3 }}</td><td class="stats">{{ item.stats.5 }}%</td>
+      <td class="stats">{{ item.stats.6 }}</td><td class="stats">{{ item.stats.8 }}%</td>
+      <td class="stats">{{ item.stats.9 }}</td>
+      <td class="stats-graph">
+        <span class="sortkey">{{ item.stats.2 }}</span>
+<img src="/static/images/green.png" class="data" height="20" width="{{ item.stats.2 }}" /><img src="/static/images/blue.png" class="data" height="20" width="{{ item.stats.5 }}" /><img src="/static/images/red.png" class="data" height="20" width="{{ item.stats.8 }}" />
+      </td>
           </tr>
 {% endfor %}
       </tbody>

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2007-02-11 10:38:05 UTC (rev 5000)
+++ src/branches/django-migration/Pootle/templates/project.html	2007-02-11 22:26:14 UTC (rev 5001)
@@ -20,7 +20,7 @@
 {% endif %}
 
       <div class="item-statistics">
-        {{ project.stats }} FIXME
+        {{ stats }} FIXME
       </div>
     </div>
 
@@ -45,7 +45,18 @@
       <tbody class="stats">
 {% for item in languages %}
           <tr  class="item item-{% cycle even,odd %}">
-            {% itemnode stats %}
+            <td class="stats-name">
+      <img src="/static/images/{{ item.language.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+      <a href="{{ item.language.code }}" lang="en" dir="ltr">{{ item.language.name }}</a>
+    </td>
+      <td class="stats">{{ item.stats.0 }}</td><td class="stats">{{ item.stats.2 }}%</td>
+      <td class="stats">{{ item.stats.3 }}</td><td class="stats">{{ item.stats.5 }}%</td>
+      <td class="stats">{{ item.stats.6 }}</td><td class="stats">{{ item.stats.8 }}%</td>
+      <td class="stats">{{ item.stats.9 }}</td>
+      <td class="stats-graph">
+        <span class="sortkey">{{ item.stats.2 }}</span>
+<img src="/static/images/green.png" class="data" height="20" width="{{ item.stats.2 }}" /><img src="/static/images/blue.png" class="data" height="20" width="{{ item.stats.5 }}" /><img src="/static/images/red.png" class="data" height="20" width="{{ item.stats.8 }}" />
+      </td>
           </tr>
 {% endfor %}
       </tbody>

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-11 10:38:05 UTC (rev 5000)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-11 22:26:14 UTC (rev 5001)
@@ -14,6 +14,7 @@
 from Pootle import indexpage, adminpages, users, translatepage
 from Pootle.conf import instance, potree
 from Pootle.conf import users as pootleusers
+from Pootle.projects import TranslationProject
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 import random
@@ -183,23 +184,25 @@
 home = login_required(home)
 
 def projectlanguageindex(req, project):
-    languages = list(potree().get_language_list(project))
+    p = potree().get_project(project)
+    languages = [] # FIXME
     context = {
-        'project': potree().get_project(project),
+        'project': p,
         'stats': ngettext(  "%(count)d language, average %(average)d%% translated", # FIXME
                             "%(count)d languages, average %(average)d%% translated", 
                             len(languages)) % { 
                                 'count': len(languages),
                                 'average': 0 #getpagestats(), }, 
                                 },
-        'languages': languages,
+        'languages': [ TranslationProject(lang, p) for lang in potree().get_language_list(project)],
         }
     return render_to_response("project.html", RequestContext(req, context))
 
 def languageindex(req, language):
+    lang = potree().get_language(language)
     context = {
-        "language": potree().get_language(language),
-        "projects": potree().get_project_list(language),
+        "language": lang,
+        "projects": [TranslationProject(lang, p) for p in potree().get_project_list(language)],
         }
     return render_to_response("language.html", RequestContext(req, context))
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5002
          http://svn.sourceforge.net/translate/?rev=5002&view=rev
Author:   zejn
Date:     2007-02-11 16:21:39 -0800 (Sun, 11 Feb 2007)

Log Message:
-----------
[django-migration] Removed FSObject in favor of path module, implemented folder browsing with it.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/potree.py
    src/branches/django-migration/Pootle/projects.py
    src/branches/django-migration/Pootle/templates/fileindex.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-02-11 22:26:14 UTC (rev 5001)
+++ src/branches/django-migration/Pootle/path.py	2007-02-12 00:21:39 UTC (rev 5002)
@@ -969,3 +969,19 @@
         def startfile(self):
             os.startfile(self)
 
+    # --- Special stuff for Pootle
+
+    def listpo(self):
+        return self.files("*.po")
+
+    def listxliff(self):
+        return self.files("*.xlf")
+
+    def stats(self):
+        return {}
+
+    def icon(self):
+        if self.isdir():
+            return 'folder'
+        elif self.isfile(): 
+            return 'file'

Modified: src/branches/django-migration/Pootle/potree.py
===================================================================
--- src/branches/django-migration/Pootle/potree.py	2007-02-11 22:26:14 UTC (rev 5001)
+++ src/branches/django-migration/Pootle/potree.py	2007-02-12 00:21:39 UTC (rev 5002)
@@ -112,20 +112,7 @@
         else:
             raise KeyError("Project %s does not have %s attribute." % (self,key))
 
-class FSObject(path):
-    icon = 'folder'
-    href = 'FIXME'
-    title = 'FIXME'
 
-    def __repr__(self):
-        return "<PootleFS object: %s>" % path.__repr__(self)
-
-    def _get_stats(self):
-        return {}
-    stats = property(_get_stats)
-
-
-
 class POTree:
     """Manages the tree of projects and languages"""
     def __init__(self, instance):
@@ -459,7 +446,7 @@
             if len(languagedirs) > 1:
                 raise IndexError("multiple regions defined for language %s, project %s" % (languagecode, projectcode))
             languagedir = projectdir / languagedirs[0]
-        return FSObject(languagedir)
+        return path(languagedir)
 
     def languagematch(self, languagecode, otherlanguagecode):
         """matches a languagecode to another, ignoring regions in the second"""

Modified: src/branches/django-migration/Pootle/projects.py
===================================================================
--- src/branches/django-migration/Pootle/projects.py	2007-02-11 22:26:14 UTC (rev 5001)
+++ src/branches/django-migration/Pootle/projects.py	2007-02-12 00:21:39 UTC (rev 5002)
@@ -131,6 +131,10 @@
         """saves the project preferences"""
         self.prefs.savefile()
 
+    def list_dir(self, subdir=None):
+        listing = subdir and path(self.podir / subdir) or path(self.podir)
+        return listing.dirs("[!.]*") + listing.listpo() 
+
     def getrightnames(self, session): # FIXME gettext
         """gets the available rights and their localized names"""
         localize = session.localize

Modified: src/branches/django-migration/Pootle/templates/fileindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/fileindex.html	2007-02-11 22:26:14 UTC (rev 5001)
+++ src/branches/django-migration/Pootle/templates/fileindex.html	2007-02-12 00:21:39 UTC (rev 5002)
@@ -10,7 +10,7 @@
 {% block content %}
     <div class="navbar">
       <img src="/static/images/folder.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
-      <h3 class="title">[ <a href="/{{ lang.code }}/">{{ lang.name }}</a> ] [ <a href="/{{ project.code }}/">{{ project.name }}</a> ]</h3>
+      <h3 class="title">[ <a href="/{{ project.language.code }}/">{{ project.language.name }}</a> ] [ <a href="/{{ project.project.code }}/">{{ project.project.name }}</a> ]</h3>
       <div class="item-description" id="actionlinks">
 
       </div>
@@ -26,7 +26,10 @@
       </div>
     </div>
 
+<table>
 {% for item in items %}
-{% itemnode edit %}
+<tr><td><img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+<a href="{{ item.basename }}">{{ item.basename }}</a><br /></td></tr>
 {% endfor %}
+</table>
 {% endblock %}

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-11 22:26:14 UTC (rev 5001)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-12 00:21:39 UTC (rev 5002)
@@ -206,14 +206,13 @@
         }
     return render_to_response("language.html", RequestContext(req, context))
     
-def projectindex(req, language, project):
+def projectindex(req, language, project, subdir=None):
     proj = potree().getproject(language, project)
-    print proj.browsefiles(dirfilter=None, depth=0)
 
+    p = TranslationProject(potree().get_language(language), potree().get_project(project))
     context = {
-        'project': potree().get_project(project),
-        'lang': potree().get_language(language),
-        'items': [1,2,3]
+        'project': p,
+        'items': p.list_dir(subdir),
        }
     return render_to_response("fileindex.html", RequestContext(req, context))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5004
          http://svn.sourceforge.net/translate/?rev=5004&view=rev
Author:   zejn
Date:     2007-02-12 15:45:31 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
[django-migration] Adding Django models for DB driven metadata storage.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/web/models.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-02-12 10:59:23 UTC (rev 5003)
+++ src/branches/django-migration/Pootle/path.py	2007-02-12 23:45:31 UTC (rev 5004)
@@ -978,7 +978,7 @@
         return self.files("*.xlf")
 
     def stats(self):
-        return {}
+        return (0,0,0,0,0,0,0,0,0,0,0)
 
     def icon(self):
         if self.isdir():

Added: src/branches/django-migration/Pootle/web/models.py
===================================================================
--- src/branches/django-migration/Pootle/web/models.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/web/models.py	2007-02-12 23:45:31 UTC (rev 5004)
@@ -0,0 +1,106 @@
+from django.db import models
+from translate.filters import checks
+from Pootle.path import path
+from django.contrib.auth.models import User
+
+CHECKSTYLES = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
+FILETYPES = (   ('po', 'po'),  ('xliff','xliff'), )
+
+class Project(models.Model):
+    code = models.SlugField(maxlength=32)
+    name = models.CharField(maxlength=100)
+    checkstyle = models.CharField(maxlength=20, choices=CHECKSTYLES)
+    description = models.TextField()
+    filetype = models.CharField(maxlength=10, choices=FILETYPES)
+    createmofiles = models.BooleanField()
+
+class Language(models.Model):
+    code = models.SlugField(maxlength=5)
+    name = models.CharField(maxlength=100)
+    specialchars = models.CharField(maxlength=100)
+    nplurals = models.IntegerField()
+    plural_equation = models.CharField(maxlength=200)
+    
+class TranslationProject(models.Model):
+    language = models.ForeignKey(Language)
+    project = models.ForeignKey(Project)
+    translatedwords = models.IntegerField()
+    translatedstrings = models.IntegerField()
+    fuzzywords = models.IntegerField()
+    fuzzystrings = models.IntegerField()
+    allwords = models.IntegerField()
+    allstrings = models.IntegerField()
+
+    def _get_stats(self):
+        perc = self.allstrings/100.0
+        untransw = self.allwords - self.translatedwords - self.fuzzywords
+        untranss = self.allstrings - self.translatedstrings - self.fuzzystrings
+        try:    
+            return (self.translatedwords, self.translatedstrings, int(self.translatedstrings/perc), 
+                    self.fuzzywords, self.fuzzystrings, int(self.fuzzystrings/perc),
+                    untransw, untranss, int(untranss/perc), 
+                    self.allwords, self.allstrings)
+        except ZeroDivisionError:
+            return (0,0,0, 0,0,0, 0,0,0, 0,0)
+    stats = property(_get_stats)
+
+    def list_dir(self, subdir=None):
+        listing = subdir and path(self.podir / subdir) or path(self.podir)
+        return listing.dirs("[!.]*") + listing.listpo()
+
+    def _get_podir(self):
+        if not hasattr(self, "_podir"):
+            self._podir = path(potree().getpodir(self.language.code, self.project.code))
+        return self._podir
+    podir = property(_get_podir)
+
+class PootlePermission(models.Model):
+    tproject = models.ForeignKey(TranslationProject)
+    user = models.ForeignKey(User)
+    rights = models.IntegerField()
+
+    # there are 31 possible rights
+    RIGHTS = {
+        'view': 0,
+        'suggest': 1,
+        'translate': 2,
+        'overwrite': 3,
+        'review': 4,
+        'archive': 5,
+        'pocompile': 6,
+        'assign': 7,
+        'admin': 8,
+        'commit': 9,
+        }
+
+    def __str__(self):
+        return "Permissions for %s for project /%s/%s/" % (self.user, self.project.code, self.language.code)
+
+    def __repr__(self):
+        return "<PootlePermissions: %s>" % ",".join(self.get_rights())
+
+    def has_right(self, right):
+        if right in self.RIGHTS:
+            # perform a bitwise AND with appropriate bit set and return True if set, False otherwise
+            return self.rights & 2**self.RIGHTS[right] and True or False
+        else:
+            return False
+
+    def get_rights(self):
+        rights = []
+        ra = rights.append
+        for r in self.RIGHTS.iterkeys():
+           if self.has_right(r):
+                ra(r)
+        return rights
+
+    def set_right(self, right):
+        if right in self.RIGHTS:
+            # bitwise OR sets the right
+            self.rights = self.rights | 2**self.RIGHTS[right]
+
+    def del_right(self, right):
+        if right in self.RIGHTS:
+            # bitwise AND with bit negative right clears the right
+            self.rights = self.rights & ~ 2**self.RIGHTS[right]
+

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-12 10:59:23 UTC (rev 5003)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-12 23:45:31 UTC (rev 5004)
@@ -207,8 +207,6 @@
     return render_to_response("language.html", RequestContext(req, context))
     
 def projectindex(req, language, project, subdir=None):
-    proj = potree().getproject(language, project)
-
     p = TranslationProject(potree().get_language(language), potree().get_project(project))
     context = {
         'project': p,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5012
          http://svn.sourceforge.net/translate/?rev=5012&view=rev
Author:   zejn
Date:     2007-02-13 03:52:36 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] Modified hrefs.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/urls.py

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2007-02-13 10:58:53 UTC (rev 5011)
+++ src/branches/django-migration/Pootle/templates/language.html	2007-02-13 11:52:36 UTC (rev 5012)
@@ -41,7 +41,7 @@
           <tr class="item item-{% cycle even,odd %}" title="{{ item.description }}">
             <td class="stats-name">
               <img src="/static/images/{{ item.project.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
-      <a href="{{ item.project.code }}" lang="en" dir="ltr">{{ item.project.name }}</a>
+      <a href="/{{ language.code }}/{{ item.project.code }}/browse/" lang="en" dir="ltr">{{ item.project.name }}</a>
     </td>
 {# data:   0,  1, 2 translated words, string, percentage    #}
 {#         3,  4, 5 fuzzy words, string, percentage         #}

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2007-02-13 10:58:53 UTC (rev 5011)
+++ src/branches/django-migration/Pootle/templates/project.html	2007-02-13 11:52:36 UTC (rev 5012)
@@ -47,7 +47,7 @@
           <tr  class="item item-{% cycle even,odd %}">
             <td class="stats-name">
       <img src="/static/images/{{ item.language.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
-      <a href="{{ item.language.code }}" lang="en" dir="ltr">{{ item.language.name }}</a>
+      <a href="/{{ item.language.code }}/{{ project.code }}/browse/" lang="en" dir="ltr">{{ item.language.name }}</a>
     </td>
       <td class="stats">{{ item.stats.0 }}</td><td class="stats">{{ item.stats.2 }}%</td>
       <td class="stats">{{ item.stats.3 }}</td><td class="stats">{{ item.stats.5 }}%</td>

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2007-02-13 10:58:53 UTC (rev 5011)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-13 11:52:36 UTC (rev 5012)
@@ -41,11 +41,12 @@
     
     (r'^(?P<language>\w+)/$', 'languageindex'),
     (r'^(?P<language>\w+)/(?P<project>\w+)/$', 'projectindex'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/index.html$', 'projectindex'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/browse/(?P<subdir>[\w/]*?)$', 'projectindex'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/translate/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'translatepage'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/download/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'downloadfile'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/review/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'review'),
     
-    (r'^(?P<language>\w+)/(?P<project>\w+)/admin.html', 'admintranslationproject'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/translate.html$', 'translatepage'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/(.*).po?translate$', 'translatepage'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/admin/', 'admintranslationproject'),
     (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/spellcheck.html$', 'spellcheck'),
     (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/spellingstandby.html$', 'spellingstandby'),
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5013
          http://svn.sourceforge.net/translate/?rev=5013&view=rev
Author:   zejn
Date:     2007-02-13 03:55:25 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] Moving forms to compat/ in order to use web/ for Django models.

Added Paths:
-----------
    src/branches/django-migration/Pootle/compat/forms.py

Removed Paths:
-------------
    src/branches/django-migration/Pootle/web/forms.py

Copied: src/branches/django-migration/Pootle/compat/forms.py (from rev 4985, src/branches/django-migration/Pootle/web/forms.py)
===================================================================
--- src/branches/django-migration/Pootle/compat/forms.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/compat/forms.py	2007-02-13 11:55:25 UTC (rev 5013)
@@ -0,0 +1,109 @@
+from django import forms
+from Pootle.conf import instance, saveprefs, potree
+from Pootle.compat.pootleauth import PootleAuth, create_user, save_users
+from translate.filters import checks
+from django.core import validators
+from django.core.validators import isOnlyDigits, isValidEmail
+from Pootle.utils import CallableValidatorWrapper
+
+isValidEmail = CallableValidatorWrapper(isValidEmail)
+
+CHECKS = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
+# FIXME: Filetypes should probably be provided by translate-toolkit.
+FILETYPES = [
+    ('po', 'po'),
+    ('xliff','xliff'),
+    ]
+
+class SiteOptionsManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="title", length=40),
+            forms.LargeTextField(field_name="description"),
+            forms.TextField(field_name="baseurl", length=40),
+            forms.TextField(field_name="homepage", length=40),
+          )
+
+    def old_data(self):
+        return dict([ (optionname.field_name, getattr(instance(), optionname.field_name, "")) for optionname in self.fields])
+
+    def save(self, new_data):
+        for optionname in self.fields:
+            setattr(instance(), optionname.field_name, new_data[optionname.field_name])
+        saveprefs()
+        
+
+class UserAdminManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="username", length=6),
+            forms.TextField(field_name="name", length=20),
+            forms.TextField(field_name="email", length=20, validator_list=[isValidEmail]),
+            forms.TextField(field_name="password", length=20),
+            forms.CheckboxField(field_name="activated"),
+            )
+
+    def old_data(self, user):
+        pa = PootleAuth()
+        u = pa.get_user(user)
+        if u:
+            return dict([ (k.field_name, getattr(u,k.field_name)) for k in self.fields if k.field_name != 'password'])
+        else:
+            return {}
+
+    def save(self, new_data):
+        pa = PootleAuth()
+        user = pa.get_user(new_data['username'])
+        if not user:
+            user = create_user(new_data['username'], new_data['email'])
+        user.set_user(new_data)
+        save_users()
+
+class ProjectAdminManipulator(forms.Manipulator):
+    def __init__(self):
+        self.fields = (
+            forms.TextField(field_name="name", length=40),
+            forms.LargeTextField(field_name="description"),
+            forms.SelectField(field_name="checkstyle", choices=CHECKS),
+            forms.SelectField(field_name="filetype", choices=FILETYPES),
+            forms.CheckboxField(field_name="createmofiles"),
+            )
+
+    def old_data(self, project):
+        p = potree().get_project(project)
+        return dict([ (k.field_name, getattr(p,k.field_name)) for k in self.fields ])
+
+    def save(self, new_data, projectcode):
+        p = potree().get_project(projectcode)
+        for k in self.fields:
+            setattr(p, k.field_name, new_data[k.field_name])
+
+class UserProfileManipulator(forms.Manipulator):
+    def __init__(self, user):
+        self.user = user
+        project_choices = [(p.code, p.name) for p in potree().get_project_list()]
+        language_choices = [(p.code, p.name.encode("utf-8")) for p in potree().get_language_list()]
+        self.fields = (
+            forms.TextField(field_name="name", length=40),
+            forms.TextField(field_name="email", length=40, validator_list=[isValidEmail]),
+            forms.PasswordField(field_name="password", length=40),
+            forms.PasswordField(field_name="password_confirm", length=40, validator_list=[validators.AlwaysMatchesOtherField('password')]),
+            forms.SelectField(field_name="uilanguage", choices=[]), # FIXME add choices
+            forms.TextField(field_name="inputheight", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="inputwidth", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="viewrows", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="translaterows", length=10, validator_list=[isOnlyDigits]),
+            forms.SelectMultipleField(field_name="projects", size=min(max(len(project_choices), 5), 15), choices=project_choices),
+            forms.SelectMultipleField(field_name="languages", size=min(max(len(language_choices), 5), 15), choices=language_choices),
+        )
+
+    def old_data(self):
+        return dict([ (k.field_name, getattr(self.user, k.field_name, None)) for k in self.fields if not k.field_name.startswith("password") ])
+
+    def save(self, new_data):
+        u = self.user
+        u.set_user(new_data)
+        u.projects = new_data.getlist('projects')
+        u.languages = new_data.getlist('languages')
+        u.save()
+        return u

Deleted: src/branches/django-migration/Pootle/web/forms.py
===================================================================
--- src/branches/django-migration/Pootle/web/forms.py	2007-02-13 11:52:36 UTC (rev 5012)
+++ src/branches/django-migration/Pootle/web/forms.py	2007-02-13 11:55:25 UTC (rev 5013)
@@ -1,109 +0,0 @@
-from django import forms
-from Pootle.conf import instance, saveprefs, potree
-from Pootle.compat.pootleauth import PootleAuth, create_user, save_users
-from translate.filters import checks
-from django.core import validators
-from django.core.validators import isOnlyDigits, isValidEmail
-from Pootle.utils import CallableValidatorWrapper
-
-isValidEmail = CallableValidatorWrapper(isValidEmail)
-
-CHECKS = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
-# FIXME: Filetypes should probably be provided by translate-toolkit.
-FILETYPES = [
-    ('po', 'po'),
-    ('xliff','xliff'),
-    ]
-
-class SiteOptionsManipulator(forms.Manipulator):
-    def __init__(self):
-        self.fields = (
-            forms.TextField(field_name="title", length=40),
-            forms.LargeTextField(field_name="description"),
-            forms.TextField(field_name="baseurl", length=40),
-            forms.TextField(field_name="homepage", length=40),
-          )
-
-    def old_data(self):
-        return dict([ (optionname.field_name, getattr(instance(), optionname.field_name, "")) for optionname in self.fields])
-
-    def save(self, new_data):
-        for optionname in self.fields:
-            setattr(instance(), optionname.field_name, new_data[optionname.field_name])
-        saveprefs()
-        
-
-class UserAdminManipulator(forms.Manipulator):
-    def __init__(self):
-        self.fields = (
-            forms.TextField(field_name="username", length=6),
-            forms.TextField(field_name="name", length=20),
-            forms.TextField(field_name="email", length=20, validator_list=[isValidEmail]),
-            forms.TextField(field_name="password", length=20),
-            forms.CheckboxField(field_name="activated"),
-            )
-
-    def old_data(self, user):
-        pa = PootleAuth()
-        u = pa.get_user(user)
-        if u:
-            return dict([ (k.field_name, getattr(u,k.field_name)) for k in self.fields if k.field_name != 'password'])
-        else:
-            return {}
-
-    def save(self, new_data):
-        pa = PootleAuth()
-        user = pa.get_user(new_data['username'])
-        if not user:
-            user = create_user(new_data['username'], new_data['email'])
-        user.set_user(new_data)
-        save_users()
-
-class ProjectAdminManipulator(forms.Manipulator):
-    def __init__(self):
-        self.fields = (
-            forms.TextField(field_name="name", length=40),
-            forms.LargeTextField(field_name="description"),
-            forms.SelectField(field_name="checkstyle", choices=CHECKS),
-            forms.SelectField(field_name="filetype", choices=FILETYPES),
-            forms.CheckboxField(field_name="createmofiles"),
-            )
-
-    def old_data(self, project):
-        p = potree().get_project(project)
-        return dict([ (k.field_name, getattr(p,k.field_name)) for k in self.fields ])
-
-    def save(self, new_data, projectcode):
-        p = potree().get_project(projectcode)
-        for k in self.fields:
-            setattr(p, k.field_name, new_data[k.field_name])
-
-class UserProfileManipulator(forms.Manipulator):
-    def __init__(self, user):
-        self.user = user
-        project_choices = [(p.code, p.name) for p in potree().get_project_list()]
-        language_choices = [(p.code, p.name.encode("utf-8")) for p in potree().get_language_list()]
-        self.fields = (
-            forms.TextField(field_name="name", length=40),
-            forms.TextField(field_name="email", length=40, validator_list=[isValidEmail]),
-            forms.PasswordField(field_name="password", length=40),
-            forms.PasswordField(field_name="password_confirm", length=40, validator_list=[validators.AlwaysMatchesOtherField('password')]),
-            forms.SelectField(field_name="uilanguage", choices=[]), # FIXME add choices
-            forms.TextField(field_name="inputheight", length=10, validator_list=[isOnlyDigits]),
-            forms.TextField(field_name="inputwidth", length=10, validator_list=[isOnlyDigits]),
-            forms.TextField(field_name="viewrows", length=10, validator_list=[isOnlyDigits]),
-            forms.TextField(field_name="translaterows", length=10, validator_list=[isOnlyDigits]),
-            forms.SelectMultipleField(field_name="projects", size=min(max(len(project_choices), 5), 15), choices=project_choices),
-            forms.SelectMultipleField(field_name="languages", size=min(max(len(language_choices), 5), 15), choices=language_choices),
-        )
-
-    def old_data(self):
-        return dict([ (k.field_name, getattr(self.user, k.field_name, None)) for k in self.fields if not k.field_name.startswith("password") ])
-
-    def save(self, new_data):
-        u = self.user
-        u.set_user(new_data)
-        u.projects = new_data.getlist('projects')
-        u.languages = new_data.getlist('languages')
-        u.save()
-        return u


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5014
          http://svn.sourceforge.net/translate/?rev=5014&view=rev
Author:   zejn
Date:     2007-02-13 03:58:26 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] Moving views from web/ to compat/ to make room for Django DB metadata views.

Added Paths:
-----------
    src/branches/django-migration/Pootle/compat/views.py

Removed Paths:
-------------
    src/branches/django-migration/Pootle/web/views.py

Copied: src/branches/django-migration/Pootle/compat/views.py (from rev 5004, src/branches/django-migration/Pootle/web/views.py)
===================================================================
--- src/branches/django-migration/Pootle/compat/views.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/compat/views.py	2007-02-13 11:58:26 UTC (rev 5014)
@@ -0,0 +1,458 @@
+from django.http import HttpResponse, HttpResponseRedirect
+from django.template import Context, RequestContext, loader
+from django.conf import settings
+from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth import REDIRECT_FIELD_NAME
+from django.shortcuts import render_to_response
+from django import forms
+from django.core.mail import send_mail
+
+from Pootle.web import forms as pootleforms 
+from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
+from Pootle.compat import pootleauth
+from Pootle import indexpage, adminpages, users, translatepage
+from Pootle.conf import instance, potree
+from Pootle.conf import users as pootleusers
+from Pootle.projects import TranslationProject
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ngettext
+import random
+
+from Pootle import __version__ as pootleversion
+from translate import __version__ as toolkitversion
+
+### backwards compatiblity 
+import kid
+import os
+from jToolkit.xml import DOMOverlay
+OLD_TEMPLATEDIR = settings.TEMPLATE_DIRS[0]
+
+class AttrDict(dict):
+  """Dictionary that also allows access to keys using attributes"""
+  def __getattr__(self, attr, default=None):
+    if attr in self:
+      return self[attr]
+    else:
+      return default
+
+# needed for 'buildpage'
+def attribify(context):
+  """takes a set of nested dictionaries and converts them into AttrDict. Also searches through lists"""
+  if isinstance(context, dict) and not isinstance(context, AttrDict):
+    newcontext = AttrDict(context)
+    for key, value in newcontext.items():
+      if isinstance(value, (dict, list)):
+        newcontext[key] = attribify(value)
+    return newcontext
+  elif isinstance(context, list):
+    for n, item in enumerate(context):
+      if isinstance(item, (dict, list)):
+        context[n] = attribify(item)
+    return context
+  else:
+    return context
+
+def loadurl(filename, context):
+    "opens a template file and returns contents as string"
+    filename = os.path.join(OLD_TEMPLATEDIR, filename+os.extsep+"html")
+    if os.path.exists(filename):
+        return open(filename, "r").read()
+    return None
+    
+def buildpage(source, context, loadurl=loadurl, localize=None, innerid=None):
+    #(self, source, context, loadurl=None, localize=None, innerid=None):
+    if DOMOverlay is not None:
+      innerid = context.pop("@innerid", None)
+      if loadurl is None:
+        loadurl = DOMOverlay.loadurl
+      domoverlay = DOMOverlay.DOMOverlay(source, loadurl, context)
+      source = domoverlay.serialise(innerid)
+    context = attribify(context)
+    t = kid.Template(source=source,**context)
+    return t.serialize(output='xhtml')
+
+# the most "important" method for rendering backwards compatible templates
+def render_to_pootleresponse(pootlepage):
+    templatename = pootlepage.templatename
+    template = open(os.path.join(OLD_TEMPLATEDIR, templatename+os.extsep+"html"), "r").read()
+    page = buildpage(template, pootlepage.templatevars or {})
+    return HttpResponse(page)
+
+def pootlesession(req):
+    """Make a wrapper around Django session object to make it work
+    with Pootle's page classes seamlessly."""
+    print 'WARNING: This view uses pootlesession.'
+    def localize(s, *args):
+        if args:
+            return _(s) % args
+        return s 
+    def nlocalize(s, s2, numarg, *args):
+        if args: 
+            return s % args
+        return s
+    session = req.session
+    session.localize = localize
+    session.nlocalize = nlocalize
+    session.username = req.user
+    session.instance = instance()
+    if not req.user.is_authenticated():
+        session.status = 'not logged in'
+    else:
+        session.status = 'logged in as <b>%s</b>' % req.user
+    session.isopen = req.user.is_authenticated()
+    session.prefs = req.user
+    
+    # user's projects
+    class getprojects:
+        def __call__(self):
+            userlanguages = getattr(session.prefs, "languages", "")
+            return [languagecode.strip() for languagecode in userlanguages.split(',') if languagecode.strip()]
+    session.getprojects = getprojects()
+    
+    def is_admin(req):
+        def _inner():
+            if not req.user.is_anonymous:
+                if req.user.is_authenticated and req.user.is_superuser:
+                    return True
+            return False
+        return _inner
+    session.issiteadmin = is_admin(req)
+
+    def getlanguages():
+        return []
+    session.getlanguages = getlanguages
+    from Pootle.conf import users as old_users
+    class LoginChecker:
+        def _get_users(self):
+            return old_users()
+        users = property(_get_users)
+
+    session.loginchecker = LoginChecker()
+    session.language = 'sl'
+    return session
+
+def css(req):
+    css = open('/home/hruske/Desktop/pootle/trunk/Pootle/html/pootle.css','r').read()
+    return HttpResponse(content=css, mimetype='text/css')
+
+def errorlist_from_errors(errors):
+    # FIXME a rather ugly hack just to keep things jtoolkit-friendly
+    error_list = []
+    for e in errors:
+        error_list.extend([ str(a) for a in errors[e]])
+    return " ".join(error_list)
+
+    
+
+### end backwards compatibility
+
+def robots(req):
+    return HttpResponse(content=generaterobotsfile(["login.html", "register.html", "activate.html"]), mimetype="text/plain")
+
+# indexpage.py
+def index(req, what=None):
+    if req.GET:
+        if 'islogout' in req.GET:
+            next_page = req.GET.get('next_page','/')
+            from django.contrib.auth import logout as djangologout
+            djangologout(req)
+            req.session.isopen = False # FIXME: will be obsoleted
+            return HttpResponseRedirect(next_page)
+
+    if what == 'languages':
+        context = {
+            'languages': potree().get_language_list(),
+            }
+    elif what == 'projects':
+        context = {
+            'projects': potree().get_project_list(),
+            }
+    else:
+        context = {
+            'languages': potree().get_language_list(),
+            'projects': potree().get_project_list(),
+            }
+    return render_to_response("index.html", RequestContext(req, context))
+    
+def about(req):
+    context = { 'pootleversion':pootleversion.ver, 'toolkitversion':toolkitversion.ver }
+    return render_to_response("about.html", RequestContext(req, context ))
+
+def home(req):
+    return render_to_response("home.html", RequestContext(req, {}))
+home = login_required(home)
+
+def projectlanguageindex(req, project):
+    p = potree().get_project(project)
+    languages = [] # FIXME
+    context = {
+        'project': p,
+        'stats': ngettext(  "%(count)d language, average %(average)d%% translated", # FIXME
+                            "%(count)d languages, average %(average)d%% translated", 
+                            len(languages)) % { 
+                                'count': len(languages),
+                                'average': 0 #getpagestats(), }, 
+                                },
+        'languages': [ TranslationProject(lang, p) for lang in potree().get_language_list(project)],
+        }
+    return render_to_response("project.html", RequestContext(req, context))
+
+def languageindex(req, language):
+    lang = potree().get_language(language)
+    context = {
+        "language": lang,
+        "projects": [TranslationProject(lang, p) for p in potree().get_project_list(language)],
+        }
+    return render_to_response("language.html", RequestContext(req, context))
+    
+def projectindex(req, language, project, subdir=None):
+    p = TranslationProject(potree().get_language(language), potree().get_project(project))
+    context = {
+        'project': p,
+        'items': p.list_dir(subdir),
+       }
+    return render_to_response("fileindex.html", RequestContext(req, context))
+
+def options(req):
+    manipulator = pootleforms.UserProfileManipulator(req.user)
+    if req.POST:
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            manipulator.do_html2python(new_data)
+            manipulator.save(new_data)
+            return HttpResponseRedirect(req.path)
+    else:
+        errors = {}
+        new_data = manipulator.old_data()
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    context = { 'form' : form, 'errors': errors }
+    return render_to_response("options.html", RequestContext(req, context))
+
+def login(req):
+    message = None
+    redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
+    manipulator = AuthenticationForm(req)
+    new_data = {}
+    if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
+        redirect_to = '/home/'
+
+    if req.user.is_authenticated():
+        return HttpResponseRedirect(redirect_to)
+    else:
+        if req.POST:
+            # do login here
+            errors = manipulator.get_validation_errors(req.POST)
+            if not errors:
+                from django.contrib.auth import login
+                login(req, manipulator.get_user())
+                req.session.delete_test_cookie()
+                req.session.isopen = True
+                return HttpResponseRedirect(redirect_to) 
+            new_data = req.POST.copy()
+            del(new_data['password'])
+        else:
+            errors = {}
+        req.session.set_test_cookie()
+        
+        form = forms.FormWrapper(manipulator, new_data, errors)
+        context = { 
+            'languages': potree().get_language_list(), # FIXME validation
+            'form': form,
+            }
+        return render_to_response("login.html", RequestContext(req, context))
+
+# users.py: registration, activation
+
+def register(req):
+    message = _("Please enter your registration details")
+    manipulator = RegistrationManipulator() 
+    if req.POST:
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if errors:
+            message = errorlist_from_errors(errors)
+        else:
+            manipulator.do_html2python(new_data)
+            activation_code = "".join(["%02x" % int(random.random()*0x100) for i in range(16)])
+            new_data['activationcode'] = activation_code
+            new_user = manipulator.save(new_data)
+            
+            # and email the activation details
+            email_contents = loader.get_template("email_register.txt")
+            context = Context({
+                'activationlink': '',
+                'activationcode': activation_code,
+                'username': new_data['username'],
+                'password': new_data['password'],
+                'email': new_data['email'],
+                })
+            send_mail("Pootle registration", email_contents.render(context), settings.DEFAULT_FROM_EMAIL, [new_data['email']],
+                fail_silently=False)
+
+            return render_to_response("register_sent.html", RequestContext(req))
+    else:
+        new_data = {}
+        errors = {}
+    
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    context = {
+        'register_message' : message, 
+        'form' : form,
+        }
+    return render_to_response("register.html", RequestContext(req, context)) 
+
+def activate(req):
+    manipulator = ActivationManipulator()
+    context = {}
+    if 'activationcode' in req.REQUEST and 'username' in req.REQUEST:
+        # FIXME: validation
+        errors = manipulator.get_validation_errors(req.REQUEST)
+        if not errors:
+            if manipulator.save(req.REQUEST):
+                context = { 'activationmessage': _("Your account has been activated!"), }
+
+    if 'username' in req.REQUEST:
+        new_data = {'username': req.REQUEST['username']} 
+    else:
+        new_data = {}
+    errors = {}
+    
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    context['form'] = form
+    return render_to_response("activate.html", RequestContext(req, context))
+
+# adminpages.py
+
+def projectadmin(req, project):
+    argdict = {}
+    return render_to_pootleresponse(adminpages.ProjectAdminPage(potree(), project, pootlesession(req), argdict))
+    
+def admin(req):
+    manipulator = pootleforms.SiteOptionsManipulator()
+    if req.POST and req.user.is_superuser():
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            manipulator.do_html2python(new_data)
+            manipulator.save(new_data)
+            return HttpResponseRedirect(req.path)
+    else:
+        errors = {}
+        new_data = manipulator.old_data()
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    return render_to_response("adminindex.html", RequestContext(req, { 'form': form, 'errors': errors } ))
+
+def admin_useredit(req, user):
+    manipulator = pootleforms.UserAdminManipulator()
+    if req.POST and req.user.is_superuser():
+        new_data = req.POST.copy()
+        new_data['username'] = user
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            manipulator.do_html2python(new_data)
+            manipulator.save(new_data)
+            return HttpResponseRedirect('/'.join(req.path.split("/")[:-2]) + '/')
+    else:
+        errors = {}
+        new_data = manipulator.old_data(user)
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user, 'errors':errors} ))
+
+def adminusers(req):
+    if req.POST and req.user.is_superuser():
+        selected = [ u for u in pootleauth.get_users() if "select-%s" % u.username in req.POST]
+        if 'delete-selected' in req.POST:
+            for u in selected:
+                u.delete()
+            pootleauth.save_users()
+    return render_to_response("adminusers.html", RequestContext(req, { 'users': pootleauth.get_users() } ))
+
+def adminlanguages(req):
+    if req.POST and req.user.is_superuser():
+        pass
+    context = { 'languages': potree().get_language_list() }
+    return render_to_response("adminlanguages.html", RequestContext(req, context))
+
+def adminprojects(req):
+    if req.POST and req.user.is_superuser():
+        pass
+    context = { 'projects' : potree().get_project_list() }
+    return render_to_response("adminprojects.html", RequestContext(req, context))
+
+def admin_projectedit(req, project):
+    manipulator = pootleforms.ProjectAdminManipulator()
+    if req.POST and req.user.is_superuser():
+        new_data = req.POST.copy()
+        errors = manipulator.get_validation_errors(new_data)
+        if not errors:
+            manipulator.do_html2python(new_data)
+            manipulator.save(new_data, project)
+            return HttpResponseRedirect('/'.join(req.path.split("/")[:-2]) + '/')
+    else:
+        errors = {}
+        new_data = manipulator.old_data(project)
+    form = forms.FormWrapper(manipulator, new_data, errors)
+    context = { 'project' : potree().get_project(project),
+                'form': form,
+                'errors': errors,}
+    return render_to_response("admin_projectedit.html", RequestContext(req, context))
+
+def admintranslationproject(req, language, project):
+    if req.POST and req.user.is_superuser():
+        pass
+    argdict = {}
+    project_obj = potree().getproject(language, project)
+    return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project_obj, pootlesession(req), argdict))
+
+# translatepage.py
+
+def translatepage(req):
+    # handles 2 urls
+    return render_to_pootleresponse(translatepage.TranslatePage(project, pootlesession(req), argdict={}, dirfilter=None))
+
+# spellui.py
+
+def spellcheck(req):
+    return render_to_pootleresponse(spellui.SpellingReview(pootlesession(req), argdict={}, js_url="/js/spellui.js"))
+
+def spellingstandby(req):
+    return render_to_pootleresponse(spellui.SpellingStandby())
+
+
+def test(req):
+    tests = []
+    ta = tests.append
+    # Pootle.compat.pootleauth
+    ta(("<b>Pootle.compat.pootleauth</b>",))
+    # user created
+    testuser = pootleauth.create_user('testuser','test@...')
+    ta(('user created', pootleauth.get_user('testuser') == testuser._user))
+    # password set
+    testuser.set_password('testpassword')
+    try: t = testuser.check_password('testpassword')
+    except: t = False
+    ta(('password set', t))
+    # user authenticated
+    pa = pootleauth.PootleAuth()
+    u = pa.authenticate('testuser', 'testpassword')
+    ta(('user authenticated', u != None and type(u) == type(pootleauth.UserWrapper(testuser._user,'testuser'))))
+    # is_authenticated is true
+    ta(('is_authenticated is true', testuser.is_authenticated() == True))
+    # is_anonymous is false
+    ta(('is_anonymous is false', testuser.is_anonymous() == False))
+    # is_active is false
+    ta(('is_active is false', testuser.is_active() == False))
+    # activate 
+    testuser.activate()
+    ta(('activate', testuser.is_active() == True))
+    # is_superuser is false
+    ta(('is_superuser is false', testuser.is_superuser() == False))
+    # user deleted
+    testuser.delete()
+    pootleauth.save_users()
+    ta( ('user deleted', pootleauth.get_user('testuser') == None))
+
+
+    return render_to_response("test.html", RequestContext(req, {'tests': tests}))

Deleted: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-13 11:55:25 UTC (rev 5013)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-13 11:58:26 UTC (rev 5014)
@@ -1,458 +0,0 @@
-from django.http import HttpResponse, HttpResponseRedirect
-from django.template import Context, RequestContext, loader
-from django.conf import settings
-from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.auth.decorators import login_required
-from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.shortcuts import render_to_response
-from django import forms
-from django.core.mail import send_mail
-
-from Pootle.web import forms as pootleforms 
-from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
-from Pootle.compat import pootleauth
-from Pootle import indexpage, adminpages, users, translatepage
-from Pootle.conf import instance, potree
-from Pootle.conf import users as pootleusers
-from Pootle.projects import TranslationProject
-from django.utils.translation import gettext_lazy as _
-from django.utils.translation import ngettext
-import random
-
-from Pootle import __version__ as pootleversion
-from translate import __version__ as toolkitversion
-
-### backwards compatiblity 
-import kid
-import os
-from jToolkit.xml import DOMOverlay
-OLD_TEMPLATEDIR = settings.TEMPLATE_DIRS[0]
-
-class AttrDict(dict):
-  """Dictionary that also allows access to keys using attributes"""
-  def __getattr__(self, attr, default=None):
-    if attr in self:
-      return self[attr]
-    else:
-      return default
-
-# needed for 'buildpage'
-def attribify(context):
-  """takes a set of nested dictionaries and converts them into AttrDict. Also searches through lists"""
-  if isinstance(context, dict) and not isinstance(context, AttrDict):
-    newcontext = AttrDict(context)
-    for key, value in newcontext.items():
-      if isinstance(value, (dict, list)):
-        newcontext[key] = attribify(value)
-    return newcontext
-  elif isinstance(context, list):
-    for n, item in enumerate(context):
-      if isinstance(item, (dict, list)):
-        context[n] = attribify(item)
-    return context
-  else:
-    return context
-
-def loadurl(filename, context):
-    "opens a template file and returns contents as string"
-    filename = os.path.join(OLD_TEMPLATEDIR, filename+os.extsep+"html")
-    if os.path.exists(filename):
-        return open(filename, "r").read()
-    return None
-    
-def buildpage(source, context, loadurl=loadurl, localize=None, innerid=None):
-    #(self, source, context, loadurl=None, localize=None, innerid=None):
-    if DOMOverlay is not None:
-      innerid = context.pop("@innerid", None)
-      if loadurl is None:
-        loadurl = DOMOverlay.loadurl
-      domoverlay = DOMOverlay.DOMOverlay(source, loadurl, context)
-      source = domoverlay.serialise(innerid)
-    context = attribify(context)
-    t = kid.Template(source=source,**context)
-    return t.serialize(output='xhtml')
-
-# the most "important" method for rendering backwards compatible templates
-def render_to_pootleresponse(pootlepage):
-    templatename = pootlepage.templatename
-    template = open(os.path.join(OLD_TEMPLATEDIR, templatename+os.extsep+"html"), "r").read()
-    page = buildpage(template, pootlepage.templatevars or {})
-    return HttpResponse(page)
-
-def pootlesession(req):
-    """Make a wrapper around Django session object to make it work
-    with Pootle's page classes seamlessly."""
-    print 'WARNING: This view uses pootlesession.'
-    def localize(s, *args):
-        if args:
-            return _(s) % args
-        return s 
-    def nlocalize(s, s2, numarg, *args):
-        if args: 
-            return s % args
-        return s
-    session = req.session
-    session.localize = localize
-    session.nlocalize = nlocalize
-    session.username = req.user
-    session.instance = instance()
-    if not req.user.is_authenticated():
-        session.status = 'not logged in'
-    else:
-        session.status = 'logged in as <b>%s</b>' % req.user
-    session.isopen = req.user.is_authenticated()
-    session.prefs = req.user
-    
-    # user's projects
-    class getprojects:
-        def __call__(self):
-            userlanguages = getattr(session.prefs, "languages", "")
-            return [languagecode.strip() for languagecode in userlanguages.split(',') if languagecode.strip()]
-    session.getprojects = getprojects()
-    
-    def is_admin(req):
-        def _inner():
-            if not req.user.is_anonymous:
-                if req.user.is_authenticated and req.user.is_superuser:
-                    return True
-            return False
-        return _inner
-    session.issiteadmin = is_admin(req)
-
-    def getlanguages():
-        return []
-    session.getlanguages = getlanguages
-    from Pootle.conf import users as old_users
-    class LoginChecker:
-        def _get_users(self):
-            return old_users()
-        users = property(_get_users)
-
-    session.loginchecker = LoginChecker()
-    session.language = 'sl'
-    return session
-
-def css(req):
-    css = open('/home/hruske/Desktop/pootle/trunk/Pootle/html/pootle.css','r').read()
-    return HttpResponse(content=css, mimetype='text/css')
-
-def errorlist_from_errors(errors):
-    # FIXME a rather ugly hack just to keep things jtoolkit-friendly
-    error_list = []
-    for e in errors:
-        error_list.extend([ str(a) for a in errors[e]])
-    return " ".join(error_list)
-
-    
-
-### end backwards compatibility
-
-def robots(req):
-    return HttpResponse(content=generaterobotsfile(["login.html", "register.html", "activate.html"]), mimetype="text/plain")
-
-# indexpage.py
-def index(req, what=None):
-    if req.GET:
-        if 'islogout' in req.GET:
-            next_page = req.GET.get('next_page','/')
-            from django.contrib.auth import logout as djangologout
-            djangologout(req)
-            req.session.isopen = False # FIXME: will be obsoleted
-            return HttpResponseRedirect(next_page)
-
-    if what == 'languages':
-        context = {
-            'languages': potree().get_language_list(),
-            }
-    elif what == 'projects':
-        context = {
-            'projects': potree().get_project_list(),
-            }
-    else:
-        context = {
-            'languages': potree().get_language_list(),
-            'projects': potree().get_project_list(),
-            }
-    return render_to_response("index.html", RequestContext(req, context))
-    
-def about(req):
-    context = { 'pootleversion':pootleversion.ver, 'toolkitversion':toolkitversion.ver }
-    return render_to_response("about.html", RequestContext(req, context ))
-
-def home(req):
-    return render_to_response("home.html", RequestContext(req, {}))
-home = login_required(home)
-
-def projectlanguageindex(req, project):
-    p = potree().get_project(project)
-    languages = [] # FIXME
-    context = {
-        'project': p,
-        'stats': ngettext(  "%(count)d language, average %(average)d%% translated", # FIXME
-                            "%(count)d languages, average %(average)d%% translated", 
-                            len(languages)) % { 
-                                'count': len(languages),
-                                'average': 0 #getpagestats(), }, 
-                                },
-        'languages': [ TranslationProject(lang, p) for lang in potree().get_language_list(project)],
-        }
-    return render_to_response("project.html", RequestContext(req, context))
-
-def languageindex(req, language):
-    lang = potree().get_language(language)
-    context = {
-        "language": lang,
-        "projects": [TranslationProject(lang, p) for p in potree().get_project_list(language)],
-        }
-    return render_to_response("language.html", RequestContext(req, context))
-    
-def projectindex(req, language, project, subdir=None):
-    p = TranslationProject(potree().get_language(language), potree().get_project(project))
-    context = {
-        'project': p,
-        'items': p.list_dir(subdir),
-       }
-    return render_to_response("fileindex.html", RequestContext(req, context))
-
-def options(req):
-    manipulator = pootleforms.UserProfileManipulator(req.user)
-    if req.POST:
-        new_data = req.POST.copy()
-        errors = manipulator.get_validation_errors(new_data)
-        if not errors:
-            manipulator.do_html2python(new_data)
-            manipulator.save(new_data)
-            return HttpResponseRedirect(req.path)
-    else:
-        errors = {}
-        new_data = manipulator.old_data()
-    form = forms.FormWrapper(manipulator, new_data, errors)
-    context = { 'form' : form, 'errors': errors }
-    return render_to_response("options.html", RequestContext(req, context))
-
-def login(req):
-    message = None
-    redirect_to = req.REQUEST.get(REDIRECT_FIELD_NAME, '')
-    manipulator = AuthenticationForm(req)
-    new_data = {}
-    if not redirect_to or '://' in redirect_to or ' ' in redirect_to:
-        redirect_to = '/home/'
-
-    if req.user.is_authenticated():
-        return HttpResponseRedirect(redirect_to)
-    else:
-        if req.POST:
-            # do login here
-            errors = manipulator.get_validation_errors(req.POST)
-            if not errors:
-                from django.contrib.auth import login
-                login(req, manipulator.get_user())
-                req.session.delete_test_cookie()
-                req.session.isopen = True
-                return HttpResponseRedirect(redirect_to) 
-            new_data = req.POST.copy()
-            del(new_data['password'])
-        else:
-            errors = {}
-        req.session.set_test_cookie()
-        
-        form = forms.FormWrapper(manipulator, new_data, errors)
-        context = { 
-            'languages': potree().get_language_list(), # FIXME validation
-            'form': form,
-            }
-        return render_to_response("login.html", RequestContext(req, context))
-
-# users.py: registration, activation
-
-def register(req):
-    message = _("Please enter your registration details")
-    manipulator = RegistrationManipulator() 
-    if req.POST:
-        new_data = req.POST.copy()
-        errors = manipulator.get_validation_errors(new_data)
-        if errors:
-            message = errorlist_from_errors(errors)
-        else:
-            manipulator.do_html2python(new_data)
-            activation_code = "".join(["%02x" % int(random.random()*0x100) for i in range(16)])
-            new_data['activationcode'] = activation_code
-            new_user = manipulator.save(new_data)
-            
-            # and email the activation details
-            email_contents = loader.get_template("email_register.txt")
-            context = Context({
-                'activationlink': '',
-                'activationcode': activation_code,
-                'username': new_data['username'],
-                'password': new_data['password'],
-                'email': new_data['email'],
-                })
-            send_mail("Pootle registration", email_contents.render(context), settings.DEFAULT_FROM_EMAIL, [new_data['email']],
-                fail_silently=False)
-
-            return render_to_response("register_sent.html", RequestContext(req))
-    else:
-        new_data = {}
-        errors = {}
-    
-    form = forms.FormWrapper(manipulator, new_data, errors)
-    context = {
-        'register_message' : message, 
-        'form' : form,
-        }
-    return render_to_response("register.html", RequestContext(req, context)) 
-
-def activate(req):
-    manipulator = ActivationManipulator()
-    context = {}
-    if 'activationcode' in req.REQUEST and 'username' in req.REQUEST:
-        # FIXME: validation
-        errors = manipulator.get_validation_errors(req.REQUEST)
-        if not errors:
-            if manipulator.save(req.REQUEST):
-                context = { 'activationmessage': _("Your account has been activated!"), }
-
-    if 'username' in req.REQUEST:
-        new_data = {'username': req.REQUEST['username']} 
-    else:
-        new_data = {}
-    errors = {}
-    
-    form = forms.FormWrapper(manipulator, new_data, errors)
-    context['form'] = form
-    return render_to_response("activate.html", RequestContext(req, context))
-
-# adminpages.py
-
-def projectadmin(req, project):
-    argdict = {}
-    return render_to_pootleresponse(adminpages.ProjectAdminPage(potree(), project, pootlesession(req), argdict))
-    
-def admin(req):
-    manipulator = pootleforms.SiteOptionsManipulator()
-    if req.POST and req.user.is_superuser():
-        new_data = req.POST.copy()
-        errors = manipulator.get_validation_errors(new_data)
-        if not errors:
-            manipulator.do_html2python(new_data)
-            manipulator.save(new_data)
-            return HttpResponseRedirect(req.path)
-    else:
-        errors = {}
-        new_data = manipulator.old_data()
-    form = forms.FormWrapper(manipulator, new_data, errors)
-    return render_to_response("adminindex.html", RequestContext(req, { 'form': form, 'errors': errors } ))
-
-def admin_useredit(req, user):
-    manipulator = pootleforms.UserAdminManipulator()
-    if req.POST and req.user.is_superuser():
-        new_data = req.POST.copy()
-        new_data['username'] = user
-        errors = manipulator.get_validation_errors(new_data)
-        if not errors:
-            manipulator.do_html2python(new_data)
-            manipulator.save(new_data)
-            return HttpResponseRedirect('/'.join(req.path.split("/")[:-2]) + '/')
-    else:
-        errors = {}
-        new_data = manipulator.old_data(user)
-    form = forms.FormWrapper(manipulator, new_data, errors)
-    return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user, 'errors':errors} ))
-
-def adminusers(req):
-    if req.POST and req.user.is_superuser():
-        selected = [ u for u in pootleauth.get_users() if "select-%s" % u.username in req.POST]
-        if 'delete-selected' in req.POST:
-            for u in selected:
-                u.delete()
-            pootleauth.save_users()
-    return render_to_response("adminusers.html", RequestContext(req, { 'users': pootleauth.get_users() } ))
-
-def adminlanguages(req):
-    if req.POST and req.user.is_superuser():
-        pass
-    context = { 'languages': potree().get_language_list() }
-    return render_to_response("adminlanguages.html", RequestContext(req, context))
-
-def adminprojects(req):
-    if req.POST and req.user.is_superuser():
-        pass
-    context = { 'projects' : potree().get_project_list() }
-    return render_to_response("adminprojects.html", RequestContext(req, context))
-
-def admin_projectedit(req, project):
-    manipulator = pootleforms.ProjectAdminManipulator()
-    if req.POST and req.user.is_superuser():
-        new_data = req.POST.copy()
-        errors = manipulator.get_validation_errors(new_data)
-        if not errors:
-            manipulator.do_html2python(new_data)
-            manipulator.save(new_data, project)
-            return HttpResponseRedirect('/'.join(req.path.split("/")[:-2]) + '/')
-    else:
-        errors = {}
-        new_data = manipulator.old_data(project)
-    form = forms.FormWrapper(manipulator, new_data, errors)
-    context = { 'project' : potree().get_project(project),
-                'form': form,
-                'errors': errors,}
-    return render_to_response("admin_projectedit.html", RequestContext(req, context))
-
-def admintranslationproject(req, language, project):
-    if req.POST and req.user.is_superuser():
-        pass
-    argdict = {}
-    project_obj = potree().getproject(language, project)
-    return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project_obj, pootlesession(req), argdict))
-
-# translatepage.py
-
-def translatepage(req):
-    # handles 2 urls
-    return render_to_pootleresponse(translatepage.TranslatePage(project, pootlesession(req), argdict={}, dirfilter=None))
-
-# spellui.py
-
-def spellcheck(req):
-    return render_to_pootleresponse(spellui.SpellingReview(pootlesession(req), argdict={}, js_url="/js/spellui.js"))
-
-def spellingstandby(req):
-    return render_to_pootleresponse(spellui.SpellingStandby())
-
-
-def test(req):
-    tests = []
-    ta = tests.append
-    # Pootle.compat.pootleauth
-    ta(("<b>Pootle.compat.pootleauth</b>",))
-    # user created
-    testuser = pootleauth.create_user('testuser','test@...')
-    ta(('user created', pootleauth.get_user('testuser') == testuser._user))
-    # password set
-    testuser.set_password('testpassword')
-    try: t = testuser.check_password('testpassword')
-    except: t = False
-    ta(('password set', t))
-    # user authenticated
-    pa = pootleauth.PootleAuth()
-    u = pa.authenticate('testuser', 'testpassword')
-    ta(('user authenticated', u != None and type(u) == type(pootleauth.UserWrapper(testuser._user,'testuser'))))
-    # is_authenticated is true
-    ta(('is_authenticated is true', testuser.is_authenticated() == True))
-    # is_anonymous is false
-    ta(('is_anonymous is false', testuser.is_anonymous() == False))
-    # is_active is false
-    ta(('is_active is false', testuser.is_active() == False))
-    # activate 
-    testuser.activate()
-    ta(('activate', testuser.is_active() == True))
-    # is_superuser is false
-    ta(('is_superuser is false', testuser.is_superuser() == False))
-    # user deleted
-    testuser.delete()
-    pootleauth.save_users()
-    ta( ('user deleted', pootleauth.get_user('testuser') == None))
-
-
-    return render_to_response("test.html", RequestContext(req, {'tests': tests}))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5015
          http://svn.sourceforge.net/translate/?rev=5015&view=rev
Author:   zejn
Date:     2007-02-13 04:08:11 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] Moving compat urls into compat/.

Added Paths:
-----------
    src/branches/django-migration/Pootle/compat/urls.py

Removed Paths:
-------------
    src/branches/django-migration/Pootle/urls.py

Copied: src/branches/django-migration/Pootle/compat/urls.py (from rev 5012, src/branches/django-migration/Pootle/urls.py)
===================================================================
--- src/branches/django-migration/Pootle/compat/urls.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/compat/urls.py	2007-02-13 12:08:11 UTC (rev 5015)
@@ -0,0 +1,55 @@
+# this is here to make sure Django Pootle sets up global variables
+import Pootle.instance
+
+from django.conf.urls.defaults import *
+from django.conf import settings
+
+urlpatterns = patterns('',
+    # js, images, pootle.css, /favicon.ico
+    (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
+)
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        (r'^test/$', 'Pootle.web.views.test'),
+    )
+
+urlpatterns += patterns('Pootle.web.views',
+    (r'^$', 'index'),
+    (r'^login.html$', 'login'),
+    (r'^register.html$', 'register'),
+    (r'^activate.html$', 'activate'),
+    (r'^about.html$', 'about'),
+    (r'^home/$', 'home'),
+    (r'^home/index.html$', 'home'),
+    (r'^home/options/$', 'options'),
+    (r'^(?P<what>languages)/$', 'index'),
+    
+    (r'^(?P<what>projects)/$', 'index'),
+    (r'^projects/(?P<project>\w+)/$', 'projectlanguageindex'),
+    (r'^projects/(?P<project>\w+)/index.html$', 'projectlanguageindex'),
+    (r'^projects/(?P<project>\w+)/admin.html$', 'projectadmin'),
+    
+    (r'^admin/$', 'admin'),
+    (r'^admin/index.html$', 'admin'),
+    (r'^admin/users/$', 'adminusers'),
+    (r'^admin/users/(?P<user>\w+)/$', 'admin_useredit'),
+    (r'^admin/languages/$', 'adminlanguages'),
+    (r'^admin/projects/$', 'adminprojects'),
+    (r'^admin/projects/(?P<project>\w+)/$', 'admin_projectedit'),
+
+    
+    (r'^(?P<language>\w+)/$', 'languageindex'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/$', 'projectindex'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/browse/(?P<subdir>[\w/]*?)$', 'projectindex'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/translate/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'translatepage'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/download/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'downloadfile'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/review/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'review'),
+    
+    (r'^(?P<language>\w+)/(?P<project>\w+)/admin/', 'admintranslationproject'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/spellcheck.html$', 'spellcheck'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/spellingstandby.html$', 'spellingstandby'),
+
+
+    (r'^robots.txt$', 'robots'),
+)

Deleted: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2007-02-13 11:58:26 UTC (rev 5014)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-13 12:08:11 UTC (rev 5015)
@@ -1,55 +0,0 @@
-# this is here to make sure Django Pootle sets up global variables
-import Pootle.instance
-
-from django.conf.urls.defaults import *
-from django.conf import settings
-
-urlpatterns = patterns('',
-    # js, images, pootle.css, /favicon.ico
-    (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
-)
-
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        (r'^test/$', 'Pootle.web.views.test'),
-    )
-
-urlpatterns += patterns('Pootle.web.views',
-    (r'^$', 'index'),
-    (r'^login.html$', 'login'),
-    (r'^register.html$', 'register'),
-    (r'^activate.html$', 'activate'),
-    (r'^about.html$', 'about'),
-    (r'^home/$', 'home'),
-    (r'^home/index.html$', 'home'),
-    (r'^home/options/$', 'options'),
-    (r'^(?P<what>languages)/$', 'index'),
-    
-    (r'^(?P<what>projects)/$', 'index'),
-    (r'^projects/(?P<project>\w+)/$', 'projectlanguageindex'),
-    (r'^projects/(?P<project>\w+)/index.html$', 'projectlanguageindex'),
-    (r'^projects/(?P<project>\w+)/admin.html$', 'projectadmin'),
-    
-    (r'^admin/$', 'admin'),
-    (r'^admin/index.html$', 'admin'),
-    (r'^admin/users/$', 'adminusers'),
-    (r'^admin/users/(?P<user>\w+)/$', 'admin_useredit'),
-    (r'^admin/languages/$', 'adminlanguages'),
-    (r'^admin/projects/$', 'adminprojects'),
-    (r'^admin/projects/(?P<project>\w+)/$', 'admin_projectedit'),
-
-    
-    (r'^(?P<language>\w+)/$', 'languageindex'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/$', 'projectindex'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/browse/(?P<subdir>[\w/]*?)$', 'projectindex'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/translate/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'translatepage'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/download/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'downloadfile'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/review/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'review'),
-    
-    (r'^(?P<language>\w+)/(?P<project>\w+)/admin/', 'admintranslationproject'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/spellcheck.html$', 'spellcheck'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/(.*)/spellingstandby.html$', 'spellingstandby'),
-
-
-    (r'^robots.txt$', 'robots'),
-)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5016
          http://svn.sourceforge.net/translate/?rev=5016&view=rev
Author:   zejn
Date:     2007-02-13 05:07:29 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] Cleanup compat/ and POOTLE_BACKWARDS_COMPATIBILITY to localsettings.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/urls.py
    src/branches/django-migration/Pootle/compat/views.py
    src/branches/django-migration/Pootle/localsettings.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/urls.py

Modified: src/branches/django-migration/Pootle/compat/urls.py
===================================================================
--- src/branches/django-migration/Pootle/compat/urls.py	2007-02-13 12:08:11 UTC (rev 5015)
+++ src/branches/django-migration/Pootle/compat/urls.py	2007-02-13 13:07:29 UTC (rev 5016)
@@ -2,19 +2,8 @@
 import Pootle.instance
 
 from django.conf.urls.defaults import *
-from django.conf import settings
 
-urlpatterns = patterns('',
-    # js, images, pootle.css, /favicon.ico
-    (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
-)
-
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        (r'^test/$', 'Pootle.web.views.test'),
-    )
-
-urlpatterns += patterns('Pootle.web.views',
+urlpatterns = patterns('Pootle.compat.views',
     (r'^$', 'index'),
     (r'^login.html$', 'login'),
     (r'^register.html$', 'register'),

Modified: src/branches/django-migration/Pootle/compat/views.py
===================================================================
--- src/branches/django-migration/Pootle/compat/views.py	2007-02-13 12:08:11 UTC (rev 5015)
+++ src/branches/django-migration/Pootle/compat/views.py	2007-02-13 13:07:29 UTC (rev 5016)
@@ -8,12 +8,11 @@
 from django import forms
 from django.core.mail import send_mail
 
-from Pootle.web import forms as pootleforms 
-from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
+from Pootle.compat import forms as pootleforms 
 from Pootle.compat import pootleauth
-from Pootle import indexpage, adminpages, users, translatepage
+from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
+from Pootle import adminpages, users, translatepage
 from Pootle.conf import instance, potree
-from Pootle.conf import users as pootleusers
 from Pootle.projects import TranslationProject
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
@@ -150,7 +149,6 @@
 def robots(req):
     return HttpResponse(content=generaterobotsfile(["login.html", "register.html", "activate.html"]), mimetype="text/plain")
 
-# indexpage.py
 def index(req, what=None):
     if req.GET:
         if 'islogout' in req.GET:

Modified: src/branches/django-migration/Pootle/localsettings.py
===================================================================
--- src/branches/django-migration/Pootle/localsettings.py	2007-02-13 12:08:11 UTC (rev 5015)
+++ src/branches/django-migration/Pootle/localsettings.py	2007-02-13 13:07:29 UTC (rev 5016)
@@ -23,7 +23,11 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    '/home/hruske/Desktop/pootle/pootle_src/django-migration-orig/Pootle/templates/',
+    next_to_this_file(__file__,'templates/'),
 )
 
 POOTLE_INSTANCE = 'Pootle'
+
+# If you have old Pootle installation, this setting will keep using 
+# Pootle's prefs files for metadata storage instead of databases.
+POOTLE_BACKWARDS_COMPATIBILITY = False

Added: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-13 13:07:29 UTC (rev 5016)
@@ -0,0 +1,22 @@
+# this is here to make sure Django Pootle sets up global variables
+import Pootle.instance
+
+from django.conf.urls.defaults import *
+from django.conf import settings
+
+if settings.POOTLE_BACKWARDS_COMPATIBILITY:
+    urlpatterns = patterns('',
+        (r'^', include('Pootle.compat.urls')),
+    )
+else:
+    urlpatterns = patterns('',
+        (r'^', include('Pootle.web.urls')),
+    )
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        (r'^test/$', 'Pootle.web.views.test'),
+        # js, images, pootle.css, /favicon.ico
+        (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
+    )
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5020
          http://svn.sourceforge.net/translate/?rev=5020&view=rev
Author:   zejn
Date:     2007-02-13 07:30:08 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] Fix imports for prefs.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/instance.py
    src/branches/django-migration/Pootle/projects.py
    src/branches/django-migration/Pootle/users.py

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-13 15:09:49 UTC (rev 5019)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-13 15:30:08 UTC (rev 5020)
@@ -5,7 +5,7 @@
 import md5
 import os
 from django.conf import settings
-from jToolkit import prefs
+from Pootle.compat import prefs
 from Pootle.conf import instance, users, potree
 
 

Modified: src/branches/django-migration/Pootle/instance.py
===================================================================
--- src/branches/django-migration/Pootle/instance.py	2007-02-13 15:09:49 UTC (rev 5019)
+++ src/branches/django-migration/Pootle/instance.py	2007-02-13 15:30:08 UTC (rev 5020)
@@ -12,7 +12,7 @@
 from django.conf import settings
 from Pootle import potree
 from Pootle.conf import set_instance
-from jToolkit import prefs
+from Pootle.compat import prefs
 import os
 
 serverprefs = prefs.PrefsParser()

Modified: src/branches/django-migration/Pootle/projects.py
===================================================================
--- src/branches/django-migration/Pootle/projects.py	2007-02-13 15:09:49 UTC (rev 5019)
+++ src/branches/django-migration/Pootle/projects.py	2007-02-13 15:30:08 UTC (rev 5020)
@@ -38,7 +38,7 @@
 from Pootle.path import path
 from Pootle.conf import potree
 from jToolkit import timecache
-from jToolkit import prefs
+from Pootle.compat import prefs
 import time
 import os
 import cStringIO

Modified: src/branches/django-migration/Pootle/users.py
===================================================================
--- src/branches/django-migration/Pootle/users.py	2007-02-13 15:09:49 UTC (rev 5019)
+++ src/branches/django-migration/Pootle/users.py	2007-02-13 15:30:08 UTC (rev 5020)
@@ -22,7 +22,7 @@
 from jToolkit import web
 from jToolkit.web import server
 from jToolkit import mailer
-from jToolkit import prefs
+from Pootle.compat import prefs
 from Pootle import pagelayout
 from Pootle.storage_client import getlanguageoptions as new_getlanguageoptions
 from Pootle.storage_client import getprojectoptions as new_getprojectoptions


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5025
          http://svn.sourceforge.net/translate/?rev=5025&view=rev
Author:   zejn
Date:     2007-02-13 15:28:07 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] Created UserProfile and fixed /home/options/. compat.forms.UserProfileManipulator is now a subclass of web.webforms.UserProfileManipulator

Modified Paths:
--------------
    src/branches/django-migration/Pootle/compat/forms.py
    src/branches/django-migration/Pootle/compat/pootleauth.py
    src/branches/django-migration/Pootle/settings.py
    src/branches/django-migration/Pootle/templates/options.html
    src/branches/django-migration/Pootle/web/models.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/web/webforms.py

Modified: src/branches/django-migration/Pootle/compat/forms.py
===================================================================
--- src/branches/django-migration/Pootle/compat/forms.py	2007-02-13 16:22:40 UTC (rev 5024)
+++ src/branches/django-migration/Pootle/compat/forms.py	2007-02-13 23:28:07 UTC (rev 5025)
@@ -1,4 +1,6 @@
 from django import forms
+
+from Pootle.web import webforms
 from Pootle.conf import instance, saveprefs, potree
 from Pootle.compat.pootleauth import PootleAuth, create_user, save_users
 from translate.filters import checks
@@ -78,27 +80,15 @@
         for k in self.fields:
             setattr(p, k.field_name, new_data[k.field_name])
 
-class UserProfileManipulator(forms.Manipulator):
-    def __init__(self, user):
-        self.user = user
-        project_choices = [(p.code, p.name) for p in potree().get_project_list()]
-        language_choices = [(p.code, p.name.encode("utf-8")) for p in potree().get_language_list()]
-        self.fields = (
-            forms.TextField(field_name="name", length=40),
-            forms.TextField(field_name="email", length=40, validator_list=[isValidEmail]),
-            forms.PasswordField(field_name="password", length=40),
-            forms.PasswordField(field_name="password_confirm", length=40, validator_list=[validators.AlwaysMatchesOtherField('password')]),
-            forms.SelectField(field_name="uilanguage", choices=[]), # FIXME add choices
-            forms.TextField(field_name="inputheight", length=10, validator_list=[isOnlyDigits]),
-            forms.TextField(field_name="inputwidth", length=10, validator_list=[isOnlyDigits]),
-            forms.TextField(field_name="viewrows", length=10, validator_list=[isOnlyDigits]),
-            forms.TextField(field_name="translaterows", length=10, validator_list=[isOnlyDigits]),
-            forms.SelectMultipleField(field_name="projects", size=min(max(len(project_choices), 5), 15), choices=project_choices),
-            forms.SelectMultipleField(field_name="languages", size=min(max(len(language_choices), 5), 15), choices=language_choices),
-        )
+project_choices = [(p.code, p.name) for p in potree().get_project_list()]
+language_choices = [(p.code, p.name.encode("utf-8")) for p in potree().get_language_list()]
 
+class UserProfileManipulator(webforms.UserProfileManipulator):
     def old_data(self):
-        return dict([ (k.field_name, getattr(self.user, k.field_name, None)) for k in self.fields if not k.field_name.startswith("password") ])
+        data = dict([ (k.field_name, getattr(self.user, k.field_name, None)) for k in self.fields if not k.field_name not in ["password", "password_confirm", "first_name", "last_name" ] ])
+        for field in ["first_name", "last_name" ]:
+            if hasattr(self.user, field):
+                data[field] = getattr(self.user, field)
 
     def save(self, new_data):
         u = self.user

Modified: src/branches/django-migration/Pootle/compat/pootleauth.py
===================================================================
--- src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-13 16:22:40 UTC (rev 5024)
+++ src/branches/django-migration/Pootle/compat/pootleauth.py	2007-02-13 23:28:07 UTC (rev 5025)
@@ -71,7 +71,7 @@
             return False
 
     def set_user(self, kwargs):
-        for i in ['name', 'email', 'uilanguage', 'inputheight', 'inputwidth', 'viewrows', 'translaterows']:
+        for i in ['first_name', 'last_name', 'email', 'uilanguage', 'inputheight', 'inputwidth', 'viewrows', 'translaterows']:
             if i in kwargs:
                 setattr(self._user, i, kwargs[i])
         if 'activated' in kwargs:

Modified: src/branches/django-migration/Pootle/settings.py
===================================================================
--- src/branches/django-migration/Pootle/settings.py	2007-02-13 16:22:40 UTC (rev 5024)
+++ src/branches/django-migration/Pootle/settings.py	2007-02-13 23:28:07 UTC (rev 5025)
@@ -67,4 +67,7 @@
 from Pootle.utils import next_to_this_file
 POOTLE_PREFS = next_to_this_file(__file__,'pootle.prefs')
 
-AUTHENTICATION_BACKENDS = ('Pootle.compat.pootleauth.PootleAuth', )
+if POOTLE_BACKWARDS_COMPATIBILITY:
+    AUTHENTICATION_BACKENDS = ('Pootle.compat.pootleauth.PootleAuth', )
+else:
+    AUTH_PROFILE_MODULE = 'web.UserProfile'

Modified: src/branches/django-migration/Pootle/templates/options.html
===================================================================
--- src/branches/django-migration/Pootle/templates/options.html	2007-02-13 16:22:40 UTC (rev 5024)
+++ src/branches/django-migration/Pootle/templates/options.html	2007-02-13 23:28:07 UTC (rev 5025)
@@ -15,10 +15,14 @@
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Current value" %}</h3></td>
           </tr>
           <tr>
-            <td colspan="1" rowspan="1">{% trans "Name" %}</td>
-            <td colspan="1" rowspan="1">{{ form.name }} {{ errors.name|join:" " }}</td>
+            <td colspan="1" rowspan="1">{% trans "First Name" %}</td>
+            <td colspan="1" rowspan="1">{{ form.first_name }} {{ errors.first_name|join:" " }}</td>
           </tr>
           <tr>
+            <td colspan="1" rowspan="1">{% trans "Last Name" %}</td>
+            <td colspan="1" rowspan="1">{{ form.last_name }} {{ errors.last_name|join:" " }}</td>
+          </tr>
+          <tr>
             <td colspan="1" rowspan="1">{% trans "Email" %}</td>
             <td colspan="1" rowspan="1">{{ form.email }} {{ errors.email|join:" " }}</td>
           </tr>

Modified: src/branches/django-migration/Pootle/web/models.py
===================================================================
--- src/branches/django-migration/Pootle/web/models.py	2007-02-13 16:22:40 UTC (rev 5024)
+++ src/branches/django-migration/Pootle/web/models.py	2007-02-13 23:28:07 UTC (rev 5025)
@@ -7,19 +7,26 @@
 FILETYPES = (   ('po', 'po'),  ('xliff','xliff'), )
 
 class Project(models.Model):
-    code = models.SlugField(maxlength=32)
+    code = models.SlugField(maxlength=32,unique=True)
     name = models.CharField(maxlength=100)
     checkstyle = models.CharField(maxlength=20, choices=CHECKSTYLES)
     description = models.TextField()
     filetype = models.CharField(maxlength=10, choices=FILETYPES)
     createmofiles = models.BooleanField()
+    
+    def __str__(self):
+        return self.name
 
 class Language(models.Model):
-    code = models.SlugField(maxlength=5)
+    code = models.SlugField(maxlength=5,unique=True)
     name = models.CharField(maxlength=100)
     specialchars = models.CharField(maxlength=100)
     nplurals = models.IntegerField()
     plural_equation = models.CharField(maxlength=200)
+    enabled = models.BooleanField()
+
+    def __str__(self):
+        return self.name
     
 class TranslationProject(models.Model):
     language = models.ForeignKey(Language)
@@ -31,6 +38,9 @@
     allwords = models.IntegerField()
     allstrings = models.IntegerField()
 
+    class Meta:
+        unique_together = ( ('language','project'),) 
+
     def _get_stats(self):
         perc = self.allstrings/100.0
         untransw = self.allwords - self.translatedwords - self.fuzzywords
@@ -104,3 +114,13 @@
             # bitwise AND with bit negative right clears the right
             self.rights = self.rights & ~ 2**self.RIGHTS[right]
 
+class UserProfile(models.Model):
+    user = models.ForeignKey(User, unique=True)  
+    uilanguage = models.ForeignKey(Language, blank=True, null=True)
+    inputheight = models.SmallIntegerField(blank=True, null=True)
+    inputwidth = models.SmallIntegerField(blank=True, null=True)
+    viewrows = models.SmallIntegerField(blank=True, null=True)
+    translaterows = models.SmallIntegerField(blank=True, null=True)
+    projects = models.ManyToManyField(Project, related_name='joined_projects', blank=True, null=True)
+    languages = models.ManyToManyField(Language, related_name='joined_languages', blank=True, null=True)
+

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-13 16:22:40 UTC (rev 5024)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-13 23:28:07 UTC (rev 5025)
@@ -8,6 +8,8 @@
 from django import forms
 from django.core.mail import send_mail
 
+from Pootle.web import webforms
+from Pootle.web.models import Project, Language
 from Pootle.compat import forms as pootleforms 
 from Pootle.compat import pootleauth
 from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
@@ -18,6 +20,8 @@
 from django.utils.translation import ngettext
 import random
 
+from Pootle.web.models import Language, Project
+
 from Pootle import __version__ as pootleversion
 from translate import __version__ as toolkitversion
 
@@ -34,16 +38,16 @@
 
     if what == 'languages':
         context = {
-            'languages': potree().get_language_list(),
+            'languages': Language.objects.all(),
             }
     elif what == 'projects':
         context = {
-            'projects': potree().get_project_list(),
+            'projects': Project.objects.all(),
             }
     else:
         context = {
-            'languages': potree().get_language_list(),
-            'projects': potree().get_project_list(),
+            'languages': Language.objects.all(),
+            'projects': Project.objects.all(),
             }
     return render_to_response("index.html", RequestContext(req, context))
     
@@ -56,7 +60,7 @@
 home = login_required(home)
 
 def projectlanguageindex(req, project):
-    p = potree().get_project(project)
+    p = Project.objects.get(code=project)
     languages = [] # FIXME
     context = {
         'project': p,
@@ -66,15 +70,15 @@
                                 'count': len(languages),
                                 'average': 0 #getpagestats(), }, 
                                 },
-        'languages': [ TranslationProject(lang, p) for lang in potree().get_language_list(project)],
+        'languages': [ TranslationProject(lang, p) for lang in Language.objects.all()],
         }
     return render_to_response("project.html", RequestContext(req, context))
 
 def languageindex(req, language):
-    lang = potree().get_language(language)
+    lang = Language.objects.get(code=language)
     context = {
         "language": lang,
-        "projects": [TranslationProject(lang, p) for p in potree().get_project_list(language)],
+        "projects": [TranslationProject(lang, p) for p in Project.objects.all()],
         }
     return render_to_response("language.html", RequestContext(req, context))
     
@@ -87,7 +91,7 @@
     return render_to_response("fileindex.html", RequestContext(req, context))
 
 def options(req):
-    manipulator = pootleforms.UserProfileManipulator(req.user)
+    manipulator = webforms.UserProfileManipulator(req.user)
     if req.POST:
         new_data = req.POST.copy()
         errors = manipulator.get_validation_errors(new_data)

Added: src/branches/django-migration/Pootle/web/webforms.py
===================================================================
--- src/branches/django-migration/Pootle/web/webforms.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/web/webforms.py	2007-02-13 23:28:07 UTC (rev 5025)
@@ -0,0 +1,69 @@
+from django import forms
+from Pootle.web.models import UserProfile, Project, Language
+from django.core import validators
+from django.core.validators import isOnlyDigits, isValidEmail
+from Pootle.utils import CallableValidatorWrapper
+
+isValidEmail = CallableValidatorWrapper(isValidEmail)
+
+project_choices = [(p.id, p.name) for p in Project.objects.all()]
+language_choices = [(p.id, p.name) for p in Language.objects.all()]
+
+class UserProfileManipulator(forms.Manipulator):
+    def __init__(self, user):
+        self.user = user
+        self.fields = (
+            forms.TextField(field_name="first_name", length=40),
+            forms.TextField(field_name="last_name", length=40),
+            forms.TextField(field_name="email", length=40, validator_list=[isValidEmail]),
+            forms.PasswordField(field_name="password", length=40),
+            forms.PasswordField(field_name="password_confirm", length=40, 
+                validator_list=[validators.AlwaysMatchesOtherField('password')]),
+            forms.SelectField(field_name="uilanguage", choices=[]), # FIXME add choices
+            forms.TextField(field_name="inputheight", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="inputwidth", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="viewrows", length=10, validator_list=[isOnlyDigits]),
+            forms.TextField(field_name="translaterows", length=10, validator_list=[isOnlyDigits]),
+            forms.SelectMultipleField(field_name="projects", 
+                size=min(max(len(project_choices), 5), 15), choices=project_choices),
+            forms.SelectMultipleField(field_name="languages", 
+                size=min(max(len(language_choices), 5), 15), choices=language_choices),
+        )
+
+    def old_data(self):
+        data = dict([ (k.field_name, getattr(self.user, k.field_name, None)) \
+            for k in self.fields if not k.field_name.startswith("password") ])
+        profile = self.user.get_profile()
+        data.update({   'projects': [p.id for p in profile.projects.all()], 
+                        'languages': [lang.id for lang in profile.languages.all()]} )
+        return data
+
+    def save(self, new_data):
+        u = self.user
+        u.first_name = new_data.get('first_name','')
+        u.last_name = new_data.get('last_name', '')
+        u.email = new_data['email']
+        if new_data['password']:
+            u.set_password(new_data['password'])
+        
+        try:
+            profile = u.get_profile()
+        except UserProfile.DoesNotExist:
+            profile = UserProfile()
+
+        for k in ['uilanguage', 'inputheight', 'inputwidth', 'viewrows', 'translaterows']:
+            setattr(profile, k, new_data[k])
+        
+        for p in Project.objects.all():
+            if str(p.id) in new_data.getlist('projects'):
+                profile.projects.add(Project.objects.get(pk=p.id))
+            else:
+                profile.projects.remove(Project.objects.get(pk=p.id))
+        
+        for lang in Language.objects.all():
+            if str(lang.id) in new_data.getlist('languages'):
+                profile.languages.add(Language.objects.get(pk=lang.id))
+            else:
+                profile.languages.remove(Language.objects.get(pk=lang.id))
+        u.save()
+        return u


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5027
          http://svn.sourceforge.net/translate/?rev=5027&view=rev
Author:   zejn
Date:     2007-02-13 16:40:48 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] Implemented (dis)allowing Languages on server.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/adminlanguages.html
    src/branches/django-migration/Pootle/templates/adminusers.html
    src/branches/django-migration/Pootle/web/models.py
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/adminlanguages.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-13 23:29:02 UTC (rev 5026)
+++ src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-14 00:40:48 UTC (rev 5027)
@@ -4,27 +4,26 @@
 {% block title %}Pootle Languages Admin Page{% endblock %}
 
 {% block adminpanel %}
+{% if error %}<div class="message">{{ error }}</div>{% endif %}
     <div class="fullwidthcontents">
       <h3 class="title">{% trans "Languages" %}</h3>
 
       <form action="" method="post" name="languages" id="languages">
         <table cellpadding="1" cellspacing="1">
           <tr>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Selected" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Enabled" %}</h3></td>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "ISO Code" %}</h3></td>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Special Chars" %}</h3></td>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Number of Plurals" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Plural Equation" %}</h3></td>
           </tr>
 {% for lang in languages %}
           <tr>
-            <td colspan="1" rowspan="1"><input type="checkbox" /></td>
+            <td colspan="1" rowspan="1"><input type="checkbox" name="{{ lang.code }}"{% if lang.enabled %} checked="on"{% endif%} /></td>
             <td colspan="1" rowspan="1">{{ lang.code }}</td>
             <td colspan="1" rowspan="1">{{ lang.name }}</td>
             <td colspan="1" rowspan="1">{{ lang.specialchars }}</td>
-            <td colspan="1" rowspan="1">{{ lang.nplurals }}</td>
-            <td colspan="1" rowspan="1">{{ lang.plural_equation }}</td>
+            <td colspan="1" rowspan="1" title="{{ lang.plural_equation }}">{{ lang.nplurals }}</td>
           </tr>
 {% endfor %}
         </table><input type="submit" name="changelanguages" value="{% trans "Save changes" %}" />

Modified: src/branches/django-migration/Pootle/templates/adminusers.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-13 23:29:02 UTC (rev 5026)
+++ src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-14 00:40:48 UTC (rev 5027)
@@ -16,9 +16,12 @@
               <h3 class="title">{% trans "Username" %}</h3>
             </td>
             <td colspan="1" rowspan="1">
-              <h3 class="title">{% trans "Full Name" %}</h3>
+              <h3 class="title">{% trans "First Name" %}</h3>
             </td>
             <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Last Name" %}</h3>
+            </td>
+            <td colspan="1" rowspan="1">
               <h3 class="title">{% trans "Email Address" %}</h3>
             </td>
             <td colspan="1" rowspan="1">
@@ -29,7 +32,8 @@
           <tr>
             <td colspan="1" rowspan="1"><input type="checkbox" name="select-{{ u.username }}" /></a></td>
             <td colspan="1" rowspan="1"><a href="{{ u.username }}/">{{ u.username }}</a></td>
-            <td colspan="1" rowspan="1">{{ u.name }}</td>
+            <td colspan="1" rowspan="1">{{ u.first_name }}</td>
+            <td colspan="1" rowspan="1">{{ u.last_name }}</td>
             <td colspan="1" rowspan="1">{{ u.email }}</td>
             <td colspan="1" rowspan="1">{% if u.activated %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %}</td>
           </tr>

Modified: src/branches/django-migration/Pootle/web/models.py
===================================================================
--- src/branches/django-migration/Pootle/web/models.py	2007-02-13 23:29:02 UTC (rev 5026)
+++ src/branches/django-migration/Pootle/web/models.py	2007-02-14 00:40:48 UTC (rev 5027)
@@ -17,6 +17,10 @@
     def __str__(self):
         return self.name
 
+class AllowedLanguageManager(models.Manager):
+    def get_query_set(self):
+        return super(AllowedLanguageManager, self).get_query_set().filter(enabled=True)
+
 class Language(models.Model):
     code = models.SlugField(maxlength=5,unique=True)
     name = models.CharField(maxlength=100)
@@ -25,8 +29,14 @@
     plural_equation = models.CharField(maxlength=200)
     enabled = models.BooleanField()
 
+    objects = AllowedLanguageManager()
+    unfiltered = models.Manager()
+
     def __str__(self):
         return self.name
+
+    class Meta:
+        ordering = ('code',)
     
 class TranslationProject(models.Model):
     language = models.ForeignKey(Language)

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-13 23:29:02 UTC (rev 5026)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-14 00:40:48 UTC (rev 5027)
@@ -3,6 +3,7 @@
 from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import User
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.shortcuts import render_to_response
 from django import forms
@@ -237,18 +238,27 @@
     return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user, 'errors':errors} ))
 
 def adminusers(req):
-    if req.POST and req.user.is_superuser():
-        selected = [ u for u in pootleauth.get_users() if "select-%s" % u.username in req.POST]
+    if req.POST and req.user.is_superuser:
+        selected = [ u for u in User.objects.all() if "select-%s" % u.username in req.POST]
         if 'delete-selected' in req.POST:
             for u in selected:
                 u.delete()
-            pootleauth.save_users()
-    return render_to_response("adminusers.html", RequestContext(req, { 'users': pootleauth.get_users() } ))
+    
+    return render_to_response("adminusers.html", RequestContext(req, { 'users': User.objects.all() } ))
 
 def adminlanguages(req):
-    if req.POST and req.user.is_superuser():
-        pass
-    context = { 'languages': potree().get_language_list() }
+    error = None
+    if req.POST:
+        if req.user.is_superuser:
+            for lang in Language.unfiltered.all():
+                lang.enabled = lang.code in req.POST
+                lang.save()
+        else:   
+            error = _("You do not have sufficient rights.")
+    context = { 
+        'languages': Language.unfiltered.all(), 
+        'error':error, 
+        'selected': [ lang.code for lang in Language.unfiltered.all()] }
     return render_to_response("adminlanguages.html", RequestContext(req, context))
 
 def adminprojects(req):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5028
          http://svn.sourceforge.net/translate/?rev=5028&view=rev
Author:   zejn
Date:     2007-02-13 17:13:57 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
[django-migration] User management works.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/admin_useredit.html
    src/branches/django-migration/Pootle/templates/adminusers.html
    src/branches/django-migration/Pootle/web/views.py
    src/branches/django-migration/Pootle/web/webforms.py

Modified: src/branches/django-migration/Pootle/templates/admin_useredit.html
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-14 00:40:48 UTC (rev 5027)
+++ src/branches/django-migration/Pootle/templates/admin_useredit.html	2007-02-14 01:13:57 UTC (rev 5028)
@@ -13,10 +13,14 @@
             <td colspan="1" rowspan="1">{{ u }}</td>
           </tr>
           <tr>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
-            <td colspan="1" rowspan="1">{{ form.name }}</td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "First Name" %}</h3></td>
+            <td colspan="1" rowspan="1">{{ form.first_name }}</td>
           </tr>
           <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Last Name" %}</h3></td>
+            <td colspan="1" rowspan="1">{{ form.last_name }}</td>
+          </tr>
+          <tr>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Email Address" %}</h3></td>
             <td colspan="1" rowspan="1">{{ form.email }} {{ errors.email|join:" " }}</td>
           </tr>
@@ -26,8 +30,12 @@
           </tr>
           <tr>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Activated" %}</h3></td>
-            <td colspan="1" rowspan="1">{{ form.activated }}</td>
+            <td colspan="1" rowspan="1">{{ form.is_active }}</td>
           </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Superuser" %}</h3></td>
+            <td colspan="1" rowspan="1">{{ form.is_superuser }}</td>
+          </tr>
         </table><input type="submit" name="changeusers" value="{% trans "Save changes" %}" />
       </form>
     </div>

Modified: src/branches/django-migration/Pootle/templates/adminusers.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-14 00:40:48 UTC (rev 5027)
+++ src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-14 01:13:57 UTC (rev 5028)
@@ -10,7 +10,6 @@
         <table cellpadding="1" cellspacing="1">
           <tr>
             <td colspan="1" rowspan="1">
-              <h3 class="title">{% trans "Selected" %}</h3>
             </td>
             <td colspan="1" rowspan="1">
               <h3 class="title">{% trans "Username" %}</h3>
@@ -35,7 +34,7 @@
             <td colspan="1" rowspan="1">{{ u.first_name }}</td>
             <td colspan="1" rowspan="1">{{ u.last_name }}</td>
             <td colspan="1" rowspan="1">{{ u.email }}</td>
-            <td colspan="1" rowspan="1">{% if u.activated %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %}</td>
+            <td colspan="1" rowspan="1">{% if u.is_active %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %}</td>
           </tr>
 {% endfor %}
         </table><input type="submit" name="delete-selected" value="{% trans "Delete selected" %}" />

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-14 00:40:48 UTC (rev 5027)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-14 01:13:57 UTC (rev 5028)
@@ -5,7 +5,7 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import User
 from django.contrib.auth import REDIRECT_FIELD_NAME
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, get_object_or_404
 from django import forms
 from django.core.mail import send_mail
 
@@ -222,8 +222,8 @@
     return render_to_response("adminindex.html", RequestContext(req, { 'form': form, 'errors': errors } ))
 
 def admin_useredit(req, user):
-    manipulator = pootleforms.UserAdminManipulator()
-    if req.POST and req.user.is_superuser():
+    manipulator = webforms.UserAdminManipulator(user)
+    if req.POST and req.user.is_superuser:
         new_data = req.POST.copy()
         new_data['username'] = user
         errors = manipulator.get_validation_errors(new_data)
@@ -233,7 +233,7 @@
             return HttpResponseRedirect('/'.join(req.path.split("/")[:-2]) + '/')
     else:
         errors = {}
-        new_data = manipulator.old_data(user)
+        new_data = manipulator.old_data()
     form = forms.FormWrapper(manipulator, new_data, errors)
     return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user, 'errors':errors} ))
 

Modified: src/branches/django-migration/Pootle/web/webforms.py
===================================================================
--- src/branches/django-migration/Pootle/web/webforms.py	2007-02-14 00:40:48 UTC (rev 5027)
+++ src/branches/django-migration/Pootle/web/webforms.py	2007-02-14 01:13:57 UTC (rev 5028)
@@ -1,5 +1,6 @@
 from django import forms
 from Pootle.web.models import UserProfile, Project, Language
+from django.contrib.auth.models import User
 from django.core import validators
 from django.core.validators import isOnlyDigits, isValidEmail
 from Pootle.utils import CallableValidatorWrapper
@@ -9,6 +10,32 @@
 project_choices = [(p.id, p.name) for p in Project.objects.all()]
 language_choices = [(p.id, p.name) for p in Language.objects.all()]
 
+class UserAdminManipulator(forms.Manipulator):
+    def __init__(self, user):
+        self.user, created = User.objects.get_or_create(username=user)
+        self.fields = (
+            forms.TextField(field_name="username", length=6),
+            forms.TextField(field_name="first_name", length=20),
+            forms.TextField(field_name="last_name", length=20),
+            forms.TextField(field_name="email", length=20, validator_list=[isValidEmail]),
+            forms.TextField(field_name="password", length=20),
+            forms.CheckboxField(field_name="is_active"),
+            forms.CheckboxField(field_name="is_superuser"),
+            )
+
+    def old_data(self):
+        return dict([ (k.field_name, getattr(self.user, k.field_name)) for k in self.fields if k.field_name != 'password'])
+
+    def save(self, new_data):
+        u = self.user
+        for k in ['first_name', 'last_name', 'email' ]:
+            setattr(u, k, new_data[k])
+        u.activated = new_data.get('is_active', False) and True
+        u.is_superuser = new_data.get('is_superuser', False) and True
+        if new_data['password'] != '':
+            u.set_password(new_data['password'])
+        u.save()
+
 class UserProfileManipulator(forms.Manipulator):
     def __init__(self, user):
         self.user = user
@@ -65,5 +92,6 @@
                 profile.languages.add(Language.objects.get(pk=lang.id))
             else:
                 profile.languages.remove(Language.objects.get(pk=lang.id))
+        profile.save()
         u.save()
         return u


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5053
          http://svn.sourceforge.net/translate/?rev=5053&view=rev
Author:   zejn
Date:     2007-02-17 00:53:00 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
[django-migration] Migrating to Django DB TranslationProject

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/web/models.py
    src/branches/django-migration/Pootle/web/views.py
    src/branches/django-migration/Pootle/web/webforms.py

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2007-02-16 12:34:37 UTC (rev 5052)
+++ src/branches/django-migration/Pootle/templates/language.html	2007-02-17 08:53:00 UTC (rev 5053)
@@ -22,6 +22,7 @@
       <b>{% trans "Plural Equation" %}</b>: {{ language.plural_equation }}
     </div>
 
+{% if projects %}
       <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">
         <thead>
           <tr>
@@ -59,4 +60,7 @@
 {% endfor %}
       </tbody>
     </table>
+{% else %}
+<p>{% trans "No projects are being translated to this language." %}</p>
+{% endif %}
 {% endblock %}

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2007-02-16 12:34:37 UTC (rev 5052)
+++ src/branches/django-migration/Pootle/templates/project.html	2007-02-17 08:53:00 UTC (rev 5053)
@@ -28,6 +28,7 @@
       {{ project.description }}
     </div>
 
+{% if languages %}
       <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">
         <thead>
           <tr>
@@ -61,4 +62,7 @@
 {% endfor %}
       </tbody>
     </table>
+{% else %}
+<p>{% trans "This project is not being translated to any language." %}</p>
+{% endif %}
 {% endblock %}

Modified: src/branches/django-migration/Pootle/web/models.py
===================================================================
--- src/branches/django-migration/Pootle/web/models.py	2007-02-16 12:34:37 UTC (rev 5052)
+++ src/branches/django-migration/Pootle/web/models.py	2007-02-17 08:53:00 UTC (rev 5053)
@@ -2,6 +2,8 @@
 from translate.filters import checks
 from Pootle.path import path
 from django.contrib.auth.models import User
+from Pootle.conf import potree
+import Pootle.instance
 
 CHECKSTYLES = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
 FILETYPES = (   ('po', 'po'),  ('xliff','xliff'), )
@@ -41,16 +43,21 @@
 class TranslationProject(models.Model):
     language = models.ForeignKey(Language)
     project = models.ForeignKey(Project)
-    translatedwords = models.IntegerField()
-    translatedstrings = models.IntegerField()
-    fuzzywords = models.IntegerField()
-    fuzzystrings = models.IntegerField()
-    allwords = models.IntegerField()
-    allstrings = models.IntegerField()
+    translatedwords = models.IntegerField(default=0)
+    translatedstrings = models.IntegerField(default=0)
+    fuzzywords = models.IntegerField(default=0)
+    fuzzystrings = models.IntegerField(default=0)
+    allwords = models.IntegerField(default=0)
+    allstrings = models.IntegerField(default=0)
+    
+    _podir = None
 
     class Meta:
         unique_together = ( ('language','project'),) 
 
+    def __repr__(self):
+        return "<TranslationProject: /%s/%s/>" % (self.project.code, self.language.code)
+
     def _get_stats(self):
         perc = self.allstrings/100.0
         untransw = self.allwords - self.translatedwords - self.fuzzywords
@@ -61,6 +68,7 @@
                     untransw, untranss, int(untranss/perc), 
                     self.allwords, self.allstrings)
         except ZeroDivisionError:
+            # fixme emit signal to indexer here
             return (0,0,0, 0,0,0, 0,0,0, 0,0)
     stats = property(_get_stats)
 
@@ -69,7 +77,7 @@
         return listing.dirs("[!.]*") + listing.listpo()
 
     def _get_podir(self):
-        if not hasattr(self, "_podir"):
+        if not self._podir:
             self._podir = path(potree().getpodir(self.language.code, self.project.code))
         return self._podir
     podir = property(_get_podir)

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-16 12:34:37 UTC (rev 5052)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-17 08:53:00 UTC (rev 5053)
@@ -10,13 +10,12 @@
 from django.core.mail import send_mail
 
 from Pootle.web import webforms
-from Pootle.web.models import Project, Language
+from Pootle.web.models import Project, Language, TranslationProject
 from Pootle.compat import forms as pootleforms 
 from Pootle.compat import pootleauth
 from Pootle.compat.authforms import RegistrationManipulator, ActivationManipulator
 from Pootle import adminpages, users, translatepage
 from Pootle.conf import instance, potree
-from Pootle.projects import TranslationProject
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 import random
@@ -71,7 +70,7 @@
                                 'count': len(languages),
                                 'average': 0 #getpagestats(), }, 
                                 },
-        'languages': [ TranslationProject(lang, p) for lang in Language.objects.all()],
+        'languages': TranslationProject.objects.filter(project=p),
         }
     return render_to_response("project.html", RequestContext(req, context))
 
@@ -79,12 +78,12 @@
     lang = get_object_or_404(Language, code=language)
     context = {
         "language": lang,
-        "projects": [TranslationProject(lang, p) for p in Project.objects.all()],
+        "projects": TranslationProject.objects.filter(language=lang),
         }
     return render_to_response("language.html", RequestContext(req, context))
     
 def projectindex(req, language, project, subdir=None):
-    p = TranslationProject(potree().get_language(language), potree().get_project(project))
+    p = TranslationProject(language=Language.objects.get(code=language), project=Project.objects.get(code=project))
     context = {
         'project': p,
         'items': p.list_dir(subdir),
@@ -125,7 +124,6 @@
                 from django.contrib.auth import login
                 login(req, manipulator.get_user())
                 req.session.delete_test_cookie()
-                req.session.isopen = True
                 return HttpResponseRedirect(redirect_to) 
             new_data = req.POST.copy()
             del(new_data['password'])
@@ -291,7 +289,7 @@
         errors = {}
         new_data = manipulator.old_data()
     form = forms.FormWrapper(manipulator, new_data, errors)
-    context = { 'project' : potree().get_project(project),
+    context = { 'project' : Project.objects.get(code=project),
                 'form': form,
                 'errors': errors,}
     return render_to_response("admin_projectedit.html", RequestContext(req, context))

Modified: src/branches/django-migration/Pootle/web/webforms.py
===================================================================
--- src/branches/django-migration/Pootle/web/webforms.py	2007-02-16 12:34:37 UTC (rev 5052)
+++ src/branches/django-migration/Pootle/web/webforms.py	2007-02-17 08:53:00 UTC (rev 5053)
@@ -87,9 +87,11 @@
     def old_data(self):
         data = dict([ (k.field_name, getattr(self.user, k.field_name, None)) \
             for k in self.fields if not k.field_name.startswith("password") ])
-        profile = self.user.get_profile()
+        profile, created = UserProfile.objects.get_or_create(user=self.user)
         data.update({   'projects': [p.id for p in profile.projects.all()], 
                         'languages': [lang.id for lang in profile.languages.all()]} )
+        if created:
+            profile.save()
         return data
 
     def save(self, new_data):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5054
          http://svn.sourceforge.net/translate/?rev=5054&view=rev
Author:   zejn
Date:     2007-02-17 01:00:10 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
[django-migration] Removed /home/ and moved Options to /options/. Renamed about.html to /about/

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/base.html
    src/branches/django-migration/Pootle/web/urls.py

Modified: src/branches/django-migration/Pootle/templates/base.html
===================================================================
--- src/branches/django-migration/Pootle/templates/base.html	2007-02-17 08:53:00 UTC (rev 5053)
+++ src/branches/django-migration/Pootle/templates/base.html	2007-02-17 09:00:10 UTC (rev 5054)
@@ -104,14 +104,14 @@
       <a href="/">{% trans "Home" %}</a>
       | <a href="/projects/">{% trans "All Projects" %}</a>
       | <a href="/languages/">{% trans "All Languages" %}</a>
-      {% if user.is_authenticated %} | <a href="/home/">{% trans "My account" %}</a>
+      {% if user.is_authenticated %} | <a href="/options/">{% trans "My account" %}</a>
       {% if user.is_superuser %} | <a href="/admin/">{% trans "Admin" %}</a>{% endif %}{% endif %} 
       | <a href="/doc/index.html">{% trans "Docs &amp; Help" %}</a>
     </div>
   </div>
 
   <div id="about" dir="{{ uidir }}" lang="{{ uilanguage }}">
-    <a href="/about.html">{% trans "About this Pootle server" %}</a>
+    <a href="/about/">{% trans "About this Pootle server" %}</a>
   </div>
 </body>
 </html>

Modified: src/branches/django-migration/Pootle/web/urls.py
===================================================================
--- src/branches/django-migration/Pootle/web/urls.py	2007-02-17 08:53:00 UTC (rev 5053)
+++ src/branches/django-migration/Pootle/web/urls.py	2007-02-17 09:00:10 UTC (rev 5054)
@@ -8,10 +8,8 @@
     (r'^login.html$', 'login'),
     (r'^register.html$', 'register'),
     (r'^activate.html$', 'activate'),
-    (r'^about.html$', 'about'),
-    (r'^home/$', 'home'),
-    (r'^home/index.html$', 'home'),
-    (r'^home/options/$', 'options'),
+    (r'^about/$', 'about'),
+    (r'^options/$', 'options'),
     (r'^(?P<what>languages)/$', 'index'),
     
     (r'^(?P<what>projects)/$', 'index'),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5056
          http://svn.sourceforge.net/translate/?rev=5056&view=rev
Author:   zejn
Date:     2007-02-17 05:30:34 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
[django-migration] document stats a bit in path.py, fileindex now displays statistics and urls have to be debug first, else they match language.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/templates/fileindex.html
    src/branches/django-migration/Pootle/urls.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-02-17 13:26:02 UTC (rev 5055)
+++ src/branches/django-migration/Pootle/path.py	2007-02-17 13:30:34 UTC (rev 5056)
@@ -978,7 +978,11 @@
         return self.files("*.xlf")
 
     def stats(self):
-        return (0,0,0,0,0,0,0,0,0,0,0)
+        # stats:  0,  1, 2 translated words, string, percentage    
+        #         3,  4, 5 fuzzy words, string, percentage         
+        #         6,  7, 8 untranslated words, string, percentage  
+        #         9, 10    all words, string                       
+        return (0,0,0, 0,0,0, 0,0,0, 0,0)
 
     def icon(self):
         if self.isdir():

Modified: src/branches/django-migration/Pootle/templates/fileindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/fileindex.html	2007-02-17 13:26:02 UTC (rev 5055)
+++ src/branches/django-migration/Pootle/templates/fileindex.html	2007-02-17 13:30:34 UTC (rev 5056)
@@ -26,10 +26,25 @@
       </div>
     </div>
 
-<table>
+<table class="sortable stats" width="100%">
 {% for item in items %}
-<tr><td><img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
-<a href="{{ item.basename }}">{{ item.basename }}</a><br /></td></tr>
+<tr><td>
+<img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" /></td><td>
+<b><a href="{{ item.basename }}">{{ item.basename }}</a></b>
+{% if item.isfile %}
+<br />{% trans "Download:" %}&nbsp;<a href="{{ item.basename }}">PO</a>&nbsp;<a href="{{ item.basename }}">.ts</a>&nbsp;<a href="{{ item.basename }}">XLIFF</a>&nbsp;<a href="{{ item.basename }}">CSV</a>
+{% endif %}
+</td><td>
+&nbsp;
+</td><td align="right">
+{{ item.stats.0 }}t, 
+{{ item.stats.3 }}f,
+{{ item.stats.6 }}u of 
+{{ item.stats.9 }} total
+<br />
+<span class="sortkey">{{ item.stats.2 }}</span>
+<img src="/static/images/green.png" class="data" height="20" width="{{ item.stats.2 }}" alt="{{ item.stats.2 }}%" /><img src="/static/images/blue.png" class="data" height="20" width="{{ item.stats.5 }}" alt="{{ item.stats.5 }}%" /><img src="/static/images/red.png" class="data" height="20" width="{{ item.stats.8 }}" alt="{{ item.stats.8 }}%" />
+</td></tr>
 {% endfor %}
 </table>
 {% endblock %}

Modified: src/branches/django-migration/Pootle/urls.py
===================================================================
--- src/branches/django-migration/Pootle/urls.py	2007-02-17 13:26:02 UTC (rev 5055)
+++ src/branches/django-migration/Pootle/urls.py	2007-02-17 13:30:34 UTC (rev 5056)
@@ -4,19 +4,22 @@
 from django.conf.urls.defaults import *
 from django.conf import settings
 
+
+if settings.DEBUG:
+    urlpatterns = patterns('',
+        (r'^test/$', 'Pootle.web.views.test'),
+        # js, images, pootle.css, /favicon.ico
+        (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
+    )
+else:
+    urlpatterns = patterns('', )
+
 if settings.POOTLE_BACKWARDS_COMPATIBILITY:
-    urlpatterns = patterns('',
+    urlpatterns += patterns('',
         (r'^', include('Pootle.compat.urls')),
     )
 else:
-    urlpatterns = patterns('',
+    urlpatterns += patterns('',
         (r'^', include('Pootle.web.urls')),
     )
 
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        (r'^test/$', 'Pootle.web.views.test'),
-        # js, images, pootle.css, /favicon.ico
-        (r'^static/(?P<path>.*)$', 'django.views.static.serve', { 'document_root': settings.MEDIA_ROOT} ),
-    )
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5057
          http://svn.sourceforge.net/translate/?rev=5057&view=rev
Author:   zejn
Date:     2007-02-17 06:24:27 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
[django-migration] Renamed view functions and templates a bit more sensibly.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/web/urls.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/admin_languages.html
    src/branches/django-migration/Pootle/templates/admin_projects.html
    src/branches/django-migration/Pootle/templates/admin_users.html
    src/branches/django-migration/Pootle/templates/translationproject.html

Removed Paths:
-------------
    src/branches/django-migration/Pootle/templates/adminlanguages.html
    src/branches/django-migration/Pootle/templates/adminprojects.html
    src/branches/django-migration/Pootle/templates/adminusers.html
    src/branches/django-migration/Pootle/templates/fileindex.html

Copied: src/branches/django-migration/Pootle/templates/admin_languages.html (from rev 5052, src/branches/django-migration/Pootle/templates/adminlanguages.html)
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_languages.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/admin_languages.html	2007-02-17 14:24:27 UTC (rev 5057)
@@ -0,0 +1,32 @@
+{% load i18n %}
+{% extends "base_admin.html" %}
+
+{% block title %}Pootle Languages Admin Page{% endblock %}
+
+{% block adminpanel %}
+{% if error %}<div class="message">{{ error }}</div>{% endif %}
+    <div class="fullwidthcontents">
+      <h3 class="title">{% trans "Languages" %}</h3>
+
+      <form action="" method="post" name="languages" id="languages">
+        <table cellpadding="1" cellspacing="1">
+          <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Enabled" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "ISO Code" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Special Chars" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Number of Plurals" %}</h3></td>
+          </tr>
+{% for lang in languages %}
+          <tr>
+            <td colspan="1" rowspan="1"><input type="checkbox" name="{{ lang.code }}"{% if lang.enabled %} checked="on"{% endif%} /></td>
+            <td colspan="1" rowspan="1">{{ lang.code }}</td>
+            <td colspan="1" rowspan="1">{{ lang.name }}</td>
+            <td colspan="1" rowspan="1">{{ lang.specialchars }}</td>
+            <td colspan="1" rowspan="1" title="{{ lang.plural_equation }}">{{ lang.nplurals }}</td>
+          </tr>
+{% endfor %}
+        </table><input type="submit" name="changelanguages" value="{% trans "Save changes" %}" />
+      </form>
+    </div>
+{% endblock %}

Copied: src/branches/django-migration/Pootle/templates/admin_projects.html (from rev 5052, src/branches/django-migration/Pootle/templates/adminprojects.html)
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_projects.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/admin_projects.html	2007-02-17 14:24:27 UTC (rev 5057)
@@ -0,0 +1,35 @@
+{% load i18n %}
+{% extends "base_admin.html" %}
+
+{% block title %}Pootle Projects Admin Page{% endblock %}
+
+{% block adminpanel %}
+    <div class="fullwidthcontents">
+      <h3 class="title">{% trans "Projects" %}</h3>
+
+      <form action="" method="post" name="projects" id="projects">
+        <table cellpadding="1" cellspacing="1">
+          <tr>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Selected" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Code" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Description" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Checker Style" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "File Type" %}</h3></td>
+            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Create MO Files" %}</h3></td>
+          </tr>
+{% for project in projects %}
+          <tr>
+            <td colspan="1" rowspan="1"><input type="checkbox" name="select-{{ project.code }}" /></td>
+            <td colspan="1" rowspan="1"><a href="{{ project.code }}">{{ project.code }}</a></td>
+            <td colspan="1" rowspan="1">{{ project.name }}</td>
+            <td colspan="1" rowspan="1">{{ project.description }}</td>
+            <td colspan="1" rowspan="1">{{ project.checkstyle }}</td>
+            <td colspan="1" rowspan="1">{{ project.filetype }}</td>
+            <td colspan="1" rowspan="1">{{ project.createmofiles }}</td>
+          </tr>
+{% endfor %}
+        </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />
+      </form>
+    </div>
+{% endblock %}

Copied: src/branches/django-migration/Pootle/templates/admin_users.html (from rev 5052, src/branches/django-migration/Pootle/templates/adminusers.html)
===================================================================
--- src/branches/django-migration/Pootle/templates/admin_users.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/admin_users.html	2007-02-17 14:24:27 UTC (rev 5057)
@@ -0,0 +1,43 @@
+{% load i18n %}
+{% extends "base_admin.html" %}
+{% block title %}Pootle User Admin Page{% endblock %}
+
+{% block adminpanel %}
+    <div class="fullwidthcontents">
+      <h3 class="title">{% trans "Users" %}</h3>
+
+      <form action="" method="post" name="users" id="users">
+        <table cellpadding="1" cellspacing="1">
+          <tr>
+            <td colspan="1" rowspan="1">
+            </td>
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Username" %}</h3>
+            </td>
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "First Name" %}</h3>
+            </td>
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Last Name" %}</h3>
+            </td>
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Email Address" %}</h3>
+            </td>
+            <td colspan="1" rowspan="1">
+              <h3 class="title">{% trans "Activated" %}</h3>
+            </td>
+          </tr>
+{% for u in users %}
+          <tr>
+            <td colspan="1" rowspan="1"><input type="checkbox" name="select-{{ u.username }}" /></a></td>
+            <td colspan="1" rowspan="1"><a href="{{ u.username }}/">{{ u.username }}</a></td>
+            <td colspan="1" rowspan="1">{{ u.first_name }}</td>
+            <td colspan="1" rowspan="1">{{ u.last_name }}</td>
+            <td colspan="1" rowspan="1">{{ u.email }}</td>
+            <td colspan="1" rowspan="1">{% if u.is_active %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %}</td>
+          </tr>
+{% endfor %}
+        </table><input type="submit" name="delete-selected" value="{% trans "Delete selected" %}" />
+      </form>
+    </div>
+{% endblock %}

Deleted: src/branches/django-migration/Pootle/templates/adminlanguages.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-17 13:30:34 UTC (rev 5056)
+++ src/branches/django-migration/Pootle/templates/adminlanguages.html	2007-02-17 14:24:27 UTC (rev 5057)
@@ -1,32 +0,0 @@
-{% load i18n %}
-{% extends "base_admin.html" %}
-
-{% block title %}Pootle Languages Admin Page{% endblock %}
-
-{% block adminpanel %}
-{% if error %}<div class="message">{{ error }}</div>{% endif %}
-    <div class="fullwidthcontents">
-      <h3 class="title">{% trans "Languages" %}</h3>
-
-      <form action="" method="post" name="languages" id="languages">
-        <table cellpadding="1" cellspacing="1">
-          <tr>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Enabled" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "ISO Code" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Special Chars" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Number of Plurals" %}</h3></td>
-          </tr>
-{% for lang in languages %}
-          <tr>
-            <td colspan="1" rowspan="1"><input type="checkbox" name="{{ lang.code }}"{% if lang.enabled %} checked="on"{% endif%} /></td>
-            <td colspan="1" rowspan="1">{{ lang.code }}</td>
-            <td colspan="1" rowspan="1">{{ lang.name }}</td>
-            <td colspan="1" rowspan="1">{{ lang.specialchars }}</td>
-            <td colspan="1" rowspan="1" title="{{ lang.plural_equation }}">{{ lang.nplurals }}</td>
-          </tr>
-{% endfor %}
-        </table><input type="submit" name="changelanguages" value="{% trans "Save changes" %}" />
-      </form>
-    </div>
-{% endblock %}

Deleted: src/branches/django-migration/Pootle/templates/adminprojects.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminprojects.html	2007-02-17 13:30:34 UTC (rev 5056)
+++ src/branches/django-migration/Pootle/templates/adminprojects.html	2007-02-17 14:24:27 UTC (rev 5057)
@@ -1,35 +0,0 @@
-{% load i18n %}
-{% extends "base_admin.html" %}
-
-{% block title %}Pootle Projects Admin Page{% endblock %}
-
-{% block adminpanel %}
-    <div class="fullwidthcontents">
-      <h3 class="title">{% trans "Projects" %}</h3>
-
-      <form action="" method="post" name="projects" id="projects">
-        <table cellpadding="1" cellspacing="1">
-          <tr>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Selected" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Code" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Full Name" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Project Description" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Checker Style" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "File Type" %}</h3></td>
-            <td colspan="1" rowspan="1"><h3 class="title">{% trans "Create MO Files" %}</h3></td>
-          </tr>
-{% for project in projects %}
-          <tr>
-            <td colspan="1" rowspan="1"><input type="checkbox" name="select-{{ project.code }}" /></td>
-            <td colspan="1" rowspan="1"><a href="{{ project.code }}">{{ project.code }}</a></td>
-            <td colspan="1" rowspan="1">{{ project.name }}</td>
-            <td colspan="1" rowspan="1">{{ project.description }}</td>
-            <td colspan="1" rowspan="1">{{ project.checkstyle }}</td>
-            <td colspan="1" rowspan="1">{{ project.filetype }}</td>
-            <td colspan="1" rowspan="1">{{ project.createmofiles }}</td>
-          </tr>
-{% endfor %}
-        </table><input type="submit" name="changeprojects" value="{% trans "Save changes" %}" />
-      </form>
-    </div>
-{% endblock %}

Deleted: src/branches/django-migration/Pootle/templates/adminusers.html
===================================================================
--- src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-17 13:30:34 UTC (rev 5056)
+++ src/branches/django-migration/Pootle/templates/adminusers.html	2007-02-17 14:24:27 UTC (rev 5057)
@@ -1,43 +0,0 @@
-{% load i18n %}
-{% extends "base_admin.html" %}
-{% block title %}Pootle User Admin Page{% endblock %}
-
-{% block adminpanel %}
-    <div class="fullwidthcontents">
-      <h3 class="title">{% trans "Users" %}</h3>
-
-      <form action="" method="post" name="users" id="users">
-        <table cellpadding="1" cellspacing="1">
-          <tr>
-            <td colspan="1" rowspan="1">
-            </td>
-            <td colspan="1" rowspan="1">
-              <h3 class="title">{% trans "Username" %}</h3>
-            </td>
-            <td colspan="1" rowspan="1">
-              <h3 class="title">{% trans "First Name" %}</h3>
-            </td>
-            <td colspan="1" rowspan="1">
-              <h3 class="title">{% trans "Last Name" %}</h3>
-            </td>
-            <td colspan="1" rowspan="1">
-              <h3 class="title">{% trans "Email Address" %}</h3>
-            </td>
-            <td colspan="1" rowspan="1">
-              <h3 class="title">{% trans "Activated" %}</h3>
-            </td>
-          </tr>
-{% for u in users %}
-          <tr>
-            <td colspan="1" rowspan="1"><input type="checkbox" name="select-{{ u.username }}" /></a></td>
-            <td colspan="1" rowspan="1"><a href="{{ u.username }}/">{{ u.username }}</a></td>
-            <td colspan="1" rowspan="1">{{ u.first_name }}</td>
-            <td colspan="1" rowspan="1">{{ u.last_name }}</td>
-            <td colspan="1" rowspan="1">{{ u.email }}</td>
-            <td colspan="1" rowspan="1">{% if u.is_active %}{% trans "True" %}{% else %}{% trans "False" %}{% endif %}</td>
-          </tr>
-{% endfor %}
-        </table><input type="submit" name="delete-selected" value="{% trans "Delete selected" %}" />
-      </form>
-    </div>
-{% endblock %}

Deleted: src/branches/django-migration/Pootle/templates/fileindex.html
===================================================================
--- src/branches/django-migration/Pootle/templates/fileindex.html	2007-02-17 13:30:34 UTC (rev 5056)
+++ src/branches/django-migration/Pootle/templates/fileindex.html	2007-02-17 14:24:27 UTC (rev 5057)
@@ -1,50 +0,0 @@
-{% load i18n %}
-{% load pootle %}
-{% extends "base.html" %}
-
-{% block head %}
-  <script type="text/javascript" src="{{ baseurl }}static/js/sorttable.js"></script>
-  <script type="text/javascript" src="{{ baseurl }}static/js/show-hide.js"></script>
-{% endblock %}
-
-{% block content %}
-    <div class="navbar">
-      <img src="/static/images/folder.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
-      <h3 class="title">[ <a href="/{{ project.language.code }}/">{{ project.language.name }}</a> ] [ <a href="/{{ project.project.code }}/">{{ project.project.name }}</a> ]</h3>
-      <div class="item-description" id="actionlinks">
-
-      </div>
-        
-      <div class="item-description" id="hiddenchecks">{% trans "Show Checks" %}</div>
-      <div class="item-description" id="shownchecks" style="display:none;">{% trans "Hide Checks" %}
-      <div>FIXME: Checks go here!
-      </div>
-      </div>
-
-      <div class="item-statistics">
-        {{ languagestats }} FIXME
-      </div>
-    </div>
-
-<table class="sortable stats" width="100%">
-{% for item in items %}
-<tr><td>
-<img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" /></td><td>
-<b><a href="{{ item.basename }}">{{ item.basename }}</a></b>
-{% if item.isfile %}
-<br />{% trans "Download:" %}&nbsp;<a href="{{ item.basename }}">PO</a>&nbsp;<a href="{{ item.basename }}">.ts</a>&nbsp;<a href="{{ item.basename }}">XLIFF</a>&nbsp;<a href="{{ item.basename }}">CSV</a>
-{% endif %}
-</td><td>
-&nbsp;
-</td><td align="right">
-{{ item.stats.0 }}t, 
-{{ item.stats.3 }}f,
-{{ item.stats.6 }}u of 
-{{ item.stats.9 }} total
-<br />
-<span class="sortkey">{{ item.stats.2 }}</span>
-<img src="/static/images/green.png" class="data" height="20" width="{{ item.stats.2 }}" alt="{{ item.stats.2 }}%" /><img src="/static/images/blue.png" class="data" height="20" width="{{ item.stats.5 }}" alt="{{ item.stats.5 }}%" /><img src="/static/images/red.png" class="data" height="20" width="{{ item.stats.8 }}" alt="{{ item.stats.8 }}%" />
-</td></tr>
-{% endfor %}
-</table>
-{% endblock %}

Copied: src/branches/django-migration/Pootle/templates/translationproject.html (from rev 5056, src/branches/django-migration/Pootle/templates/fileindex.html)
===================================================================
--- src/branches/django-migration/Pootle/templates/translationproject.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/translationproject.html	2007-02-17 14:24:27 UTC (rev 5057)
@@ -0,0 +1,50 @@
+{% load i18n %}
+{% load pootle %}
+{% extends "base.html" %}
+
+{% block head %}
+  <script type="text/javascript" src="{{ baseurl }}static/js/sorttable.js"></script>
+  <script type="text/javascript" src="{{ baseurl }}static/js/show-hide.js"></script>
+{% endblock %}
+
+{% block content %}
+    <div class="navbar">
+      <img src="/static/images/folder.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
+      <h3 class="title">[ <a href="/{{ project.language.code }}/">{{ project.language.name }}</a> ] [ <a href="/{{ project.project.code }}/">{{ project.project.name }}</a> ]</h3>
+      <div class="item-description" id="actionlinks">
+
+      </div>
+        
+      <div class="item-description" id="hiddenchecks">{% trans "Show Checks" %}</div>
+      <div class="item-description" id="shownchecks" style="display:none;">{% trans "Hide Checks" %}
+      <div>FIXME: Checks go here!
+      </div>
+      </div>
+
+      <div class="item-statistics">
+        {{ languagestats }} FIXME
+      </div>
+    </div>
+
+<table class="sortable stats" width="100%">
+{% for item in items %}
+<tr><td>
+<img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" /></td><td>
+<b><a href="{{ item.basename }}">{{ item.basename }}</a></b>
+{% if item.isfile %}
+<br />{% trans "Download:" %}&nbsp;<a href="{{ item.basename }}">PO</a>&nbsp;<a href="{{ item.basename }}">.ts</a>&nbsp;<a href="{{ item.basename }}">XLIFF</a>&nbsp;<a href="{{ item.basename }}">CSV</a>
+{% endif %}
+</td><td>
+&nbsp;
+</td><td align="right">
+{{ item.stats.0 }}t, 
+{{ item.stats.3 }}f,
+{{ item.stats.6 }}u of 
+{{ item.stats.9 }} total
+<br />
+<span class="sortkey">{{ item.stats.2 }}</span>
+<img src="/static/images/green.png" class="data" height="20" width="{{ item.stats.2 }}" alt="{{ item.stats.2 }}%" /><img src="/static/images/blue.png" class="data" height="20" width="{{ item.stats.5 }}" alt="{{ item.stats.5 }}%" /><img src="/static/images/red.png" class="data" height="20" width="{{ item.stats.8 }}" alt="{{ item.stats.8 }}%" />
+</td></tr>
+{% endfor %}
+</table>
+{% endblock %}

Modified: src/branches/django-migration/Pootle/web/urls.py
===================================================================
--- src/branches/django-migration/Pootle/web/urls.py	2007-02-17 13:30:34 UTC (rev 5056)
+++ src/branches/django-migration/Pootle/web/urls.py	2007-02-17 14:24:27 UTC (rev 5057)
@@ -13,22 +13,22 @@
     (r'^(?P<what>languages)/$', 'index'),
     
     (r'^(?P<what>projects)/$', 'index'),
-    (r'^projects/(?P<project>\w+)/$', 'projectlanguageindex'),
-    (r'^projects/(?P<project>\w+)/index.html$', 'projectlanguageindex'),
+    (r'^projects/(?P<project>\w+)/$', 'project'),
+    (r'^projects/(?P<project>\w+)/index.html$', 'project'),
     (r'^projects/(?P<project>\w+)/admin.html$', 'projectadmin'),
     
     (r'^admin/$', 'admin'),
     (r'^admin/index.html$', 'admin'),
-    (r'^admin/users/$', 'adminusers'),
+    (r'^admin/users/$', 'admin_users'),
     (r'^admin/users/(?P<user>\w+)/$', 'admin_useredit'),
-    (r'^admin/languages/$', 'adminlanguages'),
-    (r'^admin/projects/$', 'adminprojects'),
+    (r'^admin/languages/$', 'admin_languages'),
+    (r'^admin/projects/$', 'admin_projects'),
     (r'^admin/projects/(?P<project>\w+)/$', 'admin_projectedit'),
 
     
-    (r'^(?P<language>\w+)/$', 'languageindex'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/$', 'projectindex'),
-    (r'^(?P<language>\w+)/(?P<project>\w+)/browse/(?P<subdir>[\w/]*?)$', 'projectindex'),
+    (r'^(?P<language>\w+)/$', 'language'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/$', 'translationproject'),
+    (r'^(?P<language>\w+)/(?P<project>\w+)/browse/(?P<subdir>[\w/]*?)$', 'translationproject'),
     (r'^(?P<language>\w+)/(?P<project>\w+)/translate/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'translatepage'),
     (r'^(?P<language>\w+)/(?P<project>\w+)/download/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'downloadfile'),
     (r'^(?P<language>\w+)/(?P<project>\w+)/review/(?P<subdir>[\w/]*?)(?P<filename>\w+)\.po', 'review'),

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-17 13:30:34 UTC (rev 5056)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-17 14:24:27 UTC (rev 5057)
@@ -55,11 +55,7 @@
     context = { 'pootleversion':pootleversion.ver, 'toolkitversion':toolkitversion.ver }
     return render_to_response("about.html", RequestContext(req, context ))
 
-def home(req):
-    return render_to_response("home.html", RequestContext(req, {}))
-home = login_required(home)
-
-def projectlanguageindex(req, project):
+def project(req, project):
     p = get_object_or_404(Project, code=project)
     languages = [] # FIXME
     context = {
@@ -74,7 +70,7 @@
         }
     return render_to_response("project.html", RequestContext(req, context))
 
-def languageindex(req, language):
+def language(req, language):
     lang = get_object_or_404(Language, code=language)
     context = {
         "language": lang,
@@ -82,13 +78,13 @@
         }
     return render_to_response("language.html", RequestContext(req, context))
     
-def projectindex(req, language, project, subdir=None):
+def translationproject(req, language, project, subdir=None):
     p = TranslationProject(language=Language.objects.get(code=language), project=Project.objects.get(code=project))
     context = {
         'project': p,
         'items': p.list_dir(subdir),
        }
-    return render_to_response("fileindex.html", RequestContext(req, context))
+    return render_to_response("translationproject.html", RequestContext(req, context))
 
 def options(req):
     manipulator = webforms.UserProfileManipulator(req.user)
@@ -235,16 +231,16 @@
     form = forms.FormWrapper(manipulator, new_data, errors)
     return render_to_response("admin_useredit.html", RequestContext(req, { 'form': form, 'u': user, 'errors':errors} ))
 
-def adminusers(req):
+def admin_users(req):
     if req.POST and req.user.is_superuser:
         selected = [ u for u in User.objects.all() if "select-%s" % u.username in req.POST]
         if 'delete-selected' in req.POST:
             for u in selected:
                 u.delete()
     
-    return render_to_response("adminusers.html", RequestContext(req, { 'users': User.objects.all() } ))
+    return render_to_response("admin_users.html", RequestContext(req, { 'users': User.objects.all() } ))
 
-def adminlanguages(req):
+def admin_languages(req):
     error = None
     if req.POST:
         if req.user.is_superuser:
@@ -257,9 +253,9 @@
         'languages': Language.unfiltered.all(), 
         'error':error, 
         'selected': [ lang.code for lang in Language.unfiltered.all()] }
-    return render_to_response("adminlanguages.html", RequestContext(req, context))
+    return render_to_response("admin_languages.html", RequestContext(req, context))
 
-def adminprojects(req):
+def admin_projects(req):
     error = None
     if req.POST: 
         if req.user.is_superuser:
@@ -272,7 +268,7 @@
     context = { 
         'error': error,
         'projects' : Project.objects.all() }
-    return render_to_response("adminprojects.html", RequestContext(req, context))
+    return render_to_response("admin_projects.html", RequestContext(req, context))
 
 def admin_projectedit(req, project):
     p = get_object_or_404(Project, code=project)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5059
          http://svn.sourceforge.net/translate/?rev=5059&view=rev
Author:   zejn
Date:     2007-02-17 16:07:04 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
[django-migration] Moving utils.py to utils/__init__.py so the import statements do not change.

Added Paths:
-----------
    src/branches/django-migration/Pootle/utils/__init__.py

Removed Paths:
-------------
    src/branches/django-migration/Pootle/utils.py

Copied: src/branches/django-migration/Pootle/utils/__init__.py (from rev 5057, src/branches/django-migration/Pootle/utils.py)
===================================================================
--- src/branches/django-migration/Pootle/utils/__init__.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/utils/__init__.py	2007-02-18 00:07:04 UTC (rev 5059)
@@ -0,0 +1,28 @@
+# Useful functions used throughout Pootle
+
+import sre
+import os
+
+def shortdescription(descr):
+    """Returns a short description by removing markup and only including up
+    to the first br-tag"""
+    stopsign = descr.find("<br")
+    if stopsign >= 0:
+        descr = descr[:stopsign]
+    return sre.sub("<[^>]*>", "", descr).strip()
+
+def next_to_this_file(this_file, additional_path):
+    return os.path.join(os.path.dirname(os.path.abspath(this_file)), additional_path)
+
+class CallableValidatorWrapper:
+    """
+    This is needed here to make the validator an object,
+    that has an attribute 'always_test' set to true.
+    """
+    def __init__(self, check):
+        self._callable = check
+        self.always_test = True
+
+    def __call__(self, field_data, all_data):
+        return self._callable(field_data, all_data)
+

Deleted: src/branches/django-migration/Pootle/utils.py
===================================================================
--- src/branches/django-migration/Pootle/utils.py	2007-02-18 00:06:05 UTC (rev 5058)
+++ src/branches/django-migration/Pootle/utils.py	2007-02-18 00:07:04 UTC (rev 5059)
@@ -1,28 +0,0 @@
-# Useful functions used throughout Pootle
-
-import sre
-import os
-
-def shortdescription(descr):
-    """Returns a short description by removing markup and only including up
-    to the first br-tag"""
-    stopsign = descr.find("<br")
-    if stopsign >= 0:
-        descr = descr[:stopsign]
-    return sre.sub("<[^>]*>", "", descr).strip()
-
-def next_to_this_file(this_file, additional_path):
-    return os.path.join(os.path.dirname(os.path.abspath(this_file)), additional_path)
-
-class CallableValidatorWrapper:
-    """
-    This is needed here to make the validator an object,
-    that has an attribute 'always_test' set to true.
-    """
-    def __init__(self, check):
-        self._callable = check
-        self.always_test = True
-
-    def __call__(self, field_data, all_data):
-        return self._callable(field_data, all_data)
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5060
          http://svn.sourceforge.net/translate/?rev=5060&view=rev
Author:   zejn
Date:     2007-02-17 16:15:32 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
[django-migration] Adding fstags, an xattr (currently) based file tagging and modified path.py that uses it. Stats will need a bit more looking.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/utils/fstags.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-02-18 00:07:04 UTC (rev 5059)
+++ src/branches/django-migration/Pootle/path.py	2007-02-18 00:15:32 UTC (rev 5060)
@@ -35,6 +35,7 @@
 from __future__ import generators
 
 import sys, warnings, os, fnmatch, glob, shutil, codecs, md5
+from Pootle.utils.fstags import create_tag
 
 __version__ = '2.1'
 __all__ = ['path']
@@ -971,6 +972,14 @@
 
     # --- Special stuff for Pootle
 
+    def _is_po_file(self):
+        return self.ext == "po"
+    is_po = property(_is_po_file)
+
+    def _is_xliff_file(self):
+        return self.ext in ['xlf', 'xlff', 'xliff']
+    is_xliff = property(_is_xliff_file)
+
     def listpo(self):
         return self.files("*.po")
 
@@ -982,8 +991,15 @@
         #         3,  4, 5 fuzzy words, string, percentage         
         #         6,  7, 8 untranslated words, string, percentage  
         #         9, 10    all words, string                       
-        return (0,0,0, 0,0,0, 0,0,0, 0,0)
+        if not self._stats:
+            pass # FIXME : actually recalculate the stats (and add timestamp?)
+        data = self.stats.split(",")
+        map(int, data)
+        print type(data[1])
+        return data
 
+    _stats = property(*create_tag(stats))
+
     def icon(self):
         if self.isdir():
             return 'folder'

Added: src/branches/django-migration/Pootle/utils/fstags.py
===================================================================
--- src/branches/django-migration/Pootle/utils/fstags.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/utils/fstags.py	2007-02-18 00:15:32 UTC (rev 5060)
@@ -0,0 +1,57 @@
+
+__author__ = "Gasper Zejn"
+
+"""Implementation of a filesystem tags using extended file system attributes
+It can use both python-pyxattr and python-xattr.
+
+It provides functions get_tag, set_tag and del_tag, but most useful is 
+create_tag, which returns tuple of above three functions.
+"""
+
+xattr_type=None
+
+try:
+    import xattr
+except ImportError:
+    xattr = None
+
+# xattr
+def xattr_settag(filename, tagname, value):
+    xattr.setxattr(filename, "user.%s" % str(tagname), str(value))
+
+def xattr_gettag(filename, tagname):
+    try:
+        return xattr.getxattr(filename,"user.%s" % str(tagname))
+    except IOError:
+        return None
+
+def xattr_deltag(filename, tagname):
+    xattr.removexattr(filename, "user.%s" % str(tagname))
+
+
+
+# choose the right implementation
+if xattr:
+    set_tag, get_tag, del_tag = xattr_settag, xattr_gettag, xattr_deltag
+else:
+    set_tag, get_tag, del_tag = None, None, None
+
+
+# tag factory, particularly useful for properties
+def create_tag(tagname):
+    """Accepts a tag name and returns three functions suitable for 
+    "property", eg: 
+
+    >>> tag = property(*create_tag("mytagname"))
+    """
+    def _get_tag(self):
+        return get_tag(self, tagname)
+
+    def _set_tag(self, value):
+        set_tag(self, tagname, value)
+
+    def _del_tag(self):
+        del_tag(self, tagname)
+
+    return _get_tag, _set_tag, _del_tag
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5061
          http://svn.sourceforge.net/translate/?rev=5061&view=rev
Author:   zejn
Date:     2007-02-17 16:29:37 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
[django-migration] Implement a way of joining translation projects, translationprojects' stats are now cached.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/index.html
    src/branches/django-migration/Pootle/templates/options.html
    src/branches/django-migration/Pootle/templates/project.html
    src/branches/django-migration/Pootle/web/models.py
    src/branches/django-migration/Pootle/web/urls.py
    src/branches/django-migration/Pootle/web/views.py
    src/branches/django-migration/Pootle/web/webforms.py

Modified: src/branches/django-migration/Pootle/templates/index.html
===================================================================
--- src/branches/django-migration/Pootle/templates/index.html	2007-02-18 00:15:32 UTC (rev 5060)
+++ src/branches/django-migration/Pootle/templates/index.html	2007-02-18 00:29:37 UTC (rev 5061)
@@ -9,7 +9,7 @@
         {{ description }}
       </div>
 {% if languages %}
-      <h3 class="title"><a href="languages/">{% trans "Languages" %}</a></h3>
+      <h3 class="title"><a href="/languages/">{% trans "Languages" %}</a></h3>
 
       <div class="item-description">
         {% for l in languages %}
@@ -19,7 +19,7 @@
       <br />
 {% endif %}
 {% if projects %}
-      <h3 class="title"><a href="projects/">{% trans "Projects" %}</a></h3>
+      <h3 class="title"><a href="/projects/">{% trans "Projects" %}</a></h3>
 
       <div class="item-description">
         {% for p in projects %}

Modified: src/branches/django-migration/Pootle/templates/options.html
===================================================================
--- src/branches/django-migration/Pootle/templates/options.html	2007-02-18 00:15:32 UTC (rev 5060)
+++ src/branches/django-migration/Pootle/templates/options.html	2007-02-18 00:29:37 UTC (rev 5061)
@@ -9,7 +9,7 @@
 
       <form action="" method="post" name="personal" id="personal">
         <table cellpadding="1" cellspacing="1">
-          <tr><td><h3 class="title">{% trans "Personal Details" %}</h3></td></tr>
+          <tr><td colspan="2"><h3 class="title">{% trans "Personal Details" %}</h3></td></tr>
           <tr>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Option" %}</h3></td>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Current value" %}</h3></td>
@@ -34,11 +34,9 @@
             <td colspan="1" rowspan="1">{% trans "Confirm password" %}</td>
             <td colspan="1" rowspan="1">{{ form.password_confirm }} {{ errors.password_confirm|join:" " }}</td>
           </tr>
-          <tr><td><h3 class="title">{% trans "My Projects" %}</h3></td></tr>
-          <tr><td>{{ form.projects }}</td></tr>
-          <tr><td><h3 class="title">{% trans "My Languages" %}</h3></td></tr>
-          <tr><td>{{ form.languages }}</td></tr>
-          <tr><td><h3 class="title">{% trans "Translation Interface Configuration" %}</h3></td></tr>
+          <tr><td></td><td><h3 class="title">{% trans "My Languages" %}</h3></td></tr>
+          <tr><td></td><td>{{ form.languages }}</td></tr>
+          <tr><td colspan="2"><h3 class="title">{% trans "Translation Interface Configuration" %}</h3></td></tr>
           <tr>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Option" %}</h3></td>
             <td colspan="1" rowspan="1"><h3 class="title">{% trans "Current value" %}</h3></td>

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2007-02-18 00:15:32 UTC (rev 5060)
+++ src/branches/django-migration/Pootle/templates/project.html	2007-02-18 00:29:37 UTC (rev 5061)
@@ -20,7 +20,7 @@
 {% endif %}
 
       <div class="item-statistics">
-        {{ stats }} FIXME
+        {{ stats }}
       </div>
     </div>
 
@@ -28,6 +28,12 @@
       {{ project.description }}
     </div>
 
+{% if starttranslating %}
+<div class="starttranslating">
+<p>{% trans "You can start translating this project to:" %}<ul>{% for lang in starttranslating %}<li><a href="start/{{ lang.code }}/">{{ lang }}</a></li>{% endfor %}</ul></p>
+</div>
+{% endif %}
+
 {% if languages %}
       <table class="sortable stats" id="stats" cellpadding="5" cellspacing="0" width="100%">
         <thead>

Modified: src/branches/django-migration/Pootle/web/models.py
===================================================================
--- src/branches/django-migration/Pootle/web/models.py	2007-02-18 00:15:32 UTC (rev 5060)
+++ src/branches/django-migration/Pootle/web/models.py	2007-02-18 00:29:37 UTC (rev 5061)
@@ -95,6 +95,7 @@
     allstrings = models.IntegerField(default=0)
     
     _podir = None
+    _stats = None
 
     class Meta:
         unique_together = ( ('language','project'),) 
@@ -103,17 +104,19 @@
         return "<TranslationProject: /%s/%s/>" % (self.project.code, self.language.code)
 
     def _get_stats(self):
-        perc = self.allstrings/100.0
-        untransw = self.allwords - self.translatedwords - self.fuzzywords
-        untranss = self.allstrings - self.translatedstrings - self.fuzzystrings
-        try:    
-            return (self.translatedwords, self.translatedstrings, int(self.translatedstrings/perc), 
-                    self.fuzzywords, self.fuzzystrings, int(self.fuzzystrings/perc),
-                    untransw, untranss, int(untranss/perc), 
-                    self.allwords, self.allstrings)
-        except ZeroDivisionError:
-            # fixme emit signal to indexer here
-            return (0,0,0, 0,0,0, 0,0,0, 0,0)
+        if not self._stats:
+            perc = self.allstrings/100.0
+            untransw = self.allwords - self.translatedwords - self.fuzzywords
+            untranss = self.allstrings - self.translatedstrings - self.fuzzystrings
+            try:    
+                self._stats = (self.translatedwords, self.translatedstrings, int(self.translatedstrings/perc), 
+                            self.fuzzywords, self.fuzzystrings, int(self.fuzzystrings/perc),
+                            untransw, untranss, int(untranss/perc), 
+                            self.allwords, self.allstrings)
+            except ZeroDivisionError:
+                # FIXME emit signal to indexer here
+                self._stats = (0,0,0, 0,0,0, 0,0,0, 0,0)
+        return self._stats
     stats = property(_get_stats)
 
     def list_dir(self, subdir=None):
@@ -183,6 +186,5 @@
     inputwidth = models.SmallIntegerField(blank=True, null=True)
     viewrows = models.SmallIntegerField(blank=True, null=True)
     translaterows = models.SmallIntegerField(blank=True, null=True)
-    projects = models.ManyToManyField(Project, related_name='joined_projects', blank=True, null=True)
     languages = models.ManyToManyField(Language, related_name='joined_languages', blank=True, null=True)
 

Modified: src/branches/django-migration/Pootle/web/urls.py
===================================================================
--- src/branches/django-migration/Pootle/web/urls.py	2007-02-18 00:15:32 UTC (rev 5060)
+++ src/branches/django-migration/Pootle/web/urls.py	2007-02-18 00:29:37 UTC (rev 5061)
@@ -14,7 +14,7 @@
     
     (r'^(?P<what>projects)/$', 'index'),
     (r'^projects/(?P<project>\w+)/$', 'project'),
-    (r'^projects/(?P<project>\w+)/index.html$', 'project'),
+    (r'^projects/(?P<project>\w+)/start/(?P<language>\w+)/$', 'project_start'),
     (r'^projects/(?P<project>\w+)/admin.html$', 'projectadmin'),
     
     (r'^admin/$', 'admin'),

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-18 00:15:32 UTC (rev 5060)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-18 00:29:37 UTC (rev 5061)
@@ -57,19 +57,41 @@
 
 def project(req, project):
     p = get_object_or_404(Project, code=project)
-    languages = [] # FIXME
+    languages = TranslationProject.objects.filter(project=p)
+    start_translating = [ i for i in req.user.get_profile().languages.all() if i not in 
+        [ lang.language for lang in languages ]]
     context = {
         'project': p,
-        'stats': ngettext(  "%(count)d language, average %(average)d%% translated", # FIXME
+        'stats': ngettext(  "%(count)d language, average %(average)d%% translated",
                             "%(count)d languages, average %(average)d%% translated", 
                             len(languages)) % { 
                                 'count': len(languages),
-                                'average': 0 #getpagestats(), }, 
+                                'average': 0 #getpagestats(), },  # FIXME
                                 },
-        'languages': TranslationProject.objects.filter(project=p),
+        'languages': languages,
+        'starttranslating': start_translating,
         }
     return render_to_response("project.html", RequestContext(req, context))
 
+def project_start(req, project, language):
+    if settings.REQUIRE_NEW_PROJECT_APPROVAL:
+        context = { 'message': _("This site requires administrator approval when creating new translation projects. When your translation project is approved, you will be notified by email.") }
+    else:
+        try:
+            p = Project.objects.get(code=project)
+            lang = Language.objects.get(code=language)
+        except Project.DoesNotExist:
+            pass
+        except Language.DoesNotExist:
+            pass
+        else:
+            newproject = TranslationProject(project=p, language=lang)
+            newproject.save()
+            # FIXME join req.user to group as admin
+            return HttpResponseRedirect("/%s/%s/" % (language, project) )
+        context = { 'message': _("Creating new project has failed.") }
+    return render_to_response("project_start.html", RequestContext(req, context))
+
 def language(req, language):
     lang = get_object_or_404(Language, code=language)
     context = {
@@ -79,7 +101,7 @@
     return render_to_response("language.html", RequestContext(req, context))
     
 def translationproject(req, language, project, subdir=None):
-    p = TranslationProject(language=Language.objects.get(code=language), project=Project.objects.get(code=project))
+    p = get_object_or_404(TranslationProject, language=Language.objects.get(code=language), project=Project.objects.get(code=project))
     context = {
         'project': p,
         'items': p.list_dir(subdir),

Modified: src/branches/django-migration/Pootle/web/webforms.py
===================================================================
--- src/branches/django-migration/Pootle/web/webforms.py	2007-02-18 00:15:32 UTC (rev 5060)
+++ src/branches/django-migration/Pootle/web/webforms.py	2007-02-18 00:29:37 UTC (rev 5061)
@@ -78,8 +78,6 @@
             forms.TextField(field_name="inputwidth", length=10, validator_list=[isOnlyDigits]),
             forms.TextField(field_name="viewrows", length=10, validator_list=[isOnlyDigits]),
             forms.TextField(field_name="translaterows", length=10, validator_list=[isOnlyDigits]),
-            forms.SelectMultipleField(field_name="projects", 
-                size=min(max(len(project_choices), 5), 15), choices=project_choices),
             forms.SelectMultipleField(field_name="languages", 
                 size=min(max(len(language_choices), 5), 15), choices=language_choices),
         )
@@ -88,8 +86,7 @@
         data = dict([ (k.field_name, getattr(self.user, k.field_name, None)) \
             for k in self.fields if not k.field_name.startswith("password") ])
         profile, created = UserProfile.objects.get_or_create(user=self.user)
-        data.update({   'projects': [p.id for p in profile.projects.all()], 
-                        'languages': [lang.id for lang in profile.languages.all()]} )
+        data['languages'] = [lang.id for lang in profile.languages.all()]
         if created:
             profile.save()
         return data
@@ -110,12 +107,6 @@
         for k in ['uilanguage', 'inputheight', 'inputwidth', 'viewrows', 'translaterows']:
             setattr(profile, k, new_data[k])
         
-        for p in Project.objects.all():
-            if str(p.id) in new_data.getlist('projects'):
-                profile.projects.add(Project.objects.get(pk=p.id))
-            else:
-                profile.projects.remove(Project.objects.get(pk=p.id))
-        
         for lang in Language.objects.all():
             if str(lang.id) in new_data.getlist('languages'):
                 profile.languages.add(Language.objects.get(pk=lang.id))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5064
          http://svn.sourceforge.net/translate/?rev=5064&view=rev
Author:   zejn
Date:     2007-02-18 17:48:37 -0800 (Sun, 18 Feb 2007)

Log Message:
-----------
[django-migration] Implemented statistics, saved in xattr backend. Modified translationproject template to show strings instead of words.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/templates/translationproject.html
    src/branches/django-migration/Pootle/utils/__init__.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/utils/stats.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-02-19 01:45:57 UTC (rev 5063)
+++ src/branches/django-migration/Pootle/path.py	2007-02-19 01:48:37 UTC (rev 5064)
@@ -36,6 +36,9 @@
 
 import sys, warnings, os, fnmatch, glob, shutil, codecs, md5
 from Pootle.utils.fstags import create_tag
+from Pootle.utils.stats import enumerating_classify
+from translate.filters import checks
+from translate.storage import po
 
 __version__ = '2.1'
 __all__ = ['path']
@@ -79,6 +82,8 @@
 if hasattr(file, 'newlines'):
     _textmode = 'U'
 
+class NotImplementedException(Exception):
+    pass
 
 class TreeWalkWarning(Warning):
     pass
@@ -972,13 +977,11 @@
 
     # --- Special stuff for Pootle
 
-    def _is_po_file(self):
-        return self.ext == "po"
-    is_po = property(_is_po_file)
+    def is_po_file(self):
+        return self.ext == ".po"
 
-    def _is_xliff_file(self):
-        return self.ext in ['xlf', 'xlff', 'xliff']
-    is_xliff = property(_is_xliff_file)
+    def is_xliff_file(self):
+        return self.ext in ['.xlf', '.xlff', '.xliff']
 
     def listpo(self):
         return self.files("*.po")
@@ -986,20 +989,74 @@
     def listxliff(self):
         return self.files("*.xlf")
 
-    def stats(self):
-        # stats:  0,  1, 2 translated words, string, percentage    
-        #         3,  4, 5 fuzzy words, string, percentage         
-        #         6,  7, 8 untranslated words, string, percentage  
-        #         9, 10    all words, string                       
-        if not self._stats:
-            pass # FIXME : actually recalculate the stats (and add timestamp?)
-        data = self.stats.split(",")
-        map(int, data)
-        print type(data[1])
+    def _get_stats(self):
+        """_get_stats is a method that retrieves statistics for a file
+        that get displayed when browsing files that are part of 
+        TranslationProject.
+        
+        It returns a list with following indexes:
+            0   translated words
+            1   translated strings
+            2   translated percentage    
+            3   fuzzy words
+            4   fuzzy strings
+            5   fuzzy percentage
+            6   untranslated words
+            7   untranslated strings
+            8   untranslated percentage
+            9   all words
+            10  all strings
+        """
+        if not self._stats and self.classify:
+            c = self.classify
+            def _wordcount(index):
+                return c['sourcewordcount'][index]
+            transs = len(c['translated'])
+            fuzzys = len(c['fuzzy'])
+            blank = len(c['blank'])
+            totals = len(c['total']) - blank
+            untras = totals - transs - fuzzys
+            perc = total/100.0
+            transw = sum(map(_wordcount, c['translated']))
+            fuzzyw = sum(map(_wordcount, c['fuzzy']))
+            untraw = sum(map(_wordcount, [ i for i in c['total'] if i not in c['translated'] and i not in c['fuzzy']]))
+            data = [transw,transs,transs/perc, 
+                    fuzzyw,fuzzys,fuzzys/perc, 
+                    untraw,untras,untras/perc, 
+                    sum(c['sourcewordcount']), totals]
+            data = map(int, data)
+            writable_data = map(str, data)
+            self._stats = ",".join(writable_data)
+        else:
+            data = map(int, self._stats.split(","))
         return data
+    stats = property(_get_stats)
+    
+    _stats = property(*create_tag('stats'))
 
-    _stats = property(*create_tag(stats))
+    def _get_translation_store(self):
+        if not hasattr(self, '_translation_store'):
+            if self.is_po_file():
+                newpo = po.pofile()
+                newpo.parse(self.bytes())
+                self._translation_store = newpo
+            elif self.isdir():
+                self._translation_store = None
+            elif self.is_xliff_file():
+                raise NotImplementedException
+            else:
+                raise NotImplementedException
+        return self._translation_store
+    translationstore = property(_get_translation_store)
 
+    def _get_classify(self): # FIXME this should probably go to TranslationStore object
+        if not hasattr(self,'_classify'):
+            # FIXME standard checker
+            checker = checks.StandardChecker()
+            self._classify = enumerating_classify( checker , [u for u in self.translationstore.units if not u.isheader() or u.isblank()] )
+        return self._classify
+    classify = property(_get_classify)
+
     def icon(self):
         if self.isdir():
             return 'folder'

Modified: src/branches/django-migration/Pootle/templates/translationproject.html
===================================================================
--- src/branches/django-migration/Pootle/templates/translationproject.html	2007-02-19 01:45:57 UTC (rev 5063)
+++ src/branches/django-migration/Pootle/templates/translationproject.html	2007-02-19 01:48:37 UTC (rev 5064)
@@ -37,10 +37,10 @@
 </td><td>
 &nbsp;
 </td><td align="right">
-{{ item.stats.0 }}t, 
-{{ item.stats.3 }}f,
-{{ item.stats.6 }}u of 
-{{ item.stats.9 }} total
+{{ item.stats.1 }}t, 
+{{ item.stats.4 }}f,
+{{ item.stats.7 }}u of 
+{{ item.stats.10 }} total
 <br />
 <span class="sortkey">{{ item.stats.2 }}</span>
 <img src="/static/images/green.png" class="data" height="20" width="{{ item.stats.2 }}" alt="{{ item.stats.2 }}%" /><img src="/static/images/blue.png" class="data" height="20" width="{{ item.stats.5 }}" alt="{{ item.stats.5 }}%" /><img src="/static/images/red.png" class="data" height="20" width="{{ item.stats.8 }}" alt="{{ item.stats.8 }}%" />

Modified: src/branches/django-migration/Pootle/utils/__init__.py
===================================================================
--- src/branches/django-migration/Pootle/utils/__init__.py	2007-02-19 01:45:57 UTC (rev 5063)
+++ src/branches/django-migration/Pootle/utils/__init__.py	2007-02-19 01:48:37 UTC (rev 5064)
@@ -26,3 +26,20 @@
     def __call__(self, field_data, all_data):
         return self._callable(field_data, all_data)
 
+
+def flatten(l, ltypes=(list, tuple)):
+    """Flattens a list, eg.:
+    >>> flatten([1,[2,[3],[4,5]]])
+    [1, 2, 3, 4, 5]
+
+    It is not recursive and returns a list, not an iterator.
+    """
+    i = 0
+    while i < len(l):
+        if not l[i]:
+            l.pop(i)
+            continue
+        while isinstance(l[i], ltypes):
+            l[i:i+1] = list(l[i])
+        i += 1
+    return l

Added: src/branches/django-migration/Pootle/utils/stats.py
===================================================================
--- src/branches/django-migration/Pootle/utils/stats.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/utils/stats.py	2007-02-19 01:48:37 UTC (rev 5064)
@@ -0,0 +1,37 @@
+
+from translate.tools import pocount
+from Pootle.utils import flatten # FIXME pocount returns generators
+
+def enumerating_classify(checker, transunits):
+    """Analyzes TranslationStore and returns checks as are written in 
+    
+    returns a dict
+    """
+
+    keys = [ 'fuzzy', 'blank', 'translated', 'has-suggestions', 'total', 'sourcewordcount', 'targetwordcount' ]
+    classify = dict([ (k, []) for k in keys + checker.getfilters().keys() ])
+    
+    for item, unit in enumerate(transunits):
+        classify['total'].append(item)
+        unit.isfuzzy() and classify['fuzzy'].append(item)
+        unit.gettargetlen() == 0 and classify['blank'].append(item)
+        unit.istranslated() and classify['translated'].append(item)
+        source = unit.source
+        target = unit.target
+        if isinstance(source, str) and isinstance(target, unicode):
+            source = source.decode(getattr(unit, "encoding", "utf-8"))
+        for result in checker.run_filters(source, target):
+            key = "check-%s" % result[0]
+            class_list = classify.get(key, [])
+            class_list.append(item)
+            classify[key] = class_list
+        # FIXME pocount returns generators
+        classify['sourcewordcount'].append([pocount.wordcount(text) for text in unit.source.strings]) 
+        classify['targetwordcount'].append([pocount.wordcount(text) for text in unit.target.strings])
+    classify['sourcewordcount'] = flatten(classify['sourcewordcount'])
+    classify['targetwordcount']= flatten(classify['targetwordcount'])
+    # end FIXME pocount returns generators
+    
+    return classify
+
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5081
          http://svn.sourceforge.net/translate/?rev=5081&view=rev
Author:   zejn
Date:     2007-02-19 12:34:09 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
[django-migration] Statistics are now shown also for subdirectories.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/utils/stats.py
    src/branches/django-migration/Pootle/web/models.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-02-19 15:59:37 UTC (rev 5080)
+++ src/branches/django-migration/Pootle/path.py	2007-02-19 20:34:09 UTC (rev 5081)
@@ -34,9 +34,9 @@
 
 from __future__ import generators
 
-import sys, warnings, os, fnmatch, glob, shutil, codecs, md5
+import sys, warnings, os, fnmatch, glob, shutil, codecs, md5, re
 from Pootle.utils.fstags import create_tag
-from Pootle.utils.stats import enumerating_classify
+from Pootle.utils.stats import enumerating_classify, SimpleStats
 from translate.filters import checks
 from translate.storage import po
 
@@ -82,6 +82,8 @@
 if hasattr(file, 'newlines'):
     _textmode = 'U'
 
+translatable_file_re = re.compile(".*?\.(po|xli?ff?)$")
+
 class NotImplementedException(Exception):
     pass
 
@@ -983,12 +985,10 @@
     def is_xliff_file(self):
         return self.ext in ['.xlf', '.xlff', '.xliff']
 
-    def listpo(self):
-        return self.files("*.po")
+    def list_trans(self):
+        "lists files pootle storage can understand"
+        return self.dirs("[!.]*") + [ i for i in self.files() if translatable_file_re.match(i)]
 
-    def listxliff(self):
-        return self.files("*.xlf")
-
     def _get_stats(self):
         """_get_stats is a method that retrieves statistics for a file
         that get displayed when browsing files that are part of 
@@ -1007,28 +1007,34 @@
             9   all words
             10  all strings
         """
-        if not self._stats and self.classify:
-            c = self.classify
-            def _wordcount(index):
-                return c['sourcewordcount'][index]
-            transs = len(c['translated'])
-            fuzzys = len(c['fuzzy'])
-            blank = len(c['blank'])
-            totals = len(c['total']) - blank
-            untras = totals - transs - fuzzys
-            perc = totals/100.0
-            transw = sum(map(_wordcount, c['translated']))
-            fuzzyw = sum(map(_wordcount, c['fuzzy']))
-            untraw = sum(map(_wordcount, [ i for i in c['total'] if i not in c['translated'] and i not in c['fuzzy']]))
-            data = [transw,transs,transs/perc, 
-                    fuzzyw,fuzzys,fuzzys/perc, 
-                    untraw,untras,untras/perc, 
-                    sum(c['sourcewordcount']), totals]
-            data = map(int, data)
-            writable_data = map(str, data)
-            self._stats = ",".join(writable_data)
+        if not self._stats:
+            if self.classify:
+                c = self.classify
+                def _wordcount(index):
+                    return c['sourcewordcount'][index]
+                transs = len(c['translated'])
+                fuzzys = len(c['fuzzy'])
+                blank = len(c['blank'])
+                totals = len(c['total']) - blank
+                untras = totals - transs - fuzzys
+                perc = totals/100.0
+                transw = sum(map(_wordcount, c['translated']))
+                fuzzyw = sum(map(_wordcount, c['fuzzy']))
+                untraw = sum(map(_wordcount, [ i for i in c['total'] if i not in c['translated'] and i not in c['fuzzy']]))
+                data = [transw,transs,transs/perc, 
+                        fuzzyw,fuzzys,fuzzys/perc, 
+                        untraw,untras,untras/perc, 
+                        sum(c['sourcewordcount']), totals]
+                data = SimpleStats(map(int, data))
+                self._stats = ",".join(map(str, data))
+            else:
+                data = SimpleStats( (0,0,0, 0,0,0, 0,0,0, 0,0) )
+                for s in [ i.stats for i in self.list_trans()]:
+                    data = data & s
+                data.recalculate()
+                self._stats = ",".join(map(str, data))
         else:
-            data = map(int, self._stats.split(","))
+            data = SimpleStats(map(int, self._stats.split(",")))
         return data
     stats = property(_get_stats)
     
@@ -1040,20 +1046,21 @@
                 newpo = po.pofile()
                 newpo.parse(self.bytes())
                 self._translation_store = newpo
-            elif self.isdir():
-                self._translation_store = None
             elif self.is_xliff_file():
                 raise NotImplementedException
             else:
-                raise NotImplementedException
+                self._translation_store = None
         return self._translation_store
     translationstore = property(_get_translation_store)
 
     def _get_classify(self): # FIXME this should probably go to TranslationStore object
         if not hasattr(self,'_classify'):
-            # FIXME standard checker
-            checker = checks.StandardChecker()
-            self._classify = enumerating_classify( checker , [u for u in self.translationstore.units if not u.isheader() or u.isblank()] )
+            if self.is_po_file():
+                # FIXME standard checker
+                checker = checks.StandardChecker()
+                self._classify = enumerating_classify( checker , [u for u in self.translationstore.units if not u.isheader() or u.isblank()] )
+            else:
+                self._classify = None
         return self._classify
     classify = property(_get_classify)
 

Modified: src/branches/django-migration/Pootle/utils/stats.py
===================================================================
--- src/branches/django-migration/Pootle/utils/stats.py	2007-02-19 15:59:37 UTC (rev 5080)
+++ src/branches/django-migration/Pootle/utils/stats.py	2007-02-19 20:34:09 UTC (rev 5081)
@@ -2,6 +2,24 @@
 from translate.tools import pocount
 from Pootle.utils import flatten # FIXME pocount returns generators
 
+class SimpleStats(list):
+    "This implements a new operation of adding stats together for easier calculation."
+    def __repr__(self):
+        return "stats: %s" % super(SimpleStats, self).__repr__()
+
+    def __and__(self, other):
+        "vector addition"
+        assert len(self) == len(other)
+        return SimpleStats([ self[i] + other[i] for i in xrange(len(self)) ])
+
+    def recalculate(self):
+        "racalculates percentage for stats"
+        assert len(self) == 11
+        perc = self[10]/100.0
+        self[2] = int(self[1]/perc)
+        self[5] = int(self[4]/perc)
+        self[8] = int(self[7]/perc)
+
 def enumerating_classify(checker, transunits):
     """Analyzes TranslationStore and returns checks as are written in 
     

Modified: src/branches/django-migration/Pootle/web/models.py
===================================================================
--- src/branches/django-migration/Pootle/web/models.py	2007-02-19 15:59:37 UTC (rev 5080)
+++ src/branches/django-migration/Pootle/web/models.py	2007-02-19 20:34:09 UTC (rev 5081)
@@ -3,6 +3,7 @@
 from Pootle.path import path
 from django.contrib.auth.models import User
 from Pootle.conf import potree
+from Pootle.utils.stats import SimpleStats
 import Pootle.instance
 
 CHECKSTYLES = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
@@ -114,14 +115,18 @@
                             untransw, untranss, int(untranss/perc), 
                             self.allwords, self.allstrings)
             except ZeroDivisionError:
-                # FIXME emit signal to indexer here
-                self._stats = (0,0,0, 0,0,0, 0,0,0, 0,0)
-        return self._stats
+                # refresh stats
+                stats = SimpleStats( (0,0,0, 0,0,0, 0,0,0, 0,0) )
+                for s in [i.stats for i in self.list_dir()]:
+                    stats = stats & s
+                stats.recalculate()
+                self._stats = stats
+        return SimpleStats(self._stats)
     stats = property(_get_stats)
 
     def list_dir(self, subdir=None):
         listing = subdir and path(self.podir / subdir) or path(self.podir)
-        return listing.dirs("[!.]*") + listing.listpo()
+        return listing.list_trans()
 
     def _get_podir(self):
         if not self._podir:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5124
          http://svn.sourceforge.net/translate/?rev=5124&view=rev
Author:   zejn
Date:     2007-02-21 05:48:52 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
[django-migration] Fixed stats below project/language title.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2007-02-21 12:50:51 UTC (rev 5123)
+++ src/branches/django-migration/Pootle/templates/language.html	2007-02-21 13:48:52 UTC (rev 5124)
@@ -11,7 +11,7 @@
       <img src="/static/images/language.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
       <h3 class="title">[ <a href="/{{ languagecode }}/">{{ language.name }}</a> ]</h3>
       <div class="item-statistics">
-        {{ language.stats }} FIXME
+        {{ stats }}
       </div>
     </div>
 

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-21 12:50:51 UTC (rev 5123)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-21 13:48:52 UTC (rev 5124)
@@ -63,13 +63,15 @@
             [ lang.language for lang in languages ]]
     else:
         start_translating = []
+    
+    average_translated = sum([x.stats[2] for x in languages])/len(languages)
     context = {
         'project': p,
         'stats': ngettext(  "%(count)d language, average %(average)d%% translated",
                             "%(count)d languages, average %(average)d%% translated", 
                             len(languages)) % { 
                                 'count': len(languages),
-                                'average': 0 #getpagestats(), },  # FIXME
+                                'average': average_translated,
                                 },
         'languages': languages,
         'starttranslating': start_translating,
@@ -97,9 +99,18 @@
 
 def language(req, language):
     lang = get_object_or_404(Language, code=language)
+    projects = TranslationProject.objects.filter(language=lang)
+
+    average_translated = sum([x.stats[2] for x in projects])/len(projects)
     context = {
         "language": lang,
-        "projects": TranslationProject.objects.filter(language=lang),
+        "stats": ngettext(  "%(count)d project, average %(average)d%% translated",
+                            "%(count)d projects, average %(average)d%% translated", 
+                            len(projects)) % { 
+                                'count': len(projects),
+                                'average': average_translated,
+                                },
+        "projects": projects,
         }
     return render_to_response("language.html", RequestContext(req, context))
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5131
          http://svn.sourceforge.net/translate/?rev=5131&view=rev
Author:   zejn
Date:     2007-02-21 07:07:16 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
[django-migration] Changed map() calls to list comprehensions (path.py) and fixed statistics calculation to exclude obsoleted strings.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/templates/language.html
    src/branches/django-migration/Pootle/templates/project.html

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-02-21 14:58:44 UTC (rev 5130)
+++ src/branches/django-migration/Pootle/path.py	2007-02-21 15:07:16 UTC (rev 5131)
@@ -1010,31 +1010,31 @@
         if not self._stats:
             if self.classify:
                 c = self.classify
-                def _wordcount(index):
-                    return c['sourcewordcount'][index]
                 transs = len(c['translated'])
                 fuzzys = len(c['fuzzy'])
-                blank = len(c['blank'])
-                totals = len(c['total']) - blank
-                untras = totals - transs - fuzzys
+                totals = len(c['total'])
+                untras = totals - transs - fuzzys 
                 perc = totals/100.0
-                transw = sum(map(_wordcount, c['translated']))
-                fuzzyw = sum(map(_wordcount, c['fuzzy']))
-                untraw = sum(map(_wordcount, [ i for i in c['total'] if i not in c['translated'] and i not in c['fuzzy']]))
+                # sum number of words
+                transw = sum(c['sourcewordcount'][x] for x in c['translated']])
+                fuzzyw = sum(c['sourcewordcount'][x] for x in c['fuzzy']])
+                untraw = sum(c['sourcewordcount'][x] for x in [ 
+                    i for i in c['total'] if i not in c['translated'] and i not in c['fuzzy']]])
                 data = [transw,transs,transs/perc, 
                         fuzzyw,fuzzys,fuzzys/perc, 
                         untraw,untras,untras/perc, 
                         sum(c['sourcewordcount']), totals]
-                data = SimpleStats(map(int, data))
-                self._stats = ",".join(map(str, data))
+                print '==',data
+                data = SimpleStats([int(x) for x in data])
+                self._stats = ",".join([str(x) for x in data])
             else:
                 data = SimpleStats( (0,0,0, 0,0,0, 0,0,0, 0,0) )
                 for s in [ i.stats for i in self.list_trans()]:
                     data = data & s
                 data.recalculate()
-                self._stats = ",".join(map(str, data))
+                self._stats = ",".join([str(x) for x in data])
         else:
-            data = SimpleStats(map(int, self._stats.split(",")))
+            data = SimpleStats([int(x) for x in self._stats.split(",")])
         return data
     stats = property(_get_stats)
     
@@ -1058,7 +1058,7 @@
             if self.is_po_file():
                 # FIXME standard checker
                 checker = checks.StandardChecker()
-                self._classify = enumerating_classify( checker , [u for u in self.translationstore.units if not u.isheader() or u.isblank()] )
+                self._classify = enumerating_classify( checker , [u for u in self.translationstore.units if not u.isheader() and not u.isobsolete()] )
             else:
                 self._classify = None
         return self._classify

Modified: src/branches/django-migration/Pootle/templates/language.html
===================================================================
--- src/branches/django-migration/Pootle/templates/language.html	2007-02-21 14:58:44 UTC (rev 5130)
+++ src/branches/django-migration/Pootle/templates/language.html	2007-02-21 15:07:16 UTC (rev 5131)
@@ -48,10 +48,10 @@
 {#         3,  4, 5 fuzzy words, string, percentage         #}
 {#         6,  7, 8 untranslated words, string, percentage  #}
 {#         9, 10    all words, string                       #}
-      <td class="stats">{{ item.stats.0 }}</td><td class="stats">{{ item.stats.2 }}%</td>
-      <td class="stats">{{ item.stats.3 }}</td><td class="stats">{{ item.stats.5 }}%</td>
-      <td class="stats">{{ item.stats.6 }}</td><td class="stats">{{ item.stats.8 }}%</td>
-      <td class="stats">{{ item.stats.9 }}</td>
+      <td class="stats">{{ item.stats.1 }}</td><td class="stats">{{ item.stats.2 }}%</td>
+      <td class="stats">{{ item.stats.4 }}</td><td class="stats">{{ item.stats.5 }}%</td>
+      <td class="stats">{{ item.stats.7 }}</td><td class="stats">{{ item.stats.8 }}%</td>
+      <td class="stats">{{ item.stats.10 }}</td>
       <td class="stats-graph">
         <span class="sortkey">{{ item.stats.2 }}</span>
 <img src="/static/images/green.png" class="data" height="20" width="{{ item.stats.2 }}" /><img src="/static/images/blue.png" class="data" height="20" width="{{ item.stats.5 }}" /><img src="/static/images/red.png" class="data" height="20" width="{{ item.stats.8 }}" />

Modified: src/branches/django-migration/Pootle/templates/project.html
===================================================================
--- src/branches/django-migration/Pootle/templates/project.html	2007-02-21 14:58:44 UTC (rev 5130)
+++ src/branches/django-migration/Pootle/templates/project.html	2007-02-21 15:07:16 UTC (rev 5131)
@@ -56,10 +56,10 @@
       <img src="/static/images/{{ item.language.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" />
       <a href="/{{ item.language.code }}/{{ project.code }}/browse/" lang="en" dir="ltr">{{ item.language.name }}</a>
     </td>
-      <td class="stats">{{ item.stats.0 }}</td><td class="stats">{{ item.stats.2 }}%</td>
-      <td class="stats">{{ item.stats.3 }}</td><td class="stats">{{ item.stats.5 }}%</td>
-      <td class="stats">{{ item.stats.6 }}</td><td class="stats">{{ item.stats.8 }}%</td>
-      <td class="stats">{{ item.stats.9 }}</td>
+      <td class="stats">{{ item.stats.1 }}</td><td class="stats">{{ item.stats.2 }}%</td>
+      <td class="stats">{{ item.stats.4 }}</td><td class="stats">{{ item.stats.5 }}%</td>
+      <td class="stats">{{ item.stats.7 }}</td><td class="stats">{{ item.stats.8 }}%</td>
+      <td class="stats">{{ item.stats.10 }}</td>
       <td class="stats-graph">
         <span class="sortkey">{{ item.stats.2 }}</span>
 <img src="/static/images/green.png" class="data" height="20" width="{{ item.stats.2 }}" /><img src="/static/images/blue.png" class="data" height="20" width="{{ item.stats.5 }}" /><img src="/static/images/red.png" class="data" height="20" width="{{ item.stats.8 }}" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5160
          http://svn.sourceforge.net/translate/?rev=5160&view=rev
Author:   zejn
Date:     2007-02-26 00:13:23 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
[django-migration] Downloading PO, .ts, .csv works. Xliff still has some problems.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/templates/translationproject.html
    src/branches/django-migration/Pootle/utils/__init__.py
    src/branches/django-migration/Pootle/web/models.py
    src/branches/django-migration/Pootle/web/views.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/utils/convert.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-02-26 07:56:09 UTC (rev 5159)
+++ src/branches/django-migration/Pootle/path.py	2007-02-26 08:13:23 UTC (rev 5160)
@@ -37,6 +37,9 @@
 import sys, warnings, os, fnmatch, glob, shutil, codecs, md5, re
 from Pootle.utils.fstags import create_tag
 from Pootle.utils.stats import enumerating_classify, SimpleStats
+from Pootle.utils import NotImplementedException
+from Pootle.conf import instance
+from Pootle.utils.convert import convert_translation_store
 from translate.filters import checks
 from translate.storage import po
 
@@ -84,9 +87,6 @@
 
 translatable_file_re = re.compile(".*?\.(po|xli?ff?)$")
 
-class NotImplementedException(Exception):
-    pass
-
 class TreeWalkWarning(Warning):
     pass
 
@@ -1064,8 +1064,25 @@
         return self._classify
     classify = property(_get_classify)
 
+    # conveniently convert translation store
+    convert = convert_translation_store
+
     def icon(self):
+        "returns name of the icon"
         if self.isdir():
             return 'folder'
         elif self.isfile(): 
             return 'file'
+    
+    def __sub__(self, other):
+        "If path starts with 'other', this method removes the 'other' and returns the leftover"
+        if other[-1] != os.pathsep:
+            other = other + os.sep
+        if self.startswith(other):
+            return str(self[len(other):])
+        return 
+
+    def href(self):
+        "returns a path relative to project"
+        interesting = (self - getattr(instance(), 'podirectory')).split(os.sep)
+        return os.sep.join(interesting[2:])

Modified: src/branches/django-migration/Pootle/templates/translationproject.html
===================================================================
--- src/branches/django-migration/Pootle/templates/translationproject.html	2007-02-26 07:56:09 UTC (rev 5159)
+++ src/branches/django-migration/Pootle/templates/translationproject.html	2007-02-26 08:13:23 UTC (rev 5160)
@@ -3,8 +3,8 @@
 {% extends "base.html" %}
 
 {% block head %}
-  <script type="text/javascript" src="{{ baseurl }}static/js/sorttable.js"></script>
-  <script type="text/javascript" src="{{ baseurl }}static/js/show-hide.js"></script>
+  <script type="text/javascript" src="{{ baseurl }}/static/js/sorttable.js"></script>
+  <script type="text/javascript" src="{{ baseurl }}/static/js/show-hide.js"></script>
 {% endblock %}
 
 {% block content %}
@@ -30,9 +30,9 @@
 {% for item in items %}
 <tr><td>
 <img src="/static/images/{{ item.icon }}.png" class="icon" alt="" dir="{{ uidir }}" lang="{{ uilanguage }}" /></td><td>
-<b><a href="{{ item.basename }}">{{ item.basename }}</a></b>
+<b><a href="{{ project.dir }}{% if item.isdir %}browse{% else %}translate{% endif %}/{{ item.href }}">{{ item.basename }}</a></b>
 {% if item.isfile %}
-<br />{% trans "Download:" %}&nbsp;<a href="{{ item.basename }}">PO</a>&nbsp;<a href="{{ item.basename }}">.ts</a>&nbsp;<a href="{{ item.basename }}">XLIFF</a>&nbsp;<a href="{{ item.basename }}">CSV</a>
+<br />{% trans "Download:" %}&nbsp;<a href="{{ project.dir }}download/{{ item.href }}">PO</a>&nbsp;<a href="{{ project.dir }}download/{{ item.href }}?format=ts">.ts</a>&nbsp;<a href="{{ project.dir }}download/{{ item.href }}?format=xliff">XLIFF</a>&nbsp;<a href="{{ project.dir }}download/{{ item.basename }}?format=csv">CSV</a>
 {% endif %}
 </td><td>
 &nbsp;

Modified: src/branches/django-migration/Pootle/utils/__init__.py
===================================================================
--- src/branches/django-migration/Pootle/utils/__init__.py	2007-02-26 07:56:09 UTC (rev 5159)
+++ src/branches/django-migration/Pootle/utils/__init__.py	2007-02-26 08:13:23 UTC (rev 5160)
@@ -3,6 +3,9 @@
 import sre
 import os
 
+class NotImplementedException(Exception):
+    pass
+
 def shortdescription(descr):
     """Returns a short description by removing markup and only including up
     to the first br-tag"""

Added: src/branches/django-migration/Pootle/utils/convert.py
===================================================================
--- src/branches/django-migration/Pootle/utils/convert.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/utils/convert.py	2007-02-26 08:13:23 UTC (rev 5160)
@@ -0,0 +1,57 @@
+
+from cStringIO import StringIO
+from Pootle.utils import NotImplementedException
+
+po2csv = None
+po2ts = None
+po2xliff = None
+
+def _po2csv(inputfile):
+    global po2csv
+
+    if po2csv == None:
+        from translate.convert.po2csv import po2csv
+    converter = po2csv()
+    data = converter.convertfile(inputfile.translationstore)    
+    return str(data)
+
+def _po2po(inputfile):
+    return inputfile.bytes()
+
+def _po2ts(inputfile):
+    global po2ts
+
+    if po2ts == None:
+        from translate.convert.po2ts import po2ts
+    converter = po2ts()
+    data = converter.convertfile(inputfile.translationstore)
+    return str(data)
+
+def _po2xliff(inputfile):
+    global po2xliff
+    
+    if po2xliff == None:
+        from translate.convert.po2xliff import po2xliff
+    converter = po2xliff()
+    data = converter.convertfile(inputfile.translationstore)
+    return str(data)
+
+_po_converters = {
+    'csv': _po2csv,
+    'po': _po2po,
+    'ts': _po2ts,
+    'xliff': _po2xliff,
+    }
+
+def convert_translation_store(inputpath, outputfd, format):
+    """Convert between translation store formats. 
+    inputpath -- path of current translation store (should be a 
+                 Pootle.path.path object.
+    outputfd -- an object with write method
+    format -- target format to convert into
+    """
+
+    if inputpath.is_po_file():
+        outputfd.write(str(_po_converters[format](inputpath)))
+    raise NotImplementedException
+

Modified: src/branches/django-migration/Pootle/web/models.py
===================================================================
--- src/branches/django-migration/Pootle/web/models.py	2007-02-26 07:56:09 UTC (rev 5159)
+++ src/branches/django-migration/Pootle/web/models.py	2007-02-26 08:13:23 UTC (rev 5160)
@@ -133,6 +133,9 @@
             self._podir = path(potree().getpodir(self.language.code, self.project.code))
         return self._podir
     podir = property(_get_podir)
+    
+    def dir(self):
+        return '/%s/%s/' % (self.language.code, self.project.code)
 
 class PootlePermission(models.Model):
     tproject = models.ForeignKey(TranslationProject)

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-26 07:56:09 UTC (rev 5159)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-26 08:13:23 UTC (rev 5160)
@@ -1,4 +1,4 @@
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.template import Context, RequestContext, loader
 from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm
@@ -19,6 +19,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import ngettext
 import random
+from cStringIO import StringIO
 
 from Pootle.web.models import Language, Project
 
@@ -339,6 +340,16 @@
     # handles 2 urls
     return render_to_pootleresponse(translatepage.TranslatePage(project, pootlesession(req), argdict={}, dirfilter=None))
 
+def downloadfile(req, project, language, subdir, filename):
+    format = req.GET.get('format', 'po')
+    translationproject = TranslationProject.objects.get(project__code=project, language__code=language)
+    fullpath = translationproject.podir / (subdir + filename)
+    buffer = StringIO()
+    fullpath.convert(buffer, format)
+    contents = buffer.getvalue()
+    buffer.close()    
+    return HttpResponse(contents,mimetype="text/plain")
+
 # spellui.py
 
 def spellcheck(req):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5163
          http://svn.sourceforge.net/translate/?rev=5163&view=rev
Author:   zejn
Date:     2007-02-26 00:44:29 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
[django-project] Display folder statistics while browsing project.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/translationproject.html
    src/branches/django-migration/Pootle/web/views.py

Modified: src/branches/django-migration/Pootle/templates/translationproject.html
===================================================================
--- src/branches/django-migration/Pootle/templates/translationproject.html	2007-02-26 08:22:43 UTC (rev 5162)
+++ src/branches/django-migration/Pootle/templates/translationproject.html	2007-02-26 08:44:29 UTC (rev 5163)
@@ -22,7 +22,7 @@
       </div>
 
       <div class="item-statistics">
-        {{ languagestats }} FIXME
+        {{ stats }}
       </div>
     </div>
 

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-02-26 08:22:43 UTC (rev 5162)
+++ src/branches/django-migration/Pootle/web/views.py	2007-02-26 08:44:29 UTC (rev 5163)
@@ -117,8 +117,19 @@
     
 def translationproject(req, language, project, subdir=None):
     p = get_object_or_404(TranslationProject, language=Language.objects.get(code=language), project=Project.objects.get(code=project))
+    
+    files = p.list_dir(subdir)
+    numfiles = len(files)
+    average_translated = int(sum([f.stats[2] for f in files])/float(numfiles))
+
     context = {
         'project': p,
+        'stats': ngettext(  "%(count)d file, average %(average)d%% translated",
+                            "%(count)d files, average %(average)d%% translated",
+                            numfiles) % {
+                                'count': numfiles,
+                                'average': average_translated,
+                                },
         'items': p.list_dir(subdir),
        }
     return render_to_response("translationproject.html", RequestContext(req, context))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5288
          http://svn.sourceforge.net/translate/?rev=5288&view=rev
Author:   zejn
Date:     2007-03-24 01:57:45 -0700 (Sat, 24 Mar 2007)

Log Message:
-----------
[django-migration] Preliminary support for translation form

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/translatepage.html
    src/branches/django-migration/Pootle/web/views.py
    src/branches/django-migration/Pootle/web/webforms.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/templates/translate.html

Added: src/branches/django-migration/Pootle/templates/translate.html
===================================================================
--- src/branches/django-migration/Pootle/templates/translate.html	                        (rev 0)
+++ src/branches/django-migration/Pootle/templates/translate.html	2007-03-24 08:57:45 UTC (rev 5288)
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block head %}
+<script src="{{ baseurl }}static/js/autoexpand.js" type="text/javascript" />
+{% endblock %}
+
+{% block content %}
+
+{% trans "Original:" %}
+
+<br />
+{% trans "Translation:" %}
+{{ form.translation }}
+
+{% endblock %}

Modified: src/branches/django-migration/Pootle/templates/translatepage.html
===================================================================
--- src/branches/django-migration/Pootle/templates/translatepage.html	2007-03-23 04:22:34 UTC (rev 5287)
+++ src/branches/django-migration/Pootle/templates/translatepage.html	2007-03-24 08:57:45 UTC (rev 5288)
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html  PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns:py="http://purl.org/kid/ns#" xmlns:over="http://dev.sjsoft.com/ns/overlay" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta name="generator" content="HTML Tidy for Linux/x86 (vers 1st September 2004), see http://www.w3.org" />
-
-  <title py:content="pagetitle">Pootle: translating ${project.name} into ${language.name}: ${pofilename}</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <link rel="stylesheet" type="text/css" href="${baseurl}static/pootle.css" />
-  <link rel="shortcut icon" href="${baseurl}favicon.ico" />
-<script src="${baseurl}static/js/autoexpand.js" type="text/javascript">
-<!--
-//-->
-</script>
-  <!--[if lt IE 7.]>
-    <script defer type="text/javascript" src="${baseurl}static/js/correctpng.js"></script>
-  <![endif]-->
-</head>
-
-<body bgcolor="#FFFFFF">
-  <div id="abovefooter">
-  <div id="banner" over:include="pootlepage#banner"/>
-
-  <div id="content" dir="$uidir" lang="$uilanguage">
-    <div class="navbar" py:for="item in navitems">
-      <!-- search form -->
-      <div py:if="search" class="searchform" dir="$uidir" lang="$uilanguage">
-        <form action="translate.html" method="post" name="searchform" id="searchform">
-          ${search.title}
-          <input type="text" size="15" name="searchtext" value="${searchtext}" />
-          <input type="hidden" name="pofilename" value="${pofilename}" />
-        </form>
-      </div>
-      <!-- Navigation bar -->
-      <div over:include="navbar#item">
-        <h3 over:replace="itemtitle" class="title">
-          <span py:strip="True" py:if="item.path.language">[ <a href="${item.path.language.href}">${item.path.language.text}</a> ]</span>
-          <span py:strip="True" py:if="item.path.project">[ <a href="${item.path.project.href}">${item.path.project.text}</a> ]</span>
-          <span py:strip="True" py:for="pathlink in item.path.pathlinks">
-            <a href="${pathlink.href}">${pathlink.text}</a>${pathlink.sep}
-          </span>
-        </h3>
-      </div>
-
-      <div over:include="navbar#itemstats"/>
-
-      <div class="item-statistics" py:if="pagelinks">
-        <span py:strip="True" py:for="pagelink in pagelinks">
-          <a href="${pagelink.href}">${pagelink.text}</a>${pagelink.sep}
-        </span>
-      </div>
-    </div>
-
-    <div class="translate-form" dir="ltr">
-      <div py:if="notice" dir="$uidir">
-        <h3 class="title">${notice.title}</h3>
-        <div class="intro">${notice.stoppedby}</div>
-        <a href="${notice.finishedlink}">${notice.returnlink}</a>
-      </div>
-      <form py:if="not notice" action="${actionurl}" method="post" name="translate" id="translate">
-        <br clear="left" style="height: 0px;" />
-        <table cellpadding="10" cellspacing="1" class="translate-table">
-          <tr>
-            <th colspan="1" rowspan="1" class="translate-table-title" py:content="original_title">original</th>
-
-            <th colspan="1" rowspan="1" class="translate-table-title" py:content="translation_title">translation</th>
-          </tr>
-
-          <span  py:for="item in items" py:strip="True">
-          <tr title="${item.translator_comments + '\n' + item.developer_comments}">
-            <!-- Cell with original -->
-            <td colspan="1" rowspan="1" class="translate-original translate-original-${item.polarity} ${item.focus_class}">
-              <div id="${item.orig.itemid}" class="translate-original ${item.orig.focus_class}" lang="en">
-                <input py:for="field in item.orig.pure" type="hidden" name="${field.pureid}" value="${field.value}" id="${field.pureid}"/>
-                <div py:if="not item.orig.isplural" class="translation-text" py:content="XML(item.orig.text)"></div>
-                <span py:if="item.orig.isplural" py:strip="True">
-                  <span class="translation-text-headers" py:content="item.orig.singular_title">Singular</span><br />
-                  <span class="translation-text" py:content="XML(item.orig.singular_text)">singular text</span><br />
-                  <span class="translation-text-headers" py:content="item.orig.plural_title">Plural</span><br />
-                  <span class="translation-text" py:content="XML(item.orig.plural_text)">plural text</span><br />
-                </span>
-              </div>
-                <div py:if="item.editable and item.message_context" class="translate-context" py:content="item.message_context">
-                   Message Context
-                </div>
-            </td>
-
-            <!-- Cell with translation (view/suggest/review/edit) -->
-            <td lang="$uilanguage" dir="$uidir" colspan="1" rowspan="1" class="translate-translation translate-translation-${item.polarity} ${item.focus_class}">
-              <div id="${item.trans.itemid}" class="translate-translation ${item.orig.focus_class}">
-                <!-- Review suggestions -->
-                <span py:if="item.editable and reviewmode" class="translation-text">
-                  <a py:if="item.trans.editlink" href="${item.trans.editlink.href}" class="translation-action" py:content="item.trans.editlink.text" id="${item.trans.editlink.linkid}">Edit</a>
-                  <b class="${item.state_class}" py:content="item.trans.current_title">Current Translation:</b><br />
-                  <span py:for="form in item.trans.forms" py:strip="True">
-                    <span class="translation-text-headers" py:if="form.title" py:content="form.title">Plural Form ${form.n}</span>
-                    <br py:if="form.title" />
-                    <span py:replace="XML(form.diff)">Text with diffs</span><br />
-                  </span>
-                  
-                  <span py:for="sugg in item.trans.suggestions" py:strip="True">
-                    <br />
-                    <b py:content="sugg.title">Suggestion by testuser:</b><br />
-                    <div class="translate-suggestion">
-                    <span py:for="form in sugg.forms" py:strip="True">
-                      <span class="translation-text-headers" py:if="form.title" py:content="form.title">Plural Form ${form.n}</span>
-                      <br py:if="form.title" />
-                      <span py:replace="XML(form.diff)">Text with diffs</span><br />
-                      <input type="hidden" name="${form.suggid}" value="${form.value}" />
-                      <br />
-                    </span>
-                    </div>
-                    <span py:if="sugg.canreview" py:strip="True">
-                      <input type="submit" name="accept${sugg.suggid}" value="${accept_button}"/>
-                      <input type="submit" name="reject${sugg.suggid}" value="${reject_button}"/>
-                    </span>
-                    <input py:if="sugg.back" type="submit" name="back${sugg.back.item}" accesskey="b" value="${sugg.back.text}"/>
-                    <input py:if="sugg.skip" type="submit" name="skip${sugg.skip.item}" accesskey="k" value="${sugg.skip.text}"/>
-                    <br />
-                  </span>
-                  <input py:if="item.trans.back" type="submit" name="back${item.trans.back.item}" accesskey="b" value="${item.trans.back.text}"/>
-                  <input py:if="item.trans.skip" type="submit" name="skip${item.trans.skip.item}" accesskey="k" value="${item.trans.skip.text}"/>
-                </span>
-
-                <!-- Begin: Normal editing -->
-                <span py:if="item.editable and not reviewmode" py:strip="True">
-                  <!-- Translation memory -->
-                  <div py:if="item.tm" id="tm">
-                    <div class="sidetitle" py:content="related_title">Related</div>
-                    <div py:for ="unit in item.tm" class="tm-unit" title="${unit.getnotes()}" dir="ltr" lang="en">
-                      <span class="tm-original">${unit.source}</span>
-                      <span class="tm-translation" dir="$language.dir" lang="$language.code">${unit.target}</span>
-                    </div>
-                  </div>
-                  <!-- No plurals -->
-                  <span py:if="not item.trans.isplural" py:strip="True">
-                    <!--! TODO: spell checking -->
-                    <textarea dir="$language.dir" lang="$language.code" onfocus="setfocusedelement(this);" class="translation ${item.state_class}" name="${item.trans.itemid}" id="area${item.trans.itemid}"  rows="${item.trans.rows}" cols="${item.trans.cols}" py:content="XML(item.trans.text)">
-                      translatable text
-                    </textarea>
-                  </span>
-                  <!-- with plurals -->
-                  <span py:if="item.trans.isplural" py:strip="True">
-                    <span py:for="form in item.trans.forms" py:strip="True">
-                      <div class="translation-text-headers" py:content="form.title">Plural Form ${form.n}</div><br />
-                      <!--! TODO: spell checking -->
-                      <div>
-                        <textarea dir="$language.dir" lang="$language.code" onfocus="setfocusedelement(this);" class="translation ${item.state_class}" name="${form.name}" id="area${form.name}" rows="${item.trans.rows}" cols="${item.trans.cols}" py:content="XML(form.text)">
-                          translatable text for plural form
-                        </textarea>
-                      </div>
-                    </span>
-                  </span>
-
-                  <!-- Buttons, resize links, special characters -->
-                  <span py:strip="True" py:for="buttons in [item.trans.buttons]">
-                    <div>
-                      <input py:if="'back' in buttons.desired" type="button" name="back${buttons.item}" accesskey="b" value="${buttons.back}" onclick="history.back(); return false;" />
-                      <input py:if="'skip' in buttons.desired" type="submit" name="skip${buttons.item}" accesskey="k" value="${buttons.skip}"/>
-                      <input type="button" py:if="'copy' in buttons.desired" accesskey="c"
-                        onclick="copyorigtranslation('${buttons.item}'); return false"
-                        value="${buttons.copy_text}" /> 
-                      <input py:if="'suggest' in buttons.desired" type="submit" name="submitsuggest${buttons.item}" accesskey="e" value="${buttons.suggest}"/>
-                      <input py:if="'translate' in buttons.desired" type="submit" name="submit${buttons.item}" accesskey="s" value="${buttons.submit}"/>
-                    </div>
-                    <div>
-                      <input type="checkbox" checked="${item.fuzzy}" name="fuzzy${buttons.item}" accesskey="f" />
-                      ${fuzzytext}
-                    </div>
-                    <div py:if="'specialchars' in buttons" class="specialchars" lang="$language.code">
-                      <span py:for="specialchar in buttons.specialchars" py:strip="True">
-                        <a py:if="not specialchar.isspace()" py:content="specialchar" onclick="writespecial('${specialchar}', '${buttons.item}'); return false;" href="#">spc</a>
-                        <span py:if="specialchar.isspace()" class="extraspace"> </span>
-                      </span>
-                    </div>
-                    <span py:if="'resize' in buttons.desired" py:strip="True">
-                      <a href='#' onclick="return expandtextarea(this)" accesskey="=" py:content="buttons.grow">Grow</a>
-                      <a href='#' onclick="return contracttextarea(this)" accesskey="-" py:content="buttons.shrink">Shrink</a>
-                      <a href='#' onclick="return broadentextarea(this)" accesskey="+" py:content="buttons.broaden">Broaden</a>
-                      <a href='#' onclick="return narrowtextarea(this)" accesskey="_" py:content="buttons.narrow">Narrow</a>
-                      <a href='#' onclick="return resettextarea(this, ${buttons.rows}, ${buttons.cols})" py:content="buttons.reset">Reset</a>
-                    </span>
-                  </span>
-                  <script type="text/javascript">
-                    <!-- //We should comment this for old browsers, but then kid doesn't evaluate the expression -->
-                    document.forms.translate['${item.trans.focusbox}'].focus()
-                    <!-- //-->
-                  </script>
-                </span>
-                <!-- End: Normal editing -->
-
-                <!-- Normal view mode -->
-                <?python
-                  action = "document.location='%s';"
-                ?>
-                <div py:if="not item.editable" class="${item.state_class}" style="min-height: 1.5em;" ondblclick="${not item.trans.editlink or action % item.trans.editlink.href}">
-                  <div dir="$language.dir" lang="$language.code" class="translation-action">
-                    <a py:if="item.trans.editlink" lang="$uilanguage" dir="$uidir" href="${item.trans.editlink.href}" class="translation-action" py:content="item.trans.editlink.text" id="${item.trans.editlink.linkid}">Edit</a>
-                  </div>
-                  <div dir="$language.dir" lang="$language.code" py:if="not item.trans.isplural" class="translation-text" py:content="XML(item.trans.text)">
-                    text
-                  </div>
-                  <span py:if="item.trans.isplural" class="translation-text">
-                    <span py:for="form in item.trans.forms" py:strip="True">
-                      <span class="translation-text-headers" py:content="form.title">Plural Form ${form.n}</span><br />
-                      <span py:replace="XML(form.text)">Text</span><br />
-                    </span>
-                  </span>
-                </div>
-              </div>
-            </td>
-          </tr>
-          <tr py:if="item.editable">
-            <td  class="translate-original translate-original-${item.polarity} ${item.focus_class}">
-              <span py:if="item.developer_comments" py:strip="True">
-                <div py:content="developer_comments_title">Developer comments:</div>
-                <div py:if="item.editable and item.developer_comments" class="developer-comments" py:content="XML(item.developer_comments)">
-                   Developer comments.
-                </div>
-              </span>
-                <div py:if="item.editable and item.locations" class="translate-locations" py:content="item.locations">
-                   Locations
-                </div>
-            </td>
-            <td class="translate-translation translate-translation-${item.polarity} ${item.focus_class}">
-              <div py:content="translator_comments_title">Translator comments:</div>
-                   <textarea py:if="not reviewmode" dir="$language.dir" lang="$language.code" name="translator_comments${item.itemid}" id="translator_comments${item.itemid}" rows="${item.trans.rows}" cols="${item.trans.cols}" py:content="item.translator_comments">
-                    Translator comments.
-                   </textarea>
-                   <div py:if="reviewmode" py:content="XML(item.translator_comments)"  class="translator-comments">Translator comments</div>
-            </td>
-          </tr>
-          </span>
-
-
-        </table>
-        <input type="hidden" name="searchtext" value="${searchtext}" />
-        <input type="hidden" name="pofilename" value="${pofilename}" />
-      </form>
-
-      <div class="item-statistics" py:if="pagelinks" dir="$uidir" lang="$uilanguage">
-        <span py:strip="True" py:for="pagelink in pagelinks">
-          <a href="${pagelink.href}">${pagelink.text}</a>${pagelink.sep}
-        </span>
-      </div>
-    </div>
-  </div>
-
-  <div id="links" over:include="pootlepage#links">
-    <div py:if="defined('assigns')" class="sidetitle" py:content="assigns.title">Assign Strings</div>
-    <form py:if="defined('assigns')" action="?index=1" name="assignform">
-      <select name="assignto" title="${assigns.user_title}">
-        <option py:for="user in assigns.users" value="${user}" py:content="user">Username</option>
-      </select>
-      <input name="action" value="translate" title="${assigns.action_title}"/>
-      <input name="doassign" type="submit" value="${assigns.submit_text}"/>
-    </form>
-
-    <div class="side" py:if="defined('checking_text')" py:content="checking_text">
-      checking has-suggestion, etc
-    </div>
-  </div>
-  </div>
-  <div id="about" over:include="pootlepage#about"/>
-</body>
-</html>

Modified: src/branches/django-migration/Pootle/web/views.py
===================================================================
--- src/branches/django-migration/Pootle/web/views.py	2007-03-23 04:22:34 UTC (rev 5287)
+++ src/branches/django-migration/Pootle/web/views.py	2007-03-24 08:57:45 UTC (rev 5288)
@@ -345,12 +345,19 @@
     project_obj = potree().getproject(language, project)
     return render_to_pootleresponse(adminpages.TranslationProjectAdminPage(potree(), project_obj, pootlesession(req), argdict))
 
-# translatepage.py
+def translate(req, language, project, subdir, filename):
+    translationproject = TranslationProject.objects.get(project__code=project, language__code=language)
+    file = translationproject.podir / (subdir + filename)
+    manipulator = webforms.TranslationManipulator(file)
 
-def translatepage(req):
-    # handles 2 urls
-    return render_to_pootleresponse(translatepage.TranslatePage(project, pootlesession(req), argdict={}, dirfilter=None))
+    new_data = errors = {} 
+    form = forms.FormWrapper(manipulator, new_data, errors)
 
+    context = {
+        'form' : form,
+        }
+    return render_to_response("translate.html", RequestContext(req, context))
+
 def downloadfile(req, project, language, subdir, filename):
     format = req.GET.get('format', 'po')
     translationproject = TranslationProject.objects.get(project__code=project, language__code=language)

Modified: src/branches/django-migration/Pootle/web/webforms.py
===================================================================
--- src/branches/django-migration/Pootle/web/webforms.py	2007-03-23 04:22:34 UTC (rev 5287)
+++ src/branches/django-migration/Pootle/web/webforms.py	2007-03-24 08:57:45 UTC (rev 5288)
@@ -114,3 +114,14 @@
         profile.save()
         u.save()
         return u
+
+class TranslationManipulator(forms.Manipulator):
+    def __init__(self, translationunit):
+        self.unit = translationunit
+        self.fields = (
+            forms.LargeTextField(field_name="translation"),
+            )
+
+    def save(self, new_data):
+        # FIXME
+        print 'should save'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5301
          http://svn.sourceforge.net/translate/?rev=5301&view=rev
Author:   zejn
Date:     2007-03-27 17:16:14 -0700 (Tue, 27 Mar 2007)

Log Message:
-----------
[django-migration] Adding support for checkers to TranslationProject object

Modified Paths:
--------------
    src/branches/django-migration/Pootle/templates/translate.html
    src/branches/django-migration/Pootle/web/models.py
    src/branches/django-migration/Pootle/web/webforms.py

Modified: src/branches/django-migration/Pootle/templates/translate.html
===================================================================
--- src/branches/django-migration/Pootle/templates/translate.html	2007-03-27 15:11:19 UTC (rev 5300)
+++ src/branches/django-migration/Pootle/templates/translate.html	2007-03-28 00:16:14 UTC (rev 5301)
@@ -7,10 +7,17 @@
 
 {% block content %}
 
-{% trans "Original:" %}
+<table>
+<tr>
+<td>{% trans "String number:" %}</td>
+<td>{{ stringnumber }}</td>
+</tr><tr>
+<td>{% trans "Original:" %}</td>
+<td>{{ originalstring }}</td>
+</tr><tr>
+<td>{% trans "Translation:" %}</td>
+<td>{{ form.translation }}</td>
+</tr>
+</table>
 
-<br />
-{% trans "Translation:" %}
-{{ form.translation }}
-
 {% endblock %}

Modified: src/branches/django-migration/Pootle/web/models.py
===================================================================
--- src/branches/django-migration/Pootle/web/models.py	2007-03-27 15:11:19 UTC (rev 5300)
+++ src/branches/django-migration/Pootle/web/models.py	2007-03-28 00:16:14 UTC (rev 5301)
@@ -6,13 +6,13 @@
 from Pootle.utils.stats import SimpleStats
 import Pootle.instance
 
-CHECKSTYLES = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
+CHECKSTYLES = [ (ch, ch) for ch in checks.projectcheckers.keys()]
 FILETYPES = (   ('po', 'po'),  ('xliff','xliff'), )
 
 class Project(models.Model):
     code = models.SlugField(maxlength=32,unique=True)
     name = models.CharField(maxlength=100)
-    checkstyle = models.CharField(maxlength=20, choices=CHECKSTYLES)
+    checkstyle = models.CharField(maxlength=20, choices=CHECKSTYLES, default='standard')
     description = models.TextField()
     filetype = models.CharField(maxlength=10, choices=FILETYPES)
     createmofiles = models.BooleanField()
@@ -24,6 +24,7 @@
     allstrings = models.IntegerField(default=0)
     
     icon = 'folder'
+    _checker_cache = None
     
     def __str__(self):
         return self.name
@@ -42,6 +43,12 @@
             return (0,0,0, 0,0,0, 0,0,0, 0,0)
     stats = property(_get_stats)
 
+    def checker(self):
+        "returns the checker this project uses"
+        if not self._checker_cache:
+            self._checker_cache = checks.projectcheckers[self.checkstyle]()
+        return self._checker_cache
+
 class AllowedLanguageManager(models.Manager):
     def get_query_set(self):
         return super(AllowedLanguageManager, self).get_query_set().filter(enabled=True)

Modified: src/branches/django-migration/Pootle/web/webforms.py
===================================================================
--- src/branches/django-migration/Pootle/web/webforms.py	2007-03-27 15:11:19 UTC (rev 5300)
+++ src/branches/django-migration/Pootle/web/webforms.py	2007-03-28 00:16:14 UTC (rev 5301)
@@ -8,7 +8,7 @@
 
 isValidEmail = CallableValidatorWrapper(isValidEmail)
 
-CHECKS = [ ('Standard', 'Standard')] + [ (ch, ch) for ch in checks.projectcheckers.keys()]
+CHECKS = [ (ch, ch) for ch in checks.projectcheckers.keys()]
 FILETYPES = [
     ('po', 'po'),
     ('xliff','xliff'),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5338
          http://svn.sourceforge.net/translate/?rev=5338&view=rev
Author:   zejn
Date:     2007-04-02 05:42:16 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
[django-migration] Add a way to filter translations for checks and tests.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/tests/
    src/branches/django-migration/Pootle/tests/sample.po
    src/branches/django-migration/Pootle/tests/test_utils_stats.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-04-02 12:10:30 UTC (rev 5337)
+++ src/branches/django-migration/Pootle/path.py	2007-04-02 12:42:16 UTC (rev 5338)
@@ -36,7 +36,7 @@
 
 import sys, warnings, os, fnmatch, glob, shutil, codecs, md5, re
 from Pootle.utils.fstags import create_tag
-from Pootle.utils.stats import enumerating_classify, SimpleStats
+from Pootle.utils.stats import enumerating_classify, classify_unit, SimpleStats
 from Pootle.utils import NotImplementedException
 from Pootle.conf import instance
 from Pootle.utils.convert import convert_translation_store
@@ -1056,9 +1056,7 @@
     def _get_classify(self): # FIXME this should probably go to TranslationStore object
         if not hasattr(self,'_classify'):
             if self.is_po_file():
-                # FIXME standard checker
-                checker = checks.StandardChecker()
-                self._classify = enumerating_classify( checker , [u for u in self.translationstore.units if not u.isheader() and not u.isobsolete()] )
+                self._classify = enumerating_classify( self.checker , [u for u in self.translationstore.units if not u.isheader() and not u.isobsolete()] )
             else:
                 self._classify = None
         return self._classify
@@ -1067,6 +1065,31 @@
     # conveniently convert translation store
     convert = convert_translation_store
 
+    def _get_checker(self):
+        # FIXME : make this translation project aware
+        if not hasattr(self, '_checker'):
+            self._checker = checks.StandardChecker()
+        return self._checker
+    checker = property(_get_checker)
+
+    def filter(self, exclude_list, start=None):
+        if start == None:
+            start = -1
+        start = start + 1
+        end = start
+        units = [u for u in self.translationstore.units if not u.isheader() and not u.isobsolete()]
+        for unit in units[start:]:
+            d = classify_unit(self.checker, unit)
+            if sum([int(d.has_key(f)) for f in exclude_list]) == 0:
+                return end, unit
+            end = end + 1
+
+    def iterfilter(self, exclude_list):
+        unit = self.filter(exclude_list)
+        while unit:
+            yield unit
+            unit = self.filter(exclude_list, unit[0])
+
     def icon(self):
         "returns name of the icon"
         if self.isdir():

Added: src/branches/django-migration/Pootle/tests/sample.po
===================================================================
--- src/branches/django-migration/Pootle/tests/sample.po	                        (rev 0)
+++ src/branches/django-migration/Pootle/tests/sample.po	2007-04-02 12:42:16 UTC (rev 5338)
@@ -0,0 +1,1373 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: translate-pootle@..."
+"POT-Creation-Date: 2006-08-07 12:36+0200\n"
+"PO-Revision-Date: 2006-08-08 11:48+0200\n"
+"Last-Translator: FULL NAME <EMAIL@..."
+"Language-Team: LANGUAGE <LL@..."
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Generated-By: pygettext.py 1.1\n"
+"X-Generator: Pootle 0.10rc1\n"
+
+#: adminpages.py:35 adminpages.py:71 adminpages.py:126 adminpages.py:187
+#: adminpages.py:273 adminpages.py:333 indexpage.py:58 indexpage.py:77
+#: indexpage.py:112 indexpage.py:166 indexpage.py:226 indexpage.py:312
+#: pagelayout.py:59 users.py:38 users.py:71 users.py:104 users.py:125
+#: translatepage.py:91
+msgid "Pootle Demo"
+msgstr "Demo de Pootle"
+
+#: adminpages.py:43 adminpages.py:79 adminpages.py:134 adminpages.py:195
+#: pagelayout.py:36
+msgid "Home"
+msgstr "Principal"
+
+#: adminpages.py:44 adminpages.py:197
+msgid "Users"
+msgstr "Usuarios"
+
+#: adminpages.py:45 adminpages.py:81 indexpage.py:75
+msgid "Languages"
+msgstr "Idiomas"
+
+#: adminpages.py:46 adminpages.py:136 indexpage.py:76
+msgid "Projects"
+msgstr "Proyectos"
+
+#: adminpages.py:47
+msgid "General options"
+msgstr "Opciones Generales"
+
+#: adminpages.py:48 users.py:129
+msgid "Option"
+msgstr "Opción"
+
+#: adminpages.py:49 users.py:130
+msgid "Current value"
+msgstr "Valor actual"
+
+#: adminpages.py:50 adminpages.py:82 adminpages.py:137 adminpages.py:198
+#: users.py:142
+msgid "Save changes"
+msgstr "Guardar cambios"
+
+#: adminpages.py:54
+msgid "Title"
+msgstr "Título"
+
+#: adminpages.py:54
+msgid "Description"
+msgstr "Descripción"
+
+#: adminpages.py:54
+msgid "Base URL"
+msgstr "URL Base"
+
+#: adminpages.py:54
+msgid "Home Page"
+msgstr "Página Principal"
+
+#: adminpages.py:80 adminpages.py:135 adminpages.py:196
+msgid "Main admin page"
+msgstr "Página Principal de Administración"
+
+#: adminpages.py:86
+msgid "ISO Code"
+msgstr "Código ISO"
+
+#: adminpages.py:87 adminpages.py:142 adminpages.py:203 users.py:80
+msgid "Full Name"
+msgstr "Nombre Completo"
+
+#: adminpages.py:87
+msgid "(add language here)"
+msgstr "(agregar idioma aquí)"
+
+#: adminpages.py:88
+msgid "Special Chars"
+msgstr "Carácteres Especiales"
+
+#: adminpages.py:88
+msgid "(special characters)"
+msgstr "(caracteres especiales)"
+
+#: adminpages.py:89 indexpage.py:189
+msgid "Number of Plurals"
+msgstr "Número de Plurales"
+
+#: adminpages.py:89
+msgid "(number of plurals)"
+msgstr "(número de plurales)"
+
+#: adminpages.py:90 indexpage.py:190
+msgid "Plural Equation"
+msgstr "Ecuación del Plural"
+
+#: adminpages.py:90
+msgid "(plural equation)"
+msgstr "(ecuación del plural)"
+
+#: adminpages.py:91
+msgid "Remove Language"
+msgstr "Eliminar Idioma"
+
+#. l10n: The parameter is a languagecode, projectcode or username
+#: adminpages.py:106 adminpages.py:168 adminpages.py:229 adminpages.py:392
+#, python-format
+msgid "Remove %s"
+msgstr "Eliminar %s"
+
+#: adminpages.py:124
+msgid "Standard"
+msgstr "Estándar"
+
+#: adminpages.py:141
+msgid "Project Code"
+msgstr "Código del Proyecto"
+
+#: adminpages.py:142
+msgid "(add project here)"
+msgstr "(agregar proyecto aquí)"
+
+#: adminpages.py:143
+msgid "Project Description"
+msgstr "Descripción del Proyecto"
+
+#: adminpages.py:143
+msgid "(project description)"
+msgstr "(descripción del proyecto)"
+
+#: adminpages.py:144
+msgid "Checker Style"
+msgstr "Estilo del Verificador"
+
+#: adminpages.py:145
+msgid "Create MO Files"
+msgstr "Crear Archivos MO"
+
+#: adminpages.py:146
+msgid "Remove Project"
+msgstr "Eliminar Proyecto"
+
+#: adminpages.py:202 users.py:46
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: adminpages.py:203 users.py:274
+msgid "(add full name here)"
+msgstr "(agregar nombre completo aquí)"
+
+#: adminpages.py:204 users.py:77
+msgid "Email Address"
+msgstr "Dirección de Correo Electrónico"
+
+#: adminpages.py:204 users.py:277
+msgid "(add email here)"
+msgstr "(agregar correo-e aquí)"
+
+#: adminpages.py:205 users.py:83
+msgid "Password"
+msgstr "Contraseña"
+
+#: adminpages.py:205 users.py:271
+msgid "(add password here)"
+msgstr "(agregar contraseña aquí)"
+
+#: adminpages.py:206
+msgid "Activated"
+msgstr "Activado"
+
+#: adminpages.py:206
+msgid "Activate New User"
+msgstr "Activar Nuevo Usuario"
+
+#: adminpages.py:207
+msgid "Remove User"
+msgstr "Eliminar Usuario"
+
+#: adminpages.py:261
+msgid "Back to main page"
+msgstr "Regresar a la página principal"
+
+#: adminpages.py:262
+msgid "Existing languages"
+msgstr "Idiomas existentes"
+
+#. l10n: This refers to updating the translation files from the templates like with .pot files
+#: adminpages.py:266
+msgid "Update Languages"
+msgstr "Actualizar Idiomas"
+
+#: adminpages.py:267
+#, python-format
+msgid "Pootle Admin: %s"
+msgstr "Administración de Pootle: %s"
+
+#: adminpages.py:268 adminpages.py:330
+msgid "You do not have the rights to administer this project."
+msgstr "No tiene los derechos para administrar este proyecto."
+
+#. l10n: This refers to updating the translation files from the templates like with .pot files
+#: adminpages.py:270
+msgid "Update from templates"
+msgstr "Actualizar desde plantillas"
+
+#: adminpages.py:278
+msgid "Add Language"
+msgstr "Agregar Idioma"
+
+#. l10n: This is the page title. The first parameter is the language name, the second parameter is the project name
+#: adminpages.py:310
+#, python-format
+msgid "Pootle Admin: %s %s"
+msgstr "Administración Pootle: %s %s"
+
+#: adminpages.py:311
+msgid "Project home page"
+msgstr "Página principal del proyecto"
+
+#: adminpages.py:329
+#, python-format
+msgid "Cannot set rights for username %s - user does not exist"
+msgstr ""
+"No se pueden asignar derechos para el nombre de usuario %s - el usuario no "
+"existe"
+
+#: adminpages.py:346
+msgid "This is a GNU-style project (one directory, files named per language)."
+msgstr ""
+"Este es un proyecto al estilo GNU (un directorio, archivos nombrados por "
+"idioma)."
+
+#: adminpages.py:348
+msgid "This is a standard style project (one directory per language)."
+msgstr "Este es un proyecto al estilo estándar (un directorio por idioma)."
+
+#: adminpages.py:349
+msgid "User Permissions"
+msgstr "Permisos del Usuario"
+
+#: adminpages.py:350 users.py:74 users.py:107
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: adminpages.py:351
+msgid "(select to add user)"
+msgstr "(selecciona para agregar un usuario)"
+
+#: adminpages.py:352
+msgid "Rights"
+msgstr "Derechos"
+
+#: adminpages.py:353 indexpage.py:929
+msgid "Remove"
+msgstr "Eliminar"
+
+#: adminpages.py:373
+msgid "Update Rights"
+msgstr "Actualizar Derechos"
+
+#: indexpage.py:49
+msgid "About Pootle"
+msgstr "Acerca de Pootle"
+
+#: indexpage.py:50
+msgid ""
+"<strong>Pootle</strong> is a simple web portal that should allow you to "
+"<strong>translate</strong>! Since Pootle is <strong>Free Software</strong>, "
+"you can download it and run your own copy if you like. You can also help "
+"participate in the development in many ways (you don't have to be able to "
+"program)."
+msgstr ""
+"<strong>Pootle</strong> es un simple portal web que le permite "
+"<strong>traducir</strong>! Mientras que Pootle es <strong>Software Libre</"
+"strong>,  puede descargarlo y ejecutar su propia copia si lo desea. Puede "
+"incluso ayudar participando en el desarrollo en muchas formas (no tiene que "
+"saber programar)."
+
+#: indexpage.py:51
+msgid ""
+"The Pootle project itself is hosted at <a href=\"http://translate."
+"sourceforge.net/\">translate.sourceforge.net</a> where you can find the "
+"details about source code, mailing lists etc."
+msgstr ""
+"El proyecto Pootle está hospedado en <a href=\"http://translate.sourceforge."
+"net/\">translate.sourceforge.net</a> donde puede encontrar detalles acerca "
+"del código, lista de correos, etc."
+
+#. l10n: If your language uses right-to-left layout and you leave the English untranslated, consider enclosing the necessary text with <span dir="ltr">.......</span> to help browsers to display it correctly
+#: indexpage.py:53
+msgid ""
+"The name stands for <b>PO</b>-based <b>O</b>nline <b>T</b>ranslation / <b>L</"
+"b>ocalization <b>E</b>ngine, but you may need to read <a href=\"http://www."
+"thechestnut.com/flumps.htm\">this</a>."
+msgstr ""
+"El nombre quiere decir \"<b>PO</b>-based <b>O</b>nline <b>T</b>ranslation / "
+"<b>L</b>ocalization <b>E</b>ngine (Motor para la Traducción en Línea basado "
+"en PO), pero probablemente necesite leer <a href=\"http://www.thechestnut."
+"com/flumps.htm\">ésto</a>."
+
+#: indexpage.py:54
+msgid "Versions"
+msgstr "Versiones"
+
+#. l10n: If your language uses right-to-left layout and you leave the English untranslated, consider enclosing the necessary text with <span dir="ltr">.......</span> to help browsers to display it correctly
+#: indexpage.py:56
+#, fuzzy, python-format
+#, python-format
+msgid ""
+"This site is running:<br />Pootle %s<br />Translate Toolkit %s<br />jToolkit "
+"%s<br />Kid %s<br />ElementTree %s<br />Python %s (on %s/%s)"
+msgstr ""
+"Este sitio está ejecutando:<br />Pootle %s<br />Herramientas de Traducción "
+"(Toolkit) %s<br />jToolkit %s<br />Python %s (en %s/%s)"
+
+#: indexpage.py:74
+msgid "About this Pootle server"
+msgstr "Acerca de este servidor Pootle"
+
+#: indexpage.py:107
+#, python-format
+msgid "User Page for: %s"
+msgstr "Página de Usuario para: %s"
+
+#: indexpage.py:109
+msgid "Change options"
+msgstr "Cambiar opciones"
+
+#: indexpage.py:110
+msgid "Admin page"
+msgstr "Página de administración"
+
+#: indexpage.py:111
+msgid "Quick Links"
+msgstr "Vínculos Rápidos"
+
+#: indexpage.py:115
+msgid "Please click on 'Change options' and select some languages and projects"
+msgstr ""
+"Por favor haga click en 'Cambiar opciones' y seleccione algunos idiomas y "
+"proyectos"
+
+#: indexpage.py:164
+#, python-format
+msgid "%d project, average %d%% translated"
+msgid_plural "%d projects, average %d%% translated"
+msgstr[0] "%d proyecto, en promedio %d%% traducido"
+msgstr[1] "%d proyectos, en promedio %d%% traducido"
+
+#. l10n: The first parameter is the name of the installation
+#. l10n: The second parameter is the name of the project/language
+#. l10n: This is used as a page title. Most languages won't need to change this
+#: indexpage.py:170 indexpage.py:230
+#, fuzzy, python-format
+#, python-format
+msgid "%s: %s"
+msgstr "%s %s"
+
+#: indexpage.py:172 indexpage.py:232 pagelayout.py:40 pagelayout.py:140
+msgid "Admin"
+msgstr "Administración"
+
+#: indexpage.py:186
+msgid "Language Code"
+msgstr "Código del Idioma"
+
+#: indexpage.py:187
+msgid "Language Name"
+msgstr "Nombre del Idioma"
+
+#: indexpage.py:224
+#, python-format
+msgid "%d language, average %d%% translated"
+msgid_plural "%d languages, average %d%% translated"
+msgstr[0] "%d idioma, en promedio %d%% traducido"
+msgstr[1] "%d idiomas, en promedio %d%% traducido"
+
+#: indexpage.py:235
+#, fuzzy
+msgid "Language"
+msgstr "Idioma:"
+
+#. l10n: The first parameter is the name of the installation (like "Pootle")
+#: indexpage.py:314
+#, fuzzy, python-format
+#, python-format
+msgid "%s: Project %s, Language %s"
+msgstr "Pootle: Proyecto %s, Idioma %s"
+
+#. l10n: text next to search field
+#: indexpage.py:322 translatepage.py:121
+msgid "Search"
+msgstr "Búsqueda"
+
+#: indexpage.py:369
+msgid "Cannot upload file, no file attached"
+msgstr "No se puede enviar archivo, no se adjuntó archivo"
+
+#: indexpage.py:375
+msgid "Can only upload PO files and zips of PO files"
+msgstr "Sólo se pueden enviar archivos PO y archivos PO comprimidos"
+
+#: indexpage.py:483 indexpage.py:486 translatepage.py:199 translatepage.py:202
+msgid "Assign Strings"
+msgstr "Asignando Cadenas"
+
+#: indexpage.py:484 translatepage.py:201
+msgid "Assign Action"
+msgstr "Asignando Acción"
+
+#: indexpage.py:485 translatepage.py:200
+msgid "Assign to User"
+msgstr "Asignando al Usuario"
+
+#: indexpage.py:491
+msgid "goals"
+msgstr "metas"
+
+#: indexpage.py:491
+msgid "Enter goal name"
+msgstr "Introduzca el nombre de la meta"
+
+#: indexpage.py:491
+msgid "Add Goal"
+msgstr "Agregar Meta"
+
+#: indexpage.py:495 indexpage.py:497
+msgid "Upload File"
+msgstr "Enviar Archivo"
+
+#: indexpage.py:496
+msgid "Select file to upload"
+msgstr "Seleccionar archivo para enviar"
+
+#: indexpage.py:599
+msgid "Not in a goal"
+msgstr "No forma parte de una meta"
+
+#: indexpage.py:620
+msgid "Add User"
+msgstr "Agregar Usuario"
+
+#: indexpage.py:658
+msgid "PO file"
+msgstr "Archivo PO"
+
+#: indexpage.py:662
+msgid "XLIFF file"
+msgstr "Archivo XLIFF"
+
+#: indexpage.py:666
+msgid "Qt .ts file"
+msgstr "Archivo Qt .ts"
+
+#: indexpage.py:670
+msgid "CSV file"
+msgstr "Archivo CSV"
+
+#: indexpage.py:675
+msgid "MO file"
+msgstr "Archivo MO"
+
+#: indexpage.py:679
+msgid "Update"
+msgstr "Actualizar"
+
+#: indexpage.py:683 projects.py:141
+msgid "Commit"
+msgstr ""
+
+#: indexpage.py:720
+msgid "All Strings"
+msgstr "Todas las cadenas"
+
+#: indexpage.py:720 pagelayout.py:218
+msgid "Untranslated"
+msgstr "Sin traducir"
+
+#: indexpage.py:720
+msgid "Unassigned"
+msgstr "Sin asignar"
+
+#: indexpage.py:720
+msgid "Unassigned and Untranslated"
+msgstr "Sin asignar y sin traducir"
+
+#: indexpage.py:727
+msgid "Set Goal"
+msgstr "Asignar Meta"
+
+#: indexpage.py:733
+msgid "Assign To"
+msgstr "Asignar A"
+
+#: indexpage.py:762
+msgid "Show Editing Functions"
+msgstr ""
+
+#: indexpage.py:762
+#, fuzzy
+msgid "Show Statistics"
+msgstr "Mostrar Pistas"
+
+#: indexpage.py:763
+msgid "Show Tracks"
+msgstr "Mostrar Pistas"
+
+#: indexpage.py:763
+msgid "Hide Tracks"
+msgstr "Ocultar Pistas"
+
+#. l10n: "Checks" are quality checks that Pootle performs on translations to test for common mistakes
+#: indexpage.py:765
+msgid "Show Checks"
+msgstr "Mostrar Verificaciones"
+
+#: indexpage.py:765
+msgid "Hide Checks"
+msgstr "Ocultar Verificaciones"
+
+#: indexpage.py:766
+msgid "Show Goals"
+msgstr "Mostrar Metas"
+
+#: indexpage.py:766
+msgid "Hide Goals"
+msgstr "Ocultar Metas"
+
+#: indexpage.py:767
+msgid "Show Assigns"
+msgstr "Mostrar Asignaciones"
+
+#: indexpage.py:767
+msgid "Hide Assigns"
+msgstr "Ocultar Asignaciones"
+
+#: indexpage.py:776
+#, python-format
+msgid "All Goals: %s"
+msgstr "Todas las Metas: %s"
+
+#: indexpage.py:782
+msgid "Translate My Strings"
+msgstr "Traducir Mis Cadenas"
+
+#: indexpage.py:784
+msgid "View My Strings"
+msgstr "Ver Mis Cadenas"
+
+#: indexpage.py:789
+msgid "No strings assigned to you"
+msgstr "No tiene cadenas asignadas"
+
+#: indexpage.py:793
+msgid "Quick Translate My Strings"
+msgstr "Traducción Rápida de Mis Cadenas"
+
+#: indexpage.py:797
+msgid "No untranslated strings assigned to you"
+msgstr "No tiene cadenas sin traducir asignadas"
+
+#: indexpage.py:801
+msgid "Review Suggestions"
+msgstr "Revisar Sugerencias"
+
+#: indexpage.py:803
+msgid "View Suggestions"
+msgstr "Ver Sugerencias"
+
+#: indexpage.py:808
+msgid "Quick Translate"
+msgstr "Traducción Rápida"
+
+#: indexpage.py:810
+msgid "View Untranslated"
+msgstr "Ver No Traducidas"
+
+#: indexpage.py:814
+msgid "No untranslated items"
+msgstr "No hay elementos sin traducir"
+
+#: indexpage.py:817
+msgid "Translate All"
+msgstr "Traducir Todo"
+
+#: indexpage.py:832
+msgid "ZIP of goal"
+msgstr "ZIP de la Meta"
+
+#: indexpage.py:834
+msgid "ZIP of folder"
+msgstr "ZIP de la carpeta"
+
+#: indexpage.py:841
+msgid "Generate SDF"
+msgstr "Generar SDF"
+
+#: indexpage.py:894
+#, python-format
+msgid "%d string (%d%%) failed"
+msgid_plural "%d strings (%d%%) failed"
+msgstr[0] "%d cadena (%d%%) falló"
+msgstr[1] "%d cadenas (%d%%) fallaron"
+
+#: indexpage.py:924
+#, python-format
+msgid "%d/%d words (%d%%) assigned"
+msgstr "%d/%d palabras (%d%%) asignadas"
+
+#: indexpage.py:925 indexpage.py:927
+#, python-format
+msgid "[%d/%d strings]"
+msgstr "[%d/%d cadenas]"
+
+#: indexpage.py:926 pagelayout.py:204
+#, python-format
+msgid "%d/%d words (%d%%) translated"
+msgstr "%d/%d palabras (%d%%) traducido"
+
+#: pagelayout.py:37
+msgid "All projects"
+msgstr "Todos los Proyectos"
+
+#: pagelayout.py:38
+msgid "All languages"
+msgstr "Todos los Idiomas"
+
+#: pagelayout.py:39
+msgid "My account"
+msgstr "Mi cuenta"
+
+#: pagelayout.py:41
+msgid "Docs & help"
+msgstr "Documentos & Ayuda"
+
+#: pagelayout.py:42
+msgid "Log out"
+msgstr "Terminar Sesión"
+
+#: pagelayout.py:43
+msgid "Log in"
+msgstr "Iniciar sesión"
+
+#. l10n: Verb, as in "to register"
+#: pagelayout.py:45
+msgid "Register"
+msgstr "Registro"
+
+#: pagelayout.py:46
+msgid "Activate"
+msgstr "Activar"
+
+#: pagelayout.py:63
+#, fuzzy
+msgid "Pootle Logo"
+msgstr "Demo de Pootle"
+
+#: pagelayout.py:64
+#, fuzzy
+msgid "WordForge Translation Project"
+msgstr "<b>Traducción Actual:</b>"
+
+#: pagelayout.py:129
+msgid "All goals"
+msgstr "Todas las metas"
+
+#: pagelayout.py:200
+#, python-format
+msgid "%d/%d files"
+msgstr "%d/%d archivos"
+
+#: pagelayout.py:203
+#, python-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d archivo"
+msgstr[1] "%d archivos"
+
+#: pagelayout.py:205
+#, python-format
+msgid "%d/%d strings"
+msgstr "%d/%d cadenas"
+
+#: pagelayout.py:211 users.py:131
+msgid "Name"
+msgstr "Nombre"
+
+#: pagelayout.py:212
+#, fuzzy
+msgid "Translated"
+msgstr "Traducir"
+
+#: pagelayout.py:213
+#, fuzzy
+msgid "Translated percentage"
+msgstr "Traducir Mis Cadenas"
+
+#: pagelayout.py:214
+#, fuzzy
+msgid "Translated words"
+msgstr "Traducir"
+
+#: pagelayout.py:215
+msgid "Fuzzy"
+msgstr ""
+
+#: pagelayout.py:216
+msgid "Fuzzy percentage"
+msgstr ""
+
+#: pagelayout.py:217
+msgid "Fuzzy words"
+msgstr ""
+
+#: pagelayout.py:219
+#, fuzzy
+msgid "Untranslated percentage"
+msgstr "Sin traducir"
+
+#: pagelayout.py:220
+#, fuzzy
+msgid "Untranslated words"
+msgstr "Sin traducir"
+
+#: pagelayout.py:221
+#, fuzzy
+msgid "Total"
+msgstr "metas"
+
+#: pagelayout.py:222
+msgid "Total words"
+msgstr ""
+
+#: pagelayout.py:223
+msgid "Graph"
+msgstr ""
+
+#: pootle.py:226
+msgid "Login failed"
+msgstr ""
+
+#: pootle.py:270 pootle.py:296
+msgid "Redirecting to login..."
+msgstr "Redirigiendo para iniciar sesión"
+
+#: pootle.py:273
+msgid "Need to log in to access home page"
+msgstr "Necesita iniciar sesión para accesar a la página principal"
+
+#: pootle.py:299
+msgid "Need to log in to access admin page"
+msgstr "Necesita iniciar sesión para accesar a la página de administración"
+
+#: pootle.py:306
+msgid "Redirecting to home..."
+msgstr "Redirigiendo a la página principal..."
+
+#: pootle.py:309
+msgid "You do not have the rights to administer pootle."
+msgstr "No cuenta con los derechos necesarios para administrar pootle."
+
+#: projects.py:133
+msgid "View"
+msgstr "Ver"
+
+#: projects.py:134 translatepage.py:570
+msgid "Suggest"
+msgstr "Segerir"
+
+#: projects.py:135
+msgid "Translate"
+msgstr "Traducir"
+
+#: projects.py:136
+msgid "Review"
+msgstr "Revisar"
+
+#: projects.py:137
+msgid "Archive"
+msgstr "Archivar"
+
+#: projects.py:138
+msgid "Compile PO files"
+msgstr "Compilar archivos PO"
+
+#: projects.py:139
+msgid "Assign"
+msgstr "Asignar"
+
+#: projects.py:140
+msgid "Administrate"
+msgstr "Administrar"
+
+#: projects.py:197
+msgid "You cannot remove the \"nobody\" or \"default\" user"
+msgstr "No puede eliminar el usuario \"nobody\" o \"default\""
+
+#: projects.py:334 projects.py:394
+msgid "You do not have rights to alter goals here"
+msgstr "No tiene los derechos para alterar las metas aquí"
+
+#: projects.py:454
+msgid "You do not have rights to upload files here"
+msgstr "No tiene los derechos para enviar archivos aquí"
+
+#: projects.py:457
+msgid "You do not have rights to upload new files here"
+msgstr "No tiene los derechos para enviar nuevos archivos aquí"
+
+#: projects.py:466
+msgid "You do not have rights to update files here"
+msgstr "No tiene los derechos para actualizar archivos aquí"
+
+#: projects.py:536
+#, fuzzy
+msgid "You do not have rights to commit files here"
+msgstr "No tiene los derechos para enviar archivos aquí"
+
+#: projects.py:864 projects.py:905
+msgid "You do not have rights to alter assignments here"
+msgstr "No tiene los derechos para modificar asignaciones aquí"
+
+#: projects.py:1109
+msgid "You do not have rights to change translations here"
+msgstr "No tiene los derechos para cambiar las traducciones aquí"
+
+#: projects.py:1119
+msgid "You do not have rights to suggest changes here"
+msgstr "No tiene los derechos para segerir cambios aquí"
+
+#: projects.py:1135 projects.py:1158
+msgid "You do not have rights to review suggestions here"
+msgstr "No tiene los derechos para revisar las sugestiones aquí"
+
+#: users.py:36
+msgid "Login to Pootle"
+msgstr "Inisión de Sesión en Pootle"
+
+#: users.py:41
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: users.py:43
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: users.py:44
+msgid "Language:"
+msgstr "Idioma:"
+
+#: users.py:53
+msgid "Default"
+msgstr "Por Defecto"
+
+#: users.py:65
+msgid "Please enter your registration details"
+msgstr "Por favor introduzca los detalles de su registro"
+
+#: users.py:68
+msgid "Pootle Registration"
+msgstr "Registro en Pootle"
+
+#: users.py:75 users.py:108
+msgid "Your requested username"
+msgstr "Su nombre de usuario solicitado"
+
+#: users.py:78
+msgid "Must be a valid email address"
+msgstr "Debe ser una dirección electrónica válida"
+
+#: users.py:81
+msgid "Your full name"
+msgstr "Su nombre completo"
+
+#: users.py:84
+msgid "Your desired password"
+msgstr "Su contraseña seleccionada"
+
+#: users.py:86
+msgid "Register Account"
+msgstr "Registrar Cuenta"
+
+#: users.py:95
+msgid "Please enter your activation details"
+msgstr "Por favor introduce sus detalles de activación"
+
+#: users.py:100
+msgid "Pootle Account Activation"
+msgstr "Activación de Cuentas Pootle"
+
+#: users.py:110
+msgid "Activation Code"
+msgstr "Código de Activación"
+
+#: users.py:111
+msgid "The activation code you received"
+msgstr "El código de activación que ha recibido"
+
+#: users.py:113
+msgid "Activate Account"
+msgstr "Activar Cuenta"
+
+#: users.py:123
+#, python-format
+msgid "Options for: %s"
+msgstr "Opciones para: %s"
+
+#: users.py:128
+msgid "Personal Details"
+msgstr "Detalles Personales"
+
+#: users.py:133
+msgid "Email"
+msgstr "Correo-e"
+
+#: users.py:135
+msgid "Translation Interface Configuration"
+msgstr "Configuración de la Interface de Traducción"
+
+#: users.py:136
+msgid "User Interface language"
+msgstr "Idioma de la Interfase con el Usuario"
+
+#: users.py:137
+msgid "My Projects"
+msgstr "Mis Proyectos"
+
+#: users.py:139
+msgid "My Languages"
+msgstr "Mis Idiomas"
+
+#: users.py:141
+msgid "Home page"
+msgstr "Página principal"
+
+#: users.py:175
+msgid "Input Height (in lines)"
+msgstr "Alto de la Entrada (en líneas)"
+
+#: users.py:175
+msgid "Input Width (in characters)"
+msgstr "Ancho de la Entrada (en carácteres)"
+
+#: users.py:176
+msgid "Number of rows in view mode"
+msgstr "Número de renglones en el modo de vista"
+
+#: users.py:177
+msgid "Number of rows in translate mode"
+msgstr "Número de renglones en el modo de traducción"
+
+#: users.py:230
+msgid "You need to be siteadmin to change users"
+msgstr "Necesita ser el administrador del sitio para cambiar usuarios"
+
+#: users.py:307
+msgid ""
+"You (or someone else) attempted to register an account with your username.\n"
+msgstr ""
+
+#: users.py:308
+msgid "We don't store your actual password but only a hash of it.\n"
+msgstr ""
+
+#: users.py:310
+#, python-format
+msgid "If you have a problem with registration, please contact %s.\n"
+msgstr ""
+
+#: users.py:312
+msgid ""
+"If you have a problem with registration, please contact the site "
+"administrator.\n"
+msgstr ""
+
+#: users.py:313
+msgid ""
+"That username already exists. An email will be sent to the registered email "
+"address.\n"
+msgstr ""
+
+#: users.py:315
+#, python-format
+msgid "Proceeding to <a href='%s'>login</a>\n"
+msgstr ""
+
+#: users.py:319
+#, python-format
+msgid "You must supply a valid password of at least %d characters."
+msgstr ""
+
+#: users.py:323
+msgid "A Pootle account has been created for you using this email address.\n"
+msgstr ""
+
+#: users.py:325
+msgid "To activate your account, follow this link:\n"
+msgstr ""
+
+#: users.py:331
+#, fuzzy, python-format
+#, python-format
+msgid ""
+"Your activation code is:\n"
+"%s\n"
+msgstr "Código de Activación"
+
+#: users.py:333
+msgid ""
+"If you are unable to follow the link, please enter the above code at the "
+"activation page.\n"
+msgstr ""
+
+#: users.py:334
+msgid ""
+"This message is sent to verify that the email address is in fact correct. If "
+"you did not want to register an account, you may simply ignore the message.\n"
+msgstr ""
+
+#: users.py:336
+#, python-format
+msgid ""
+"Account created. You will be emailed login details and an activation code. "
+"Please enter your activation code on the <a href='%s'>activation page</a>."
+msgstr ""
+
+#: users.py:338
+msgid "(Or simply click on the activation link in the email)"
+msgstr ""
+
+#: users.py:340
+#, fuzzy, python-format
+#, python-format
+msgid "Your user name is: %s\n"
+msgstr "Su nombre completo"
+
+#: users.py:342
+#, fuzzy, python-format
+#, python-format
+msgid "Your password is: %s\n"
+msgstr "Su contraseña seleccionada"
+
+#: users.py:343
+#, python-format
+msgid "Your registered email address is: %s\n"
+msgstr ""
+
+#: users.py:367
+msgid "Redirecting to Registration Page..."
+msgstr "Redirigiendo a la página de Registro"
+
+#: users.py:391
+msgid "Redirecting to login Page..."
+msgstr "Redirigiendo a la página de inicio de sesión..."
+
+#: users.py:394
+msgid "Your account has been activated! Redirecting to login..."
+msgstr "Su cuenta ha sido activada! Redirigiendo al inicio de sesión..."
+
+#: users.py:398
+#, fuzzy
+msgid "The activation information was not valid."
+msgstr "El vínculo de activación no es válido"
+
+#: users.py:399
+msgid "Activation Failed"
+msgstr "Falló la Activación"
+
+#: users.py:493
+msgid "Input height must be numeric"
+msgstr "La altura de entrada debe ser numérica"
+
+#: users.py:494
+msgid "Input width must be numeric"
+msgstr "El ancho de entrada debe ser numérico"
+
+#: users.py:495
+msgid "The number of rows displayed in view mode must be numeric"
+msgstr "El número de renglones mostrados en el modo de vista debe ser numérico"
+
+#: users.py:496
+msgid "The number of rows displayed in translate mode must be numeric"
+msgstr ""
+"El número de renglones mostradso en el modo de traducción debe ser numérico"
+
+#: translatepage.py:80
+#, python-format
+msgid ""
+"%d/%d translated\n"
+"(%d blank, %d fuzzy)"
+msgstr ""
+"%d/%d traducidas\n"
+"(%d en blanco, %d vagas)"
+
+#. l10n: first parameter: name of the installation (like "Pootle")
+#. l10n: second parameter: project name
+#. l10n: third parameter: target language
+#. l10n: fourth parameter: file name
+#: translatepage.py:96
+#, fuzzy, python-format
+#, python-format
+msgid "%s: translating %s into %s: %s"
+msgstr "Pootle: traduciendo %s en %s: %s"
+
+#: translatepage.py:110
+msgid "Original"
+msgstr "Original"
+
+#: translatepage.py:111
+msgid "Translation"
+msgstr "Traducción"
+
+#: translatepage.py:114
+msgid "Accept"
+msgstr "Aceptar"
+
+#: translatepage.py:115
+msgid "Reject"
+msgstr "Rechazar"
+
+#. l10n: This heading refers to related translations and terminology
+#: translatepage.py:117
+msgid "Related"
+msgstr ""
+
+#. l10n: "batch" refers to the set of translations that were reviewed
+#: translatepage.py:135
+msgid "End of batch"
+msgstr "Fin de la rutina"
+
+#: translatepage.py:137
+msgid "Click here to return to the index"
+msgstr "Haga click aquí para regresar al índice"
+
+#. l10n: noun (the start)
+#: translatepage.py:150 translatepage.py:153
+msgid "Start"
+msgstr "Iniciar"
+
+#. l10n: the parameter refers to the number of messages
+#: translatepage.py:157 translatepage.py:160
+#, python-format
+msgid "Previous %d"
+msgstr "Previos %d"
+
+#. l10n: the third parameter refers to the total number of messages in the file
+#: translatepage.py:162
+#, python-format
+msgid "Items %d to %d of %d"
+msgstr "Elementos %d a %d de %d"
+
+#. l10n: the parameter refers to the number of messages
+#: translatepage.py:167 translatepage.py:170
+#, python-format
+msgid "Next %d"
+msgstr "Siguiente %d"
+
+#. l10n: noun (the end)
+#: translatepage.py:173 translatepage.py:176
+msgid "End"
+msgstr "Fin"
+
+#. l10n: the parameter is the name of one of the quality checks, like "fuzzy"
+#: translatepage.py:192
+#, python-format
+msgid "checking %s"
+msgstr "verificando %s"
+
+#: translatepage.py:334
+#, python-format
+msgid "There are no items matching that search ('%s')"
+msgstr "No existen elmentos que cumplan con la búsquda ('%s')"
+
+#: translatepage.py:336
+msgid "You have finished going through the items you selected"
+msgstr "Ha terminado de revisar con los elementos que ha seleccionado"
+
+#: translatepage.py:534
+msgid "Singular"
+msgstr "Singular"
+
+#: translatepage.py:535
+msgid "Plural"
+msgstr "Plural"
+
+#. l10n: verb
+#: translatepage.py:549
+msgid "Edit"
+msgstr "Editar"
+
+#. l10n: verb
+#: translatepage.py:566
+msgid "Copy"
+msgstr "Copiar"
+
+#: translatepage.py:567 translatepage.py:741
+msgid "Skip"
+msgstr "Saltar"
+
+#. l10n: verb
+#: translatepage.py:569 translatepage.py:740
+msgid "Back"
+msgstr ""
+
+#: translatepage.py:571
+msgid "Submit"
+msgstr "Enviar"
+
+#. l10n: action that increases the height of the textarea
+#: translatepage.py:576
+msgid "Grow"
+msgstr "Crecer"
+
+#. l10n: action that decreases the height of the textarea
+#: translatepage.py:578
+msgid "Shrink"
+msgstr "Encoger"
+
+#. l10n: action that increases the width of the textarea
+#: translatepage.py:580
+msgid "Broaden"
+msgstr "Ensanchar"
+
+#. l10n: action that decreases the width of the textarea
+#: translatepage.py:582
+msgid "Narrow"
+msgstr "Estrechar"
+
+#. l10n: action that resets the size of the textarea
+#: translatepage.py:584
+msgid "Reset"
+msgstr "Restablecer"
+
+#: translatepage.py:602 translatepage.py:695 translatepage.py:729
+#: translatepage.py:762
+#, python-format
+msgid "Plural Form %d"
+msgstr "Forma Plural %d"
+
+#: translatepage.py:617
+msgid ""
+"Translation not possible because plural information for your language is not "
+"available. Please contact the site administrator."
+msgstr ""
+
+#: translatepage.py:699
+msgid "Current Translation:"
+msgstr "<b>Traducción Actual:</b>"
+
+#: translatepage.py:710
+#, python-format
+msgid "Suggestion %d by %s:"
+msgstr "Segerencia %d de %s:"
+
+#: translatepage.py:712
+#, python-format
+msgid "Suggestion %d:"
+msgstr "Sugerencia %d:"
+
+#: translatepage.py:715
+#, python-format
+msgid "Suggestion by %s:"
+msgstr "Segerencia de %s:"
+
+#: translatepage.py:717
+msgid "Suggestion:"
+msgstr "Sugerencia:"
+
+#: indexpage.py:731
+msgid "Select Multiple"
+msgstr "Selección Múltiple"
+
+#~ msgid "Pootle"
+#~ msgstr "Pootle"
+
+#~ msgid "Pootle: %s"
+#~ msgstr "Pootle: %s"
+
+#~ msgid ""
+#~ "<strong>Pootle</strong> is a simple web portal that should allow you to "
+#~ "<strong>translate</strong>!"
+#~ msgstr ""
+#~ "<strong>Pootle</strong> es un portal sencillo que le permite "
+#~ "<strong>traducir</strong>!"
+
+#~ msgid "parent folder"
+#~ msgstr "carpeta de nivel superior"
+
+#~ msgid "<h3 class=\"title\">Projects</h3>"
+#~ msgstr "<h3 class=\"title\">Proyectos</h3>"
+
+#~ msgid "%d files, %d/%d strings (%d%%) translated"
+#~ msgstr "%d archivos, %d/%d cadenas (%d%%) traducidas"
+
+#~ msgid "%s language"
+#~ msgstr "idioma %s"
+
+#~ msgid "%d strings (%d%%) failed"
+#~ msgstr "%d cadenas (%d%%) falladas"
+
+#~ msgid "this is a demo installation of pootle"
+#~ msgstr "este es una instlación de demostración de pootle"
+
+#~ msgid "current folder"
+#~ msgstr "carpeta actual"
+
+#~ msgid "Log In"
+#~ msgstr "Inciar Sesión"
+
+#~ msgid "login status"
+#~ msgstr "estado de la sesión"
+
+#~ msgid "project root"
+#~ msgstr "inicio del proyecto"
+
+#~ msgid "%s project"
+#~ msgstr "proyecto %s"
+
+#~ msgid "you do not have rights to suggest changes here"
+#~ msgstr "usted no tiene los derechos para segerir cambios aquí"
+
+#~ msgid "you do not have rights to change translations here"
+#~ msgstr ""
+#~ "usted no tiene los derechos para sugerir cambios en las traducciones"
+
+#~ msgid "%d/%d strings (%d%%) translated"
+#~ msgstr "%d/%d cadenas (%d%%) traducidas"
+
+#~ msgid "%d files, "
+#~ msgstr "%d archivos, "
+
+#~ msgid "<h3 class=\"title\">Languages</h3>"
+#~ msgstr "<h3 class=\"title\">Idiomas</h3>"
+
+#~ msgid "current file"
+#~ msgstr "archivo actual"
+
+#~ msgid "not logged in"
+#~ msgstr "sesión no iniciada"
+
+#~ msgid "Pootle Admin Page"
+#~ msgstr "Página de Administración de Pootle"
+
+#~ msgid "Pootle Languages Admin Page"
+#~ msgstr "Página de Administración de Idiomas de Pootle"
+
+#~ msgid "Pootle Projects Admin Page"
+#~ msgstr "Página de Administración de Proyectos de Pootle"
+
+#~ msgid "You do not have the rights to administer Pootle."
+#~ msgstr "No tiene los derechos para administrar Pootle."
+
+#~ msgid "Pootle User Admin Page"
+#~ msgstr "Página de Administración de Usuarios de Pootle"
+
+#~ msgid "suggest"
+#~ msgstr "sugerir"
+
+#~ msgid "Input Width"
+#~ msgstr "Ancho de la Entrada"

Added: src/branches/django-migration/Pootle/tests/test_utils_stats.py
===================================================================
--- src/branches/django-migration/Pootle/tests/test_utils_stats.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/tests/test_utils_stats.py	2007-04-02 12:42:16 UTC (rev 5338)
@@ -0,0 +1,168 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""tests for stats classes"""
+
+from py import test
+from Pootle.utils import stats
+from Pootle.path import path
+from translate.filters import checks
+from translate.storage import po
+import os
+try:
+    import cStringIO as StringIO
+except ImportError:
+    import StringIO
+
+
+# set up test PO
+testdir = os.sep.join(__file__.split(os.sep)[:-1])
+test_path = path(os.path.join(testdir, "sample.po"))
+test_po = test_path.translationstore
+
+class TestStats:
+    def test_classification(self):
+        posource = '''msgid "Simple String"\nmsgstr "Dimpled ring"\n'''
+        openedfile = StringIO.StringIO(posource)
+        po_obj = po.pofile(openedfile)
+
+        d = stats.enumerating_classify(checks.StandardChecker(), po_obj.units)
+        
+        expected_result = { 
+            'acronyms': [], 
+            'escapes': [], 
+            'tabs': [], 
+            'unchanged': [], 
+            'blank': [], 
+            'validchars': [], 
+            'numbers': [], 
+            'printf': [], 
+            'accelerators': [], 
+            'total': [0], 
+            'doublewords': [], 
+            'newlines': [], 
+            'puncspacing': [], 
+            'functions': [], 
+            'simplecaps': [], 
+            'spellcheck': [], 
+            'doublequoting': [], 
+            'brackets': [], 
+            'untranslated': [], 
+            'endwhitespace': [], 
+            'long': [], 
+            'targetwordcount': [2], 
+            'notranslatewords': [], 
+            'compendiumconflicts': [], 
+            'filepaths': [], 
+            'startwhitespace': [], 
+            'variables': [], 
+            'doublespacing': [], 
+            'startpunc': [], 
+            'startcaps': [], 
+            'fuzzy': [], 
+            'purepunc': [], 
+            'kdecomments': [], 
+            'singlequoting': [], 
+            'emails': [], 
+            'musttranslatewords': [], 
+            'short': [], 
+            'endpunc': [], 
+            'xmltags': [], 
+            'has-suggestions': [], 
+            'urls': [], 
+            'translated': [0], 
+            'sentencecount': [], 
+            'simpleplurals': [], 
+            'sourcewordcount': [2]
+            }
+        for key in d.iterkeys():
+            assert d[key] == expected_result[key]
+        
+       
+    def test_classification_two(self):
+        data = stats.enumerating_classify(checks.StandardChecker(), test_po.units)
+
+        expected_result = {
+            'check-untranslated': [100, 107, 154, 155, 156, 160, 161, 162, 216, 217, 218, 219, 220, 221, 222, 223, 224, 226, 227, 228, 229, 232, 248, 264, 272], 
+            'check-unchanged': [244, 259, 260], 
+            'acronyms': [], 
+            'check-doublespacing': [62], 
+            'escapes': [], 
+            'tabs': [], 
+            'check-startpunc': [80, 145, 243, 273], 
+            'unchanged': [], 
+            'blank': [100, 107, 154, 155, 156, 160, 161, 162, 216, 217, 218, 219, 220, 221, 222, 223, 224, 226, 227, 228, 229, 232, 248, 264, 272, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306], 
+            'validchars': [], 
+            'numbers': [], 
+            'printf': [], 
+            'accelerators': [], 
+            'check-endpunc': [0, 79, 163, 225, 230, 231, 233, 236, 273], 
+            'check-xmltags': [0, 66, 145, 273], 
+            'total': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306], 
+            'doublewords': [], 
+            'newlines': [], 
+            'puncspacing': [], 
+            'functions': [], 
+            'simplecaps': [], 
+            'spellcheck': [], 
+            'doublequoting': [], 
+            'brackets': [], 
+            'check-simplecaps': [0, 6, 14, 96, 136, 137, 139, 140, 152, 159, 190, 225, 243], 
+            'untranslated': [], 
+            'endwhitespace': [], 
+            'long': [], 
+            'targetwordcount': [37, 3, 1, 1, 1, 1, 2, 1, 2, 2, 1, 1, 2, 2, 4, 2, 2, 3, 2, 2, 3, 3, 3, 3, 2, 2, 1, 3, 3, 3, 3, 3, 3, 2, 2, 4, 4, 3, 1, 3, 1, 3, 2, 5, 2, 2, 4, 8, 3, 2, 4, 4, 16, 13, 11, 3, 3, 5, 1, 1, 2, 3, 41, 20, 24, 1, 13, 5, 5, 2, 3, 2, 13, 6, 6, 2, 1, 3, 3, 6, 6, 1, 5, 1, 9, 10, 2, 2, 3, 1, 6, 2, 2, 4, 6, 2, 2, 2, 3, 2, 2, 1, 0, 3, 2, 2, 5, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 3, 3, 4, 5, 6, 2, 2, 2, 3, 5, 2, 4, 4, 2, 4, 4, 4, 2, 4, 3, 3, 2, 3, 2, 2, 1, 1, 3, 2, 3, 2, 2, 2, 2, 1, 1, 3, 1, 0, 0, 0, 2, 2, 1, 0, 0, 0, 4, 9, 10, 6, 9, 1, 1, 1, 1, 1, 3, 1, 1, 8, 9, 8, 9, 8, 8, 8, 9, 8, 9, 5, 3, 1, 1, 2, 8, 3, 5, 6, 3, 3, 2, 7, 4, 3, 7, 2, 3, 2, 1, 6, 7, 2, 2, 2, 6, 6, 8, 8, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 3, 3, 0, 6, 9, 11, 7, 3, 7, 7, 13, 13, 7, 6, 1, 1, 1, 1, 0, 4, 7, 1, 2, 6, 2, 1, 2, 9, 10, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 0, 2, 4, 2, 3, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+            'notranslatewords': [], 
+            'check-emails': [0], 
+            'compendiumconflicts': [], 
+            'check-doublequoting': [64], 
+            'filepaths': [], 
+            'startwhitespace': [], 
+            'variables': [], 
+            'check-endwhitespace': [0, 225, 230, 231], 
+            'check-filepaths': [66], 
+            'doublespacing': [], 
+            'startpunc': [], 
+            'startcaps': [], 
+            'fuzzy': [66, 74, 79, 80, 108, 144, 145, 151, 152, 153, 157, 158, 159, 181, 225, 230, 231, 236, 243], 
+            'purepunc': [], 
+            'kdecomments': [], 
+            'singlequoting': [], 
+            'emails': [], 
+            'musttranslatewords': [], 
+            'short': [], 
+            'endpunc': [], 
+            'xmltags': [], 
+            'check-sentencecount': [0, 163, 233, 236], 
+            'check-brackets': [0, 64, 66], 
+            'check-newlines': [0, 225, 230, 231], 
+            'has-suggestions': [], 
+            'urls': [], 
+            'check-startcaps': [0, 80, 145, 159, 243, 273], 
+            'translated': [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 67, 68, 69, 70, 71, 72, 73, 75, 76, 77, 78, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 101, 102, 103, 104, 105, 106, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 146, 147, 148, 149, 150, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 233, 234, 235, 237, 238, 239, 240, 241, 242, 244, 245, 246, 247, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 265, 266, 267, 268, 269, 270, 271, 273, 274, 275, 276, 277, 278], 
+            'sentencecount': [], 
+            'simpleplurals': [], 
+            'sourcewordcount': [0, 2, 1, 1, 1, 1, 2, 1, 2, 2, 1, 1, 2, 2, 3, 2, 2, 3, 2, 2, 3, 3, 2, 2, 2, 2, 1, 2, 3, 2, 2, 2, 3, 2, 1, 4, 2, 3, 1, 3, 1, 3, 2, 4, 2, 2, 3, 10, 3, 2, 4, 3, 11, 11, 10, 2, 1, 4, 1, 1, 2, 2, 48, 22, 17, 1, 13, 4, 4, 2, 2, 2, 11, 5, 5, 2, 1, 2, 2, 5, 5, 1, 5, 1, 6, 10, 2, 2, 3, 1, 3, 2, 2, 4, 4, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 1, 3, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 5, 4, 6, 2, 2, 2, 2, 3, 2, 3, 3, 2, 4, 4, 4, 2, 4, 2, 2, 2, 3, 2, 2, 1, 1, 2, 3, 2, 2, 2, 2, 2, 1, 1, 2, 2, 1, 2, 2, 2, 2, 1, 2, 1, 2, 4, 8, 8, 4, 9, 1, 1, 1, 1, 1, 3, 1, 1, 8, 9, 9, 10, 9, 9, 9, 9, 9, 9, 3, 1, 1, 1, 1, 5, 2, 3, 6, 3, 3, 2, 5, 3, 2, 5, 2, 3, 2, 1, 3, 3, 2, 2, 2, 4, 4, 6, 6, 8, 12, 12, 10, 12, 14, 3, 11, 12, 7, 5, 17, 29, 21, 10, 5, 4, 6, 5, 5, 9, 6, 2, 5, 5, 11, 11, 6, 6, 1, 1, 1, 1, 1, 3, 7, 1, 2, 6, 2, 1, 2, 8, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 17, 2, 4, 2, 3, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 
+            'check-printf': [66, 80, 225, 230, 231, 243], 
+            'check-doublewords': [50, 74]
+            }
+
+        for key in data.iterkeys():
+            assert data[key] == expected_result[key]
+
+class TestFilter:
+    def test_filter(self):
+
+        next, unit = test_path.filter(['translated'],1)
+        assert next == 65
+        next, unit = test_path.filter(['translated'],next)
+        assert next == 73
+
+    def test_iterfilter(self):
+        result = []
+    
+        for c in test_path.iterfilter(['translated']): 
+            result.append(c[0])
+
+        assert result == [65, 73, 78, 79, 99, 106, 107, 143, 144, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 180, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 235, 242, 247, 263, 271]
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5339
          http://svn.sourceforge.net/translate/?rev=5339&view=rev
Author:   zejn
Date:     2007-04-02 06:09:28 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
[django-migration] Add docstrings and tests for Pootle.path.path

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/tests/test_utils_stats.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/tests/test_path.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-04-02 12:42:16 UTC (rev 5338)
+++ src/branches/django-migration/Pootle/path.py	2007-04-02 13:09:28 UTC (rev 5339)
@@ -1024,7 +1024,6 @@
                         fuzzyw,fuzzys,fuzzys/perc, 
                         untraw,untras,untras/perc, 
                         sum(c['sourcewordcount']), totals]
-                print '==',data
                 data = SimpleStats([int(x) for x in data])
                 self._stats = ",".join([str(x) for x in data])
             else:
@@ -1073,6 +1072,8 @@
     checker = property(_get_checker)
 
     def filter(self, exclude_list, start=None):
+        """Filters translation units and return next one, that doesn't have 
+        checks listed in exclude_list."""
         if start == None:
             start = -1
         start = start + 1
@@ -1085,6 +1086,8 @@
             end = end + 1
 
     def iterfilter(self, exclude_list):
+        """Filters translation units and returns a generator yielding the ones,
+        that don't have checks listed in exclude_list."""
         unit = self.filter(exclude_list)
         while unit:
             yield unit

Added: src/branches/django-migration/Pootle/tests/test_path.py
===================================================================
--- src/branches/django-migration/Pootle/tests/test_path.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/tests/test_path.py	2007-04-02 13:09:28 UTC (rev 5339)
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""tests for stats classes"""
+
+from py import test
+from Pootle.utils import stats
+from Pootle.path import path
+from translate.filters import checks
+from translate.storage import po
+import os
+try:
+    import cStringIO as StringIO
+except ImportError:
+    import StringIO
+
+
+# set up test PO
+testdir = os.sep.join(__file__.split(os.sep)[:-1])
+test_path = path(os.path.join(testdir, "sample.po"))
+test_po = test_path.translationstore
+
+class TestPath:
+    def test_filter(self):
+        next, unit = test_path.filter(['translated'],1)
+        assert next == 65
+        next, unit = test_path.filter(['translated'],next)
+        assert next == 73
+
+    def test_iterfilter(self):
+        result = []
+        for c in test_path.iterfilter(['translated']): 
+            result.append(c[0])
+        assert result == [65, 73, 78, 79, 99, 106, 107, 143, 144, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 180, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 235, 242, 247, 263, 271]
+
+    def test_stats(self):
+        assert test_path.stats == [824,234,84,113,19,6,157,25,8,1102,278]
+        # cleanup fstags entry
+        del test_path._stats
+
+    

Modified: src/branches/django-migration/Pootle/tests/test_utils_stats.py
===================================================================
--- src/branches/django-migration/Pootle/tests/test_utils_stats.py	2007-04-02 12:42:16 UTC (rev 5338)
+++ src/branches/django-migration/Pootle/tests/test_utils_stats.py	2007-04-02 13:09:28 UTC (rev 5339)
@@ -150,19 +150,3 @@
         for key in data.iterkeys():
             assert data[key] == expected_result[key]
 
-class TestFilter:
-    def test_filter(self):
-
-        next, unit = test_path.filter(['translated'],1)
-        assert next == 65
-        next, unit = test_path.filter(['translated'],next)
-        assert next == 73
-
-    def test_iterfilter(self):
-        result = []
-    
-        for c in test_path.iterfilter(['translated']): 
-            result.append(c[0])
-
-        assert result == [65, 73, 78, 79, 99, 106, 107, 143, 144, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 180, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 235, 242, 247, 263, 271]
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5341
          http://svn.sourceforge.net/translate/?rev=5341&view=rev
Author:   zejn
Date:     2007-04-02 07:28:40 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
[django-migration] Make filter more intuitive and adapt test accordingly.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/path.py
    src/branches/django-migration/Pootle/tests/test_path.py

Modified: src/branches/django-migration/Pootle/path.py
===================================================================
--- src/branches/django-migration/Pootle/path.py	2007-04-02 14:12:55 UTC (rev 5340)
+++ src/branches/django-migration/Pootle/path.py	2007-04-02 14:28:40 UTC (rev 5341)
@@ -1075,8 +1075,7 @@
         """Filters translation units and return next one, that doesn't have 
         checks listed in exclude_list."""
         if start == None:
-            start = -1
-        start = start + 1
+            start = 0
         end = start
         units = [u for u in self.translationstore.units if not u.isheader() and not u.isobsolete()]
         for unit in units[start:]:
@@ -1091,7 +1090,7 @@
         unit = self.filter(exclude_list)
         while unit:
             yield unit
-            unit = self.filter(exclude_list, unit[0])
+            unit = self.filter(exclude_list, unit[0]+1)
 
     def icon(self):
         "returns name of the icon"

Modified: src/branches/django-migration/Pootle/tests/test_path.py
===================================================================
--- src/branches/django-migration/Pootle/tests/test_path.py	2007-04-02 14:12:55 UTC (rev 5340)
+++ src/branches/django-migration/Pootle/tests/test_path.py	2007-04-02 14:28:40 UTC (rev 5341)
@@ -24,7 +24,7 @@
     def test_filter(self):
         next, unit = test_path.filter(['translated'],1)
         assert next == 65
-        next, unit = test_path.filter(['translated'],next)
+        next, unit = test_path.filter(['translated'],next+1)
         assert next == 73
 
     def test_iterfilter(self):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5534
          http://svn.sourceforge.net/translate/?rev=5534&view=rev
Author:   zejn
Date:     2007-04-28 01:58:24 -0700 (Sat, 28 Apr 2007)

Log Message:
-----------
[django-migration] Removed the need to set PYTHONPATH before running Django Pootle.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/localsettings.py
    src/branches/django-migration/Pootle/utils/__init__.py

Modified: src/branches/django-migration/Pootle/localsettings.py
===================================================================
--- src/branches/django-migration/Pootle/localsettings.py	2007-04-27 09:26:45 UTC (rev 5533)
+++ src/branches/django-migration/Pootle/localsettings.py	2007-04-28 08:58:24 UTC (rev 5534)
@@ -1,6 +1,10 @@
 # Django settings for Pootle project.
-from Pootle.utils import next_to_this_file
+import os
 
+def next_to_this_file(this_file, additional_path):
+    return os.path.join(os.path.dirname(os.path.abspath(this_file)), additional_path)
+
+
 DEBUG = True
 
 DATABASE_ENGINE = 'sqlite3'           # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.

Modified: src/branches/django-migration/Pootle/utils/__init__.py
===================================================================
--- src/branches/django-migration/Pootle/utils/__init__.py	2007-04-27 09:26:45 UTC (rev 5533)
+++ src/branches/django-migration/Pootle/utils/__init__.py	2007-04-28 08:58:24 UTC (rev 5534)
@@ -14,9 +14,6 @@
         descr = descr[:stopsign]
     return sre.sub("<[^>]*>", "", descr).strip()
 
-def next_to_this_file(this_file, additional_path):
-    return os.path.join(os.path.dirname(os.path.abspath(this_file)), additional_path)
-
 class CallableValidatorWrapper:
     """
     This is needed here to make the validator an object,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5535
          http://svn.sourceforge.net/translate/?rev=5535&view=rev
Author:   zejn
Date:     2007-04-29 09:51:52 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
[django-migration] Adding a basic scheme for read access for storage server.

Added Paths:
-----------
    src/branches/django-migration/Pootle/storage/
    src/branches/django-migration/Pootle/storage/dirlayout.py
    src/branches/django-migration/Pootle/storage/test_server.py

Added: src/branches/django-migration/Pootle/storage/dirlayout.py
===================================================================
--- src/branches/django-migration/Pootle/storage/dirlayout.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/storage/dirlayout.py	2007-04-29 16:51:52 UTC (rev 5535)
@@ -0,0 +1,144 @@
+from Pootle.path import path
+from translate.storage.po import pofile, pounit
+import os
+
+class gettext_path(path):
+    def _get_current(self):
+        current_id = (self / 'current').bytes()
+        current_file = self / 'revisions' / current_id
+        return current_file
+    current = property(_get_current, None, None)
+
+    def _get_index(self):
+        return self / 'index'
+    index = property(_get_index, None, None)
+
+    def has_updates(self):
+        updatelist = (self / 'pending').listdir() 
+        return len(updatelist) > 0
+    updated = property(has_updates, None, None)
+
+    def lock(self):
+        if self.locked:
+            raise ValueError("file locked")
+        (self / 'lock').touch()
+        
+    def unlock(self):
+        (self / 'lock').remove()
+
+    def is_locked(self):
+        return (self / 'lock').exists()
+    locked = property(is_locked, None, None)
+
+    def merge(self):
+
+        self.lock()
+        pending = self / 'pending'
+        updates = []
+        pending_list = pending.listdir()
+
+        if not pending_list:
+            return 
+        # calculate update ranges
+        pending_num = [int(i.basename()) for i in pending_list]
+        while pending_num:
+            x = pending_num.pop(0)
+            start = x 
+            while len(pending_num) > 0 and  pending_num[0] == x+1:
+                x += 1 
+                pending_num.pop(0)
+            end = x + 1
+            updates.append((start, end))
+            
+        index = (self / 'index').open()
+        num_units = int(index.readline())
+        newpo = []
+        current = self.current.open()
+        cursor = 0
+        for start, end in updates:
+            index.seek(32*start)
+            line = index.readline().split()
+            newpo.append(current.read(int(line[0]) - cursor))
+            
+            for x in range(start, end):
+                newpo.append((self / 'pending' / ('%.8d' % x)).bytes())
+            
+            index.seek(32*end)
+            line = index.readline().split()
+            current.seek(int(line[0]))
+            cursor = current.tell()
+        newpo.append(current.read())
+        
+        current = self / 'current'
+        current_id = int(current.bytes()) + 1
+        current.write_bytes("%.8d" % current_id)
+        self.current.write_bytes("".join(newpo))
+        self.update_index()
+        for f in pending_list:
+            f.remove()
+        self.unlock()
+
+    def update_index(self, indexfile=None):
+        if indexfile == None:
+            indexfile = 'index'
+        index_file = os.open(self / indexfile, os.O_TRUNC | os.O_CREAT, 0666)
+        os.close(index_file)
+        current_po = pofile(self.current.open())
+        stats = []
+        seek = 0
+        # FIXME add packed stats
+        for unit in current_po.units:
+            stats.append("%.10d %.20d\n" % (seek + 1, 0))
+            seek += len(str(unit)) + 1
+        stats.append("%.10d %.20d\n" % (seek, 0))
+        stats.insert(0, "%.10d                     \n" % len(stats))
+        index_file = (self / indexfile).open("w")
+        index_file.write("".join(stats))
+        index_file.close()
+
+    def __getitem__(self, key):
+        key = int(key)
+        if key <= 0:
+            raise ValueError("key must be positive integer")
+        pending = self / 'pending' / ('%.8d' % key)
+        
+        if pending.exists():
+            data = pending.bytes()
+        else:
+            # open index file and read position of pounit
+            index_file = self.index.open()
+            index_file.seek(32*(key))
+            line1 = index_file.readline().split()
+            line2 = index_file.readline().split()
+            line1 = [int(i) for i in line1]
+            line2 = [int(i) for i in line2]
+            # read pounit
+            current_file = self.current.open()
+            current_file.seek(line1[0])
+            data = current_file.read(line2[0] - line1[0])
+        unit = pounit()
+        unit.parse(data)
+        return unit
+
+    def _get_version(self):
+        return int((self / 'version').bytes())
+    version = property(_get_version, None, None)
+
+    def getpo(self, nonblocking=False):
+        if self.updated:
+            if  nonblocking:
+                raise IOError("getpo would block")
+            self.merge()
+        return self.current.open()
+    
+if __name__ == '__main__':
+    po_file = gettext_path('test.po')
+
+    if po_file.exists():
+        print 'current:', po_file.current
+        print 'updated:', po_file.updated
+        po_file.update_index()
+        #print str(po_file[1])
+        po_file.merge()
+        print 'end'
+

Added: src/branches/django-migration/Pootle/storage/test_server.py
===================================================================
--- src/branches/django-migration/Pootle/storage/test_server.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/storage/test_server.py	2007-04-29 16:51:52 UTC (rev 5535)
@@ -0,0 +1,38 @@
+#!/usr/bin/python
+
+from SimpleAsyncHTTPServer import Server,RequestHandler
+import asyncore, cgi, re
+
+pofile_re = re.compile('(?P<dir>[\w/]+)/(?P<file>\w+\.po)?')
+
+class PootleHandler(RequestHandler):
+    
+    def do_GET(self):
+        print 'my get'
+        qspos = self.path.find('?')
+        if qspos >= 0:
+            self.body = cgi.parse_qs(self.path[qspos+1:], keep_blank_values=1)
+            self.path = self.path[:qspos]
+        match = pofile_re.match(self.path)
+        if match:
+            print match.groupdict()
+        self.handle_data()
+        
+        
+    def do_POST(self):
+        print 'my post'
+        ctype, pdict = cgi.parse_header(self.headers.getheader('content-type'))
+        length = int(self.headers.getheader('content-length'))
+        if ctype == 'multipart/form-data':
+            self.body = cgi.parse_multipart(self.rfile, pdict)
+        elif ctype == 'application/x-www-form-urlencoded':
+            qs = self.rfile.read(length)
+            self.body = cgi.parse_qs(qs, keep_blank_values=1)
+        else:
+            self.body = '' # unknown content type
+        self.handle_data()
+
+a = Server('',8000, PootleHandler)
+# os.chdir('/home/hruske') # storage root
+asyncore.loop()
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5537
          http://svn.sourceforge.net/translate/?rev=5537&view=rev
Author:   zejn
Date:     2007-04-30 10:42:47 -0700 (Mon, 30 Apr 2007)

Log Message:
-----------
[django-migration] Updating storage daemon, also added first tests.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/storage/dirlayout.py
    src/branches/django-migration/Pootle/storage/test_server.py

Added Paths:
-----------
    src/branches/django-migration/Pootle/storage/__init__.py
    src/branches/django-migration/Pootle/tests/storage_testroot1.zip
    src/branches/django-migration/Pootle/tests/test_storage.py

Added: src/branches/django-migration/Pootle/storage/__init__.py
===================================================================

Modified: src/branches/django-migration/Pootle/storage/dirlayout.py
===================================================================
--- src/branches/django-migration/Pootle/storage/dirlayout.py	2007-04-30 11:27:36 UTC (rev 5536)
+++ src/branches/django-migration/Pootle/storage/dirlayout.py	2007-04-30 17:42:47 UTC (rev 5537)
@@ -96,6 +96,26 @@
         index_file.write("".join(stats))
         index_file.close()
 
+    def indexed(self, key):
+        """return an offset from start of file and length of unit in bytes"""
+        index_file = self.index
+        if not index_file.exists():
+            self.update_index()
+        index_file = index_file.open()
+        key = int(key)
+        if key <= 0:
+            raise ValueError("key must be positive integer")
+        
+        index_file.seek(32*(key))
+        line1 = [int(i) for i in index_file.readline().split()]
+        line2 = [int(i) for i in index_file.readline().split()]
+        if not line1 or not line2:
+            # if index is invalid, rebuild it and rerun indexed
+            self.update_index()
+            return self.indexed(key)
+        return (line1[0], line2[0] - line1[0], line1[1])
+        
+
     def __getitem__(self, key):
         key = int(key)
         if key <= 0:
@@ -105,17 +125,11 @@
         if pending.exists():
             data = pending.bytes()
         else:
-            # open index file and read position of pounit
-            index_file = self.index.open()
-            index_file.seek(32*(key))
-            line1 = index_file.readline().split()
-            line2 = index_file.readline().split()
-            line1 = [int(i) for i in line1]
-            line2 = [int(i) for i in line2]
+            offset, numread, stats = self.indexed(key)
             # read pounit
             current_file = self.current.open()
-            current_file.seek(line1[0])
-            data = current_file.read(line2[0] - line1[0])
+            current_file.seek(offset)
+            data = current_file.read(numread)
         unit = pounit()
         unit.parse(data)
         return unit

Modified: src/branches/django-migration/Pootle/storage/test_server.py
===================================================================
--- src/branches/django-migration/Pootle/storage/test_server.py	2007-04-30 11:27:36 UTC (rev 5536)
+++ src/branches/django-migration/Pootle/storage/test_server.py	2007-04-30 17:42:47 UTC (rev 5537)
@@ -2,9 +2,13 @@
 
 from SimpleAsyncHTTPServer import Server,RequestHandler
 import asyncore, cgi, re
+from Pootle.storage.dirlayout import gettext_path
+from Pootle.path import path
 
-pofile_re = re.compile('(?P<dir>[\w/]+)/(?P<file>\w+\.po)?')
+pofile_re = re.compile(r'/(?P<dir>[\w/]+)/((?P<file>\w+.po)(/(?P<id>\d+)/)?)?')
 
+STORAGE_ROOT = None
+
 class PootleHandler(RequestHandler):
     
     def do_GET(self):
@@ -15,8 +19,21 @@
             self.path = self.path[:qspos]
         match = pofile_re.match(self.path)
         if match:
-            print match.groupdict()
+            mdict = match.groupdict()
+            if mdict['file']:
+                a = gettext_path(STORAGE_ROOT / mdict['dir'] / mdict['file'])
+
+                if a.exists():
+                    if mdict['id']:
+                        # return only one translation
+                        id = int(mdict['id'])
+                        print a[id]
+
+            else:
+                print 'file not present'
+            print mdict
         self.handle_data()
+
         
         
     def do_POST(self):
@@ -32,7 +49,20 @@
             self.body = '' # unknown content type
         self.handle_data()
 
-a = Server('',8000, PootleHandler)
-# os.chdir('/home/hruske') # storage root
-asyncore.loop()
 
+def set_storage_root(storage_root):
+    global STORAGE_ROOT
+
+    STORAGE_ROOT = storage_root
+
+def run_storage():
+    if STORAGE_ROOT == None:
+        raise ValueError('cannot run uninitialized; please call set_storage_root first')
+    a = Server('',8000, PootleHandler)
+    # os.chdir(STORAGE_ROOT) # storage root
+    print 'Server listening'
+    asyncore.loop()
+
+if __name__ == "__main__":
+    set_storage_root(path('/home/hruske/projekti/pootle/django-migration/Pootle/storage/testroot/'))
+    run_storage()

Added: src/branches/django-migration/Pootle/tests/storage_testroot1.zip
===================================================================
(Binary files differ)


Property changes on: src/branches/django-migration/Pootle/tests/storage_testroot1.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: src/branches/django-migration/Pootle/tests/test_storage.py
===================================================================
--- src/branches/django-migration/Pootle/tests/test_storage.py	                        (rev 0)
+++ src/branches/django-migration/Pootle/tests/test_storage.py	2007-04-30 17:42:47 UTC (rev 5537)
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""tests for stats classes"""
+
+from py import test
+from Pootle.storage.dirlayout import gettext_path
+
+from Pootle.path import path
+import os
+import zipfile
+
+# set up test PO
+testdir = os.sep.join(__file__.split(os.sep)[:-1])
+test_path = path(os.path.join(testdir, "testroot"))
+test_po = test_path.translationstore
+
+
+testroots = ['storage_testroot1.zip']
+
+def setup(zipped_root):
+    if test_path.exists():
+        test_path.rmtree()
+    test_path.mkdir()
+    zipped = zipfile.ZipFile(zipped_root, 'r')
+    for name in zipped.namelist():
+        f = (test_path / name)
+        if f.endswith('/'):
+            f.mkdir()
+        else:
+            f.write_bytes(zipped.read(name))
+
+def cleanup():
+    test_path.rmtree()
+
+class TestStorage:
+    def test_index(self):
+        for root in testroots:
+            setup(root)
+            t = gettext_path(test_path / 'test' / 'test.po')
+            # test.po exists
+            assert(t.exists() == True)
+            
+            # index rebuild
+            t.index.remove()
+            t.update_index()
+            assert(t.index.exists() == True)
+
+            data = '0000000025                     \n0000000001 00000000000000000000\n0000000673 00000000000000000000\n0000000736 00000000000000000000\n0000000812 00000000000000000000\n0000000867 00000000000000000000\n0000000967 00000000000000000000\n0000001033 00000000000000000000\n0000001102 00000000000000000000\n0000001176 00000000000000000000\n0000001227 00000000000000000000\n0000001308 00000000000000000000\n0000001451 00000000000000000000\n0000001647 00000000000000000000\n0000001780 00000000000000000000\n0000001896 00000000000000000000\n0000002026 00000000000000000000\n0000002152 00000000000000000000\n0000002272 00000000000000000000\n0000002390 00000000000000000000\n0000002546 00000000000000000000\n0000002674 00000000000000000000\n0000002797 00000000000000000000\n0000002943 00000000000000000000\n0000003101 00000000000000000000\n0000003450 00000000000000000000\n'
+            assert(t.index.bytes() == data)
+
+            # automatic index rebuild
+            t.index.remove()
+            t[2]
+            assert(t.index.exists() == True)
+            assert(t.index.bytes() == data)
+            
+            #cleanup()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5564
          http://svn.sourceforge.net/translate/?rev=5564&view=rev
Author:   zejn
Date:     2007-05-03 14:02:41 -0700 (Thu, 03 May 2007)

Log Message:
-----------
[django-migration] Added storage_client functions and a setting localsettings. The deleted functions in this file were previously used only by old Pootle files: indexpage.py, users.py and pootle.py.

Modified Paths:
--------------
    src/branches/django-migration/Pootle/localsettings.py
    src/branches/django-migration/Pootle/storage_client.py

Modified: src/branches/django-migration/Pootle/localsettings.py
===================================================================
--- src/branches/django-migration/Pootle/localsettings.py	2007-05-03 20:57:55 UTC (rev 5563)
+++ src/branches/django-migration/Pootle/localsettings.py	2007-05-03 21:02:41 UTC (rev 5564)
@@ -40,3 +40,8 @@
 # option to True.
 REQUIRE_NEW_PROJECT_APPROVAL = True
 
+# Set this to root url for storage daemon. This is where Pootle web 
+# interface will fetch translatable strings from and submit back 
+# the translated ones.
+STORAGE_ROOT_URL = "http://127.0.0.1:8080/"
+

Modified: src/branches/django-migration/Pootle/storage_client.py
===================================================================
--- src/branches/django-migration/Pootle/storage_client.py	2007-05-03 20:57:55 UTC (rev 5563)
+++ src/branches/django-migration/Pootle/storage_client.py	2007-05-03 21:02:41 UTC (rev 5564)
@@ -1,117 +1,20 @@
 # This file is supposed to have all translation accessing functions in Pootle,
 # at least the web portal part of it.
 
-from Pootle.conf import instance, potree
-from Pootle.utils import shortdescription
-from gettext import gettext as _
+from urllib2 import urlopen
+from Pootle.settings import STORAGE_ROOT_URL
+from translate.storage.po import pounit
 
-def getstats(project, projectstats, numfiles):
-    """returns a list with the data items to fill a statistics table
-    Remember to update getstatsheadings() above as needed"""
-    wanted = ["translated", "fuzzy", "untranslated", "total"]
-    gotten = {}
-    for key in wanted:
-        gotten[key] = projectstats.get(key, [])
-        wordkey = key + "words"
-        if wordkey in projectstats:
-            gotten[wordkey] = projectstats[wordkey]
-        else:
-            count = projectstats.get(key, [])
-            gotten[wordkey] = project.countwords(count)
-        if isinstance(gotten[key], list):
-            #TODO: consider carefully:
-            gotten[key] = len(gotten[key])
-    gotten["untranslated"] = gotten["total"] - gotten["translated"] - gotten["fuzzy"]
-    gotten["untranslatedwords"] = gotten["totalwords"] - gotten["translatedwords"] - gotten["fuzzywords"]
+if STORAGE_ROOT_URL.endswith("/"):
+    storage_root = STORAGE_ROOT_URL
+else:
+    storage_root = STORAGE_ROOT_URL + '/' 
 
-    for key in wanted[:-1]:
-        percentkey = key + "percentage"
-        wordkey = key + "words"
-        gotten[percentkey] = gotten[wordkey]*100/max(gotten["totalwords"], 1)
+def get_unit(file, id):
+    url = "%s%s/%d" % (storage_root, file, id)
+    a = urlopen(url)
+    data = a.read()
+    unit = pounit()
+    unit.parse(data)
+    return unit
 
-    for key in gotten:
-        if key.find("check-") == 0:
-            value = gotten.pop(key)
-            gotten[key[len("check-"):]] = value
-
-    return gotten
-
-def getprojectoptions(session):
-    """gets the options box to change the user's projects"""
-    projectoptions = []
-    userprojects = session.getprojects()
-    for projectcode in potree().getprojectcodes():
-      projectname = potree().getprojectname(projectcode)
-      projectoptions.append({"code": projectcode, "name": projectname, "selected": projectcode
- in userprojects or None})
-    return projectoptions
-
-def getlanguageoptions(session):
-    """returns options for languages"""
-    userlanguages = session.getlanguages()
-    languageoptions = potree().getlanguages()
-    languages = []
-    for language, name in languageoptions:
-      languages.append({"code": language, "name": name, "selected": language in userlanguages
-or None})
-    return languages
-
-def getotheroptions(session):
-    uilanguage = getattr(session.prefs, "uilanguage", "")
-    if not uilanguage:
-      userlanguages = session.getlanguages()
-      if userlanguages:
-        uilanguage = userlanguages[0]
-    languageoptions = [{"code": '', "name": ''}]
-    for code, name in potree().getlanguages():
-      if code == "templates":
-        continue
-      languageoptions.append({"code": code, "name": name, "selected": uilanguage == code or None})
-    options = {
-        "inputheight": _("Input Height (in lines)"),
-        "inputwidth": _("Input Width (in characters)"),
-        "viewrows": _("Number of rows in view mode"),
-        "translaterows": _("Number of rows in translate mode")}
-    optionlist = []
-    for option, description in options.items():
-      optionvalue = getattr(session.prefs, option, "")
-      optionlist.append({"code": option, "description": description, "value": optionvalue})
-    return {"uilanguage": uilanguage, "uilanguage_options": languageoptions, "other_options": optionlist}
-
-# indexpage.py
-def getprojectitem(projectcode, languagecode):
-    href = '%s/' % projectcode
-    projectname = potree().getprojectname(projectcode)
-    projectdescription = shortdescription(potree().getprojectdescription(projectc