[Checkins] SVN: grok/branches/ulif-i18n/src/grok/ Move localesdir definition from i18n.py to directives.py.

[Uli Fouquet]

Log message for revision 80915:
  Move localesdir definition from i18n.py to directives.py.

Changed:
  U   grok/branches/ulif-i18n/src/grok/__init__.py
  U   grok/branches/ulif-i18n/src/grok/directive.py
  U   grok/branches/ulif-i18n/src/grok/i18n.py
  U   grok/branches/ulif-i18n/src/grok/meta.py

-=-
Modified: grok/branches/ulif-i18n/src/grok/__init__.py
===================================================================
--- grok/branches/ulif-i18n/src/grok/__init__.py	2007-10-18 11:32:42 UTC (rev 80914)
+++ grok/branches/ulif-i18n/src/grok/__init__.py	2007-10-18 11:37:43 UTC (rev 80915)
@@ -39,8 +39,7 @@
 from grok.components import Skin, IGrokLayer
 from grok.directive import (context, name, title, template, templatedir,
                             provides, baseclass, global_utility, local_utility,
-                            permissions, require, site, layer)
-from grok.i18n import localesdir
+                            permissions, require, site, layer, localesdir)
 from grok._grok import do_grok as grok  # Avoid name clash within _grok
 from grok._grok import grok_component
 from grok._grok import SubscribeDecorator as subscribe

Modified: grok/branches/ulif-i18n/src/grok/directive.py
===================================================================
--- grok/branches/ulif-i18n/src/grok/directive.py	2007-10-18 11:32:42 UTC (rev 80914)
+++ grok/branches/ulif-i18n/src/grok/directive.py	2007-10-18 11:37:43 UTC (rev 80915)
@@ -122,3 +122,5 @@
     'grok.permissions', ClassDirectiveContext())
 layer = InterfaceOrClassDirective('grok.layer',
                            ClassOrModuleDirectiveContext())
+localesdir = MultipleTextDirective('grok.localesdir',
+                                 ModuleDirectiveContext())

Modified: grok/branches/ulif-i18n/src/grok/i18n.py
===================================================================
--- grok/branches/ulif-i18n/src/grok/i18n.py	2007-10-18 11:32:42 UTC (rev 80914)
+++ grok/branches/ulif-i18n/src/grok/i18n.py	2007-10-18 11:37:43 UTC (rev 80915)
@@ -25,10 +25,7 @@
 from zope.i18n.translationdomain import TranslationDomain
 from zope.i18n.interfaces import ITranslationDomain
 
-from martian.error import GrokImportError
-from martian.directive import MultipleTextDirective, ModuleDirectiveContext
 
-
 def registerTranslationsDirectory(directory):
     """A replacement for the ZCML registerTranslations directive.
 
@@ -65,6 +62,3 @@
         provideUtility(domain, ITranslationDomain, name)
     return
 
-
-localesdir = MultipleTextDirective('grok.localesdir',
-                                 ModuleDirectiveContext())

Modified: grok/branches/ulif-i18n/src/grok/meta.py
===================================================================
--- grok/branches/ulif-i18n/src/grok/meta.py	2007-10-18 11:32:42 UTC (rev 80914)
+++ grok/branches/ulif-i18n/src/grok/meta.py	2007-10-18 11:37:43 UTC (rev 80915)
@@ -47,6 +47,7 @@
 import grok
 from grok import components, formlib
 from grok.util import check_adapts, get_default_permission, make_checker
+from grok.i18n import registerTranslationsDirectory
 
 
 class AdapterGrokker(martian.ClassGrokker):