[Checkins] SVN: z3c.authenticator/trunk/ Drop dependency on z3c.i18n.

[Dan Korostelev]

Log message for revision 98111:
  Drop dependency on z3c.i18n.

Changed:
  U   z3c.authenticator/trunk/CHANGES.txt
  U   z3c.authenticator/trunk/setup.py
  U   z3c.authenticator/trunk/src/z3c/authenticator/browser/authenticator.py
  U   z3c.authenticator/trunk/src/z3c/authenticator/browser/authenticator.zcml
  U   z3c.authenticator/trunk/src/z3c/authenticator/browser/credential.py
  U   z3c.authenticator/trunk/src/z3c/authenticator/browser/group.py
  U   z3c.authenticator/trunk/src/z3c/authenticator/browser/login.py
  U   z3c.authenticator/trunk/src/z3c/authenticator/browser/user.py
  U   z3c.authenticator/trunk/src/z3c/authenticator/interfaces.py
  U   z3c.authenticator/trunk/src/z3c/authenticator/vocabulary.py

-=-
Modified: z3c.authenticator/trunk/CHANGES.txt
===================================================================
--- z3c.authenticator/trunk/CHANGES.txt	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/CHANGES.txt	2009-03-14 19:55:06 UTC (rev 98111)
@@ -14,6 +14,7 @@
    * Use ``zope.password`` instead of maintaining a copy of password
      managers.
 
+- Drop dependency on z3c.i18n and recreate a message factory instead.
 
 Version 0.6.0 (2009-01-04)
 --------------------------

Modified: z3c.authenticator/trunk/setup.py
===================================================================
--- z3c.authenticator/trunk/setup.py	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/setup.py	2009-03-14 19:55:06 UTC (rev 98111)
@@ -68,7 +68,6 @@
         'z3c.contents',
         'z3c.form',
         'z3c.formui',
-        'z3c.i18n',
         'z3c.template',
         'zope.app.generations',
         'zope.authentication',

Modified: z3c.authenticator/trunk/src/z3c/authenticator/browser/authenticator.py
===================================================================
--- z3c.authenticator/trunk/src/z3c/authenticator/browser/authenticator.py	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/src/z3c/authenticator/browser/authenticator.py	2009-03-14 19:55:06 UTC (rev 98111)
@@ -22,7 +22,7 @@
 from zope.traversing.browser import absoluteURL
 import zope.schema
 
-from z3c.i18n import MessageFactory as _
+from z3c.authenticator.authentication import Authenticator
 from z3c.authenticator import interfaces
 from z3c.authenticator import group
 from z3c.authenticator import user
@@ -31,6 +31,7 @@
 from z3c.formui import form
 from z3c.configurator import configurator
 
+from z3c.authenticator.interfaces import _
 
 class IAddName(zope.interface.Interface):
     """Object name."""
@@ -45,13 +46,13 @@
 class AuthenticatorAddForm(form.AddForm):
     """Authenticator add form."""
 
-    label = _('Add Authenticatorr.')
+    label = _('Add Authenticator')
     contentName = None
 
     fields = field.Fields(IAddName)
 
     def createAndAdd(self, data):
-        obj = user.UserContainer()
+        obj = Authenticator()
         self.contentName = data.get('__name__', u'')
         zope.event.notify(zope.lifecycleevent.ObjectCreatedEvent(obj))
         self.context[self.contentName] = obj
@@ -62,7 +63,7 @@
 
     def nextURL(self):
         obj = self.context[self.contentName]
-        return '%s/index.html' % absoluteURL(obj, self.request)
+        return '%s/contents.html' % absoluteURL(obj, self.request)
 
 
 class AuthenticatorEditForm(form.EditForm):

Modified: z3c.authenticator/trunk/src/z3c/authenticator/browser/authenticator.zcml
===================================================================
--- z3c.authenticator/trunk/src/z3c/authenticator/browser/authenticator.zcml	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/src/z3c/authenticator/browser/authenticator.zcml	2009-03-14 19:55:06 UTC (rev 98111)
@@ -6,7 +6,7 @@
 
   <z3c:pagelet
       name="addAuthenticator.html"
-      for="..interfaces.IAuthenticator"
+      for="zope.container.interfaces.IContainer"
       class=".authenticator.AuthenticatorAddForm"
       permission="zope.ManageServices"
       />

Modified: z3c.authenticator/trunk/src/z3c/authenticator/browser/credential.py
===================================================================
--- z3c.authenticator/trunk/src/z3c/authenticator/browser/credential.py	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/src/z3c/authenticator/browser/credential.py	2009-03-14 19:55:06 UTC (rev 98111)
@@ -16,11 +16,11 @@
 """
 __docformat__ = "reStructuredText"
 
-from z3c.i18n import MessageFactory as _
 from z3c.form import field
 from z3c.formui import form
 
 from z3c.authenticator import interfaces
+from z3c.authenticator.interfaces import _
 
 
 class SessionCredentialsPluginEditForm(form.EditForm):

Modified: z3c.authenticator/trunk/src/z3c/authenticator/browser/group.py
===================================================================
--- z3c.authenticator/trunk/src/z3c/authenticator/browser/group.py	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/src/z3c/authenticator/browser/group.py	2009-03-14 19:55:06 UTC (rev 98111)
@@ -22,7 +22,6 @@
 from zope.traversing.browser import absoluteURL
 import zope.schema
 
-from z3c.i18n import MessageFactory as _
 from z3c.authenticator import interfaces
 from z3c.authenticator import group
 from z3c.authenticator import user
@@ -32,6 +31,7 @@
 from z3c.formui import form
 from z3c.configurator import configurator
 
+from z3c.authenticator.interfaces import _
 
 
 class IAddName(zope.interface.Interface):

Modified: z3c.authenticator/trunk/src/z3c/authenticator/browser/login.py
===================================================================
--- z3c.authenticator/trunk/src/z3c/authenticator/browser/login.py	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/src/z3c/authenticator/browser/login.py	2009-03-14 19:55:06 UTC (rev 98111)
@@ -25,8 +25,8 @@
 from z3c.template.template import getPageTemplate
 from z3c.template.template import getLayoutTemplate
 
-from z3c.i18n import MessageFactory as _
 from z3c.authenticator import interfaces
+from z3c.authenticator.interfaces import _
 
 
 class LoginForm(form.Form):

Modified: z3c.authenticator/trunk/src/z3c/authenticator/browser/user.py
===================================================================
--- z3c.authenticator/trunk/src/z3c/authenticator/browser/user.py	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/src/z3c/authenticator/browser/user.py	2009-03-14 19:55:06 UTC (rev 98111)
@@ -22,7 +22,6 @@
 from zope.traversing.browser import absoluteURL
 import zope.schema
 
-from z3c.i18n import MessageFactory as _
 from z3c.authenticator import interfaces
 from z3c.authenticator import group
 from z3c.authenticator import user
@@ -31,6 +30,7 @@
 from z3c.formui import form
 from z3c.configurator import configurator
 
+from z3c.authenticator.interfaces import _
 
 class IAddName(zope.interface.Interface):
     """Object name."""

Modified: z3c.authenticator/trunk/src/z3c/authenticator/interfaces.py
===================================================================
--- z3c.authenticator/trunk/src/z3c/authenticator/interfaces.py	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/src/z3c/authenticator/interfaces.py	2009-03-14 19:55:06 UTC (rev 98111)
@@ -29,7 +29,8 @@
 from zope.authentication.interfaces import ILogout
 from zope.authentication.principal import PrincipalSource
 
-from z3c.i18n import MessageFactory as _
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory('z3c')
 
 
 class IPlugin(zope.interface.Interface):
@@ -72,7 +73,7 @@
 
     allowQueryPrincipal = zope.schema.Bool(
         title=_('Allow query principal'),
-        description=_('Allow query principal. This is usefull if an '
+        description=_('Allow query principal. This is useful if an '
                       'authenticator plugin manages principals for another '
                       'authenticator.'),
         default=True,

Modified: z3c.authenticator/trunk/src/z3c/authenticator/vocabulary.py
===================================================================
--- z3c.authenticator/trunk/src/z3c/authenticator/vocabulary.py	2009-03-14 19:20:39 UTC (rev 98110)
+++ z3c.authenticator/trunk/src/z3c/authenticator/vocabulary.py	2009-03-14 19:55:06 UTC (rev 98111)
@@ -23,8 +23,8 @@
 from zope.schema import vocabulary
 from zope.schema.interfaces import IVocabularyFactory
 
-from z3c.i18n import MessageFactory as _
 from z3c.authenticator import interfaces
+from z3c.authenticator.interfaces import _
 
 UTILITY_TITLE = _(
     'z3c.authenticator.vocabulary-utility-plugin-title',