From 57bfa38869f5524bf79ac9f3dc9b64b0fe0cf83e Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 26 Apr 2010 01:09:58 +0000
Subject: [PATCH] Colander does not require the Chameleon-variant message
 extractors.

---
 colander/locale/colander.pot | 65 ++++++++++++++++++++++++++++++++++--
 setup.py                     |  4 ---
 2 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/colander/locale/colander.pot b/colander/locale/colander.pot
index 65b7aec..5c0682e 100644
--- a/colander/locale/colander.pot
+++ b/colander/locale/colander.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: colander 0.5.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-04-25 21:06-0400\n"
+"POT-Creation-Date: 2010-04-25 21:09-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -37,24 +37,85 @@ msgstr ""
 msgid "${val} is greater than maximum value ${max}"
 msgstr ""
 
-#: colander/__init__.py:461
+#: colander/__init__.py:279
+msgid "Shorter than minimum length ${min}"
+msgstr ""
+
+#: colander/__init__.py:285
+msgid "Longer than maximum length ${max}"
+msgstr ""
+
+#: colander/__init__.py:298
+msgid "\"${val}\" is not one of ${choices}"
+msgstr ""
+
+#: colander/__init__.py:367
+msgid "\"${val}\" is not a mapping type: ${err}"
+msgstr ""
+
+#: colander/__init__.py:394
+msgid "\"${val}\" is required but missing"
+msgstr ""
+
+#: colander/__init__.py:411
+msgid "Unrecognized keys in mapping: \"${val}\""
+msgstr ""
+
+#: colander/__init__.py:461 colander/__init__.py:539
 msgid "\"${val}\" is not iterable"
 msgstr ""
 
+#: colander/__init__.py:469
+msgid "\"${val}\" has an incorrect number of elements (expected ${exp}, was ${was})"
+msgstr ""
+
+#: colander/__init__.py:644
+msgid "${val} is not a string: %{err}"
+msgstr ""
+
 #: colander/__init__.py:648 colander/__init__.py:680 colander/__init__.py:710
 #: colander/__init__.py:751 colander/__init__.py:996
 msgid "Required"
 msgstr ""
 
+#: colander/__init__.py:662
+msgid "\"${val} cannot be serialized to str: ${err}"
+msgstr ""
+
+#: colander/__init__.py:683 colander/__init__.py:692 colander/__init__.py:713
+#: colander/__init__.py:722
+msgid "\"${val}\" is not a number"
+msgstr ""
+
 #: colander/__init__.py:747
 msgid "${val} is not a string"
 msgstr ""
 
+#: colander/__init__.py:808 colander/__init__.py:825 colander/__init__.py:835
+msgid "relative name \"${val}\" irresolveable without package"
+msgstr ""
+
 #: colander/__init__.py:860
 msgid "\"${val}\" is not a string"
 msgstr ""
 
+#: colander/__init__.py:868
+msgid "The dotted name \"${name}\" cannot be imported"
+msgstr ""
+
+#: colander/__init__.py:876
+msgid "\"${val}\" has no __name__"
+msgstr ""
+
 #: colander/__init__.py:918 colander/__init__.py:982
 msgid "${val} cannot be parsed as an iso8601 date: ${err}"
 msgstr ""
 
+#: colander/__init__.py:929
+msgid "\"${val}\" is not a datetime object"
+msgstr ""
+
+#: colander/__init__.py:988
+msgid "\"${val}\" is not a date object"
+msgstr ""
+
diff --git a/setup.py b/setup.py
index 7157f6a..92de748 100644
--- a/setup.py
+++ b/setup.py
@@ -43,9 +43,5 @@ setup(name='colander',
       tests_require = requires,
       install_requires = requires,
       test_suite="colander",
-      message_extractors = { ".": [
-            ("**.py",   "chameleon_python", None ),
-            ("**.pt",   "chameleon_xml", None ),
-            ]},
       )