Skip to content

Commit 9eb59e9

Browse files
author
J. David Ibanez
committed
Remove some obsolete code (see release notes)
1 parent 5b54188 commit 9eb59e9

6 files changed

+50
-18
lines changed

LocalContent.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
from Globals import InitializeClass, MessageDialog
3535

3636
# Import from Localizer
37+
from LocalAttributes import LocalAttribute
3738
from LocalFiles import LocalDTMLFile
38-
from LocalPropertyManager import LocalPropertyManager, LocalProperty
39+
from LocalPropertyManager import LocalPropertyManager
3940
from utils import _
4041

4142

@@ -70,8 +71,8 @@ class LocalContent(CatalogAware, LocalPropertyManager, PropertyManager,
7071

7172
_properties = ()
7273

73-
title = LocalProperty('title') # Override title from SimpleItem
74-
body = LocalProperty('body')
74+
title = LocalAttribute('title') # Override title from SimpleItem
75+
body = LocalAttribute('body')
7576

7677

7778
def manage_options(self):

LocalFiles.py

-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ def __init__(self, name, _prefix=None, **kw):
4545
def _exec(self, bound_data, args, kw):
4646
# Add our gettext first
4747
bound_data['gettext'] = self.gettext
48-
bound_data['ugettext'] = self.gettext # XXX backwards compatibility
4948
return apply(LocalDTMLFile.inheritedAttribute('_exec'),
5049
(self, bound_data, args, kw))
5150

@@ -71,7 +70,6 @@ def __init__(self, name, _prefix=None, **kw):
7170
def _exec(self, bound_data, args, kw):
7271
# Add our gettext first
7372
bound_data['gettext'] = self.gettext
74-
bound_data['ugettext'] = self.gettext # XXX backwards compatibility
7573
return apply(LocalPageTemplateFile.inheritedAttribute('_exec'),
7674
(self, bound_data, args, kw))
7775

LocalPropertyManager.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def set_localproperty(self, id, type, lang=None, value=None):
131131
"""Adds a new local property"""
132132
if not self.hasLocalProperty(id):
133133
self._local_properties_metadata += ({'id': id, 'type': type},)
134-
setattr(self, id, LocalProperty(id))
134+
setattr(self, id, LocalAttribute(id))
135135

136136
if lang is not None:
137137
self.set_localpropvalue(id, lang, value)
@@ -156,13 +156,6 @@ def del_localproperty(self, id):
156156
pass
157157

158158

159-
# XXX Backwards compatibility
160-
_setLocalPropValue = set_localpropvalue
161-
_setLocalProperty = set_localproperty
162-
_delLocalProperty = del_localproperty
163-
164-
165-
166159
security.declareProtected('Manage properties', 'manage_addLocalProperty')
167160
def manage_addLocalProperty(self, id, type, REQUEST=None, RESPONSE=None):
168161
"""Adds a new local property"""
@@ -257,9 +250,6 @@ def getLocalAttribute(self, id, lang=None):
257250
return ''
258251
return value
259252

260-
# XXX For backwards compatibility (<= 0.8.0)
261-
getLocalProperty = getLocalAttribute
262-
263253

264254
# Languages logic
265255
security.declarePublic('get_available_languages')

README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Requirements
99

1010
- Python 2.5.2 or later
1111

12-
- Zope 2.12 or later
12+
- Zope 2.12.0 or later
1313

1414
- itools 0.50.6 or later (download from
1515
"http://www.hforge.org/itools":http://www.hforge.org/itools)

RELEASE-1.3.0

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
Localizer 1.3.0 (2009/XX/XX)
2+
============================
3+
4+
Localizer is a Zope product for developers and web masters. Localizer
5+
solves the problem of building multilingual products and web sites,
6+
ranging from internationalization and localization of the user
7+
interface to management of multilingual content.
8+
9+
What is new?
10+
------------
11+
12+
Upgraded to Zope 2.12, Python 2.5 and itools 0.50 (previous versions are
13+
not supported).
14+
15+
Some API obsolete since at least 2004 has been removed:
16+
17+
- The 'ugettext' function has been removed from DTML and ZPT templates,
18+
use instead 'gettext'.
19+
20+
- Four methods from the 'LocalPropertyManger' class have been removed:
21+
22+
_setLocalPropValue => set_localpropvalue
23+
_setLocalProperty => set_localproperty
24+
_delLocalProperty => del_localproperty
25+
getLocalProperty => getLocalAttribute
26+
27+
28+
Resources
29+
---------
30+
31+
Download
32+
http://download.hforge.org/localizer/Localizer-1.3.0.tar.gz
33+
http://download.hforge.org/itools/0.50/itools-0.50.7.tar.gz
34+
35+
Home
36+
http://www.localizer.org/
37+
38+
Mailing list
39+
http://www.hforge.org/community
40+
http://archives.hforge.org/index.cgi?list=localizer
41+
42+
Bug Tracker
43+
http://bugs.hforge.org/

zgettext.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def create_mo_files():
5656
system('msgfmt locale/%s.po -o locale/%s.mo' % (language, language))
5757

5858

59-
def parse_generic(text, commands=('gettext', 'ugettext')):
59+
def parse_generic(text, commands=('gettext',)):
6060
"""Search for patterns like: gettext('message').
6161
6262
XXX

0 commit comments

Comments
 (0)