测试gitnore

2022-05-06 15:45:57 +08:00
parent 12f390949b
commit 51552904f9
2347 changed files with 120102 additions and 53549 deletions
@@ -4,5 +4,5 @@ from django.contrib.sites.models import Site

@admin.register(Site)
 class SiteAdmin(admin.ModelAdmin):
-    list_display = ("domain", "name")
-    search_fields = ("domain", "name")
+    list_display = ('domain', 'name')
+    search_fields = ('domain', 'name')
@@ -8,8 +8,8 @@ from .management import create_default_site


 class SitesConfig(AppConfig):
-    default_auto_field = "django.db.models.AutoField"
-    name = "django.contrib.sites"
+    default_auto_field = 'django.db.models.AutoField'
+    name = 'django.contrib.sites'
    verbose_name = _("Sites")

    def ready(self):
@@ -3,10 +3,11 @@ from django.core.checks import Error


 def check_site_id(app_configs, **kwargs):
-    if hasattr(settings, "SITE_ID") and not isinstance(
-        settings.SITE_ID, (type(None), int)
+    if (
+        hasattr(settings, 'SITE_ID') and
+        not isinstance(settings.SITE_ID, (type(None), int))
    ):
        return [
-            Error("The SITE_ID setting must be an integer", id="sites.E101"),
+            Error('The SITE_ID setting must be an integer', id='sites.E101'),
        ]
    return []
@@ -1,16 +1,15 @@
 # This file is distributed under the same license as the Django package.
 #
 # Translators:
-# Tom Fifield <tom@tomfifield.net>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-17 11:07+0100\n"
-"PO-Revision-Date: 2021-04-11 13:15+0000\n"
-"Last-Translator: Tom Fifield <tom@tomfifield.net>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/django/django/"
-"language/en_AU/)\n"
+"PO-Revision-Date: 2014-10-05 20:11+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: English (Australia) (http://www.transifex.com/projects/p/"
+"django/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,19 +17,19 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 msgid "Sites"
-msgstr "Sites"
+msgstr ""

 msgid "The domain name cannot contain any spaces or tabs."
-msgstr "The domain name cannot contain any spaces or tabs."
+msgstr ""

 msgid "domain name"
-msgstr "domain name"
+msgstr ""

 msgid "display name"
-msgstr "display name"
+msgstr ""

 msgid "site"
-msgstr "site"
+msgstr ""

 msgid "sites"
-msgstr "sites"
+msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 msgid "Sites"
 msgstr "وب‌گاه‌ها"
@@ -15,8 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
-"1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"

 msgid "Sites"
 msgstr "אתרים"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ka\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 msgid "Sites"
 msgstr "საიტები"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: kk\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 msgid "Sites"
 msgstr "Сайттар"
@@ -2,24 +2,23 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011
-# Rohith PR, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-17 11:07+0100\n"
-"PO-Revision-Date: 2021-08-03 10:54+0000\n"
-"Last-Translator: Rohith PR\n"
+"PO-Revision-Date: 2017-09-19 16:40+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Kannada (http://www.transifex.com/django/django/language/"
 "kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: kn\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 msgid "Sites"
-msgstr "ತಾಣಗಳು"
+msgstr ""

 msgid "The domain name cannot contain any spaces or tabs."
 msgstr ""
@@ -18,9 +18,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt\n"
-"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < "
-"11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? "
-"1 : n % 1 != 0 ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"

 msgid "Sites"
 msgstr "Tinklalapiai"
@@ -1,35 +0,0 @@
-# This file is distributed under the same license as the Django package.
-#
-# Translators:
-# Jafry Hisham, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: django\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-17 11:07+0100\n"
-"PO-Revision-Date: 2021-11-16 12:40+0000\n"
-"Last-Translator: Jafry Hisham\n"
-"Language-Team: Malay (http://www.transifex.com/django/django/language/ms/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ms\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-msgid "Sites"
-msgstr "Laman-laman"
-
-msgid "The domain name cannot contain any spaces or tabs."
-msgstr "Nama domain tidak boleh mengandungi ruang kosong atau tab."
-
-msgid "domain name"
-msgstr "nama domain"
-
-msgid "display name"
-msgstr "nama paparan"
-
-msgid "site"
-msgstr "laman"
-
-msgid "sites"
-msgstr "laman-laman"
@@ -2,14 +2,13 @@
 #
 # Translators:
 # Jannis Leidel <jannis@leidel.info>, 2011
-# Sivert Olstad, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-01-17 11:07+0100\n"
-"PO-Revision-Date: 2021-11-11 00:23+0000\n"
-"Last-Translator: Sivert Olstad\n"
+"PO-Revision-Date: 2017-09-19 16:40+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/django/django/"
 "language/nn/)\n"
 "MIME-Version: 1.0\n"
@@ -19,10 +18,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 msgid "Sites"
-msgstr "Nettstader"
+msgstr ""

 msgid "The domain name cannot contain any spaces or tabs."
-msgstr "Domenenamnet kan ikkje innehalde mellomrom."
+msgstr ""

 msgid "domain name"
 msgstr "domenenamn"
@@ -16,8 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n "
-">= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

 msgid "Sites"
 msgstr "Sídla"
@@ -17,10 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
-"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
-"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
-"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

 msgid "Sites"
 msgstr "Сайти"
@@ -8,16 +8,9 @@ from django.core.management.color import no_style
 from django.db import DEFAULT_DB_ALIAS, connections, router


-def create_default_site(
-    app_config,
-    verbosity=2,
-    interactive=True,
-    using=DEFAULT_DB_ALIAS,
-    apps=global_apps,
-    **kwargs,
-):
+def create_default_site(app_config, verbosity=2, interactive=True, using=DEFAULT_DB_ALIAS, apps=global_apps, **kwargs):
    try:
-        Site = apps.get_model("sites", "Site")
+        Site = apps.get_model('sites', 'Site')
    except LookupError:
        return

@@ -32,9 +25,7 @@ def create_default_site(
        # can also crop up outside of tests - see #15346.
        if verbosity >= 2:
            print("Creating example.com Site object")
-        Site(
-            pk=getattr(settings, "SITE_ID", 1), domain="example.com", name="example.com"
-        ).save(using=using)
+        Site(pk=getattr(settings, 'SITE_ID', 1), domain="example.com", name="example.com").save(using=using)

        # We set an explicit pk instead of relying on auto-incrementation,
        # so we need to reset the database sequence. See #17415.
@@ -25,41 +25,36 @@ class CurrentSiteManager(models.Manager):
        except FieldDoesNotExist:
            return [
                checks.Error(
-                    "CurrentSiteManager could not find a field named '%s'."
-                    % field_name,
+                    "CurrentSiteManager could not find a field named '%s'." % field_name,
                    obj=self,
-                    id="sites.E001",
+                    id='sites.E001',
                )
            ]

        if not field.many_to_many and not isinstance(field, (models.ForeignKey)):
            return [
                checks.Error(
-                    "CurrentSiteManager cannot use '%s.%s' as it is not a foreign key "
-                    "or a many-to-many field."
-                    % (self.model._meta.object_name, field_name),
+                    "CurrentSiteManager cannot use '%s.%s' as it is not a foreign key or a many-to-many field." % (
+                        self.model._meta.object_name, field_name
+                    ),
                    obj=self,
-                    id="sites.E002",
+                    id='sites.E002',
                )
            ]

        return []

    def _get_field_name(self):
-        """Return self.__field_name or 'site' or 'sites'."""
+        """ Return self.__field_name or 'site' or 'sites'. """

        if not self.__field_name:
            try:
-                self.model._meta.get_field("site")
+                self.model._meta.get_field('site')
            except FieldDoesNotExist:
-                self.__field_name = "sites"
+                self.__field_name = 'sites'
            else:
-                self.__field_name = "site"
+                self.__field_name = 'site'
        return self.__field_name

    def get_queryset(self):
-        return (
-            super()
-            .get_queryset()
-            .filter(**{self._get_field_name() + "__id": settings.SITE_ID})
-        )
+        return super().get_queryset().filter(**{self._get_field_name() + '__id': settings.SITE_ID})
@@ -9,36 +9,23 @@ class Migration(migrations.Migration):

    operations = [
        migrations.CreateModel(
-            name="Site",
+            name='Site',
            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        verbose_name="ID",
-                        serialize=False,
-                        auto_created=True,
-                        primary_key=True,
-                    ),
-                ),
-                (
-                    "domain",
-                    models.CharField(
-                        max_length=100,
-                        verbose_name="domain name",
-                        validators=[_simple_domain_name_validator],
-                    ),
-                ),
-                ("name", models.CharField(max_length=50, verbose_name="display name")),
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('domain', models.CharField(
+                    max_length=100, verbose_name='domain name', validators=[_simple_domain_name_validator]
+                )),
+                ('name', models.CharField(max_length=50, verbose_name='display name')),
            ],
            options={
-                "ordering": ["domain"],
-                "db_table": "django_site",
-                "verbose_name": "site",
-                "verbose_name_plural": "sites",
+                'ordering': ['domain'],
+                'db_table': 'django_site',
+                'verbose_name': 'site',
+                'verbose_name_plural': 'sites',
            },
            bases=(models.Model,),
            managers=[
-                ("objects", django.contrib.sites.models.SiteManager()),
+                ('objects', django.contrib.sites.models.SiteManager()),
            ],
        ),
    ]
@@ -5,18 +5,16 @@ from django.db import migrations, models
 class Migration(migrations.Migration):

    dependencies = [
-        ("sites", "0001_initial"),
+        ('sites', '0001_initial'),
    ]

    operations = [
        migrations.AlterField(
-            model_name="site",
-            name="domain",
+            model_name='site',
+            name='domain',
            field=models.CharField(
-                max_length=100,
-                unique=True,
-                validators=[django.contrib.sites.models._simple_domain_name_validator],
-                verbose_name="domain name",
+                max_length=100, unique=True, validators=[django.contrib.sites.models._simple_domain_name_validator],
+                verbose_name='domain name'
            ),
        ),
    ]
@@ -18,7 +18,7 @@ def _simple_domain_name_validator(value):
    if any(checks):
        raise ValidationError(
            _("The domain name cannot contain any spaces or tabs."),
-            code="invalid",
+            code='invalid',
        )


@@ -53,15 +53,14 @@ class SiteManager(models.Manager):
        retrieved from the database.
        """
        from django.conf import settings
-
-        if getattr(settings, "SITE_ID", ""):
+        if getattr(settings, 'SITE_ID', ''):
            site_id = settings.SITE_ID
            return self._get_site_by_id(site_id)
        elif request:
            return self._get_site_by_request(request)

        raise ImproperlyConfigured(
-            'You\'re using the Django "sites framework" without having '
+            "You're using the Django \"sites framework\" without having "
            "set the SITE_ID setting. Create a site in your database and "
            "set the SITE_ID setting or pass a request to "
            "Site.objects.get_current() to fix this error."
@@ -79,20 +78,20 @@ class SiteManager(models.Manager):
 class Site(models.Model):

    domain = models.CharField(
-        _("domain name"),
+        _('domain name'),
        max_length=100,
        validators=[_simple_domain_name_validator],
        unique=True,
    )
-    name = models.CharField(_("display name"), max_length=50)
+    name = models.CharField(_('display name'), max_length=50)

    objects = SiteManager()

    class Meta:
-        db_table = "django_site"
-        verbose_name = _("site")
-        verbose_name_plural = _("sites")
-        ordering = ["domain"]
+        db_table = 'django_site'
+        verbose_name = _('site')
+        verbose_name_plural = _('sites')
+        ordering = ['domain']

    def __str__(self):
        return self.domain
@@ -105,8 +104,8 @@ def clear_site_cache(sender, **kwargs):
    """
    Clear the cache (if primed) each time a site is saved or deleted.
    """
-    instance = kwargs["instance"]
-    using = kwargs["using"]
+    instance = kwargs['instance']
+    using = kwargs['using']
    try:
        del SITE_CACHE[instance.pk]
    except KeyError:
@@ -6,7 +6,6 @@ class RequestSite:

    The save() and delete() methods raise NotImplementedError.
    """
-
    def __init__(self, request):
        self.domain = self.name = request.get_host()

@@ -14,7 +13,7 @@ class RequestSite:
        return self.domain

    def save(self, force_insert=False, force_update=False):
-        raise NotImplementedError("RequestSite cannot be saved.")
+        raise NotImplementedError('RequestSite cannot be saved.')

    def delete(self):
-        raise NotImplementedError("RequestSite cannot be deleted.")
+        raise NotImplementedError('RequestSite cannot be deleted.')
@@ -8,11 +8,9 @@ def get_current_site(request):
    """
    # Imports are inside the function because its point is to avoid importing
    # the Site models when django.contrib.sites isn't installed.
-    if apps.is_installed("django.contrib.sites"):
+    if apps.is_installed('django.contrib.sites'):
        from .models import Site
-
        return Site.objects.get_current(request)
    else:
        from .requests import RequestSite
-
        return RequestSite(request)