hannosch / zope.babel / changeset / be222b062327

@@ -45,7 +45,7 @@ class GettextMessageCatalog(object):
     def getMessage(self, id):
         return self._catalog.ugettext(id)
-    def queryMessage(self, id, context=None):
+    def query(self, id, context=None):
         try:
             return self._catalog.ugettext(id)
         except KeyError:

@@ -43,7 +43,7 @@ class IMessageCatalog(Interface):
         An exception is raised if the message is not found.
         """
-    def queryMessage(msgid, context=None):
+    def query(msgid, context=None):
         """Look for the appropriate text for the given message / context.
         If the message is not found, the message is returned.

@@ -38,11 +38,11 @@ class TestIMessageCatalog(unittest.TestC
         self.assertEqual(catalog.getMessage('short_greeting'), 'Hello!')
         self.assertRaises(KeyError, catalog.getMessage, 'foo')
-    def testQueryMessage(self):
+    def testQuery(self):
         catalog = self._catalog
         self.assertEqual(catalog.queryMessage('short_greeting'), 'Hello!')
         self.assertEqual(catalog.queryMessage('foo'), 'foo')
-        self.assertEqual(catalog.queryMessage('foo', 'bar'), 'foo')
+        self.assertEqual(catalog.query('short_greeting'), 'Hello!')
         self.assertEqual(catalog.query('foo'), 'foo')
         self.assertEqual(catalog.query('foo', 'bar'), 'foo')
     def testGetLanguage(self):
         catalog = self._catalog

@@ -64,7 +64,7 @@ class TranslationDomain(object):
         if catalog_names:
             for name in catalog_names:
                 catalog = self._data[name]
-                s = catalog.queryMessage(msgid, context)
+                s = catalog.query(msgid, context)
                 if s is not None:
                     text = s
                     break