[Zope3-checkins] CVS: Zope3/src/zope/i18n - domain.py:1.1.2.3 gettextmessagecatalog.py:1.1.2.3 globaltranslationservice.py:1.1.2.3 negotiator.py:1.1.2.2 simpletranslationservice.py:1.1.2.3 translate.py:1.1.2.2
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:37 -0500
Update of /cvs-repository/Zope3/src/zope/i18n
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/i18n
Modified Files:
Tag: NameGeddon-branch
domain.py gettextmessagecatalog.py globaltranslationservice.py
negotiator.py simpletranslationservice.py translate.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/i18n/domain.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/i18n/domain.py:1.1.2.2 Tue Dec 24 07:51:26 2002
+++ Zope3/src/zope/i18n/domain.py Tue Dec 24 21:21:06 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -30,7 +30,7 @@
def getDomainName(self):
"""Return the domain name"""
return self._domain
-
+
# IDomain interface methods
def translate(self, msgid, mapping=None, context=None,
=== Zope3/src/zope/i18n/gettextmessagecatalog.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/i18n/gettextmessagecatalog.py:1.1.2.2 Tue Dec 24 07:51:26 2002
+++ Zope3/src/zope/i18n/gettextmessagecatalog.py Tue Dec 24 21:21:06 2002
@@ -2,16 +2,16 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
-"""A simple implementation of a Message Catalog.
+"""A simple implementation of a Message Catalog.
$Id$
"""
@@ -33,7 +33,7 @@
self._path_to_file = path_to_file
self.__translation_object = None
self._prepareTranslations()
-
+
def _prepareTranslations(self):
""" """
@@ -41,7 +41,7 @@
file = open(self._path_to_file, 'r')
self.__translation_object = GNUTranslations(file)
file.close()
-
+
def getMessage(self, id):
'See IReadMessageCatalog'
@@ -62,7 +62,7 @@
def getLanguage(self):
'See IReadMessageCatalog'
return self._language
-
+
def getDomain(self):
'See IReadMessageCatalog'
return self._domain
=== Zope3/src/zope/i18n/globaltranslationservice.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/i18n/globaltranslationservice.py:1.1.2.2 Tue Dec 24 07:51:26 2002
+++ Zope3/src/zope/i18n/globaltranslationservice.py Tue Dec 24 21:21:06 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Global Translation Service for providing I18n to file-based code.
@@ -64,7 +64,7 @@
fallbacks = LANGUAGE_FALLBACKS
self._fallbacks = fallbacks
- def translate(self, domain, msgid, mapping=None, context=None,
+ def translate(self, domain, msgid, mapping=None, context=None,
target_language=None):
'''See interface ITranslationService'''
if target_language is None:
=== Zope3/src/zope/i18n/negotiator.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/i18n/negotiator.py:1.1.2.1 Mon Dec 23 14:32:51 2002
+++ Zope3/src/zope/i18n/negotiator.py Tue Dec 24 21:21:06 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
=== Zope3/src/zope/i18n/simpletranslationservice.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/i18n/simpletranslationservice.py:1.1.2.2 Tue Dec 24 07:51:26 2002
+++ Zope3/src/zope/i18n/simpletranslationservice.py Tue Dec 24 21:21:06 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""This is a simple implementation of the ITranslationService interface.
@@ -87,7 +87,7 @@
return None
# If the mapping does not exist, make a "raw translation" without
- # interpolation.
+ # interpolation.
if mapping is None:
return text
=== Zope3/src/zope/i18n/translate.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/i18n/translate.py:1.1.2.1 Mon Dec 23 14:32:51 2002
+++ Zope3/src/zope/i18n/translate.py Tue Dec 24 21:21:06 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""