[Zope3-checkins] CVS: Zope3/src/zope/app/form - __init__.py:1.3.8.1 interfaces.py:1.3.2.1 utility.py:1.29.8.1

[Martijn Faassen]

Update of /cvs-repository/Zope3/src/zope/app/form
In directory cvs.zope.org:/tmp/cvs-serv20906/src/zope/app/form

Modified Files:
      Tag: faassen-interfaces-branch
	__init__.py interfaces.py utility.py 
Log Message:
Sync up with changes in HEAD (so I can generate up to date patch file).


=== Zope3/src/zope/app/form/__init__.py 1.3 => 1.3.8.1 ===
--- Zope3/src/zope/app/form/__init__.py:1.3	Thu Mar 18 12:01:09 2004
+++ Zope3/src/zope/app/form/__init__.py	Tue May 11 05:10:12 2004
@@ -38,10 +38,10 @@
         self.request = request
         self.name = self._prefix + context.__name__
         
-    title = property(lambda self: self._translate(
+    label = property(lambda self: self._translate(
         self.context.title))
     
-    description = property(lambda self: self._translate(
+    hint = property(lambda self: self._translate(
         self.context.description))
     
     def _translate(self, text):


=== Zope3/src/zope/app/form/interfaces.py 1.3 => 1.3.2.1 ===
--- Zope3/src/zope/app/form/interfaces.py:1.3	Sun Apr 11 06:34:48 2004
+++ Zope3/src/zope/app/form/interfaces.py	Tue May 11 05:10:12 2004
@@ -102,15 +102,18 @@
 
         This must be unique within a set of widgets.""")
 
-    title = Attribute(
-        """The widget title.
+    label = Attribute(
+        """The widget label.
         
-        Title may be translated for the request.""")
+        Label may be translated for the request.""")
 
-    description = Attribute(
-        """The widget description.
+    hint = Attribute(
+        """A hint regarding the use of the widget.
         
-        Description may be translated for the request.""")
+        Hints are traditionally rendered using tooltips in GUIs, but may be
+        rendered differently depending on the UI implementation.
+        
+        Hint may be translated for the request.""")
         
     visible = Attribute(
         """A flag indicating whether or not the widget is visible.""")


=== Zope3/src/zope/app/form/utility.py 1.29 => 1.29.8.1 ===
--- Zope3/src/zope/app/form/utility.py:1.29	Thu Mar 18 22:17:30 2004
+++ Zope3/src/zope/app/form/utility.py	Tue May 11 05:10:12 2004
@@ -274,7 +274,7 @@
                     errors.append(v)
             elif field.required:
                 errors.append(MissingInputError(
-                    name, widget.title, 'the field is required'))
+                    name, widget.label, 'the field is required'))
             
     if errors:
         raise WidgetsError(errors, widgetsData=result)