Django

Code

Show
Ignore:
Timestamp:
03/13/08 01:14:26 (8 months ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [7232]

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-7120 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-7232
  • django/branches/newforms-admin/django/conf/global_settings.py

    r7121 r7233  
    5353    ('fi', gettext_noop('Finnish')), 
    5454    ('fr', gettext_noop('French')), 
    55     ('ga', gettext_noop('Gaeilge')), 
     55    ('ga', gettext_noop('Irish')), 
    5656    ('gl', gettext_noop('Galician')), 
    5757    ('hu', gettext_noop('Hungarian')), 
     
    6161    ('it', gettext_noop('Italian')), 
    6262    ('ja', gettext_noop('Japanese')), 
     63    ('ka', gettext_noop('Georgian')), 
    6364    ('ko', gettext_noop('Korean')), 
    6465    ('km', gettext_noop('Khmer')), 
     
    9192# to load the internationalization machinery. 
    9293USE_I18N = True 
    93  
    9494LOCALE_PATHS = () 
     95LANGUAGE_COOKIE_NAME = 'django_language' 
    9596 
    9697# Not-necessarily-technical managers of the site. They get broken link