Commit f27a4ee3 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Removed django.contrib.localflavor. 

Each localflavor lives on as a separate app.
parent b2d20e98

.tx/config

+0 −5
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ file_filter = django/contrib/humanize/locale/<lang>/LC_MESSAGES/django.po 
source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po

source_lang = en



[django.contrib-localflavor]

file_filter = django/contrib/localflavor/locale/<lang>/LC_MESSAGES/django.po

source_file = django/contrib/localflavor/locale/en/LC_MESSAGES/django.po

source_lang = en



[django.contrib-messages]

file_filter = django/contrib/messages/locale/<lang>/LC_MESSAGES/django.po

source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po

django/contrib/gis/tests/relatedapp/models.py

+1 −2
Original line number Diff line number Diff line 
from django.contrib.gis.db import models

from django.contrib.localflavor.us.models import USStateField

from django.utils.encoding import python_2_unicode_compatible



@python_2_unicode_compatible
@@ -11,7 +10,7 @@ class Location(models.Model): 
@python_2_unicode_compatible

class City(models.Model):

    name = models.CharField(max_length=50)

    state = USStateField()

    state = models.CharField(max_length=2)

    location = models.ForeignKey(Location)

    objects = models.GeoManager()

    def __str__(self): return self.name

django/contrib/gis/utils/layermapping.py

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ from django.contrib.gis.gdal import (CoordTransform, DataSource, 
from django.contrib.gis.gdal.field import (

    OFTDate, OFTDateTime, OFTInteger, OFTReal, OFTString, OFTTime)

from django.db import models, transaction

from django.contrib.localflavor.us.models import USStateField

from django.utils import six

from django.utils.encoding import force_text
@@ -55,7 +54,6 @@ class LayerMapping(object): 
        models.SlugField : OFTString,

        models.TextField : OFTString,

        models.URLField : OFTString,

        USStateField : OFTString,

        models.BigIntegerField : (OFTInteger, OFTReal, OFTString),

        models.SmallIntegerField : (OFTInteger, OFTReal, OFTString),

        models.PositiveSmallIntegerField : (OFTInteger, OFTReal, OFTString),

django/contrib/localflavor/__init__.py

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
import warnings

warnings.warn("django.contrib.localflavor is deprecated. Use the separate django-localflavor-* packages instead.", DeprecationWarning)

django/contrib/localflavor/ar/__init__.py

deleted100644 → 0
+0 −0

Empty file deleted.