[Zope3-checkins] CVS: Zope3/src/zope/i18n - domain.py:1.1.2.2 gettextmessagecatalog.py:1.1.2.2 globaltranslationservice.py:1.1.2.2 simpletranslationservice.py:1.1.2.2
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:51:57 -0500
Update of /cvs-repository/Zope3/src/zope/i18n
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/i18n
Modified Files:
Tag: NameGeddon-branch
domain.py gettextmessagecatalog.py globaltranslationservice.py
simpletranslationservice.py
Log Message:
Searched for and changed over 1200 references to Zope.something.
Most of these were either comments, doc strings, or permission ids.
Many were imports or ids in zcml. (much zcml fixup is still needed.
=== Zope3/src/zope/i18n/domain.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/i18n/domain.py:1.1.2.1 Mon Dec 23 14:32:51 2002
+++ Zope3/src/zope/i18n/domain.py Tue Dec 24 07:51:26 2002
@@ -35,6 +35,6 @@
def translate(self, msgid, mapping=None, context=None,
target_language=None):
- """See Zope.I18n.IDomain.IDomain"""
+ """See IDomain"""
return self._translationService.translate(
self._domain, msgid, mapping, context, target_language)
=== Zope3/src/zope/i18n/gettextmessagecatalog.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/i18n/gettextmessagecatalog.py:1.1.2.1 Mon Dec 23 14:32:51 2002
+++ Zope3/src/zope/i18n/gettextmessagecatalog.py Tue Dec 24 07:51:26 2002
@@ -43,12 +43,8 @@
file.close()
- ############################################################
- # Implementation methods for interface
- # Zope.I18n.IMessageCatalog.IReadMessageCatalog
-
def getMessage(self, id):
- 'See Zope.I18n.IMessageCatalog.IReadMessageCatalog'
+ 'See IReadMessageCatalog'
self._prepareTranslations()
msg = self.__translation_object.ugettext(id)
if msg == id:
@@ -56,7 +52,7 @@
return msg
def queryMessage(self, id, default=None):
- 'See Zope.I18n.IMessageCatalog.IReadMessageCatalog'
+ 'See IReadMessageCatalog'
self._prepareTranslations()
text = self.__translation_object.ugettext(id)
if text != id:
@@ -64,16 +60,13 @@
return default
def getLanguage(self):
- 'See Zope.I18n.IMessageCatalog.IReadMessageCatalog'
+ 'See IReadMessageCatalog'
return self._language
def getDomain(self):
- 'See Zope.I18n.IMessageCatalog.IReadMessageCatalog'
+ 'See IReadMessageCatalog'
return self._domain
def getIdentifier(self):
- 'See Zope.I18n.IMessageCatalog.IReadMessageCatalog'
+ 'See IReadMessageCatalog'
return self._path_to_file
-
- #
- ############################################################
=== Zope3/src/zope/i18n/globaltranslationservice.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/i18n/globaltranslationservice.py:1.1.2.1 Mon Dec 23 14:32:51 2002
+++ Zope3/src/zope/i18n/globaltranslationservice.py Tue Dec 24 07:51:26 2002
@@ -64,11 +64,6 @@
fallbacks = LANGUAGE_FALLBACKS
self._fallbacks = fallbacks
-
- ############################################################
- # Implementation methods for interface
- # Zope.I18n.ITranslationService.
-
def translate(self, domain, msgid, mapping=None, context=None,
target_language=None):
'''See interface ITranslationService'''
@@ -97,9 +92,5 @@
# Now we need to do the interpolation
return self.interpolate(text, mapping)
-
- #
- ############################################################
-
translationService = GlobalTranslationService()
=== Zope3/src/zope/i18n/simpletranslationservice.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/i18n/simpletranslationservice.py:1.1.2.1 Mon Dec 23 14:32:51 2002
+++ Zope3/src/zope/i18n/simpletranslationservice.py Tue Dec 24 07:51:26 2002
@@ -55,10 +55,6 @@
self.messages = messages
- ############################################################
- # Implementation methods for interface
- # Zope.I18n.ITranslationService.
-
def translate(self, domain, msgid, mapping=None, context=None,
target_language=None):
'''See interface ITranslationService'''
@@ -82,10 +78,6 @@
def getDomain(self, domain):
'''See interface ITranslationService'''
return Domain(domain, self)
-
- #
- ############################################################
-
def interpolate(self, text, mapping):
"""Insert the data passed from mapping into the text"""