Commit 0be7f57a authored by Claude Paroz's avatar Claude Paroz
Browse files

Merge pull request #1907 from Bouke/tickets/21388 

Fixed #21388 -- Corrected language code for Frisian
parents 5fda9c98 4142d151

django/conf/global_settings.py

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ LANGUAGES = ( 
    ('fa', gettext_noop('Persian')),

    ('fi', gettext_noop('Finnish')),

    ('fr', gettext_noop('French')),

    ('fy-nl', gettext_noop('Frisian')),

    ('fy', gettext_noop('Frisian')),

    ('ga', gettext_noop('Irish')),

    ('gl', gettext_noop('Galician')),

    ('he', gettext_noop('Hebrew')),

django/conf/locale/__init__.py

+3 −3
Original line number Diff line number Diff line
@@ -167,11 +167,11 @@ LANG_INFO = { 
        'name': 'French',

        'name_local': 'français',

    },

    'fy-nl': {

    'fy': {

        'bidi': False,

        'code': 'fy-nl',

        'code': 'fy',

        'name': 'Frisian',

        'name_local': 'Frisian',

        'name_local': 'frysk',

    },

    'ga': {

        'bidi': False,