Django

Code

Show
Ignore:
Timestamp:
07/10/08 15:47:18 (6 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7877].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7852 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7880

  • django/branches/newforms-admin/django/utils/translation/trans_real.py

    r7233 r7881  
    161161 
    162162        res = _translation(globalpath) 
     163 
     164        # We want to ensure that, for example,  "en-gb" and "en-us" don't share 
     165        # the same translation object (thus, merging en-us with a local update 
     166        # doesn't affect en-gb), even though they will both use the core "en" 
     167        # translation. So we have to subvert Python's internal gettext caching. 
     168        base_lang = lambda x: x.split('-', 1)[0] 
     169        if base_lang(lang) in [base_lang(trans) for trans in _translations]: 
     170            res._info = res._info.copy() 
     171            res._catalog = res._catalog.copy() 
    163172 
    164173        def _merge(path):