[Mpuls-commits] r2949 - in base/trunk/mpulsweb: controllers lib model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-06-09 15:26:57 +0200 (Wed, 09 Jun 2010)
New Revision: 2949

Modified:
   base/trunk/mpulsweb/controllers/administration.py
   base/trunk/mpulsweb/controllers/annotations.py
   base/trunk/mpulsweb/controllers/appointment.py
   base/trunk/mpulsweb/controllers/case.py
   base/trunk/mpulsweb/controllers/case_bundle.py
   base/trunk/mpulsweb/controllers/casedocument.py
   base/trunk/mpulsweb/controllers/document.py
   base/trunk/mpulsweb/controllers/evaluate.py
   base/trunk/mpulsweb/controllers/formularpage.py
   base/trunk/mpulsweb/controllers/logbook.py
   base/trunk/mpulsweb/controllers/news.py
   base/trunk/mpulsweb/controllers/phase.py
   base/trunk/mpulsweb/controllers/privacy.py
   base/trunk/mpulsweb/controllers/repeatgroup.py
   base/trunk/mpulsweb/controllers/settings.py
   base/trunk/mpulsweb/controllers/tags.py
   base/trunk/mpulsweb/controllers/usersettings.py
   base/trunk/mpulsweb/lib/base.py
   base/trunk/mpulsweb/lib/dialogs.py
   base/trunk/mpulsweb/lib/helpers.py
   base/trunk/mpulsweb/lib/navigation.py
   base/trunk/mpulsweb/lib/renderer.py
   base/trunk/mpulsweb/lib/validators.py
   base/trunk/mpulsweb/model/case.py
   base/trunk/mpulsweb/model/phase.py
Log:
Import '_' from mpulsweb.lib.translation instead from pylons.i18n


Modified: base/trunk/mpulsweb/controllers/administration.py
===================================================================
--- base/trunk/mpulsweb/controllers/administration.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/administration.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -4,7 +4,7 @@
 import formencode
 
 from pylons import request, session, tmpl_context as c
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from mpulsweb.lib.db import db
 from mpulsweb.lib.base import BaseController, render, redirect_to

Modified: base/trunk/mpulsweb/controllers/annotations.py
===================================================================
--- base/trunk/mpulsweb/controllers/annotations.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/annotations.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -1,7 +1,7 @@
 import logging
 
 from pylons import g
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 from pylons import c
 from pylons.controllers.util import abort
 

Modified: base/trunk/mpulsweb/controllers/appointment.py
===================================================================
--- base/trunk/mpulsweb/controllers/appointment.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/appointment.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -33,7 +33,7 @@
 
 import formencode
 
-from pylons.i18n import _, ungettext
+from mpulsweb.lib.translation import _, ungettext
 
 from mpulsweb.lib.base import BaseController, c, redirect_to, render, request
 from mpulsweb.lib.helpers import url_for, dd_mm_YYYY, HH_MM

Modified: base/trunk/mpulsweb/controllers/case.py
===================================================================
--- base/trunk/mpulsweb/controllers/case.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/case.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -4,7 +4,7 @@
 import formencode
 
 from pylons import request, session, tmpl_context as c, app_globals as g
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 from pylons.controllers.util import redirect_to
 
 

Modified: base/trunk/mpulsweb/controllers/case_bundle.py
===================================================================
--- base/trunk/mpulsweb/controllers/case_bundle.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/case_bundle.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -6,7 +6,7 @@
 import paste
 
 from pylons import app_globals as g
-from pylons.i18n import _, ungettext
+from mpulsweb.lib.translation import _, ungettext
 
 from formed.meta.data import PageNode
 

Modified: base/trunk/mpulsweb/controllers/casedocument.py
===================================================================
--- base/trunk/mpulsweb/controllers/casedocument.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/casedocument.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -7,7 +7,7 @@
 
 from pylons import request, session, tmpl_context as c
 from pylons.controllers.util import redirect_to
-from pylons.i18n import _, ungettext
+from mpulsweb.lib.translation import _, ungettext
 
 from mpulsweb.lib.base import BaseController, render
 from mpulsweb.lib.validators import UploadCaseDocumentForm

Modified: base/trunk/mpulsweb/controllers/document.py
===================================================================
--- base/trunk/mpulsweb/controllers/document.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/document.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -31,7 +31,7 @@
 import logging
 import formencode
 
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 import paste
 

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -5,7 +5,7 @@
 import pylons
 
 from pylons import session, g, c
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from libmpuls.evaluation.config import EvaluationConfig
 from libmpuls.evaluation.evaluation import EvaluationSet

Modified: base/trunk/mpulsweb/controllers/formularpage.py
===================================================================
--- base/trunk/mpulsweb/controllers/formularpage.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/formularpage.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -9,7 +9,7 @@
 
 from pylons import request, session, c
 from pylons import g, h
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 from pylons.controllers.util import abort, redirect
 
 from formed.instance.backends.postgres import DBFactory as InstanceFactory

Modified: base/trunk/mpulsweb/controllers/logbook.py
===================================================================
--- base/trunk/mpulsweb/controllers/logbook.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/logbook.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -29,7 +29,7 @@
 import formencode
 from datetime import datetime
 
-from pylons.i18n import _, ungettext
+from mpulsweb.lib.translation import _, ungettext
 
 from mpulsweb.lib.security import checkRole
 from mpulsweb.model.logbook import Logbook, LogbookEntry, LogbookEntryChecker

Modified: base/trunk/mpulsweb/controllers/news.py
===================================================================
--- base/trunk/mpulsweb/controllers/news.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/news.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -4,7 +4,7 @@
 
 from pylons import session, tmpl_context as c
 from pylons.controllers.util import redirect_to
-from pylons.i18n import _, ungettext
+from mpulsweb.lib.translation import _, ungettext
 
 from mpulsweb.lib.helpers import url_for
 from mpulsweb.lib.base import BaseController, render

Modified: base/trunk/mpulsweb/controllers/phase.py
===================================================================
--- base/trunk/mpulsweb/controllers/phase.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/phase.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -2,7 +2,7 @@
 import logging
 
 from pylons import c
-from pylons.i18n import _, ungettext
+from mpulsweb.lib.translation import _, ungettext
 
 from mpulsweb.lib.base import BaseController, h, render, request
 from mpulsweb.lib.security import checkRole

Modified: base/trunk/mpulsweb/controllers/privacy.py
===================================================================
--- base/trunk/mpulsweb/controllers/privacy.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/privacy.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -4,7 +4,7 @@
 
 from pylons import app_globals as g
 
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from formed.instance.tree import SetDataException
 

Modified: base/trunk/mpulsweb/controllers/repeatgroup.py
===================================================================
--- base/trunk/mpulsweb/controllers/repeatgroup.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/repeatgroup.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -3,7 +3,7 @@
 import logging
 
 from pylons import session, c, g
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 from pylons.controllers.util import abort
 
 from formed.instance.backends.postgres import DBFactory as InstanceFactory

Modified: base/trunk/mpulsweb/controllers/settings.py
===================================================================
--- base/trunk/mpulsweb/controllers/settings.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/settings.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -3,7 +3,7 @@
 import formencode
 
 from pylons import request, tmpl_context as c
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from mpulsweb.lib.helpers import url_for
 from mpulsweb.lib.base import BaseController, render

Modified: base/trunk/mpulsweb/controllers/tags.py
===================================================================
--- base/trunk/mpulsweb/controllers/tags.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/tags.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -4,7 +4,7 @@
 import formencode
 
 from pylons import c
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from mpulsweb.lib.base import BaseController, h, render, request
 from mpulsweb.lib.security import checkRole

Modified: base/trunk/mpulsweb/controllers/usersettings.py
===================================================================
--- base/trunk/mpulsweb/controllers/usersettings.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/controllers/usersettings.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -32,7 +32,7 @@
 import logging
 import formencode
 
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from mpulsweb.lib.base import BaseController, c, h, render, request, session, _
 

Modified: base/trunk/mpulsweb/lib/base.py
===================================================================
--- base/trunk/mpulsweb/lib/base.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/lib/base.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -38,7 +38,7 @@
 from pylons import c, config, g, request, response, session
 from pylons.controllers import WSGIController
 from pylons.controllers.util import redirect_to
-#from pylons.i18n import _
+#from mpulsweb.lib.translation import _
 #from pylons.templating import render_mako as render
 from pylons.templating import cached_template, pylons_globals 
 

Modified: base/trunk/mpulsweb/lib/dialogs.py
===================================================================
--- base/trunk/mpulsweb/lib/dialogs.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/lib/dialogs.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -6,7 +6,7 @@
 from webob.exc import HTTPNotFound
 
 from pylons import request, session, tmpl_context as c, app_globals as g
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from mpulsweb.lib.base import render
 from mpulsweb.lib.helpers import url_for 

Modified: base/trunk/mpulsweb/lib/helpers.py
===================================================================
--- base/trunk/mpulsweb/lib/helpers.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/lib/helpers.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -37,7 +37,7 @@
 from xml.sax.saxutils import quoteattr
 
 from pylons import c, cache, config, g, request, response, session, url
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 # Use url_for from prior versions
 from routes import url_for

Modified: base/trunk/mpulsweb/lib/navigation.py
===================================================================
--- base/trunk/mpulsweb/lib/navigation.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/lib/navigation.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -32,7 +32,7 @@
 from cgi import escape
 
 from pylons import session, g
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from formed.meta.data import PageNode
 from formed.instance.tree import InstanceNode, RepeatInstanceContainerNode, \

Modified: base/trunk/mpulsweb/lib/renderer.py
===================================================================
--- base/trunk/mpulsweb/lib/renderer.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/lib/renderer.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -32,7 +32,7 @@
 from cgi import escape
 import logging
 
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 import formed.meta.data as data
 from formed.meta.nodecomponents import Node, NodeComponent as MetaNodeComponent

Modified: base/trunk/mpulsweb/lib/validators.py
===================================================================
--- base/trunk/mpulsweb/lib/validators.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/lib/validators.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -11,7 +11,7 @@
      FileUploadKeeper, OneOf
 
 from pylons import session, app_globals as g
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from mpulsweb.lib.db import db
 from mpulsweb.lib.helpers import format_date 

Modified: base/trunk/mpulsweb/model/case.py
===================================================================
--- base/trunk/mpulsweb/model/case.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/model/case.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -34,7 +34,7 @@
 
 import psycopg2.extras
 
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from formed.meta.data import RepeatNode, DateLeaf, IntLeaf, TextLeaf, ChoiceNode
 from formed.instance.backends.postgres import DBFactory as InstanceFactory

Modified: base/trunk/mpulsweb/model/phase.py
===================================================================
--- base/trunk/mpulsweb/model/phase.py	2010-06-09 13:25:49 UTC (rev 2948)
+++ base/trunk/mpulsweb/model/phase.py	2010-06-09 13:26:57 UTC (rev 2949)
@@ -4,7 +4,7 @@
 import re
 
 from pylons import g, c
-from pylons.i18n import _
+from mpulsweb.lib.translation import _
 
 from formed.instance.backends.postgres import DBFactory as InstanceFactory
 from formed.instance.backends.common import RuleEvalContext