Django

Code

Changeset 5255

Show
Ignore:
Timestamp:
05/16/07 07:50:27 (2 years ago)
Author:
mtredinnick
Message:

unicode: Renamed no_trans() to the more descriptive deactivate_all(). Added a
verbose_name_raw attribute to the model Options class so that we can more
conveniently access the untranslated model name when we need to.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/unicode/django/contrib/contenttypes/management.py

    r5240 r5255  
    55from django.dispatch import dispatcher 
    66from django.db.models import get_apps, get_models, signals 
    7 from django.utils.translation import activate, no_trans, get_language 
    87from django.utils.encoding import smart_unicode 
    98 
    …… 
    2019                model=opts.object_name.lower()) 
    2120        except ContentType.DoesNotExist: 
    22             lang = get_language() 
    23             no_trans() 
    24             ct = ContentType(name=smart_unicode(opts.verbose_name), 
     21            ct = ContentType(name=smart_unicode(opts.verbose_name_raw), 
    2522                app_label=opts.app_label, model=opts.object_name.lower()) 
    2623            ct.save() 
    27             activate(lang) 
    2824            if verbosity >= 2: 
    2925                print "Adding content type '%s | %s'" % (ct.app_label, ct.model) 

  • django/branches/unicode/django/contrib/contenttypes/models.py

    r5240 r5255  
    11from django.db import models 
    2 from django.utils.translation import ugettext_lazy as _, no_trans, activate, get_language 
     2from django.utils.translation import ugettext_lazy as _ 
    33from django.utils.encoding import smart_unicode 
    44 
    …… 
    1717            # The unicode() is needed around opts.verbose_name because it might 
    1818            # be a django.utils.functional.__proxy__ object. 
    19             lang = get_language() 
    20             no_trans() 
    2119            ct, created = self.model._default_manager.get_or_create(app_label=key[0], 
    22                 model=key[1], defaults={'name': smart_unicode(opts.verbose_name)}) 
     20                model=key[1], defaults={'name': smart_unicode(opts.verbose_name_raw)}) 
    2321            CONTENT_TYPE_CACHE[key] = ct 
    24             activate(lang) 
    2522        return ct 
    2623 

  • django/branches/unicode/django/db/models/options.py

    r5126 r5255  
    66from django.db.models.query import orderlist2sql 
    77from django.db.models import Manager 
     8from django.utils.translation import activate, deactivate_all, get_language 
    89from bisect import bisect 
    910import re 
    …… 
    4243        self.module_name = self.object_name.lower() 
    4344        self.verbose_name = get_verbose_name(self.object_name) 
     45 
     46        # There are a few places where the untranslated verbose name is needed 
     47        # (so that we get the same value regardless of currently active 
     48        # locale). 
     49        lang = get_language() 
     50        deactivate_all() 
     51        self.verbose_name_raw = unicode(self.verbose_name) 
     52        activate(lang) 
     53 
    4454        # Next, apply any overridden values from 'class Meta'. 
    4555        if self.meta: 

  • django/branches/unicode/django/utils/translation/__init__.py

    r5240 r5255  
    99        'get_partial_date_formats', 'check_for_language', 'to_locale', 
    1010        'get_language_from_request', 'install', 'templatize', 'ugettext', 
    11         'ungettext', 'no_trans'] 
     11        'ungettext', 'deactivate_all'] 
    1212 
    1313# Here be dragons, so a short explanation of the logic won't hurt: 
    …… 
    106106    return real_templatize(src) 
    107107 
    108 def no_trans(): 
    109     return real_no_trans() 
     108def deactivate_all(): 
     109    return real_deactivate_all() 
    110110 

  • django/branches/unicode/django/utils/translation/trans_null.py

    r5240 r5255  
    1616string_concat = lambda *strings: ''.join([str(el) for el in strings]) 
    1717activate = lambda x: None 
    18 deactivate = no_trans = install = lambda: None 
     18deactivate = deactivate_all = install = lambda: None 
    1919get_language = lambda: settings.LANGUAGE_CODE 
    2020get_language_bidi = lambda: settings.LANGUAGE_CODE in settings.LANGUAGES_BIDI 

  • django/branches/unicode/django/utils/translation/trans_real.py

    r5240 r5255  
    204204        del _active[currentThread()] 
    205205 
    206 def no_trans(): 
     206def deactivate_all(): 
    207207    """ 
    208208    Makes the active translation object a NullTranslations() instance. This is