From 6eb70ea8e2e61d20b6832a85ff4928b216f6f78c Mon Sep 17 00:00:00 2001 From: Pavel Zuna Date: Wed, 2 Feb 2011 15:37:14 -0500 Subject: Remove deprecated i18n code from ipalib/request and all references to it. Ticket #903 --- ipalib/request.py | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'ipalib/request.py') diff --git a/ipalib/request.py b/ipalib/request.py index 9a11fb9c3..15b26f598 100644 --- a/ipalib/request.py +++ b/ipalib/request.py @@ -23,8 +23,6 @@ Per-request thread-local data. """ import threading -import locale -import gettext from base import ReadOnly, lock from constants import OVERRIDE_ERROR, CALLABLE_ERROR @@ -58,41 +56,3 @@ def destroy_context(): value.disconnect() context.__dict__.clear() - -def ugettext(message): - if hasattr(context, 'ugettext'): - return context.ugettext(message) - return message.decode('UTF-8') - - -def ungettext(singular, plural, n): - if hasattr(context, 'ungettext'): - return context.ungettext(singular, plural, n) - if n == 1: - return singular.decode('UTF-8') - return plural.decode('UTF-8') - - -def set_languages(*languages): - if hasattr(context, 'languages'): - raise StandardError(OVERRIDE_ERROR % - ('context', 'languages', context.languages, languages) - ) - if len(languages) == 0: - languages = locale.getdefaultlocale()[:1] - context.languages = languages - assert type(context.languages) is tuple - - -def create_translation(domain, localedir, *languages): - if hasattr(context, 'ugettext') or hasattr(context, 'ungettext'): - raise StandardError( - 'create_translation() already called in thread %r' % - threading.currentThread().getName() - ) - set_languages(*languages) - translation = gettext.translation(domain, - localedir=localedir, languages=context.languages, fallback=True - ) - context.ugettext = translation.ugettext - context.ungettext = translation.ungettext -- cgit