diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f2116902ef..6c43c1c99a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,12 +1,12 @@ -# Trac ticket number +#### Trac ticket number ticket-XXXXX -# Branch description +#### Branch description Provide a concise overview of the issue or rationale behind the proposed changes. -# Checklist +#### Checklist - [ ] This PR targets the `main` branch. - [ ] The commit message is written in past tense, mentions the ticket number, and ends with a period. - [ ] I have checked the "Has patch" ticket flag in the Trac system. diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 27cac36b23..0d5ec23550 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -17,6 +17,11 @@ jobs: with: repository: django/django-asv path: "." + - name: Setup Miniforge + uses: conda-incubator/setup-miniconda@v3 + with: + miniforge-version: "24.1.2-0" + activate-environment: asv-bench - name: Install Requirements run: pip install -r requirements.txt - name: Cache Django diff --git a/.github/workflows/data/test_postgres.py.tpl b/.github/workflows/data/test_postgres.py.tpl index e121946d3f..15dfa0d62e 100644 --- a/.github/workflows/data/test_postgres.py.tpl +++ b/.github/workflows/data/test_postgres.py.tpl @@ -1,3 +1,4 @@ +import os from test_sqlite import * # NOQA DATABASES = { @@ -8,6 +9,9 @@ DATABASES = { "PASSWORD": "postgres", "HOST": "localhost", "PORT": 5432, + "OPTIONS": { + "server_side_binding": os.getenv("SERVER_SIDE_BINDING") == "1", + }, }, "other": { "ENGINE": "django.db.backends.postgresql", diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9b88b9be93..f61692ef79 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -30,7 +30,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' cache: 'pip' cache-dependency-path: 'docs/requirements.txt' - run: python -m pip install -r docs/requirements.txt @@ -48,7 +48,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - run: python -m pip install blacken-docs - name: Build docs run: | diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 3875e755f9..7c64dc98ff 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -27,7 +27,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - run: python -m pip install flake8 - name: flake8 # Pinned to v3.0.0. @@ -44,7 +44,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - run: python -m pip install isort - name: isort # Pinned to v3.0.0. diff --git a/.github/workflows/python_matrix.yml b/.github/workflows/python_matrix.yml new file mode 100644 index 0000000000..ab48c2be83 --- /dev/null +++ b/.github/workflows/python_matrix.yml @@ -0,0 +1,52 @@ +name: Python Matrix from config file + +on: + pull_request: + types: [labeled, synchronize, opened, reopened] + paths-ignore: + - 'docs/**' + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +permissions: + contents: read + +jobs: + define-matrix: + if: contains(github.event.pull_request.labels.*.name, 'python-matrix') + runs-on: ubuntu-latest + outputs: + python_versions_output: ${{ steps.set-matrix.outputs.python_versions }} + steps: + - name: Checkout code + uses: actions/checkout@v4 + - id: set-matrix + run: | + python_versions=$(sed -n "s/^.*Programming Language :: Python :: \([[:digit:]]\+\.[[:digit:]]\+\).*$/'\1', /p" pyproject.toml | tr -d '\n' | sed 's/, $//g') + echo "Supported Python versions: $python_versions" + echo "python_versions=[$python_versions]" >> "$GITHUB_OUTPUT" + python: + runs-on: ubuntu-latest + needs: define-matrix + strategy: + matrix: + python-version: ${{ fromJson(needs.define-matrix.outputs.python_versions_output) }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + cache: 'pip' + cache-dependency-path: 'tests/requirements/py3.txt' + - name: Install libmemcached-dev for pylibmc + run: sudo apt-get install libmemcached-dev + - name: Install and upgrade packaging tools + run: python -m pip install --upgrade pip setuptools wheel + - run: python -m pip install -r tests/requirements/py3.txt -e . + - name: Run tests + run: python tests/runtests.py -v2 diff --git a/.github/workflows/reminders_check.yml b/.github/workflows/reminders_check.yml deleted file mode 100644 index 6b5ef92367..0000000000 --- a/.github/workflows/reminders_check.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Check reminders - -on: - schedule: - - cron: '0 * * * *' # At the start of every hour - workflow_dispatch: - -permissions: - contents: read - pull-requests: write - -jobs: - reminders: - runs-on: ubuntu-latest - steps: - - name: Check reminders and notify users - uses: agrc/reminder-action@e59091b4e9705a6108120cb50823108df35b5392 diff --git a/.github/workflows/reminders_create.yml b/.github/workflows/reminders_create.yml deleted file mode 100644 index 97059e507b..0000000000 --- a/.github/workflows/reminders_create.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Create reminders - -on: - issue_comment: - types: [created, edited] - workflow_dispatch: - -permissions: - contents: read - pull-requests: write - -jobs: - reminders: - runs-on: ubuntu-latest - steps: - - name: Check comments and create reminders - uses: agrc/create-reminder-action@922893a5705067719c4c4751843962f56aabf5eb diff --git a/.github/workflows/schedule_tests.yml b/.github/workflows/schedule_tests.yml index 8b1f01ad86..f99ef218aa 100644 --- a/.github/workflows/schedule_tests.yml +++ b/.github/workflows/schedule_tests.yml @@ -19,7 +19,7 @@ jobs: - '3.10' - '3.11' - '3.12' - - '3.13-dev' + - '3.13' name: Windows, SQLite, Python ${{ matrix.python-version }} continue-on-error: true steps: @@ -46,7 +46,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' cache: 'pip' - name: Install libmemcached-dev for pylibmc run: sudo apt-get install libmemcached-dev @@ -145,7 +145,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' cache: 'pip' cache-dependency-path: 'tests/requirements/py3.txt' - name: Install libmemcached-dev for pylibmc @@ -181,7 +181,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' cache: 'pip' cache-dependency-path: 'tests/requirements/py3.txt' - name: Install libmemcached-dev for pylibmc @@ -195,3 +195,47 @@ jobs: working-directory: ./tests/ run: | python -Wall runtests.py --verbosity 2 --noinput --selenium=chrome --headless --settings=test_postgres --parallel 2 + + postgresql: + strategy: + fail-fast: false + matrix: + version: [16, 17] + server_side_bindings: [0, 1] + runs-on: ubuntu-latest + name: PostgreSQL Versions + env: + SERVER_SIDE_BINDING: ${{ matrix.server_side_bindings }} + services: + postgres: + image: postgres:${{ matrix.version }}-alpine + env: + POSTGRES_DB: django + POSTGRES_USER: user + POSTGRES_PASSWORD: postgres + ports: + - 5432:5432 + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.13' + cache: 'pip' + cache-dependency-path: 'tests/requirements/py3.txt' + - name: Install libmemcached-dev for pylibmc + run: sudo apt-get install libmemcached-dev + - name: Install and upgrade packaging tools + run: python -m pip install --upgrade pip setuptools wheel + - run: python -m pip install -r tests/requirements/py3.txt -r tests/requirements/postgres.txt -e . + - name: Create PostgreSQL settings file + run: mv ./.github/workflows/data/test_postgres.py.tpl ./tests/test_postgres.py + - name: Run tests + working-directory: ./tests/ + run: python -Wall runtests.py --settings=test_postgres --verbosity=2 diff --git a/.github/workflows/selenium.yml b/.github/workflows/selenium.yml index 7e46e0cfb1..14a95f3b66 100644 --- a/.github/workflows/selenium.yml +++ b/.github/workflows/selenium.yml @@ -24,7 +24,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' cache: 'pip' cache-dependency-path: 'tests/requirements/py3.txt' - name: Install libmemcached-dev for pylibmc @@ -61,7 +61,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' cache: 'pip' cache-dependency-path: 'tests/requirements/py3.txt' - name: Install libmemcached-dev for pylibmc diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index abe7c78a25..5de554721d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: python-version: - - '3.12' + - '3.13' name: Windows, SQLite, Python ${{ matrix.python-version }} steps: - name: Checkout diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d1c74a66c8..5f20568b34 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,15 +1,15 @@ repos: - repo: https://github.com/psf/black-pre-commit-mirror - rev: 24.2.0 + rev: 24.10.0 hooks: - id: black exclude: \.py-tpl$ - repo: https://github.com/adamchainz/blacken-docs - rev: 1.16.0 + rev: 1.19.0 hooks: - id: blacken-docs additional_dependencies: - - black==24.2.0 + - black==24.10.0 files: 'docs/.*\.txt$' args: ["--rst-literal-block"] - repo: https://github.com/PyCQA/isort @@ -17,10 +17,10 @@ repos: hooks: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 7.0.0 + rev: 7.1.1 hooks: - id: flake8 - repo: https://github.com/pre-commit/mirrors-eslint - rev: v9.2.0 + rev: v9.12.0 hooks: - id: eslint diff --git a/AUTHORS b/AUTHORS index d394290728..573a030ea1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -68,7 +68,7 @@ answer newbie questions, and generally made Django that much better: Aljaž Košir Aljosa Mohorovic Alokik Vijay - Amir Karimi + Amir Karimi Amit Chakradeo Amit Ramon Amit Upadhyay @@ -110,8 +110,10 @@ answer newbie questions, and generally made Django that much better: Anubhav Joshi Anvesh Mishra Anže Pečar + A. Rafey Khan Aram Dulyan arien + Arjun Omray Armin Ronacher Aron Podrigal Arsalan Ghassemi @@ -152,6 +154,7 @@ answer newbie questions, and generally made Django that much better: Ben Lomax Ben Slavin Ben Sturmfels + Bendegúz Csirmaz Berker Peksag Bernd Schlapsi Bernhard Essl @@ -495,6 +498,7 @@ answer newbie questions, and generally made Django that much better: Jeremy Carbaugh Jeremy Dunck Jeremy Lainé + Jeremy Thompson Jerin Peter George Jesse Young Jezeniel Zapanta @@ -621,6 +625,7 @@ answer newbie questions, and generally made Django that much better: Lowe Thiderman Luan Pablo Lucas Connors + Lucas Esposito Luciano Ramalho Lucidiot Ludvig Ericson diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 8e1d2ace09..f4535acb09 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -43,8 +43,10 @@ TIME_ZONE = "America/Chicago" # If you set this to True, Django will use timezone-aware datetimes. USE_TZ = True -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html +# Language code for this installation. Valid choices can be found here: +# https://www.iana.org/assignments/language-subtag-registry/ +# If LANGUAGE_CODE is not listed in LANGUAGES (below), the project must +# provide the necessary translations and locale definitions. LANGUAGE_CODE = "en-us" # Languages we provide translations for, out of the box. diff --git a/django/conf/locale/az/LC_MESSAGES/django.mo b/django/conf/locale/az/LC_MESSAGES/django.mo index f24150dc82..441b0ca0c9 100644 Binary files a/django/conf/locale/az/LC_MESSAGES/django.mo and b/django/conf/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/az/LC_MESSAGES/django.po b/django/conf/locale/az/LC_MESSAGES/django.po index 2e25c04597..72734bb6fa 100644 --- a/django/conf/locale/az/LC_MESSAGES/django.po +++ b/django/conf/locale/az/LC_MESSAGES/django.po @@ -5,14 +5,16 @@ # Emin Mastizada , 2015-2016 # Metin Amiroff , 2011 # Nicat Məmmədov , 2022 +# Nijat Mammadov, 2024 +# Sevdimali , 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-17 05:23-0500\n" -"PO-Revision-Date: 2022-07-25 06:49+0000\n" -"Last-Translator: Nicat Məmmədov , 2022\n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Sevdimali , 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,55 +26,58 @@ msgid "Afrikaans" msgstr "Afrikaans" msgid "Arabic" -msgstr "Ərəbcə" +msgstr "Ərəb" msgid "Algerian Arabic" msgstr "Əlcəzair Ərəbcəsi" msgid "Asturian" -msgstr "Asturiyaca" +msgstr "Asturiya" msgid "Azerbaijani" -msgstr "Azərbaycanca" +msgstr "Azərbaycan" msgid "Bulgarian" -msgstr "Bolqarca" +msgstr "Bolqar" msgid "Belarusian" -msgstr "Belarusca" +msgstr "Belarus" msgid "Bengali" -msgstr "Benqalca" +msgstr "Benqal" msgid "Breton" -msgstr "Bretonca" +msgstr "Breton" msgid "Bosnian" -msgstr "Bosniyaca" +msgstr "Bosniya" msgid "Catalan" -msgstr "Katalanca" +msgstr "Katalon" + +msgid "Central Kurdish (Sorani)" +msgstr "Mərkəzi Kürd dili (Sorani)" msgid "Czech" -msgstr "Çexcə" +msgstr "Çex" msgid "Welsh" -msgstr "Uelscə" +msgstr "Uels" msgid "Danish" -msgstr "Danimarkaca" +msgstr "Danimarka" msgid "German" -msgstr "Almanca" +msgstr "Alman" msgid "Lower Sorbian" -msgstr "Aşağı Sorbca" +msgstr "Aşağı Sorb" msgid "Greek" -msgstr "Yunanca" +msgstr "Yunan" msgid "English" -msgstr "İngiliscə" +msgstr "İngilis" msgid "Australian English" msgstr "Avstraliya İngiliscəsi" @@ -84,7 +89,7 @@ msgid "Esperanto" msgstr "Esperanto" msgid "Spanish" -msgstr "İspanca" +msgstr "İspan" msgid "Argentinian Spanish" msgstr "Argentina İspancası" @@ -102,73 +107,73 @@ msgid "Venezuelan Spanish" msgstr "Venesuela İspancası" msgid "Estonian" -msgstr "Estonca" +msgstr "Eston" msgid "Basque" -msgstr "Baskca" +msgstr "Bask" msgid "Persian" -msgstr "Farsca" +msgstr "Fars" msgid "Finnish" -msgstr "Fincə" +msgstr "Fin" msgid "French" -msgstr "Fransızca" +msgstr "Fransız" msgid "Frisian" -msgstr "Friscə" +msgstr "Fris" msgid "Irish" -msgstr "İrlandca" +msgstr "İrland" msgid "Scottish Gaelic" msgstr "Şotland Keltcəsi" msgid "Galician" -msgstr "Qallik dili" +msgstr "Qalisiya" msgid "Hebrew" -msgstr "İbranicə" +msgstr "İvrit" msgid "Hindi" -msgstr "Hindcə" +msgstr "Hind" msgid "Croatian" -msgstr "Xorvatca" +msgstr "Xorvat" msgid "Upper Sorbian" -msgstr "Üst Sorbca" +msgstr "Yuxarı Sorb" msgid "Hungarian" -msgstr "Macarca" +msgstr "Macar" msgid "Armenian" -msgstr "Ermənicə" +msgstr "Erməni" msgid "Interlingua" msgstr "İnterlinqua" msgid "Indonesian" -msgstr "İndonezcə" +msgstr "İndoneziya dili" msgid "Igbo" -msgstr "İqbo dili" +msgstr "İqbo" msgid "Ido" -msgstr "İdoca" +msgstr "İdo" msgid "Icelandic" -msgstr "İslandca" +msgstr "İsland" msgid "Italian" -msgstr "İtalyanca" +msgstr "İtalyan" msgid "Japanese" -msgstr "Yaponca" +msgstr "Yapon" msgid "Georgian" -msgstr "Gürcücə" +msgstr "Gürcü" msgid "Kabyle" msgstr "Kabile" @@ -177,43 +182,43 @@ msgid "Kazakh" msgstr "Qazax" msgid "Khmer" -msgstr "Kxmercə" +msgstr "Xmer" msgid "Kannada" -msgstr "Kannada dili" +msgstr "Kannada" msgid "Korean" -msgstr "Koreyca" +msgstr "Koreya" msgid "Kyrgyz" msgstr "Qırğız" msgid "Luxembourgish" -msgstr "Lüksemburqca" +msgstr "Lüksemburq" msgid "Lithuanian" -msgstr "Litva dili" +msgstr "Litva" msgid "Latvian" -msgstr "Latviya dili" +msgstr "Latış" msgid "Macedonian" -msgstr "Makedonca" +msgstr "Makedon" msgid "Malayalam" -msgstr "Malayamca" +msgstr "Malayam" msgid "Mongolian" -msgstr "Monqolca" +msgstr "Monqol" msgid "Marathi" -msgstr "Marathicə" +msgstr "Marathi" msgid "Malay" msgstr "Malay" msgid "Burmese" -msgstr "Burmescə" +msgstr "Birman" msgid "Norwegian Bokmål" msgstr "Norveç Bukmolcası" @@ -222,94 +227,97 @@ msgid "Nepali" msgstr "Nepal" msgid "Dutch" -msgstr "Flamandca" +msgstr "Niderland" msgid "Norwegian Nynorsk" -msgstr "Nynorsk Norveçcəsi" +msgstr "Norveç Nyunorskcası" msgid "Ossetic" -msgstr "Osetincə" +msgstr "Osetin" msgid "Punjabi" -msgstr "Pancabicə" +msgstr "Pəncab" msgid "Polish" -msgstr "Polyakca" +msgstr "Polyak" msgid "Portuguese" -msgstr "Portuqalca" +msgstr "Portuqal" msgid "Brazilian Portuguese" msgstr "Braziliya Portuqalcası" msgid "Romanian" -msgstr "Rumınca" +msgstr "Rumın" msgid "Russian" -msgstr "Rusca" +msgstr "Rus" msgid "Slovak" -msgstr "Slovakca" +msgstr "Slovak" msgid "Slovenian" -msgstr "Slovencə" +msgstr "Sloven" msgid "Albanian" -msgstr "Albanca" +msgstr "Alban" msgid "Serbian" -msgstr "Serbcə" +msgstr "Serb" msgid "Serbian Latin" -msgstr "Serbcə Latın" +msgstr "Serb (Latın)" msgid "Swedish" -msgstr "İsveçcə" +msgstr "İsveç" msgid "Swahili" msgstr "Suahili" msgid "Tamil" -msgstr "Tamilcə" +msgstr "Tamil" msgid "Telugu" -msgstr "Teluqu dili" +msgstr "Teluqu" msgid "Tajik" msgstr "Tacik" msgid "Thai" -msgstr "Tayca" +msgstr "Tay" msgid "Turkmen" msgstr "Türkmən" msgid "Turkish" -msgstr "Türkcə" +msgstr "Türk" msgid "Tatar" msgstr "Tatar" msgid "Udmurt" -msgstr "Udmurtca" +msgstr "Udmurt" + +msgid "Uyghur" +msgstr "Uyğur" msgid "Ukrainian" -msgstr "Ukraynaca" +msgstr "Ukrayn" msgid "Urdu" -msgstr "Urduca" +msgstr "Urdu" msgid "Uzbek" -msgstr "Özbəkcə" +msgstr "Özbək" msgid "Vietnamese" -msgstr "Vyetnamca" +msgstr "Vyetnam" msgid "Simplified Chinese" -msgstr "Sadələşdirilmiş Çincə" +msgstr "Sadələşdirilmiş Çin dili" msgid "Traditional Chinese" -msgstr "Ənənəvi Çincə" +msgstr "Ənənəvi Çin dili" msgid "Messages" msgstr "Mesajlar" @@ -335,10 +343,13 @@ msgid "That page number is less than 1" msgstr "Səhifə nömrəsi 1-dən balacadır" msgid "That page contains no results" -msgstr "Səhifədə nəticə yoxdur" +msgstr "O səhifədə nəticə yoxdur" msgid "Enter a valid value." -msgstr "Düzgün qiymət daxil edin." +msgstr "Düzgün dəyər daxil edin." + +msgid "Enter a valid domain name." +msgstr "Düzgün domen adı daxil edin." msgid "Enter a valid URL." msgstr "Düzgün URL daxil edin." @@ -363,35 +374,52 @@ msgstr "" "Unicode hərflərdən, rəqəmlərdən, alt-xətlərdən və ya defislərdən ibarət " "düzgün qısaltma (“slug”) daxil edin." -msgid "Enter a valid IPv4 address." -msgstr "Düzgün IPv4 ünvanı daxil edin." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Düzgün %(protocol)s adres daxil edin." -msgid "Enter a valid IPv6 address." -msgstr "Düzgün IPv6 ünvanını daxil edin." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Düzgün IPv4 və ya IPv6 ünvanını daxil edin." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 və ya IPv6" msgid "Enter only digits separated by commas." msgstr "Vergüllə ayırmaqla yalnız rəqəmlər daxil edin." #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." -msgstr "Əmin edin ki, bu qiymət %(limit_value)s-dir (bu %(show_value)s-dir)." +msgstr "" +"Əmin olun ki, bu dəyər %(limit_value)s-dir/dır (bu %(show_value)s-dir/dır)." #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" -"Bu qiymətin %(limit_value)s-ya bərabər və ya ondan kiçik olduğunu yoxlayın." +"Bu qiymətin %(limit_value)s-(y)a/ə bərabər və ya ondan kiçik olduğunu " +"yoxlayın." #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" -"Bu qiymətin %(limit_value)s-ya bərabər və ya ondan böyük olduğunu yoxlayın." +"Bu qiymətin %(limit_value)s-(y)a/ə bərabər və ya ondan böyük olduğunu " +"yoxlayın." #, python-format msgid "Ensure this value is a multiple of step size %(limit_value)s." msgstr "" +"Bu dəyərin %(limit_value)s addım ölçüsünün mərtəbələri olduğundan əmin olun." + +#, python-format +msgid "" +"Ensure this value is a multiple of step size %(limit_value)s, starting from " +"%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." +msgstr "" +"Bu dəyərin %(offset)s dəyərindən başlayaraq %(limit_value)s addım ölçüsü " +"mərtəbəsi olduğundan əmin olun. Məs: %(offset)s, %(valid_value1)s, " +"%(valid_value2)s və s." #, python-format msgid "" @@ -402,10 +430,10 @@ msgid_plural "" "%(show_value)d)." msgstr[0] "" "Bu dəyərin ən az %(limit_value)d simvol olduğuna əmin olun (%(show_value)d " -"var)" +"simvol var)" msgstr[1] "" "Bu dəyərin ən az %(limit_value)d simvol olduğuna əmin olun (%(show_value)d " -"var)" +"simvol var)" #, python-format msgid "" @@ -416,10 +444,10 @@ msgid_plural "" "%(show_value)d)." msgstr[0] "" "Bu dəyərin ən çox %(limit_value)d simvol olduğuna əmin olun (%(show_value)d " -"var)" +"simvol var)" msgstr[1] "" "Bu dəyərin ən çox %(limit_value)d simvol olduğuna əmin olun (%(show_value)d " -"var)" +"simvol var)" msgid "Enter a number." msgstr "Ədəd daxil edin." @@ -464,7 +492,7 @@ msgstr "%(field_labels)s ilə %(model_name)s artıq mövcuddur." #, python-format msgid "Constraint “%(name)s” is violated." -msgstr "" +msgstr "“%(name)s” məhdudiyyəti pozuldu." #, python-format msgid "Value %(value)r is not a valid choice." @@ -495,7 +523,7 @@ msgstr "Sahənin tipi: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "“%(value)s” dəyəri True və ya False olmalıdır." +msgstr "“%(value)s” dəyəri ya True, ya da False olmalıdır." #, python-format msgid "“%(value)s” value must be either True, False, or None." @@ -508,6 +536,9 @@ msgstr "Bul (ya Doğru, ya Yalan)" msgid "String (up to %(max_length)s)" msgstr "Sətir (%(max_length)s simvola kimi)" +msgid "String (unlimited)" +msgstr "Sətir (limitsiz)" + msgid "Comma-separated integers" msgstr "Vergüllə ayrılmış tam ədədlər" @@ -523,7 +554,7 @@ msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" -"“%(value)s” dəyəri düzgün formatdadır (YYYY-MM-DD) amma bu tarix xətalıdır." +"“%(value)s” dəyəri düzgün formatdadır (YYYY-MM-DD), amma bu tarix xətalıdır." msgid "Date (without time)" msgstr "Tarix (saatsız)" @@ -602,7 +633,7 @@ msgid "“%(value)s” value must be either None, True or False." msgstr "“%(value)s” dəyəri None, True və ya False olmalıdır." msgid "Boolean (Either True, False or None)" -msgstr "Bul (Ya Doğru, ya Yalan, ya da Heç nə)" +msgstr "Bul (Ya True, ya False, ya da None)" msgid "Positive big integer" msgstr "Müsbət böyük rəqəm" @@ -661,7 +692,7 @@ msgid "A JSON object" msgstr "JSON obyekti" msgid "Value must be valid JSON." -msgstr "Dəyər etibarlı JSON olmalıdır." +msgstr "Dəyər düzgün JSON olmalıdır." #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." @@ -770,6 +801,9 @@ msgid "" "ManagementForm data is missing or has been tampered with. Missing fields: " "%(field_names)s. You may need to file a bug report if the issue persists." msgstr "" +"ManagementForm datası ya əskikdir, ya da dəyişdirilib. Çatışmayan xanalar: " +"%(field_names)s. Problem davam edərsə, səhv hesabatı təqdim etməli ola " +"bilərsiniz." #, python-format msgid "Please submit at most %(num)d form." @@ -826,7 +860,7 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" "%(datetime)s vaxtı %(current_timezone)s zaman qurşağında ifadə oluna bilmir; " -"ya duallıq, ya da mövcud olmaya bilər." +"ya qeyri-müəyyənlik, ya da mövcud olmaya bilər." msgid "Clear" msgstr "Təmizlə" @@ -877,16 +911,16 @@ msgid "%s PB" msgstr "%s PB" msgid "p.m." -msgstr "p.m." +msgstr "g.s." msgid "a.m." -msgstr "a.m." +msgstr "g.ə." msgid "PM" -msgstr "PM" +msgstr "GS" msgid "AM" -msgstr "AM" +msgstr "GƏ" msgid "midnight" msgstr "gecə yarısı" @@ -1042,7 +1076,7 @@ msgstr "Avq." msgctxt "abbrev. month" msgid "Sept." -msgstr "Sent." +msgstr "Sen." msgctxt "abbrev. month" msgid "Oct." @@ -1167,6 +1201,10 @@ msgid "" "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Bu mesajı ona görə görürsünüz ki, bu HTTPS saytı sizin səyyah tərəfindən " +"“Referer header”in göndərilməsini tələb etdiyi halda heç nə " +"göndərilməmişdir. Bu başlıq sizin veb-səyyahınızın kənar şəxlər tərəfindən " +"ələ keçirilmədiyindən əmin olmaq üçün tələb olunur." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" @@ -1181,14 +1219,14 @@ msgid "" "If you are using the tag or " "including the “Referrer-Policy: no-referrer” header, please remove them. The " "CSRF protection requires the “Referer” header to do strict referer checking. " -"If you’re concerned about privacy, use alternatives like for links to third-party sites." +"If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" "Əgər etiketini və ya " "“Referrer-Policy: no-referrer” başlığını işlədirsinizsə, lütfən silin. CSRF " "qoruma dəqiq yönləndirən yoxlaması üçün “Referer” başlığını tələb edir. Əgər " -"məxfilik üçün düşünürsünüzsə, üçüncü tərəf sayt keçidləri üçün kimi bir alternativ işlədin." +"məxfilik üçün düşünürsünüzsə, üçüncü tərəf sayt keçidləri üçün kimi bir alternativ işlədin." msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1249,7 +1287,7 @@ msgstr "Səhifə həm “axırıncı” deyil, həm də tam ədədə çevrilə b #, python-format msgid "Invalid page (%(page_number)s): %(message)s" -msgstr "Qeyri-düzgün səhifə (%(page_number)s): %(message)s" +msgstr "Yanlış səhifə (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." @@ -1281,16 +1319,17 @@ msgstr "" #, python-format msgid "" "You are seeing this page because DEBUG=True is in your settings file and you have not configured any " -"URLs." +"%(version)s/ref/settings/#debug\" target=\"_blank\" " +"rel=\"noopener\">DEBUG=True is in your settings file and you have not " +"configured any URLs." msgstr "" "Tənzimləmə faylınızda DEBUG=True və heç bir URL qurmadığınız üçün bu səhifəni görürsünüz." +"%(version)s/ref/settings/#debug\" target=\"_blank\" " +"rel=\"noopener\">DEBUG=True və heç bir URL qurmadığınız üçün bu səhifəni " +"görürsünüz." msgid "Django Documentation" -msgstr "Django Sənədləri" +msgstr "Django Dokumentasiya" msgid "Topics, references, & how-to’s" msgstr "Mövzular, istinadlar və nümunələr" @@ -1299,7 +1338,7 @@ msgid "Tutorial: A Polling App" msgstr "Məşğələ: Səsvermə Tətbiqi" msgid "Get started with Django" -msgstr "Django-ya başla" +msgstr "Django ilə başla" msgid "Django Community" msgstr "Django İcması" diff --git a/django/conf/locale/be/LC_MESSAGES/django.mo b/django/conf/locale/be/LC_MESSAGES/django.mo index c639c8bdf1..9c04ff16ca 100644 Binary files a/django/conf/locale/be/LC_MESSAGES/django.mo and b/django/conf/locale/be/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/be/LC_MESSAGES/django.po b/django/conf/locale/be/LC_MESSAGES/django.po index c8dbffe4f3..a8172066ae 100644 --- a/django/conf/locale/be/LC_MESSAGES/django.po +++ b/django/conf/locale/be/LC_MESSAGES/django.po @@ -2,15 +2,16 @@ # # Translators: # Viktar Palstsiuk , 2014-2015 -# znotdead , 2016-2017,2019-2021,2023 +# znotdead , 2016-2017,2019-2021,2023-2024 # Bobsans , 2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: znotdead , 2016-2017,2019-2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: znotdead , " +"2016-2017,2019-2021,2023-2024\n" "Language-Team: Belarusian (http://app.transifex.com/django/django/language/" "be/)\n" "MIME-Version: 1.0\n" @@ -347,6 +348,9 @@ msgstr "Гэтая старонка не мае ніякіх вынікаў" msgid "Enter a valid value." msgstr "Пазначце правільнае значэньне." +msgid "Enter a valid domain name." +msgstr "Пазначце сапраўднае даменнае имя." + msgid "Enter a valid URL." msgstr "Пазначце чынную спасылку." @@ -370,14 +374,18 @@ msgstr "" "Значэнне павінна быць толькі з літараў стандарту Unicode, личбаў, знакаў " "падкрэслівання ці злучкі." -msgid "Enter a valid IPv4 address." -msgstr "Пазначце чынны адрас IPv4." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Пазначце сапраўдны %(protocol)s адрас." -msgid "Enter a valid IPv6 address." -msgstr "Пазначце чынны адрас IPv6." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Пазначце чынны адрас IPv4 або IPv6." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 або IPv6" msgid "Enter only digits separated by commas." msgstr "Набярыце лічбы, падзеленыя коскамі." diff --git a/django/conf/locale/bg/LC_MESSAGES/django.mo b/django/conf/locale/bg/LC_MESSAGES/django.mo index b7b8c865a4..f6bd12b04d 100644 Binary files a/django/conf/locale/bg/LC_MESSAGES/django.mo and b/django/conf/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bg/LC_MESSAGES/django.po b/django/conf/locale/bg/LC_MESSAGES/django.po index 7446b5478c..52cc913016 100644 --- a/django/conf/locale/bg/LC_MESSAGES/django.po +++ b/django/conf/locale/bg/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# arneatec , 2022-2023 +# arneatec , 2022-2024 # Boris Chervenkov , 2012 # Claude Paroz , 2020 # Jannis Leidel , 2011 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Mariusz Felisiak , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: arneatec , 2022-2024\n" "Language-Team: Bulgarian (http://app.transifex.com/django/django/language/" "bg/)\n" "MIME-Version: 1.0\n" @@ -303,7 +303,7 @@ msgid "Udmurt" msgstr "удмурт" msgid "Uyghur" -msgstr "" +msgstr "Уйгурски" msgid "Ukrainian" msgstr "украински" @@ -352,6 +352,9 @@ msgstr "В тази страница няма резултати" msgid "Enter a valid value." msgstr "Въведете валидна стойност. " +msgid "Enter a valid domain name." +msgstr "Въведете валидно име на домейн." + msgid "Enter a valid URL." msgstr "Въведете валиден URL адрес." @@ -374,14 +377,18 @@ msgstr "" "Въведете валиден 'слъг', състоящ се от Уникод букви, цифри, тирета или долни " "тирета." -msgid "Enter a valid IPv4 address." -msgstr "Въведете валиден IPv4 адрес." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Въведете валиден %(protocol)s адрес." -msgid "Enter a valid IPv6 address." -msgstr "Въведете валиден IPv6 адрес." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Въведете валиден IPv4 или IPv6 адрес." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 или IPv6" msgid "Enter only digits separated by commas." msgstr "Въведете само еднозначни числа, разделени със запетая. " @@ -408,6 +415,8 @@ msgid "" "Ensure this value is a multiple of step size %(limit_value)s, starting from " "%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." msgstr "" +"Въведете стойност, кратна на стъпката %(limit_value)s, започвайки от " +"%(offset)s, например %(offset)s, %(valid_value1)s, %(valid_value2)s, и т.н." #, python-format msgid "" diff --git a/django/conf/locale/ckb/LC_MESSAGES/django.mo b/django/conf/locale/ckb/LC_MESSAGES/django.mo index cf41a447ec..39b9108995 100644 Binary files a/django/conf/locale/ckb/LC_MESSAGES/django.mo and b/django/conf/locale/ckb/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ckb/LC_MESSAGES/django.po b/django/conf/locale/ckb/LC_MESSAGES/django.po index 0d78c77e4b..1caebbc6b1 100644 --- a/django/conf/locale/ckb/LC_MESSAGES/django.po +++ b/django/conf/locale/ckb/LC_MESSAGES/django.po @@ -4,14 +4,14 @@ # Bawar Jalal, 2021 # Bawar Jalal, 2020-2021 # Bawar Jalal, 2020 -# kosar tofiq , 2020-2021 +# Kosar Tofiq Saeed , 2020-2021 # Swara , 2022-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2024-01-12 06:49+0000\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" "Last-Translator: Swara , 2022-2024\n" "Language-Team: Central Kurdish (http://app.transifex.com/django/django/" "language/ckb/)\n" @@ -347,6 +347,9 @@ msgstr "ئەو پەڕەیە هیچ ئەنجامێکی تێدا نییە" msgid "Enter a valid value." msgstr "نرخێکی دروست لەناودابنێ." +msgid "Enter a valid domain name." +msgstr "پاوەن/دۆمەینی دروست بنوسە." + msgid "Enter a valid URL." msgstr "URL ی دروست لەناودابنێ." @@ -368,14 +371,18 @@ msgstr "" "\"سلەگ\"ێکی دروست بنوسە کە پێکهاتووە لە پیتی یونیکۆد، ژمارە، هێڵی ژێرەوە، " "یان هێما." -msgid "Enter a valid IPv4 address." -msgstr "ناونیشانێکی IPv4 ی دروست لەناودابنێ." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "ناونیشانی %(protocol)s دروست بنوسە." -msgid "Enter a valid IPv6 address." -msgstr "ناونیشانێکی IPv64 ی دروست لەناودابنێ." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "ناونیشانێکی IPv4 یان IPv6 ی دروست لەناودابنێ." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 یان IPv6" msgid "Enter only digits separated by commas." msgstr "تەنها ژمارە لەناودابنێ بە فاریزە جیاکرابێتەوە." diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 66e08fed43..95086e3d52 100644 Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index bf85e0c41d..14f5ef9684 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -3,10 +3,11 @@ # Translators: # Claude Paroz , 2020 # Jannis Leidel , 2011 -# Jan Papež , 2012 -# trendspotter , 2022 +# Jan Papež , 2012,2024 +# Jiří Podhorecký , 2024 +# Jiří Podhorecký , 2022 # Jirka Vejrazka , 2011 -# trendspotter , 2020 +# Jiří Podhorecký , 2020 # Tomáš Ehrlich , 2015 # Vláďa Macek , 2012-2014 # Vláďa Macek , 2015-2022 @@ -14,10 +15,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-17 05:23-0500\n" -"PO-Revision-Date: 2022-07-25 06:49+0000\n" -"Last-Translator: trendspotter \n" -"Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Jan Papež , 2012,2024\n" +"Language-Team: Czech (http://app.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -58,6 +59,9 @@ msgstr "bosensky" msgid "Catalan" msgstr "katalánsky" +msgid "Central Kurdish (Sorani)" +msgstr "Střední kurdština (soranština)" + msgid "Czech" msgstr "česky" @@ -298,6 +302,9 @@ msgstr "tatarsky" msgid "Udmurt" msgstr "udmurtsky" +msgid "Uyghur" +msgstr "Ujgurština" + msgid "Ukrainian" msgstr "ukrajinsky" @@ -345,6 +352,9 @@ msgstr "Stránka je bez výsledků" msgid "Enter a valid value." msgstr "Zadejte platnou hodnotu." +msgid "Enter a valid domain name." +msgstr "Zadejte platný název domény." + msgid "Enter a valid URL." msgstr "Zadejte platnou adresu URL." @@ -368,14 +378,18 @@ msgstr "" "Zadejte platný identifikátor složený pouze z písmen, čísel, podtržítek a " "pomlček typu Unicode." -msgid "Enter a valid IPv4 address." -msgstr "Zadejte platnou adresu typu IPv4." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Zadejte platnou %(protocol)s adresu." -msgid "Enter a valid IPv6 address." -msgstr "Zadejte platnou adresu typu IPv6." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Zadejte platnou adresu typu IPv4 nebo IPv6." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 nebo IPv6" msgid "Enter only digits separated by commas." msgstr "Zadejte pouze číslice oddělené čárkami." @@ -397,6 +411,15 @@ msgid "Ensure this value is a multiple of step size %(limit_value)s." msgstr "" "Ujistěte se, že tato hodnota je násobkem velikosti kroku %(limit_value)s." +#, python-format +msgid "" +"Ensure this value is a multiple of step size %(limit_value)s, starting from " +"%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." +msgstr "" +"Zajistěte, aby tato hodnota byla %(limit_value)s násobkem velikosti kroku , " +"počínaje %(offset)s, např. %(offset)s, %(valid_value1)s, %(valid_value2)s, a " +"tak dále." + #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -533,6 +556,9 @@ msgstr "Pravdivost (buď Ano (True), nebo Ne (False))" msgid "String (up to %(max_length)s)" msgstr "Řetězec (max. %(max_length)s znaků)" +msgid "String (unlimited)" +msgstr "Řetězec (neomezený)" + msgid "Comma-separated integers" msgstr "Celá čísla oddělená čárkou" @@ -806,18 +832,18 @@ msgstr "" #, python-format msgid "Please submit at most %(num)d form." msgid_plural "Please submit at most %(num)d forms." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Odešlete prosím nejvíce %(num)d formulář." +msgstr[1] "Odešlete prosím nejvíce %(num)d formuláře." +msgstr[2] "Odešlete prosím nejvíce %(num)d formulářů." +msgstr[3] "Odešlete prosím nejvíce %(num)d formulářů." #, python-format msgid "Please submit at least %(num)d form." msgid_plural "Please submit at least %(num)d forms." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Odešlete prosím alespoň %(num)d formulář." +msgstr[1] "Odešlete prosím alespoň %(num)d formuláře." +msgstr[2] "Odešlete prosím alespoň %(num)d formulářů." +msgstr[3] "Odešlete prosím alespoň %(num)d formulářů." msgid "Order" msgstr "Pořadí" @@ -1233,8 +1259,8 @@ msgid "" "If you are using the tag or " "including the “Referrer-Policy: no-referrer” header, please remove them. The " "CSRF protection requires the “Referer” header to do strict referer checking. " -"If you’re concerned about privacy, use alternatives like for links to third-party sites." +"If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" "Pokud používáte značku nebo " "záhlaví \"Referrer-Policy: no-referrer\", odeberte je. Ochrana typu CSRF " @@ -1334,13 +1360,13 @@ msgstr "" #, python-format msgid "" "You are seeing this page because DEBUG=True is in your settings file and you have not configured any " -"URLs." +"%(version)s/ref/settings/#debug\" target=\"_blank\" " +"rel=\"noopener\">DEBUG=True is in your settings file and you have not " +"configured any URLs." msgstr "" "Tuto zprávu vidíte, protože máte v nastavení Djanga zapnutý vývojový režim " -"DEBUG=True a zatím nemáte " +"DEBUG=True a zatím nemáte " "nastavena žádná URL." msgid "Django Documentation" diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo index 253c828318..59b111a325 100644 Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po index 7853017477..eb89a01242 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.po +++ b/django/conf/locale/da/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Christian Joergensen , 2012 # Danni Randeris , 2014 -# Erik Ramsgaard Wognsen , 2020-2023 +# Erik Ramsgaard Wognsen , 2020-2024 # Erik Ramsgaard Wognsen , 2013-2019 # Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Erik Ramsgaard Wognsen , 2020-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Erik Ramsgaard Wognsen , 2020-2024\n" "Language-Team: Danish (http://app.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -350,6 +350,9 @@ msgstr "Den side indeholder ingen resultater" msgid "Enter a valid value." msgstr "Indtast en gyldig værdi." +msgid "Enter a valid domain name." +msgstr "Indtast et gyldigt domænenavn." + msgid "Enter a valid URL." msgstr "Indtast en gyldig URL." @@ -373,14 +376,18 @@ msgstr "" "Indtast en gyldig “slug” bestående af Unicode-bogstaver, cifre, understreger " "eller bindestreger." -msgid "Enter a valid IPv4 address." -msgstr "Indtast en gyldig IPv4-adresse." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Indtast en gyldig %(protocol)s-adresse." -msgid "Enter a valid IPv6 address." -msgstr "Indtast en gyldig IPv6-adresse." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Indtast en gyldig IPv4- eller IPv6-adresse." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 eller IPv6" msgid "Enter only digits separated by commas." msgstr "Indtast kun cifre adskilt af kommaer." diff --git a/django/conf/locale/dsb/LC_MESSAGES/django.mo b/django/conf/locale/dsb/LC_MESSAGES/django.mo index 645e6c7c44..4d70da4f1c 100644 Binary files a/django/conf/locale/dsb/LC_MESSAGES/django.mo and b/django/conf/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/dsb/LC_MESSAGES/django.po b/django/conf/locale/dsb/LC_MESSAGES/django.po index e7c0fb6ce5..4448d1a2d3 100644 --- a/django/conf/locale/dsb/LC_MESSAGES/django.po +++ b/django/conf/locale/dsb/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2023 +# Michael Wolf , 2016-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Michael Wolf , 2016-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Michael Wolf , 2016-2024\n" "Language-Team: Lower Sorbian (http://app.transifex.com/django/django/" "language/dsb/)\n" "MIME-Version: 1.0\n" @@ -344,6 +344,9 @@ msgstr "Toś ten bok njewopśimujo wuslědki" msgid "Enter a valid value." msgstr "Zapódajśo płaśiwu gódnotu." +msgid "Enter a valid domain name." +msgstr "Zapódajśo płaśiwe domenowe mě." + msgid "Enter a valid URL." msgstr "Zapódajśo płaśiwy URL." @@ -367,14 +370,18 @@ msgstr "" "Zapódajśo płaśiwe „adresowe mě“, kótarež jano wopśimujo unicodowe pismiki, " "licby, pódmužki abo wězawki." -msgid "Enter a valid IPv4 address." -msgstr "Zapódajśo płaśiwu IPv4-adresu." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Zapódajśo płaśiwu %(protocol)s-adresu." -msgid "Enter a valid IPv6 address." -msgstr "Zapódajśo płaśiwu IPv6-adresu." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Zapódajśo płaśiwu IPv4- abo IPv6-adresu." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 abo IPv6" msgid "Enter only digits separated by commas." msgstr "Zapódajśo jano cyfry źělone pśez komy." diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index f84b533674..20ea819b3c 100644 Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index fa014d6660..77ec5f4834 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -22,6 +22,7 @@ # Ignacio José Lizarán Rus , 2019 # Igor Támara , 2015 # Jannis Leidel , 2011 +# Jorge Andres Bravo Meza, 2024 # José Luis , 2016 # José Luis , 2016 # Josue Naaman Nistal Guerra , 2014 @@ -32,7 +33,7 @@ # Mariusz Felisiak , 2021 # mpachas , 2022 # monobotsoft , 2012 -# Natalia (Django Fellow), 2024 +# Natalia, 2024 # ntrrgc , 2013 # ntrrgc , 2013 # Pablo, 2015 @@ -46,9 +47,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2024-01-12 06:49+0000\n" -"Last-Translator: Natalia (Django Fellow), 2024\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Jorge Andres Bravo Meza, 2024\n" "Language-Team: Spanish (http://app.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -384,6 +385,9 @@ msgstr "Esa página no contiene resultados" msgid "Enter a valid value." msgstr "Introduzca un valor válido." +msgid "Enter a valid domain name." +msgstr "Ingrese un nombre de dominio válido." + msgid "Enter a valid URL." msgstr "Introduzca una URL válida." @@ -407,14 +411,18 @@ msgstr "" "Introduzca un 'slug' válido, consistente en letras, números, guiones bajos o " "medios de Unicode." -msgid "Enter a valid IPv4 address." -msgstr "Introduzca una dirección IPv4 válida." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Ingrese una dirección de %(protocol)s válida." -msgid "Enter a valid IPv6 address." -msgstr "Introduzca una dirección IPv6 válida." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Introduzca una dirección IPv4 o IPv6 válida." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 o IPv6" msgid "Enter only digits separated by commas." msgstr "Introduzca sólo dígitos separados por comas." diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo index 5f62b7125a..cdb8444a35 100644 Binary files a/django/conf/locale/es_AR/LC_MESSAGES/django.mo and b/django/conf/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po index ada4c3170f..17680c6f3f 100644 --- a/django/conf/locale/es_AR/LC_MESSAGES/django.po +++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po @@ -3,16 +3,16 @@ # Translators: # Jannis Leidel , 2011 # lardissone , 2014 -# Natalia (Django Fellow), 2023 +# Natalia, 2023 # poli , 2014 -# Ramiro Morales, 2013-2023 +# Ramiro Morales, 2013-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Natalia (Django Fellow), 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Ramiro Morales, 2013-2024\n" "Language-Team: Spanish (Argentina) (http://app.transifex.com/django/django/" "language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -347,6 +347,9 @@ msgstr "Esa página no contiene resultados" msgid "Enter a valid value." msgstr "Introduzca un valor válido." +msgid "Enter a valid domain name." +msgstr "Introduzca un nombre de dominio válido." + msgid "Enter a valid URL." msgstr "Introduzca una URL válida." @@ -368,14 +371,18 @@ msgstr "" "Introduzca un “slug” compuesto por letras Unicode, números, guiones bajos o " "guiones." -msgid "Enter a valid IPv4 address." -msgstr "Introduzca una dirección IPv4 válida." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Introduzca una dirección de %(protocol)s válida." -msgid "Enter a valid IPv6 address." -msgstr "Introduzca una dirección IPv6 válida." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Introduzca una dirección IPv4 o IPv6 válida." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 o IPv6" msgid "Enter only digits separated by commas." msgstr "Introduzca sólo dígitos separados por comas." diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo index 186a2588de..3556bb11e8 100644 Binary files a/django/conf/locale/et/LC_MESSAGES/django.mo and b/django/conf/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/et/LC_MESSAGES/django.po b/django/conf/locale/et/LC_MESSAGES/django.po index ed0121e9e8..813f3ab717 100644 --- a/django/conf/locale/et/LC_MESSAGES/django.po +++ b/django/conf/locale/et/LC_MESSAGES/django.po @@ -2,11 +2,11 @@ # # Translators: # eallik , 2011 -# Erlend , 2020 +# Erlend Eelmets , 2020 # Jannis Leidel , 2011 # Janno Liivak , 2013-2015 # madisvain , 2011 -# Martin , 2014-2015,2021-2023 +# Martin , 2014-2015,2021-2024 # Martin , 2016-2017,2019-2020 # Marti Raudsepp , 2014,2016 # Ragnar Rebase , 2019 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Martin , 2014-2015,2021-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Martin , 2014-2015,2021-2024\n" "Language-Team: Estonian (http://app.transifex.com/django/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -351,6 +351,9 @@ msgstr "See leht ei sisalda tulemusi" msgid "Enter a valid value." msgstr "Sisestage korrektne väärtus." +msgid "Enter a valid domain name." +msgstr "Sisestage korrektne domeeninimi." + msgid "Enter a valid URL." msgstr "Sisestage korrektne URL." @@ -374,14 +377,18 @@ msgstr "" "Sisestage korrektne “nälk”, mis koosneb Unicode tähtedest, numbritest, ala- " "või sidekriipsudest." -msgid "Enter a valid IPv4 address." -msgstr "Sisestage korrektne IPv4 aadress." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Sisestage korrektne %(protocol)s aadress." -msgid "Enter a valid IPv6 address." -msgstr "Sisestage korrektne IPv6 aadress." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Sisestage korrektne IPv4 või IPv6 aadress." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 või IPv6" msgid "Enter only digits separated by commas." msgstr "Sisestage ainult komaga eraldatud numbreid." diff --git a/django/conf/locale/eu/LC_MESSAGES/django.mo b/django/conf/locale/eu/LC_MESSAGES/django.mo index 572ea61467..031ad43496 100644 Binary files a/django/conf/locale/eu/LC_MESSAGES/django.mo and b/django/conf/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/eu/LC_MESSAGES/django.po b/django/conf/locale/eu/LC_MESSAGES/django.po index 563aa694dd..f3e91a8677 100644 --- a/django/conf/locale/eu/LC_MESSAGES/django.po +++ b/django/conf/locale/eu/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Aitzol Naberan , 2013,2016 # Ander Martinez , 2013-2014 -# Eneko Illarramendi , 2017-2019,2021-2022 +# Eneko Illarramendi , 2017-2019,2021-2022,2024 # Jannis Leidel , 2011 # jazpillaga , 2011 # julen, 2011-2012 @@ -16,10 +16,11 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-17 05:23-0500\n" -"PO-Revision-Date: 2022-07-25 06:49+0000\n" -"Last-Translator: Eneko Illarramendi \n" -"Language-Team: Basque (http://www.transifex.com/django/django/language/eu/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Eneko Illarramendi , " +"2017-2019,2021-2022,2024\n" +"Language-Team: Basque (http://app.transifex.com/django/django/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -59,6 +60,9 @@ msgstr "Bosniera" msgid "Catalan" msgstr "Katalana" +msgid "Central Kurdish (Sorani)" +msgstr "" + msgid "Czech" msgstr "Txekiera" @@ -159,7 +163,7 @@ msgid "Indonesian" msgstr "Indonesiera" msgid "Igbo" -msgstr "" +msgstr "Igboera" msgid "Ido" msgstr "Ido" @@ -299,6 +303,9 @@ msgstr "Tatarera" msgid "Udmurt" msgstr "Udmurtera" +msgid "Uyghur" +msgstr "" + msgid "Ukrainian" msgstr "Ukrainera" @@ -346,6 +353,9 @@ msgstr "Orrialde horrek ez du emaitzarik" msgid "Enter a valid value." msgstr "Idatzi baleko balio bat." +msgid "Enter a valid domain name." +msgstr "" + msgid "Enter a valid URL." msgstr "Idatzi baleko URL bat." @@ -365,14 +375,18 @@ msgid "" "hyphens." msgstr "" -msgid "Enter a valid IPv4 address." -msgstr "Idatzi baleko IPv4 sare-helbide bat." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "" -msgid "Enter a valid IPv6 address." -msgstr "Idatzi baleko IPv6 sare-helbide bat." +msgid "IPv4" +msgstr "" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Idatzi baleko IPv4 edo IPv6 sare-helbide bat." +msgid "IPv6" +msgstr "" + +msgid "IPv4 or IPv6" +msgstr "" msgid "Enter only digits separated by commas." msgstr "Idatzi komaz bereizitako digitoak soilik." @@ -394,6 +408,12 @@ msgstr "Ziurtatu balio hau %(limit_value)s baino handiagoa edo berdina dela." msgid "Ensure this value is a multiple of step size %(limit_value)s." msgstr "" +#, python-format +msgid "" +"Ensure this value is a multiple of step size %(limit_value)s, starting from " +"%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." +msgstr "" + #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -506,6 +526,9 @@ msgstr "Boolearra (True edo False)" msgid "String (up to %(max_length)s)" msgstr "String-a (%(max_length)s gehienez)" +msgid "String (unlimited)" +msgstr "" + msgid "Comma-separated integers" msgstr "Komaz bereiztutako zenbaki osoak" @@ -1169,8 +1192,8 @@ msgid "" "If you are using the tag or " "including the “Referrer-Policy: no-referrer” header, please remove them. The " "CSRF protection requires the “Referer” header to do strict referer checking. " -"If you’re concerned about privacy, use alternatives like for links to third-party sites." +"If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" msgid "" @@ -1241,7 +1264,7 @@ msgstr "Direktorio zerrendak ez daude baimenduak." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "\"%(path)s\" ez da existitzen" #, python-format msgid "Index of %(directory)s" @@ -1262,14 +1285,14 @@ msgstr "" #, python-format msgid "" "You are seeing this page because DEBUG=True is in your settings file and you have not configured any " -"URLs." +"%(version)s/ref/settings/#debug\" target=\"_blank\" " +"rel=\"noopener\">DEBUG=True is in your settings file and you have not " +"configured any URLs." msgstr "" "Zure settings fitxategian DEBUG=True jarrita eta URLrik konfiguratu gabe duzulako ari zara " -"ikusten orrialde hau." +"%(version)s/ref/settings/#debug\" target=\"_blank\" " +"rel=\"noopener\">DEBUG=True jarrita eta URLrik konfiguratu gabe duzulako " +"ari zara ikusten orrialde hau." msgid "Django Documentation" msgstr "Django dokumentazioa" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 08b33f0a79..bf4a0fe19f 100644 Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 6c5a6dda75..253672ee44 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Bruno Brouard , 2021 # Simon Charette , 2012 -# Claude Paroz , 2013-2023 +# Claude Paroz , 2013-2024 # Claude Paroz , 2011 # Jannis Leidel , 2011 # Jean-Baptiste Mora, 2014 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Claude Paroz , 2013-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Claude Paroz , 2013-2024\n" "Language-Team: French (http://app.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -228,7 +228,7 @@ msgid "Nepali" msgstr "Népalais" msgid "Dutch" -msgstr "Hollandais" +msgstr "Néerlandais" msgid "Norwegian Nynorsk" msgstr "Norvégien nynorsk" @@ -349,6 +349,9 @@ msgstr "Cette page ne contient aucun résultat" msgid "Enter a valid value." msgstr "Saisissez une valeur valide." +msgid "Enter a valid domain name." +msgstr "Saisissez un nom de domaine valide." + msgid "Enter a valid URL." msgstr "Saisissez une URL valide." @@ -372,14 +375,18 @@ msgstr "" "Ce champ ne doit contenir que des caractères Unicode, des nombres, des " "tirets bas (_) et des traits d’union." -msgid "Enter a valid IPv4 address." -msgstr "Saisissez une adresse IPv4 valide." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Saisissez une adresse %(protocol)s valide." -msgid "Enter a valid IPv6 address." -msgstr "Saisissez une adresse IPv6 valide." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Saisissez une adresse IPv4 ou IPv6 valide." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 ou IPv6" msgid "Enter only digits separated by commas." msgstr "Saisissez uniquement des chiffres séparés par des virgules." @@ -1181,8 +1188,8 @@ msgstr ", " msgid "%(num)d year" msgid_plural "%(num)d years" msgstr[0] "%(num)d année" -msgstr[1] "%(num)d années" -msgstr[2] "%(num)d années" +msgstr[1] "%(num)d ans" +msgstr[2] "%(num)d ans" #, python-format msgid "%(num)d month" @@ -1275,8 +1282,8 @@ msgid "" "them, at least for this site, or for “same-origin” requests." msgstr "" "Si vous avez désactivé l’envoi des cookies par votre navigateur, veuillez " -"les réactiver au moins pour ce site ou pour les requêtes de même origine (« " -"same-origin »)." +"les réactiver au moins pour ce site ou pour les requêtes de même origine " +"(« same-origin »)." msgid "More information is available with DEBUG=True." msgstr "" diff --git a/django/conf/locale/ga/LC_MESSAGES/django.mo b/django/conf/locale/ga/LC_MESSAGES/django.mo index c2a8a88d70..e55658a322 100644 Binary files a/django/conf/locale/ga/LC_MESSAGES/django.mo and b/django/conf/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ga/LC_MESSAGES/django.po b/django/conf/locale/ga/LC_MESSAGES/django.po index 2b1b5289e1..21a1e19712 100644 --- a/django/conf/locale/ga/LC_MESSAGES/django.po +++ b/django/conf/locale/ga/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Claude Paroz , 2020 # Jannis Leidel , 2011 # John Moylan , 2013 @@ -13,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-19 20:23+0200\n" -"PO-Revision-Date: 2020-07-14 21:42+0000\n" -"Last-Translator: Transifex Bot <>\n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -31,7 +32,7 @@ msgid "Arabic" msgstr "Araibis" msgid "Algerian Arabic" -msgstr "" +msgstr "Araibis na hAilgéire" msgid "Asturian" msgstr "Astúiris" @@ -57,6 +58,9 @@ msgstr "Boisnis" msgid "Catalan" msgstr "Catalóinis" +msgid "Central Kurdish (Sorani)" +msgstr "Coirdis Láir (Sorani)" + msgid "Czech" msgstr "Seicis" @@ -70,7 +74,7 @@ msgid "German" msgstr "Gearmáinis" msgid "Lower Sorbian" -msgstr "" +msgstr "Sorbais Íochtarach" msgid "Greek" msgstr "Gréigis" @@ -94,7 +98,7 @@ msgid "Argentinian Spanish" msgstr "Spáinnis na hAirgintíne" msgid "Colombian Spanish" -msgstr "" +msgstr "Spáinnis na Colóime" msgid "Mexican Spanish" msgstr "Spáinnis Mheicsiceo " @@ -142,13 +146,13 @@ msgid "Croatian" msgstr "Cróitis" msgid "Upper Sorbian" -msgstr "" +msgstr "Sorbian Uachtarach" msgid "Hungarian" msgstr "Ungáiris" msgid "Armenian" -msgstr "" +msgstr "Airméinis" msgid "Interlingua" msgstr "Interlingua" @@ -157,7 +161,7 @@ msgid "Indonesian" msgstr "Indinéisis" msgid "Igbo" -msgstr "" +msgstr "Igbo" msgid "Ido" msgstr "Ido" @@ -175,7 +179,7 @@ msgid "Georgian" msgstr "Seoirsis" msgid "Kabyle" -msgstr "" +msgstr "Cabaill" msgid "Kazakh" msgstr "Casaicis" @@ -190,7 +194,7 @@ msgid "Korean" msgstr "Cóiréis" msgid "Kyrgyz" -msgstr "" +msgstr "Chirgeastáin" msgid "Luxembourgish" msgstr "Lucsamburgach" @@ -213,11 +217,14 @@ msgstr "Mongóilis" msgid "Marathi" msgstr "Maraitis" +msgid "Malay" +msgstr "Malaeis" + msgid "Burmese" msgstr "Burmais" msgid "Norwegian Bokmål" -msgstr "" +msgstr "Ioruais Bokmål" msgid "Nepali" msgstr "Neipeailis" @@ -268,7 +275,7 @@ msgid "Swedish" msgstr "Sualainnis" msgid "Swahili" -msgstr "" +msgstr "Svahaílis" msgid "Tamil" msgstr "Tamailis" @@ -277,22 +284,25 @@ msgid "Telugu" msgstr "Teileagúis" msgid "Tajik" -msgstr "" +msgstr "Táidsíc" msgid "Thai" msgstr "Téalainnis" msgid "Turkmen" -msgstr "" +msgstr "Tuircméinis" msgid "Turkish" msgstr "Tuircis" msgid "Tatar" -msgstr "" +msgstr "Tatairis" msgid "Udmurt" -msgstr "" +msgstr "Udmurt" + +msgid "Uyghur" +msgstr "Uighur" msgid "Ukrainian" msgstr "Úcráinis" @@ -301,7 +311,7 @@ msgid "Urdu" msgstr "Urdais" msgid "Uzbek" -msgstr "" +msgstr "Úisbéicis" msgid "Vietnamese" msgstr "Vítneamais" @@ -316,7 +326,7 @@ msgid "Messages" msgstr "Teachtaireachtaí" msgid "Site Maps" -msgstr "" +msgstr "Léarscáileanna Suímh" msgid "Static Files" msgstr "Comhaid Statach" @@ -324,45 +334,61 @@ msgstr "Comhaid Statach" msgid "Syndication" msgstr "Sindeacáitiú" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" -msgstr "" +msgstr "Ní slánuimhir í an uimhir leathanaigh sin" msgid "That page number is less than 1" -msgstr "" +msgstr "Tá uimhir an leathanaigh sin níos lú ná 1" msgid "That page contains no results" -msgstr "" +msgstr "Níl aon torthaí ar an leathanach sin" msgid "Enter a valid value." msgstr "Iontráil luach bailí" +msgid "Enter a valid domain name." +msgstr "Cuir isteach ainm fearainn bailí." + msgid "Enter a valid URL." msgstr "Iontráil URL bailí." msgid "Enter a valid integer." -msgstr "" +msgstr "Cuir isteach slánuimhir bhailí." msgid "Enter a valid email address." -msgstr "" +msgstr "Cuir isteach seoladh ríomhphoist bailí." #. Translators: "letters" means latin letters: a-z and A-Z. msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" +"Cuir isteach “sluga” bailí ar a bhfuil litreacha, uimhreacha, foscórthaí nó " +"fleiscíní." msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" +"Cuir isteach “sluga” bailí ar a bhfuil litreacha Unicode, uimhreacha, fo-" +"scóranna, nó fleiscíní." -msgid "Enter a valid IPv4 address." -msgstr "Iontráil seoladh IPv4 bailí." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Cuir isteach seoladh bailí %(protocol)s." -msgid "Enter a valid IPv6 address." -msgstr "Cuir seoladh bailí IPv6 isteach." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Cuir seoladh bailí IPv4 nó IPv6 isteach." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 nó IPv6" msgid "Enter only digits separated by commas." msgstr "Ná hiontráil ach digití atá deighilte le camóga." @@ -382,6 +408,19 @@ msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" "Cinntigh go bhfuil an luach seo níos mó ná nó cothrom le %(limit_value)s." +#, python-format +msgid "Ensure this value is a multiple of step size %(limit_value)s." +msgstr "Cinntigh gur iolraí de chéimmhéid %(limit_value)s an luach seo." + +#, python-format +msgid "" +"Ensure this value is a multiple of step size %(limit_value)s, starting from " +"%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." +msgstr "" +"Cinntigh gur iolraí de chéimmhéid %(limit_value)s an luach seo, ag tosú ó " +"%(offset)s, m.sh. %(offset)s, %(valid_value1)s, %(valid_value2)s, agus mar " +"sin de." + #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -390,10 +429,20 @@ msgid_plural "" "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"Cinntigh go bhfuil ar a laghad %(limit_value)d carachtar ag an luach seo (tá " +"%(show_value)d aige)." msgstr[1] "" +"Cinntigh go bhfuil ar a laghad %(limit_value)d carachtar ag an luach seo (tá " +"%(show_value)d aige)." msgstr[2] "" +"Cinntigh go bhfuil ar a laghad %(limit_value)d carachtar ag an luach seo (tá " +"%(show_value)d aige)." msgstr[3] "" +"Cinntigh go bhfuil ar a laghad %(limit_value)d carachtar ag an luach seo (tá " +"%(show_value)d aige)." msgstr[4] "" +"Cinntigh go bhfuil ar a laghad %(limit_value)d carachtar ag an luach seo (tá " +"%(show_value)d aige)." #, python-format msgid "" @@ -403,10 +452,20 @@ msgid_plural "" "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"Cinntigh go bhfuil %(limit_value)d carachtar ar a mhéad ag an luach seo (tá " +"%(show_value)d aige)." msgstr[1] "" +"Cinntigh go bhfuil %(limit_value)d carachtar ar a mhéad ag an luach seo (tá " +"%(show_value)d aige)." msgstr[2] "" +"Cinntigh go bhfuil %(limit_value)d carachtar ar a mhéad ag an luach seo (tá " +"%(show_value)d aige)." msgstr[3] "" +"Cinntigh go bhfuil %(limit_value)d carachtar ar a mhéad ag an luach seo (tá " +"%(show_value)d aige)." msgstr[4] "" +"Cinntigh go bhfuil %(limit_value)d carachtar ar a mhéad ag an luach seo (tá " +"%(show_value)d aige)." msgid "Enter a number." msgstr "Iontráil uimhir." @@ -414,20 +473,20 @@ msgstr "Iontráil uimhir." #, python-format msgid "Ensure that there are no more than %(max)s digit in total." msgid_plural "Ensure that there are no more than %(max)s digits in total." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgstr[0] "Cinntigh nach bhfuil níos mó ná %(max)s digit san iomlán." +msgstr[1] "Cinntigh nach bhfuil níos mó ná %(max)s digit san iomlán." +msgstr[2] "Cinntigh nach bhfuil níos mó ná %(max)s digit san iomlán." +msgstr[3] "Cinntigh nach bhfuil níos mó ná %(max)s digit san iomlán." +msgstr[4] "Cinntigh nach bhfuil níos mó ná %(max)s digit san iomlán." #, python-format msgid "Ensure that there are no more than %(max)s decimal place." msgid_plural "Ensure that there are no more than %(max)s decimal places." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgstr[0] "Cinntigh nach bhfuil níos mó ná %(max)s ionad deachúlach ann." +msgstr[1] "Cinntigh nach bhfuil níos mó ná %(max)s de dheachúlacha ann." +msgstr[2] "Cinntigh nach bhfuil níos mó ná %(max)s de dheachúlacha ann." +msgstr[3] "Cinntigh nach bhfuil níos mó ná %(max)s de dheachúlacha ann." +msgstr[4] "Cinntigh nach bhfuil níos mó ná %(max)s de dheachúlacha ann." #, python-format msgid "" @@ -435,30 +494,41 @@ msgid "" msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." msgstr[0] "" +"Cinntigh nach bhfuil níos mó ná %(max)s digit ann roimh an bpointe deachúil." msgstr[1] "" +"Cinntigh nach bhfuil níos mó ná %(max)s dhigit roimh an bpointe deachúil." msgstr[2] "" +"Cinntigh nach bhfuil níos mó ná %(max)s dhigit roimh an bpointe deachúil." msgstr[3] "" +"Cinntigh nach bhfuil níos mó ná %(max)s dhigit roimh an bpointe deachúil." msgstr[4] "" +"Cinntigh nach bhfuil níos mó ná %(max)s dhigit roimh an bpointe deachúil." #, python-format msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." msgstr "" +"Ní cheadaítear iarmhír chomhaid “%(extension)s”. Is iad seo a leanas " +"eisínteachtaí ceadaithe: %(allowed_extensions)s." msgid "Null characters are not allowed." -msgstr "" +msgstr "Ní cheadaítear carachtair null." msgid "and" msgstr "agus" #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "" +msgstr "Tá %(model_name)s leis an %(field_labels)s seo ann cheana." + +#, python-format +msgid "Constraint “%(name)s” is violated." +msgstr "Tá srian “%(name)s” sáraithe." #, python-format msgid "Value %(value)r is not a valid choice." -msgstr "" +msgstr "Ní rogha bhailí é luach %(value)r." msgid "This field cannot be null." msgstr "Ní cheadaítear luach nialasach sa réimse seo." @@ -470,12 +540,14 @@ msgstr "Ní cheadaítear luach nialasach sa réimse seo." msgid "%(model_name)s with this %(field_label)s already exists." msgstr "Tá %(model_name)s leis an %(field_label)s seo ann cheana." -#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. -#. Eg: "Title must be unique for pub_date year" +#. Translators: The 'lookup_type' is one of 'date', 'year' or +#. 'month'. Eg: "Title must be unique for pub_date year" #, python-format msgid "" "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." msgstr "" +"Caithfidh %(field_label)s a bheith uathúil le haghaidh %(date_field_label)s " +"%(lookup_type)s." #, python-format msgid "Field of type: %(field_type)s" @@ -483,11 +555,11 @@ msgstr "Réimse de Cineál: %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "Caithfidh luach “%(value)s” a bheith Fíor nó Bréagach." #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "Caithfidh luach “%(value)s” a bheith Fíor, Bréagach, nó Neamhní." msgid "Boolean (Either True or False)" msgstr "Boole" @@ -496,6 +568,9 @@ msgstr "Boole" msgid "String (up to %(max_length)s)" msgstr "Teaghrán (suas go %(max_length)s)" +msgid "String (unlimited)" +msgstr "Teaghrán (gan teorainn)" + msgid "Comma-separated integers" msgstr "Slánuimhireacha camóg-scartha" @@ -504,12 +579,16 @@ msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" +"Tá formáid dáta neamhbhailí ag luach “%(value)s”. Caithfidh sé a bheith i " +"bhformáid BBBB-MM-LL." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" +"Tá an fhormáid cheart ag luach “%(value)s” (BBBB-MM-DD) ach is dáta " +"neamhbhailí é." msgid "Date (without time)" msgstr "Dáta (gan am)" @@ -519,19 +598,23 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"Tá formáid neamhbhailí ag luach “%(value)s”. Caithfidh sé a bheith san " +"fhormáid BBBB-MM-DD HH:MM[:ss[.uuuuuu]][TZ]." #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"Tá an fhormáid cheart ag luach “%(value)s” (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]) ach is dáta/am neamhbhailí é." msgid "Date (with time)" msgstr "Dáta (le am)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "Caithfidh luach “%(value)s” a bheith ina uimhir dheachúil." msgid "Decimal number" msgstr "Uimhir deachúlach" @@ -541,6 +624,8 @@ msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" +"Tá formáid neamhbhailí ag luach “%(value)s”. Caithfidh sé a bheith i " +"bhformáid [DD] [[HH:]MM:]ss[.uuuuuu]." msgid "Duration" msgstr "Fad" @@ -553,14 +638,14 @@ msgstr "Conair comhaid" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "Caithfidh luach “%(value)s” a bheith ina shnámhán." msgid "Floating point number" msgstr "Snámhphointe" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "Caithfidh luach “%(value)s” a bheith ina shlánuimhir." msgid "Integer" msgstr "Slánuimhir" @@ -568,6 +653,9 @@ msgstr "Slánuimhir" msgid "Big (8 byte) integer" msgstr "Mór (8 byte) slánuimhi" +msgid "Small integer" +msgstr "Slánuimhir beag" + msgid "IPv4 address" msgstr "Seoladh IPv4" @@ -576,13 +664,13 @@ msgstr "Seoladh IP" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "Ní mór luach “%(value)s” a bheith Easpa, Fíor nó Bréagach." msgid "Boolean (Either True, False or None)" msgstr "Boole (Fíor, Bréagach nó Dada)" msgid "Positive big integer" -msgstr "" +msgstr "Slánuimhir mhór dhearfach" msgid "Positive integer" msgstr "Slánuimhir dearfach" @@ -594,9 +682,6 @@ msgstr "Slánuimhir beag dearfach" msgid "Slug (up to %(max_length)s)" msgstr "Slug (suas go %(max_length)s)" -msgid "Small integer" -msgstr "Slánuimhir beag" - msgid "Text" msgstr "Téacs" @@ -605,12 +690,16 @@ msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" +"Tá formáid neamhbhailí ag luach “%(value)s”. Caithfidh sé a bheith i " +"bhformáid HH:MM[:ss[.uuuuuu]]." #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" +"Tá an fhormáid cheart ag luach “%(value)s” (HH:MM[:ss[.uuuuuu]]) ach is am " +"neamhbhailí é." msgid "Time" msgstr "Am" @@ -619,14 +708,14 @@ msgid "URL" msgstr "URL" msgid "Raw binary data" -msgstr "" +msgstr "Sonraí dénártha amh" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "Ní UUID bailí é “%(value)s”." msgid "Universally unique identifier" -msgstr "" +msgstr "Aitheantóir uathúil uilíoch" msgid "File" msgstr "Comhaid" @@ -635,14 +724,14 @@ msgid "Image" msgstr "Íomhá" msgid "A JSON object" -msgstr "" +msgstr "Réad JSON" msgid "Value must be valid JSON." -msgstr "" +msgstr "Caithfidh an luach a bheith bailí JSON." #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." -msgstr "" +msgstr "Níl sampla %(model)s le %(field)s %(value)r ann." msgid "Foreign Key (type determined by related field)" msgstr "Eochair Eachtracha (cineál a chinnfear de réir réimse a bhaineann)" @@ -652,11 +741,11 @@ msgstr "Duine-le-duine caidreamh" #, python-format msgid "%(from)s-%(to)s relationship" -msgstr "" +msgstr "%(from)s-%(to)s caidreamh" #, python-format msgid "%(from)s-%(to)s relationships" -msgstr "" +msgstr "%(from)s-%(to)s caidrimh" msgid "Many-to-many relationship" msgstr "Go leor le go leor caidreamh" @@ -683,11 +772,11 @@ msgid "Enter a valid date/time." msgstr "Iontráil dáta/am bailí." msgid "Enter a valid duration." -msgstr "" +msgstr "Cuir isteach ré bailí." #, python-brace-format msgid "The number of days must be between {min_days} and {max_days}." -msgstr "" +msgstr "Caithfidh líon na laethanta a bheith idir {min_days} agus {max_days}." msgid "No file was submitted. Check the encoding type on the form." msgstr "Níor seoladh comhad. Deimhnigh cineál an ionchódaithe ar an bhfoirm." @@ -703,10 +792,20 @@ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." msgid_plural "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." msgstr[0] "" +"Cinntigh go bhfuil %(max)d carachtar ar a mhéad ag an gcomhadainm seo (tá " +"%(length)d aige)." msgstr[1] "" +"Cinntigh go bhfuil %(max)d carachtar ar a mhéad ag an gcomhadainm seo (tá " +"%(length)d aige)." msgstr[2] "" +"Cinntigh go bhfuil %(max)d carachtar ar a mhéad ag an gcomhadainm seo (tá " +"%(length)d aige)." msgstr[3] "" +"Cinntigh go bhfuil %(max)d carachtar ar a mhéad ag an gcomhadainm seo (tá " +"%(length)d aige)." msgstr[4] "" +"Cinntigh go bhfuil %(max)d carachtar ar a mhéad ag an gcomhadainm seo (tá " +"%(length)d aige)." msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" @@ -728,13 +827,13 @@ msgid "Enter a list of values." msgstr "Cuir liosta de luachanna isteach." msgid "Enter a complete value." -msgstr "" +msgstr "Cuir isteach luach iomlán." msgid "Enter a valid UUID." -msgstr "" +msgstr "Cuir isteach UUID bailí." msgid "Enter a valid JSON." -msgstr "" +msgstr "Cuir isteach JSON bailí." #. Translators: This is the default suffix added to form field labels msgid ":" @@ -742,28 +841,34 @@ msgstr ":" #, python-format msgid "(Hidden field %(name)s) %(error)s" -msgstr "" - -msgid "ManagementForm data is missing or has been tampered with" -msgstr "" +msgstr "(Réimse folaithe %(name)s) %(error)s" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"Tá sonraí ManagementForm in easnamh nó ar cuireadh isteach orthu. Réimsí ar " +"iarraidh: %(field_names)s. Seans go mbeidh ort tuairisc fhabht a chomhdú má " +"leanann an cheist." #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "Please submit at most %(num)d form." +msgid_plural "Please submit at most %(num)d forms." +msgstr[0] "Cuir isteach %(num)d foirm ar a mhéad." +msgstr[1] "Cuir isteach %(num)d foirm ar a mhéad." +msgstr[2] "Cuir isteach %(num)d foirm ar a mhéad." +msgstr[3] "Cuir isteach %(num)d foirm ar a mhéad." +msgstr[4] "Cuir isteach %(num)d foirm ar a mhéad." + +#, python-format +msgid "Please submit at least %(num)d form." +msgid_plural "Please submit at least %(num)d forms." +msgstr[0] "Cuir isteach ar a laghad %(num)d foirm." +msgstr[1] "Cuir isteach %(num)d foirm ar a laghad." +msgstr[2] "Cuir isteach %(num)d foirm ar a laghad." +msgstr[3] "Cuir isteach %(num)d foirm ar a laghad." +msgstr[4] "Cuir isteach %(num)d foirm ar a laghad." msgid "Order" msgstr "Ord" @@ -793,20 +898,22 @@ msgid "Please correct the duplicate values below." msgstr "Le do thoil ceartaigh na luachanna dúbail thíos." msgid "The inline value did not match the parent instance." -msgstr "" +msgstr "Níor mheaitseáil an luach inlíne leis an gcás tuismitheora." msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Déan rogha bhailí. Ní ceann de na roghanna é do roghasa." #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "Ní luach bailí é “%(pk)s”." #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"Níorbh fhéidir %(datetime)s a léirmhíniú i gcrios ama %(current_timezone)s; " +"d'fhéadfadh sé a bheith débhríoch nó b'fhéidir nach bhfuil sé ann." msgid "Clear" msgstr "Glan" @@ -1088,12 +1195,12 @@ msgid "December" msgstr "Mí na Nollag" msgid "This is not a valid IPv6 address." -msgstr "" +msgstr "Ní seoladh IPv6 bailí é seo." #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s…" -msgstr "" +msgstr "%(truncated_text)s…" msgid "or" msgstr "nó" @@ -1103,96 +1210,117 @@ msgid ", " msgstr ", " #, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d bhliain" +msgstr[1] "%(num)d bliain" +msgstr[2] "%(num)d bliain" +msgstr[3] "%(num)d bliain" +msgstr[4] "%(num)d bliain" #, python-format -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d mí" +msgstr[1] "%(num)d míonna" +msgstr[2] "%(num)d míonna" +msgstr[3] "%(num)d míonna" +msgstr[4] "%(num)d míonna" #, python-format -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d seachtain" +msgstr[1] "%(num)d seachtainí" +msgstr[2] "%(num)d seachtainí" +msgstr[3] "%(num)d seachtainí" +msgstr[4] "%(num)d seachtainí" #, python-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d lá" +msgstr[1] "%(num)d laethanta" +msgstr[2] "%(num)d laethanta" +msgstr[3] "%(num)d laethanta" +msgstr[4] "%(num)d laethanta" #, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d uair" +msgstr[1] "%(num)d huaireanta" +msgstr[2] "%(num)d huaireanta" +msgstr[3] "%(num)d huaireanta" +msgstr[4] "%(num)d huaireanta" #, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d nóiméad" -msgstr[1] "%d nóiméad" -msgstr[2] "%d nóiméad" -msgstr[3] "%d nóiméad" -msgstr[4] "%d nóiméad" +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d nóiméad" +msgstr[1] "%(num)d nóiméad" +msgstr[2] "%(num)d nóiméad" +msgstr[3] "%(num)d nóiméad" +msgstr[4] "%(num)d nóiméad" msgid "Forbidden" msgstr "Toirmiscthe" msgid "CSRF verification failed. Request aborted." -msgstr "" +msgstr "Theip ar fhíorú CSRF. Cuireadh deireadh leis an iarratas." msgid "" "You are seeing this message because this HTTPS site requires a “Referer " -"header” to be sent by your Web browser, but none was sent. This header is " +"header” to be sent by your web browser, but none was sent. This header is " "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"Tá an teachtaireacht seo á fheiceáil agat toisc go bhfuil “ceanntásc " +"tarchuir” ag teastáil ón suíomh HTTPS seo le bheith seolta ag do bhrabhsálaí " +"gréasáin, ach níor seoladh aon cheann. Tá an ceanntásc seo ag teastáil ar " +"chúiseanna slándála, lena chinntiú nach bhfuil do bhrabhsálaí á fuadach ag " +"tríú páirtithe." msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"Má tá do bhrabhsálaí cumraithe agat chun ceanntásca “Tagairtí” a dhíchumasú, " +"le do thoil déan iad a athchumasú, le do thoil don suíomh seo, nó do naisc " +"HTTPS, nó d’iarratais “ar an mbunús céanna”." msgid "" "If you are using the tag or " "including the “Referrer-Policy: no-referrer” header, please remove them. The " "CSRF protection requires the “Referer” header to do strict referer checking. " -"If you’re concerned about privacy, use alternatives like for links to third-party sites." +"If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"Má tá an chlib 1 á úsáid agat nó má tá an ceanntásc “Polasaí Atreoraithe: " +"gan atreorú” san áireamh, bain amach iad le do thoil. Éilíonn an chosaint " +"CSRF go bhfuil an ceanntásc “Tagairtí” chun seiceáil docht atreoraithe a " +"dhéanamh. Má tá imní ort faoi phríobháideachas, bain úsáid as roghanna eile " +"amhail le haghaidh naisc chuig láithreáin tríú " +"páirtí." msgid "" "You are seeing this message because this site requires a CSRF cookie when " "submitting forms. This cookie is required for security reasons, to ensure " "that your browser is not being hijacked by third parties." msgstr "" +"Tá an teachtaireacht seo á fheiceáil agat toisc go bhfuil fianán CSRF ag " +"teastáil ón suíomh seo agus foirmeacha á gcur isteach agat. Tá an fianán seo " +"ag teastáil ar chúiseanna slándála, lena chinntiú nach bhfuil do bhrabhsálaí " +"á fuadach ag tríú páirtithe." msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"Má tá do bhrabhsálaí cumraithe agat chun fianáin a dhíchumasú, le do thoil " +"athchumasaigh iad, le do thoil, le haghaidh an tsuímh seo ar a laghad, nó le " +"haghaidh iarratais “ar an mbunús céanna”." msgid "More information is available with DEBUG=True." msgstr "Tá tuilleadh eolais ar fáil le DEBUG=True." @@ -1201,7 +1329,7 @@ msgid "No year specified" msgstr "Bliain gan sonrú" msgid "Date out of range" -msgstr "" +msgstr "Dáta as raon" msgid "No month specified" msgstr "Mí gan sonrú" @@ -1226,7 +1354,7 @@ msgstr "" #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "Teaghrán dáta neamhbhailí “%(datestr)s” tugtha formáid “%(format)s”" #, python-format msgid "No %(verbose_name)s found matching the query" @@ -1234,6 +1362,7 @@ msgstr "Níl bhfuarthas %(verbose_name)s le hadhaigh an iarratas" msgid "Page is not “last”, nor can it be converted to an int." msgstr "" +"Níl an leathanach “deireadh”, agus ní féidir é a thiontú go slánuimhir." #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1241,53 +1370,57 @@ msgstr "Leathanach neamhbhailí (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "Tá liosta folamh agus “%(class_name)s.allow_empty” bréagach." msgid "Directory indexes are not allowed here." msgstr "Níl innéacsanna chomhadlann cheadaítear anseo." #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "Níl “%(path)s” ann" #, python-format msgid "Index of %(directory)s" msgstr "Innéacs de %(directory)s" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "" +msgid "The install worked successfully! Congratulations!" +msgstr "D'éirigh leis an suiteáil! Comhghairdeachas!" #, python-format msgid "" "View release notes for Django %(version)s" msgstr "" - -msgid "The install worked successfully! Congratulations!" -msgstr "" +"Féach ar nótaí scaoilte le haghaidh Django " +"%(version)s" #, python-format msgid "" "You are seeing this page because DEBUG=True is in your settings file and you have not configured any " -"URLs." +"%(version)s/ref/settings/#debug\" target=\"_blank\" " +"rel=\"noopener\">DEBUG=True is in your settings file and you have not " +"configured any URLs." msgstr "" +"Tá an leathanach seo á fheiceáil agat toisc go bhfuil DEBUG=True i do chomhad socruithe agus nach bhfuil aon " +"URL cumraithe agat." msgid "Django Documentation" -msgstr "" +msgstr "Doiciméadú Django" msgid "Topics, references, & how-to’s" -msgstr "" +msgstr "Ábhair, tagairtí, & conas atá" msgid "Tutorial: A Polling App" -msgstr "" +msgstr "Teagaisc: A Vótaíocht Aip" msgid "Get started with Django" msgstr "Tosaigh le Django" msgid "Django Community" -msgstr "" +msgstr "Pobal Django" msgid "Connect, get help, or contribute" -msgstr "" +msgstr "Ceangail, faigh cúnamh, nó ranníoc" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index d4d4dbbeea..4a9d164480 100644 Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index 58f7858566..7ebeab2075 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -8,14 +8,14 @@ # Jannis Leidel , 2011 # Leandro Regueiro , 2013 # 948a55bc37dd6d642f1875bb84258fff_07a28cc , 2012 -# X Bello , 2023 +# X Bello , 2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: X Bello , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: X Bello , 2023-2024\n" "Language-Team: Galician (http://app.transifex.com/django/django/language/" "gl/)\n" "MIME-Version: 1.0\n" @@ -350,6 +350,9 @@ msgstr "Esa páxina non contén resultados" msgid "Enter a valid value." msgstr "Insira un valor válido." +msgid "Enter a valid domain name." +msgstr "Introduza un nome de dominio válido." + msgid "Enter a valid URL." msgstr "Insira un URL válido." @@ -373,14 +376,18 @@ msgstr "" "Insira un “slug” valido composto por letras Unicode, números, guións baixos " "ou medios." -msgid "Enter a valid IPv4 address." -msgstr "Insira unha dirección IPv4 válida." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Introduza unha dirección %(protocol)s válida." -msgid "Enter a valid IPv6 address." -msgstr "Insira unha dirección IPv6 válida" +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Insira unha dirección IPv4 ou IPv6 válida" +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 ou IPv6" msgid "Enter only digits separated by commas." msgstr "Insira só díxitos separados por comas." diff --git a/django/conf/locale/hsb/LC_MESSAGES/django.mo b/django/conf/locale/hsb/LC_MESSAGES/django.mo index 600b787b05..16f40d3094 100644 Binary files a/django/conf/locale/hsb/LC_MESSAGES/django.mo and b/django/conf/locale/hsb/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/hsb/LC_MESSAGES/django.po b/django/conf/locale/hsb/LC_MESSAGES/django.po index a5fb97cfb5..46f12d09bc 100644 --- a/django/conf/locale/hsb/LC_MESSAGES/django.po +++ b/django/conf/locale/hsb/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2023 +# Michael Wolf , 2016-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Michael Wolf , 2016-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Michael Wolf , 2016-2024\n" "Language-Team: Upper Sorbian (http://app.transifex.com/django/django/" "language/hsb/)\n" "MIME-Version: 1.0\n" @@ -344,6 +344,9 @@ msgstr "Tuta strona wuslědki njewobsahuje" msgid "Enter a valid value." msgstr "Zapodajće płaćiwu hódnotu." +msgid "Enter a valid domain name." +msgstr "Zapodajće płaćiwe domenowe mjeno." + msgid "Enter a valid URL." msgstr "Zapodajće płaćiwy URL." @@ -367,14 +370,18 @@ msgstr "" "Zapodajće płaćiwe „adresowe mjeno“, kotrež jenož pismiki, ličby, podsmužki " "abo wjazawki wobsahuje." -msgid "Enter a valid IPv4 address." -msgstr "Zapodajće płaćiwu IPv4-adresu." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Zapodajće płaćiwu %(protocol)s-adresu." -msgid "Enter a valid IPv6 address." -msgstr "Zapodajće płaćiwu IPv6-adresu." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Zapodajće płaćiwu IPv4- abo IPv6-adresu." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 abo IPv6" msgid "Enter only digits separated by commas." msgstr "Zapodajće jenož přez komy dźělene cyfry," diff --git a/django/conf/locale/id/LC_MESSAGES/django.mo b/django/conf/locale/id/LC_MESSAGES/django.mo index 4a2eb2bb4c..b1815ce52d 100644 Binary files a/django/conf/locale/id/LC_MESSAGES/django.mo and b/django/conf/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/id/LC_MESSAGES/django.po b/django/conf/locale/id/LC_MESSAGES/django.po index f0027b7f02..56340389e0 100644 --- a/django/conf/locale/id/LC_MESSAGES/django.po +++ b/django/conf/locale/id/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Adiyat Mubarak , 2017 +# Bayu Satiyo , 2024 # Claude Paroz , 2018 # Fery Setiawan , 2015-2019,2021-2023 # Jannis Leidel , 2011 @@ -9,15 +10,15 @@ # oon arfiandwi (OonID) , 2016,2020 # rodin , 2011 # rodin , 2013-2016 -# sag᠎e , 2018-2019 +# sag​e , 2018-2019 # Sutrisno Efendi , 2015,2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Fery Setiawan , 2015-2019,2021-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2013-04-25 06:49+0000\n" +"Last-Translator: Bayu Satiyo , 2024\n" "Language-Team: Indonesian (http://app.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -303,7 +304,7 @@ msgid "Udmurt" msgstr "Udmurt" msgid "Uyghur" -msgstr "" +msgstr "Uyghur" msgid "Ukrainian" msgstr "Ukrainia" @@ -352,6 +353,9 @@ msgstr "Tidak ada hasil untuk halaman tersebut" msgid "Enter a valid value." msgstr "Masukkan nilai yang valid." +msgid "Enter a valid domain name." +msgstr "" + msgid "Enter a valid URL." msgstr "Masukkan URL yang valid." @@ -375,14 +379,18 @@ msgstr "" "Masukkan sebuah “slug” valid yang terdiri dari huruf, angka, garis bawah, " "atau penghubung Unicode." -msgid "Enter a valid IPv4 address." -msgstr "Masukkan alamat IPv4 yang valid." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "" -msgid "Enter a valid IPv6 address." -msgstr "Masukkan alamat IPv6 yang valid" +msgid "IPv4" +msgstr "" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Masukkan alamat IPv4 atau IPv6 yang valid" +msgid "IPv6" +msgstr "" + +msgid "IPv4 or IPv6" +msgstr "" msgid "Enter only digits separated by commas." msgstr "Hanya masukkan angka yang dipisahkan dengan koma." @@ -409,6 +417,9 @@ msgid "" "Ensure this value is a multiple of step size %(limit_value)s, starting from " "%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." msgstr "" +"Pastikan nilai ini merupakan kelipatan ukuran langkah %(limit_value)s, " +"dimulai dari %(offset)s, misalnya %(offset)s, %(valid_value1)s, " +"%(valid_value2)s, dan seterusnya." #, python-format msgid "" diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo index d7f0f768d2..d7dad0a5ad 100644 Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po index 591cdf3080..ca8a726ffb 100644 --- a/django/conf/locale/ja/LC_MESSAGES/django.po +++ b/django/conf/locale/ja/LC_MESSAGES/django.po @@ -12,8 +12,8 @@ # Masashi SHIBATA , 2017 # Nikita K , 2019 # Shinichi Katsumata , 2019 -# Shinya Okano , 2012-2019,2021,2023 -# Taichi Taniguchi, 2022 +# Shinya Okano , 2012-2019,2021,2023-2024 +# TANIGUCHI Taichi, 2022 # Takuro Onoue , 2020 # Takuya N , 2020 # Tetsuya Morimoto , 2011 @@ -21,9 +21,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Shinya Okano , 2012-2019,2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Shinya Okano , " +"2012-2019,2021,2023-2024\n" "Language-Team: Japanese (http://app.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -358,6 +359,9 @@ msgstr "このページには結果が含まれていません。" msgid "Enter a valid value." msgstr "値を正しく入力してください。" +msgid "Enter a valid domain name." +msgstr "有効なドメイン名を入力してください。" + msgid "Enter a valid URL." msgstr "URLを正しく入力してください。" @@ -380,14 +384,18 @@ msgstr "" "ユニコード文字、数字、アンダースコアまたはハイフンで構成された、有効なスラグ" "を入力してください。" -msgid "Enter a valid IPv4 address." -msgstr "有効なIPアドレス (IPv4) を入力してください。" +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "有効な%(protocol)sアドレスを入力してください。" -msgid "Enter a valid IPv6 address." -msgstr "IPv6の正しいアドレスを入力してください。" +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "IPv4またはIPv6の正しいアドレスを入力してください。" +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4またはIPv6" msgid "Enter only digits separated by commas." msgstr "カンマ区切りの数字だけを入力してください。" diff --git a/django/conf/locale/ko/LC_MESSAGES/django.mo b/django/conf/locale/ko/LC_MESSAGES/django.mo index 0aaf757398..02c61beb19 100644 Binary files a/django/conf/locale/ko/LC_MESSAGES/django.mo and b/django/conf/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ko/LC_MESSAGES/django.po b/django/conf/locale/ko/LC_MESSAGES/django.po index 52832dcc51..ef36cf19d9 100644 --- a/django/conf/locale/ko/LC_MESSAGES/django.po +++ b/django/conf/locale/ko/LC_MESSAGES/django.po @@ -4,6 +4,7 @@ # BJ Jang , 2014 # JunGu Kang , 2017 # Jiyoon, Ha , 2016 +# darjeeling , 2024 # DONGHO JEONG , 2020 # Park Hyunwoo , 2017 # Geonho Kim / Leo Kim , 2019 @@ -22,6 +23,7 @@ # Mariusz Felisiak , 2021 # Seho Noh , 2018 # Seoeun(Sun☀️) Hong, 2023 +# 최소영, 2024 # Subin Choi , 2016 # Taesik Yoon , 2015 # 정훈 이, 2021 @@ -29,9 +31,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Seoeun(Sun☀️) Hong, 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: darjeeling , 2024\n" "Language-Team: Korean (http://app.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -316,7 +318,7 @@ msgid "Udmurt" msgstr "이제프스크" msgid "Uyghur" -msgstr "" +msgstr "위구르" msgid "Ukrainian" msgstr "우크라이나어" @@ -365,6 +367,9 @@ msgstr "해당 페이지에 결과가 없습니다." msgid "Enter a valid value." msgstr "올바른 값을 입력하세요." +msgid "Enter a valid domain name." +msgstr "유효한 도메인 이름을 입력하세요." + msgid "Enter a valid URL." msgstr "올바른 URL을 입력하세요." @@ -386,14 +391,18 @@ msgstr "" "유니코드 문자, 숫자, 언더스코어 또는 하이픈으로 구성된 올바른 내용을 입력하세" "요." -msgid "Enter a valid IPv4 address." -msgstr "올바른 IPv4 주소를 입력하세요." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "유효한 %(protocol)s의 주소를 입력하세요." -msgid "Enter a valid IPv6 address." -msgstr "올바른 IPv6 주소를 입력하세요." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "올바른 IPv4 혹은 IPv6 주소를 입력하세요." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 혹은 IPv6" msgid "Enter only digits separated by commas." msgstr "콤마로 구분된 숫자만 입력하세요." @@ -414,13 +423,15 @@ msgstr "%(limit_value)s 이상의 값을 입력해 주세요." #, python-format msgid "Ensure this value is a multiple of step size %(limit_value)s." -msgstr "" +msgstr "단계 크기 %(limit_value)s의 배수를 입력해 주세요." #, python-format msgid "" "Ensure this value is a multiple of step size %(limit_value)s, starting from " "%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." msgstr "" +"예를 들어 %(offset)s, %(valid_value1)s, %(valid_value2)s 등, %(offset)s에서 " +"시작하는 %(limit_value)s의 배수를 입력해 주세요." #, python-format msgid "" @@ -529,7 +540,7 @@ msgid "String (up to %(max_length)s)" msgstr "문자열(%(max_length)s 글자까지)" msgid "String (unlimited)" -msgstr "" +msgstr "문자열 (무제한의)" msgid "Comma-separated integers" msgstr "정수(콤마로 구분)" diff --git a/django/conf/locale/lv/LC_MESSAGES/django.mo b/django/conf/locale/lv/LC_MESSAGES/django.mo index 3e4fae85eb..ddbf8c3baa 100644 Binary files a/django/conf/locale/lv/LC_MESSAGES/django.mo and b/django/conf/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/lv/LC_MESSAGES/django.po b/django/conf/locale/lv/LC_MESSAGES/django.po index 91b6f74269..26e5090617 100644 --- a/django/conf/locale/lv/LC_MESSAGES/django.po +++ b/django/conf/locale/lv/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # edgars , 2011 -# Edgars Voroboks , 2023 +# Edgars Voroboks , 2023-2024 # Edgars Voroboks , 2017,2022 # Edgars Voroboks , 2017-2018 # Jannis Leidel , 2011 @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Edgars Voroboks , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Edgars Voroboks , 2023-2024\n" "Language-Team: Latvian (http://app.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -355,6 +355,9 @@ msgstr "Lapa nesatur rezultātu" msgid "Enter a valid value." msgstr "Ievadiet korektu vērtību." +msgid "Enter a valid domain name." +msgstr "Ievadiet derīgu domēna vārdu." + msgid "Enter a valid URL." msgstr "Ievadiet korektu URL adresi." @@ -378,14 +381,18 @@ msgstr "" "Ievadiet korektu \"identifikatora\" vērtību, kas satur tikai Unikoda burtus, " "ciparus, apakšsvītras vai defises." -msgid "Enter a valid IPv4 address." -msgstr "Ievadiet korektu IPv4 adresi." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Ievadiet derīgu %(protocol)s adresi." -msgid "Enter a valid IPv6 address." -msgstr "Ievadiet korektu IPv6 adresi" +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Ievadiet korektu IPv4 vai IPv6 adresi" +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 vai IPv6" msgid "Enter only digits separated by commas." msgstr "Ievadiet tikai numurus, atdalītus ar komatiem." diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo index bd0c7363fb..7bb3da3fc2 100644 Binary files a/django/conf/locale/nl/LC_MESSAGES/django.mo and b/django/conf/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po index 9db19ac023..85fe2403ae 100644 --- a/django/conf/locale/nl/LC_MESSAGES/django.po +++ b/django/conf/locale/nl/LC_MESSAGES/django.po @@ -15,14 +15,14 @@ # Meteor0id, 2019-2020 # 8de006b1b0894aab6aef71979dcd8bd6_5c6b207 , 2014-2015 # Tino de Bruijn , 2013 -# Tonnes , 2017,2019-2020,2022-2023 +# Tonnes , 2017,2019-2020,2022-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Tonnes , 2017,2019-2020,2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Tonnes , 2017,2019-2020,2022-2024\n" "Language-Team: Dutch (http://app.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -356,6 +356,9 @@ msgstr "Die pagina bevat geen resultaten" msgid "Enter a valid value." msgstr "Voer een geldige waarde in." +msgid "Enter a valid domain name." +msgstr "Voer een geldige domeinnaam in." + msgid "Enter a valid URL." msgstr "Voer een geldige URL in." @@ -379,14 +382,18 @@ msgstr "" "Voer een geldige ‘slug’ in, bestaande uit Unicode-letters, cijfers, liggende " "streepjes en verbindingsstreepjes." -msgid "Enter a valid IPv4 address." -msgstr "Voer een geldig IPv4-adres in." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Voer een geldig %(protocol)s-adres in." -msgid "Enter a valid IPv6 address." -msgstr "Voer een geldig IPv6-adres in." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Voer een geldig IPv4- of IPv6-adres in." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4- of IPv6" msgid "Enter only digits separated by commas." msgstr "Voer alleen cijfers in, gescheiden door komma's." diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo index 3da13804f9..56a969979b 100644 Binary files a/django/conf/locale/pl/LC_MESSAGES/django.mo and b/django/conf/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pl/LC_MESSAGES/django.po b/django/conf/locale/pl/LC_MESSAGES/django.po index 99d69fae38..7dc17ae2db 100644 --- a/django/conf/locale/pl/LC_MESSAGES/django.po +++ b/django/conf/locale/pl/LC_MESSAGES/django.po @@ -18,7 +18,7 @@ # Maciej Olko , 2016-2021 # Maciej Olko , 2023 # Maciej Olko , 2015 -# Mariusz Felisiak , 2020-2021,2023 +# Mariusz Felisiak , 2020-2021,2023-2024 # Michał Pasternak , 2013 # c10516f0462e552b4c3672569f0745a7_cc5cca2 <841826256cd8f47d0e443806a8e56601_19204>, 2012 # Piotr Meuś , 2014 @@ -33,10 +33,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" "Last-Translator: Mariusz Felisiak , " -"2020-2021,2023\n" +"2020-2021,2023-2024\n" "Language-Team: Polish (http://app.transifex.com/django/django/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -372,6 +372,9 @@ msgstr "Ta strona nie zawiera wyników" msgid "Enter a valid value." msgstr "Wpisz poprawną wartość." +msgid "Enter a valid domain name." +msgstr "Wpisz poprawną nazwę domeny." + msgid "Enter a valid URL." msgstr "Wpisz poprawny URL." @@ -394,14 +397,18 @@ msgstr "" "Wpisz poprawny „slug” zawierający litery Unicode, cyfry, podkreślenia i " "myślniki." -msgid "Enter a valid IPv4 address." -msgstr "Wprowadź poprawny adres IPv4." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Wpisz poprawny adres %(protocol)s. " -msgid "Enter a valid IPv6 address." -msgstr "Wprowadź poprawny adres IPv6." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Wprowadź poprawny adres IPv4 lub IPv6." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 lub IPv6" msgid "Enter only digits separated by commas." msgstr "Wpisz tylko cyfry oddzielone przecinkami." diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 66c5ac7745..41fb501633 100644 Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 9e08d6b3cf..11ee807b93 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,12 +8,13 @@ # Arthur Silva , 2017 # bruno.devpod , 2014 # Camilo B. Moreira , 2017 -# Carlos C. Leite , 2020 -# Carlos C. Leite , 2016,2019 +# Carlos Cadu “Cadu” Leite , 2020 +# Carlos Cadu “Cadu” Leite , 2016,2019 # Filipe Cifali , 2016 # Claudio Rogerio Carvalho Filho , 2020 # dudanogueira , 2012 # dudanogueira , 2019 +# Eduardo Felipe Castegnaro , 2024 # Elyézer Rezende , 2013 # Fábio C. Barrionuevo da Luz , 2014-2015 # Felipe Rodrigues , 2016 @@ -22,6 +23,7 @@ # fa9e10542e458baef0599ae856e43651_13d2225, 2011-2014 # Guilherme , 2022 # Heron Fonsaca, 2022 +# Hugo Tácito , 2024 # Igor Cavalcante , 2017 # Jannis Leidel , 2011 # Jonas Rodrigues, 2023 @@ -42,9 +44,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Leonardo Gregianin, 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Eduardo Felipe Castegnaro , 2024\n" "Language-Team: Portuguese (Brazil) (http://app.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -379,6 +381,9 @@ msgstr "Essa página não contém resultados" msgid "Enter a valid value." msgstr "Informe um valor válido." +msgid "Enter a valid domain name." +msgstr "Informe um domínio válido." + msgid "Enter a valid URL." msgstr "Informe uma URL válida." @@ -401,14 +406,18 @@ msgstr "" "Informe um “slug” válido tendo letras em Unicode, números, \"underscores\" e " "hífens." -msgid "Enter a valid IPv4 address." -msgstr "Insira um endereço IPv4 válido." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Insira um endereço %(protocol)s válido." -msgid "Enter a valid IPv6 address." -msgstr "Insira um endereço IPv6 válido." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Insira um endereço IPv4 ou IPv6 válido." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 ou IPv6" msgid "Enter only digits separated by commas." msgstr "Insira apenas dígitos separados por vírgulas." diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index e4044214a9..138118e11a 100644 Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index a4d56f2026..1766d19521 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -19,16 +19,16 @@ # Panasoft, 2021 # Вася Аникин , 2017 # SeryiMysh , 2020 -# Алексей Борискин , 2013-2017,2019-2020,2022-2023 +# Алексей Борискин , 2013-2017,2019-2020,2022-2024 # Bobsans , 2016,2018 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" "Last-Translator: Алексей Борискин , " -"2013-2017,2019-2020,2022-2023\n" +"2013-2017,2019-2020,2022-2024\n" "Language-Team: Russian (http://app.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -365,6 +365,9 @@ msgstr "Страница не содержит результатов" msgid "Enter a valid value." msgstr "Введите правильное значение." +msgid "Enter a valid domain name." +msgstr "Введите правильное имя домена." + msgid "Enter a valid URL." msgstr "Введите правильный URL." @@ -388,14 +391,18 @@ msgstr "" "Значение должно состоять только из символов входящих в стандарт Юникод, " "цифр, символов подчёркивания или дефисов." -msgid "Enter a valid IPv4 address." -msgstr "Введите правильный IPv4 адрес." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Введите правильный адрес %(protocol)s." -msgid "Enter a valid IPv6 address." -msgstr "Введите действительный IPv6 адрес." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Введите действительный IPv4 или IPv6 адрес." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 или IPv6" msgid "Enter only digits separated by commas." msgstr "Введите цифры, разделенные запятыми." diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index e1f7271601..ddfe767cc9 100644 Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index 14da7f96f2..e245cb14c5 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Adam Zahradník, 2023 +# Adam Zahradník, 2023-2024 # Jannis Leidel , 2011 # 18f25ad6fa9930fc67cb11aca9d16a27, 2012-2013 # Marian Andre , 2013,2015,2017-2018 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Martin Tóth , 2017,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Adam Zahradník, 2023-2024\n" "Language-Team: Slovak (http://app.transifex.com/django/django/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -351,6 +351,9 @@ msgstr "Stránka neobsahuje žiadne výsledky" msgid "Enter a valid value." msgstr "Zadajte platnú hodnotu." +msgid "Enter a valid domain name." +msgstr "Zadajte platný názov domény." + msgid "Enter a valid URL." msgstr "Zadajte platnú URL adresu." @@ -374,14 +377,18 @@ msgstr "" "Zadajte platnú skratku pozostávajúcu z písmen Unicode, čísel, " "podčiarkovníkov alebo pomlčiek." -msgid "Enter a valid IPv4 address." -msgstr "Zadajte platnú IPv4 adresu." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Zadajte platnú %(protocol)s adresu." -msgid "Enter a valid IPv6 address." -msgstr "Zadajte platnú IPv6 adresu." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Zadajte platnú IPv4 alebo IPv6 adresu." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 alebo IPv6" msgid "Enter only digits separated by commas." msgstr "Zadajte len číslice oddelené čiarkami." diff --git a/django/conf/locale/sq/LC_MESSAGES/django.mo b/django/conf/locale/sq/LC_MESSAGES/django.mo index 44c1348d3a..b6de2d0425 100644 Binary files a/django/conf/locale/sq/LC_MESSAGES/django.mo and b/django/conf/locale/sq/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sq/LC_MESSAGES/django.po b/django/conf/locale/sq/LC_MESSAGES/django.po index a58abd152a..37142f53c9 100644 --- a/django/conf/locale/sq/LC_MESSAGES/django.po +++ b/django/conf/locale/sq/LC_MESSAGES/django.po @@ -2,16 +2,16 @@ # # Translators: # Besnik Bleta , 2011-2014 -# Besnik Bleta , 2020-2023 +# Besnik Bleta , 2020-2024 # Besnik Bleta , 2015-2019 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Besnik Bleta , 2020-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Besnik Bleta , 2020-2024\n" "Language-Team: Albanian (http://app.transifex.com/django/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -346,6 +346,9 @@ msgstr "Ajo faqe s’përmban përfundime" msgid "Enter a valid value." msgstr "Jepni një vlerë të vlefshme." +msgid "Enter a valid domain name." +msgstr "Jepni një emër të vlefshëm përkatësie." + msgid "Enter a valid URL." msgstr "Jepni një URL të vlefshme." @@ -369,14 +372,18 @@ msgstr "" "Jepni një “slug” të vlefshëm, të përbërë nga shkronja, numra, nënvija ose " "vija ndarëse Unikod." -msgid "Enter a valid IPv4 address." -msgstr "Jepni një adresë IPv4 të vlefshme." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Jepni një adresë %(protocol)s të vlefshme." -msgid "Enter a valid IPv6 address." -msgstr "Jepni një adresë IPv6 të vlefshme." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Jepni një adresë IPv4 ose IPv6 të vlefshme." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4, ose IPv6" msgid "Enter only digits separated by commas." msgstr "Jepni vetëm shifra të ndara nga presje." diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index 4b305d7daa..ce850cd15e 100644 Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index 7d8efcf0af..aee578af78 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # Branko Kokanovic , 2018-2019 -# Igor Jerosimić, 2019-2021,2023 +# Igor Jerosimić, 2019-2021,2023-2024 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 # Mariusz Felisiak , 2021 @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Igor Jerosimić, 2019-2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Igor Jerosimić, 2019-2021,2023-2024\n" "Language-Team: Serbian (http://app.transifex.com/django/django/language/" "sr/)\n" "MIME-Version: 1.0\n" @@ -348,6 +348,9 @@ msgstr "Тражена страна не садржи резултате" msgid "Enter a valid value." msgstr "Унесите исправну вредност." +msgid "Enter a valid domain name." +msgstr "Унесите исправно име домена." + msgid "Enter a valid URL." msgstr "Унесите исправан URL." @@ -371,14 +374,18 @@ msgstr "" "Унесите исправан \"слаг\", који се састоји од Уникод слова, бројки, доњих " "црта или цртица." -msgid "Enter a valid IPv4 address." -msgstr "Унесите исправну IPv4 адресу." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Унесите исправну адресу %(protocol)s." -msgid "Enter a valid IPv6 address." -msgstr "Унесите исправну IPv6 адресу." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Унесите исправну IPv4 или IPv6 адресу." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 или IPv6" msgid "Enter only digits separated by commas." msgstr "Унесите само цифре раздвојене запетама." diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo index 3e17b5ae9b..4a4ffa80dc 100644 Binary files a/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.po b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po index ab4ac0ff44..5f5bc7790a 100644 --- a/django/conf/locale/sr_Latn/LC_MESSAGES/django.po +++ b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po @@ -1,410 +1,537 @@ # This file is distributed under the same license as the Django package. -# +# # Translators: # Aleksa Cukovic` , 2020 # Danijela Popović, 2022 -# Igor Jerosimić, 2019-2021,2023 +# Igor Jerosimić, 2019-2021,2023-2024 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Igor Jerosimić, 2019-2021,2023\n" -"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/" -"language/sr@latin/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Igor Jerosimić, 2019-2021,2023-2024\n" +"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/language/sr@latin/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr@latin\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" +"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" +#: conf/global_settings.py:52 msgid "Afrikaans" msgstr "afrikanski" +#: conf/global_settings.py:53 msgid "Arabic" msgstr "arapski" +#: conf/global_settings.py:54 msgid "Algerian Arabic" msgstr "Alžirski arapski" +#: conf/global_settings.py:55 msgid "Asturian" msgstr "asturijski" +#: conf/global_settings.py:56 msgid "Azerbaijani" msgstr "azerbejdžanski" +#: conf/global_settings.py:57 msgid "Bulgarian" msgstr "bugarski" +#: conf/global_settings.py:58 msgid "Belarusian" msgstr "beloruski" +#: conf/global_settings.py:59 msgid "Bengali" msgstr "bengalski" +#: conf/global_settings.py:60 msgid "Breton" msgstr "bretonski" +#: conf/global_settings.py:61 msgid "Bosnian" msgstr "bosanski" +#: conf/global_settings.py:62 msgid "Catalan" msgstr "katalonski" +#: conf/global_settings.py:63 msgid "Central Kurdish (Sorani)" msgstr "centralnokurdski (sorani)" +#: conf/global_settings.py:64 msgid "Czech" msgstr "češki" +#: conf/global_settings.py:65 msgid "Welsh" msgstr "velški" +#: conf/global_settings.py:66 msgid "Danish" msgstr "danski" +#: conf/global_settings.py:67 msgid "German" msgstr "nemački" +#: conf/global_settings.py:68 msgid "Lower Sorbian" msgstr "donjolužičkosrpski" +#: conf/global_settings.py:69 msgid "Greek" msgstr "grčki" +#: conf/global_settings.py:70 msgid "English" msgstr "engleski" +#: conf/global_settings.py:71 msgid "Australian English" msgstr "australijski engleski" +#: conf/global_settings.py:72 msgid "British English" msgstr "britanski engleski" +#: conf/global_settings.py:73 msgid "Esperanto" msgstr "esperanto" +#: conf/global_settings.py:74 msgid "Spanish" msgstr "španski" +#: conf/global_settings.py:75 msgid "Argentinian Spanish" msgstr "argentinski španski" +#: conf/global_settings.py:76 msgid "Colombian Spanish" msgstr "kolumbijski španski" +#: conf/global_settings.py:77 msgid "Mexican Spanish" msgstr "meksički španski" +#: conf/global_settings.py:78 msgid "Nicaraguan Spanish" msgstr "nikaragvanski španski" +#: conf/global_settings.py:79 msgid "Venezuelan Spanish" msgstr "venecuelanski španski" +#: conf/global_settings.py:80 msgid "Estonian" msgstr "estonski" +#: conf/global_settings.py:81 msgid "Basque" msgstr "baskijski" +#: conf/global_settings.py:82 msgid "Persian" msgstr "persijski" +#: conf/global_settings.py:83 msgid "Finnish" msgstr "finski" +#: conf/global_settings.py:84 msgid "French" msgstr "francuski" +#: conf/global_settings.py:85 msgid "Frisian" msgstr "frizijski" +#: conf/global_settings.py:86 msgid "Irish" msgstr "irski" +#: conf/global_settings.py:87 msgid "Scottish Gaelic" msgstr "škotski galski" +#: conf/global_settings.py:88 msgid "Galician" msgstr "galski" +#: conf/global_settings.py:89 msgid "Hebrew" msgstr "hebrejski" +#: conf/global_settings.py:90 msgid "Hindi" msgstr "hindu" +#: conf/global_settings.py:91 msgid "Croatian" msgstr "hrvatski" +#: conf/global_settings.py:92 msgid "Upper Sorbian" msgstr "gornjolužičkosrpski" +#: conf/global_settings.py:93 msgid "Hungarian" msgstr "mađarski" +#: conf/global_settings.py:94 msgid "Armenian" msgstr "jermenski" +#: conf/global_settings.py:95 msgid "Interlingua" msgstr "interlingva" +#: conf/global_settings.py:96 msgid "Indonesian" msgstr "indonežanski" +#: conf/global_settings.py:97 msgid "Igbo" msgstr "Igbo" +#: conf/global_settings.py:98 msgid "Ido" msgstr "ido" +#: conf/global_settings.py:99 msgid "Icelandic" msgstr "islandski" +#: conf/global_settings.py:100 msgid "Italian" msgstr "italijanski" +#: conf/global_settings.py:101 msgid "Japanese" msgstr "japanski" +#: conf/global_settings.py:102 msgid "Georgian" msgstr "gruzijski" +#: conf/global_settings.py:103 msgid "Kabyle" msgstr "kabilski" +#: conf/global_settings.py:104 msgid "Kazakh" msgstr "kazaški" +#: conf/global_settings.py:105 msgid "Khmer" msgstr "kambodijski" +#: conf/global_settings.py:106 msgid "Kannada" msgstr "kanada" +#: conf/global_settings.py:107 msgid "Korean" msgstr "korejski" +#: conf/global_settings.py:108 msgid "Kyrgyz" msgstr "Kirgiski" +#: conf/global_settings.py:109 msgid "Luxembourgish" msgstr "luksemburški" +#: conf/global_settings.py:110 msgid "Lithuanian" msgstr "litvanski" +#: conf/global_settings.py:111 msgid "Latvian" msgstr "latvijski" +#: conf/global_settings.py:112 msgid "Macedonian" msgstr "makedonski" +#: conf/global_settings.py:113 msgid "Malayalam" msgstr "malajalamski" +#: conf/global_settings.py:114 msgid "Mongolian" msgstr "mongolski" +#: conf/global_settings.py:115 msgid "Marathi" msgstr "marathi" +#: conf/global_settings.py:116 msgid "Malay" msgstr "malajski" +#: conf/global_settings.py:117 msgid "Burmese" msgstr "burmanski" +#: conf/global_settings.py:118 msgid "Norwegian Bokmål" msgstr "norveški književni" +#: conf/global_settings.py:119 msgid "Nepali" msgstr "nepalski" +#: conf/global_settings.py:120 msgid "Dutch" msgstr "holandski" +#: conf/global_settings.py:121 msgid "Norwegian Nynorsk" msgstr "norveški novi" +#: conf/global_settings.py:122 msgid "Ossetic" msgstr "osetinski" +#: conf/global_settings.py:123 msgid "Punjabi" msgstr "Pandžabi" +#: conf/global_settings.py:124 msgid "Polish" msgstr "poljski" +#: conf/global_settings.py:125 msgid "Portuguese" msgstr "portugalski" +#: conf/global_settings.py:126 msgid "Brazilian Portuguese" msgstr "brazilski portugalski" +#: conf/global_settings.py:127 msgid "Romanian" msgstr "rumunski" +#: conf/global_settings.py:128 msgid "Russian" msgstr "ruski" +#: conf/global_settings.py:129 msgid "Slovak" msgstr "slovački" +#: conf/global_settings.py:130 msgid "Slovenian" msgstr "slovenački" +#: conf/global_settings.py:131 msgid "Albanian" msgstr "albanski" +#: conf/global_settings.py:132 msgid "Serbian" msgstr "srpski" +#: conf/global_settings.py:133 msgid "Serbian Latin" msgstr "srpski (latinica)" +#: conf/global_settings.py:134 msgid "Swedish" msgstr "švedski" +#: conf/global_settings.py:135 msgid "Swahili" msgstr "svahili" +#: conf/global_settings.py:136 msgid "Tamil" msgstr "tamilski" +#: conf/global_settings.py:137 msgid "Telugu" msgstr "telugu" +#: conf/global_settings.py:138 msgid "Tajik" msgstr "Tadžiki" +#: conf/global_settings.py:139 msgid "Thai" msgstr "tajlandski" +#: conf/global_settings.py:140 msgid "Turkmen" msgstr "Turkmenski" +#: conf/global_settings.py:141 msgid "Turkish" msgstr "turski" +#: conf/global_settings.py:142 msgid "Tatar" msgstr "tatarski" +#: conf/global_settings.py:143 msgid "Udmurt" msgstr "udmurtski" +#: conf/global_settings.py:144 msgid "Uyghur" -msgstr "" +msgstr "Ujgur" +#: conf/global_settings.py:145 msgid "Ukrainian" msgstr "ukrajinski" +#: conf/global_settings.py:146 msgid "Urdu" msgstr "Urdu" +#: conf/global_settings.py:147 msgid "Uzbek" msgstr "Uzbekistanski" +#: conf/global_settings.py:148 msgid "Vietnamese" msgstr "vijetnamski" +#: conf/global_settings.py:149 msgid "Simplified Chinese" msgstr "novokineski" +#: conf/global_settings.py:150 msgid "Traditional Chinese" msgstr "starokineski" +#: contrib/messages/apps.py:15 msgid "Messages" msgstr "Poruke" +#: contrib/sitemaps/apps.py:8 msgid "Site Maps" msgstr "Mape sajta" +#: contrib/staticfiles/apps.py:9 msgid "Static Files" msgstr "Statičke datoteke" +#: contrib/syndication/apps.py:7 msgid "Syndication" msgstr "Udruživanje sadržaja" #. Translators: String used to replace omitted page numbers in elided page #. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +#: core/paginator.py:30 msgid "…" msgstr "…" +#: core/paginator.py:32 msgid "That page number is not an integer" msgstr "Zadati broj strane nije ceo broj" +#: core/paginator.py:33 msgid "That page number is less than 1" msgstr "Zadati broj strane je manji od 1" +#: core/paginator.py:34 msgid "That page contains no results" msgstr "Tražena strana ne sadrži rezultate" +#: core/validators.py:22 msgid "Enter a valid value." msgstr "Unesite ispravnu vrednost." +#: core/validators.py:70 +msgid "Enter a valid domain name." +msgstr "Unesite ispravno ime domena." + +#: core/validators.py:104 forms/fields.py:759 msgid "Enter a valid URL." msgstr "Unesite ispravan URL." +#: core/validators.py:165 msgid "Enter a valid integer." msgstr "Unesite ispravan ceo broj." +#: core/validators.py:176 msgid "Enter a valid email address." msgstr "Unesite ispravnu e-mail adresu." #. Translators: "letters" means latin letters: a-z and A-Z. +#: core/validators.py:259 msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." -msgstr "" -"Unesite isrpavan „slag“, koji se sastoji od slova, brojki, donjih crta ili " -"cirtica." +msgstr "Unesite isrpavan „slag“, koji se sastoji od slova, brojki, donjih crta ili cirtica." +#: core/validators.py:267 msgid "" -"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " -"hyphens." -msgstr "" -"Unesite ispravan \"slag\", koji se sastoji od Unikod slova, brojki, donjih " -"crta ili crtica." +"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or" +" hyphens." +msgstr "Unesite ispravan \"slag\", koji se sastoji od Unikod slova, brojki, donjih crta ili crtica." -msgid "Enter a valid IPv4 address." -msgstr "Unesite ispravnu IPv4 adresu." +#: core/validators.py:327 core/validators.py:336 core/validators.py:350 +#: db/models/fields/__init__.py:2219 +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Unesite ispravnu adresu %(protocol)s." -msgid "Enter a valid IPv6 address." -msgstr "Unesite ispravnu IPv6 adresu." +#: core/validators.py:329 +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Unesite ispravnu IPv4 ili IPv6 adresu." +#: core/validators.py:338 utils/ipv6.py:30 +msgid "IPv6" +msgstr "IPv6" +#: core/validators.py:352 +msgid "IPv4 or IPv6" +msgstr "IPv4 ili IPv6" + +#: core/validators.py:341 msgid "Enter only digits separated by commas." msgstr "Unesite samo brojke razdvojene zapetama." +#: core/validators.py:347 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Ovo polje mora da bude %(limit_value)s (trenutno ima %(show_value)s)." +#: core/validators.py:382 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "Ova vrednost mora da bude manja od %(limit_value)s. ili tačno toliko." +#: core/validators.py:391 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "Ova vrednost mora biti veća od %(limit_value)s ili tačno toliko." +#: core/validators.py:400 #, python-format msgid "Ensure this value is a multiple of step size %(limit_value)s." msgstr "Ova vrednost mora da umnožak veličine koraka %(limit_value)s." +#: core/validators.py:407 #, python-format msgid "" "Ensure this value is a multiple of step size %(limit_value)s, starting from " "%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." -msgstr "" +msgstr "Uverite se da je ova vrednost višestruka od veličine koraka %(limit_value)s, počevši od %(offset)s, npr. %(offset)s, %(valid_value1)s, %(valid_value2)s, itd." +#: core/validators.py:439 #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -412,16 +539,11 @@ msgid "" msgid_plural "" "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." -msgstr[0] "" -"Ovo polje mora da ima najmanje %(limit_value)d karakter (trenutno ima " -"%(show_value)d)." -msgstr[1] "" -"Ovo polje mora da ima najmanje %(limit_value)d karaktera (trenutno ima " -"%(show_value)d)." -msgstr[2] "" -"Ovo polje mora da ima %(limit_value)d najmanje karaktera (trenutno ima " -"%(show_value)d )." +msgstr[0] "Ovo polje mora da ima najmanje %(limit_value)d karakter (trenutno ima %(show_value)d)." +msgstr[1] "Ovo polje mora da ima najmanje %(limit_value)d karaktera (trenutno ima %(show_value)d)." +msgstr[2] "Ovo polje mora da ima %(limit_value)d najmanje karaktera (trenutno ima %(show_value)d )." +#: core/validators.py:457 #, python-format msgid "" "Ensure this value has at most %(limit_value)d character (it has " @@ -429,19 +551,15 @@ msgid "" msgid_plural "" "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." -msgstr[0] "" -"Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima " -"%(show_value)d)." -msgstr[1] "" -"Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima " -"%(show_value)d)." -msgstr[2] "" -"Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima " -"%(show_value)d)." +msgstr[0] "Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima %(show_value)d)." +msgstr[1] "Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima %(show_value)d)." +msgstr[2] "Ovo polje ne sme da ima više od %(limit_value)d karaktera (trenutno ima %(show_value)d)." +#: core/validators.py:480 forms/fields.py:354 forms/fields.py:393 msgid "Enter a number." msgstr "Unesite broj." +#: core/validators.py:482 #, python-format msgid "Ensure that there are no more than %(max)s digit in total." msgid_plural "Ensure that there are no more than %(max)s digits in total." @@ -449,6 +567,7 @@ msgstr[0] "Ukupno ne može biti više od %(max)s cifre." msgstr[1] "Ukupno ne može biti više od %(max)s cifre." msgstr[2] "Ukupno ne može biti više od %(max)s cifara." +#: core/validators.py:487 #, python-format msgid "Ensure that there are no more than %(max)s decimal place." msgid_plural "Ensure that there are no more than %(max)s decimal places." @@ -456,6 +575,7 @@ msgstr[0] "Ne može biti više od %(max)s decimale." msgstr[1] "Ne može biti više od %(max)s decimale." msgstr[2] "Ne može biti više od %(max)s decimala." +#: core/validators.py:492 #, python-format msgid "" "Ensure that there are no more than %(max)s digit before the decimal point." @@ -465,344 +585,402 @@ msgstr[0] "Ne može biti više od %(max)s cifre pre decimalnog zapisa." msgstr[1] "Ne može biti više od %(max)s cifre pre decimalnog zapisa." msgstr[2] "Ne može biti više od %(max)s cifara pre decimalnog zapisa." +#: core/validators.py:563 #, python-format msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." -msgstr "" -"Ekstenzija datoteke \"%(extension)s\" nije dozvoljena. Dozvoljene su sledeće " -"ekstenzije: %(allowed_extensions)s." +msgstr "Ekstenzija datoteke \"%(extension)s\" nije dozvoljena. Dozvoljene su sledeće ekstenzije: %(allowed_extensions)s." +#: core/validators.py:624 msgid "Null characters are not allowed." msgstr "'Null' karakteri nisu dozvoljeni." +#: db/models/base.py:1465 forms/models.py:902 msgid "and" msgstr "i" +#: db/models/base.py:1467 #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." msgstr "%(model_name)s sa poljem %(field_labels)s već postoji." +#: db/models/constraints.py:20 #, python-format msgid "Constraint “%(name)s” is violated." msgstr "Ograničenje „%(name)s“ je prekršeno." +#: db/models/fields/__init__.py:128 #, python-format msgid "Value %(value)r is not a valid choice." msgstr "Vrednost %(value)r nije validna." +#: db/models/fields/__init__.py:129 msgid "This field cannot be null." msgstr "Ovo polje ne može da ostane prazno." +#: db/models/fields/__init__.py:130 msgid "This field cannot be blank." msgstr "Ovo polje ne može da ostane prazno." +#: db/models/fields/__init__.py:131 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s sa ovom vrednošću %(field_label)s već postoji." #. Translators: The 'lookup_type' is one of 'date', 'year' or #. 'month'. Eg: "Title must be unique for pub_date year" +#: db/models/fields/__init__.py:135 #, python-format msgid "" "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." -msgstr "" -"%(field_label)s mora biti jedinstven(a) za %(date_field_label)s " -"%(lookup_type)s." +msgstr "%(field_label)s mora biti jedinstven(a) za %(date_field_label)s %(lookup_type)s." +#: db/models/fields/__init__.py:174 #, python-format msgid "Field of type: %(field_type)s" msgstr "Polje tipa: %(field_type)s" +#: db/models/fields/__init__.py:1157 #, python-format msgid "“%(value)s” value must be either True or False." msgstr "Vrednost \"%(value)s\" mora biti True ili False." +#: db/models/fields/__init__.py:1158 #, python-format msgid "“%(value)s” value must be either True, False, or None." msgstr "\"%(value)s\" vrednost mora biti True, False ili None." +#: db/models/fields/__init__.py:1160 msgid "Boolean (Either True or False)" msgstr "Bulova vrednost (True ili False)" +#: db/models/fields/__init__.py:1210 #, python-format msgid "String (up to %(max_length)s)" msgstr "String (najviše %(max_length)s znakova)" +#: db/models/fields/__init__.py:1212 msgid "String (unlimited)" msgstr "String (neograničeno)" +#: db/models/fields/__init__.py:1316 msgid "Comma-separated integers" msgstr "Celi brojevi razdvojeni zapetama" +#: db/models/fields/__init__.py:1417 #, python-format msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." -msgstr "" -"Vrednost \"%(value)s\" nema ispravan format datuma. Mora biti u formatu GGGG-" -"MM-DD." +msgstr "Vrednost \"%(value)s\" nema ispravan format datuma. Mora biti u formatu GGGG-MM-DD." +#: db/models/fields/__init__.py:1421 db/models/fields/__init__.py:1556 #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." -msgstr "" -"Vrednost “%(value)s” ima odgovarajući format (GGGG-MM-DD), ali nije validan " -"datum." +msgstr "Vrednost “%(value)s” ima odgovarajući format (GGGG-MM-DD), ali nije validan datum." +#: db/models/fields/__init__.py:1425 msgid "Date (without time)" msgstr "Datum (bez vremena)" +#: db/models/fields/__init__.py:1552 #, python-format msgid "" -"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." -"uuuuuu]][TZ] format." -msgstr "" -"Vrednost “%(value)s” je u nevažećem formatu. Mora se uneti u formatu YYYY-MM-" -"DD HH:MM[:ss[.uuuuuu]][TZ]." +"“%(value)s” value has an invalid format. It must be in YYYY-MM-DD " +"HH:MM[:ss[.uuuuuu]][TZ] format." +msgstr "Vrednost “%(value)s” je u nevažećem formatu. Mora se uneti u formatu YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]." +#: db/models/fields/__init__.py:1560 #, python-format msgid "" -"“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ]) but it is an invalid date/time." -msgstr "" -"Vrednost “%(value)s” je u odgovarajućem formatu (YYYY-MM-DD HH:MM[:ss[." -"uuuuuu]][TZ]), ali nije validna vrednost za datum i vreme." +"“%(value)s” value has the correct format (YYYY-MM-DD " +"HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time." +msgstr "Vrednost “%(value)s” je u odgovarajućem formatu (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), ali nije validna vrednost za datum i vreme." +#: db/models/fields/__init__.py:1565 msgid "Date (with time)" msgstr "Datum (sa vremenom)" +#: db/models/fields/__init__.py:1689 #, python-format msgid "“%(value)s” value must be a decimal number." msgstr "Vrednost “%(value)s” mora biti decimalni broj." +#: db/models/fields/__init__.py:1691 msgid "Decimal number" msgstr "Decimalni broj" +#: db/models/fields/__init__.py:1852 #, python-format msgid "" -"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." -"uuuuuu] format." -msgstr "" -"Vrednost “%(value)s” nije u odgovarajućem formatu. Mora biti u formatu [DD] " -"[[HH:]MM:]ss[.uuuuuu]." +"“%(value)s” value has an invalid format. It must be in [DD] " +"[[HH:]MM:]ss[.uuuuuu] format." +msgstr "Vrednost “%(value)s” nije u odgovarajućem formatu. Mora biti u formatu [DD] [[HH:]MM:]ss[.uuuuuu]." +#: db/models/fields/__init__.py:1856 msgid "Duration" msgstr "Vremenski interval" +#: db/models/fields/__init__.py:1908 msgid "Email address" msgstr "Imejl adresa" +#: db/models/fields/__init__.py:1933 msgid "File path" msgstr "Putanja fajla" +#: db/models/fields/__init__.py:2011 #, python-format msgid "“%(value)s” value must be a float." msgstr "Vrednost “%(value)s” value mora biti tipa float." +#: db/models/fields/__init__.py:2013 msgid "Floating point number" msgstr "Broj sa pokrenom zapetom" +#: db/models/fields/__init__.py:2053 #, python-format msgid "“%(value)s” value must be an integer." msgstr "Vrednost “%(value)s” mora biti ceo broj." +#: db/models/fields/__init__.py:2055 msgid "Integer" msgstr "Ceo broj" +#: db/models/fields/__init__.py:2151 msgid "Big (8 byte) integer" msgstr "Veliki ceo broj" +#: db/models/fields/__init__.py:2168 msgid "Small integer" msgstr "Mali ceo broj" +#: db/models/fields/__init__.py:2176 msgid "IPv4 address" msgstr "IPv4 adresa" +#: db/models/fields/__init__.py:2207 msgid "IP address" msgstr "IP adresa" +#: db/models/fields/__init__.py:2300 db/models/fields/__init__.py:2301 #, python-format msgid "“%(value)s” value must be either None, True or False." msgstr "Vrednost “%(value)s” mora biti None, True ili False." +#: db/models/fields/__init__.py:2303 msgid "Boolean (Either True, False or None)" msgstr "Bulova vrednost (True, False ili None)" +#: db/models/fields/__init__.py:2354 msgid "Positive big integer" msgstr "Velik pozitivan celi broj" +#: db/models/fields/__init__.py:2369 msgid "Positive integer" msgstr "Pozitivan ceo broj" +#: db/models/fields/__init__.py:2384 msgid "Positive small integer" msgstr "Pozitivan mali ceo broj" +#: db/models/fields/__init__.py:2400 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slag (ne duži od %(max_length)s)" +#: db/models/fields/__init__.py:2436 msgid "Text" msgstr "Tekst" +#: db/models/fields/__init__.py:2511 #, python-format msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." -msgstr "" -"Vrednost “%(value)s” nije u odgovarajućem formatu. Mora biti u formatu HH:" -"MM[:ss[.uuuuuu]]." +msgstr "Vrednost “%(value)s” nije u odgovarajućem formatu. Mora biti u formatu HH:MM[:ss[.uuuuuu]]." +#: db/models/fields/__init__.py:2515 #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." -msgstr "" -"Vrednost “%(value)s” je u odgovarajućem formatu (HH:MM[:ss[.uuuuuu]]), ali " -"nije validna vrednost za vreme." +msgstr "Vrednost “%(value)s” je u odgovarajućem formatu (HH:MM[:ss[.uuuuuu]]), ali nije validna vrednost za vreme." +#: db/models/fields/__init__.py:2519 msgid "Time" msgstr "Vreme" +#: db/models/fields/__init__.py:2627 msgid "URL" msgstr "URL" +#: db/models/fields/__init__.py:2651 msgid "Raw binary data" msgstr "Sirovi binarni podaci" +#: db/models/fields/__init__.py:2716 #, python-format msgid "“%(value)s” is not a valid UUID." msgstr "Vrednost “%(value)s” nije validan UUID (jedinstveni ID)." +#: db/models/fields/__init__.py:2718 msgid "Universally unique identifier" msgstr "Univerzalno jedinstveni identifikator" +#: db/models/fields/files.py:232 msgid "File" msgstr "Fajl" +#: db/models/fields/files.py:393 msgid "Image" msgstr "Slika" +#: db/models/fields/json.py:26 msgid "A JSON object" msgstr "JSON objekat" +#: db/models/fields/json.py:28 msgid "Value must be valid JSON." msgstr "Vrednost mora biti ispravni JSON." +#: db/models/fields/related.py:939 #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "Instanca modela %(model)s sa vrednošću %(field)s %(value)r ne postoji." +#: db/models/fields/related.py:941 msgid "Foreign Key (type determined by related field)" msgstr "Strani ključ (tip određuje referentno polje)" +#: db/models/fields/related.py:1235 msgid "One-to-one relationship" msgstr "Relacija jedan na jedan" +#: db/models/fields/related.py:1292 #, python-format msgid "%(from)s-%(to)s relationship" msgstr "Relacija %(from)s-%(to)s" +#: db/models/fields/related.py:1294 #, python-format msgid "%(from)s-%(to)s relationships" msgstr "Relacije %(from)s-%(to)s" +#: db/models/fields/related.py:1342 msgid "Many-to-many relationship" msgstr "Relacija više na više" #. Translators: If found as last label character, these punctuation #. characters will prevent the default label_suffix to be appended to the #. label +#: forms/boundfield.py:185 msgid ":?.!" msgstr ":?.!" +#: forms/fields.py:94 msgid "This field is required." msgstr "Ovo polje se mora popuniti." +#: forms/fields.py:303 msgid "Enter a whole number." msgstr "Unesite ceo broj." +#: forms/fields.py:474 forms/fields.py:1246 msgid "Enter a valid date." msgstr "Unesite ispravan datum." +#: forms/fields.py:497 forms/fields.py:1247 msgid "Enter a valid time." msgstr "Unesite ispravno vreme" +#: forms/fields.py:524 msgid "Enter a valid date/time." msgstr "Unesite ispravan datum/vreme." +#: forms/fields.py:558 msgid "Enter a valid duration." msgstr "Unesite ispravno trajanje." +#: forms/fields.py:559 #, python-brace-format msgid "The number of days must be between {min_days} and {max_days}." msgstr "Broj dana mora biti između {min_days} i {max_days}." +#: forms/fields.py:628 msgid "No file was submitted. Check the encoding type on the form." msgstr "Fajl nije prebačen. Proverite tip enkodiranja formulara." +#: forms/fields.py:629 msgid "No file was submitted." msgstr "Fajl nije prebačen." +#: forms/fields.py:630 msgid "The submitted file is empty." msgstr "Prebačen fajl je prazan." +#: forms/fields.py:632 #, python-format -msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." +msgid "" +"Ensure this filename has at most %(max)d character (it has %(length)d)." msgid_plural "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." -msgstr[0] "" -"Ime fajla ne može imati više od %(max)d karaktera (trenutno ima %(length)d)." -msgstr[1] "" -"Ime fajla ne može imati više od %(max)d karaktera (trenutno ima %(length)d)." -msgstr[2] "" -"Ime fajla ne može imati više od %(max)d karaktera (trenutno ima %(length)d)." +msgstr[0] "Ime fajla ne može imati više od %(max)d karaktera (trenutno ima %(length)d)." +msgstr[1] "Ime fajla ne može imati više od %(max)d karaktera (trenutno ima %(length)d)." +msgstr[2] "Ime fajla ne može imati više od %(max)d karaktera (trenutno ima %(length)d)." +#: forms/fields.py:637 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Može se samo poslati fajl ili izbrisati, ne oba." +#: forms/fields.py:701 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "" -"Prebacite ispravan fajl. Fajl koji je prebačen ili nije slika, ili je " -"oštećen." +msgstr "Prebacite ispravan fajl. Fajl koji je prebačen ili nije slika, ili je oštećen." +#: forms/fields.py:868 forms/fields.py:954 forms/models.py:1581 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "" -"%(value)s nije među ponuđenim vrednostima. Odaberite jednu od ponuđenih." +msgstr "%(value)s nije među ponuđenim vrednostima. Odaberite jednu od ponuđenih." +#: forms/fields.py:956 forms/fields.py:1075 forms/models.py:1579 msgid "Enter a list of values." msgstr "Unesite listu vrednosti." +#: forms/fields.py:1076 msgid "Enter a complete value." msgstr "Unesite kompletnu vrednost." +#: forms/fields.py:1315 msgid "Enter a valid UUID." msgstr "Unesite ispravan UUID." +#: forms/fields.py:1345 msgid "Enter a valid JSON." msgstr "Unesite ispravan JSON." #. Translators: This is the default suffix added to form field labels +#: forms/forms.py:94 msgid ":" msgstr ":" +#: forms/forms.py:231 #, python-format msgid "(Hidden field %(name)s) %(error)s" msgstr "(Skriveno polje %(name)s) %(error)s" +#: forms/formsets.py:61 #, python-format msgid "" "ManagementForm data is missing or has been tampered with. Missing fields: " "%(field_names)s. You may need to file a bug report if the issue persists." -msgstr "" -"Podaci od ManagementForm nedostaju ili su pokvareni. Polja koja nedostaju: " -"%(field_names)s. Možda će biti potrebno da prijavite grešku ako se problem " -"nastavi." +msgstr "Podaci od ManagementForm nedostaju ili su pokvareni. Polja koja nedostaju: %(field_names)s. Možda će biti potrebno da prijavite grešku ako se problem nastavi." +#: forms/formsets.py:65 #, python-format msgid "Please submit at most %(num)d form." msgid_plural "Please submit at most %(num)d forms." @@ -810,6 +988,7 @@ msgstr[0] "Molim prosledite najviše %(num)d formular." msgstr[1] "Molim prosledite najviše %(num)d formulara." msgstr[2] "Molim prosledite najviše %(num)d formulara." +#: forms/formsets.py:70 #, python-format msgid "Please submit at least %(num)d form." msgid_plural "Please submit at least %(num)d forms." @@ -817,72 +996,86 @@ msgstr[0] " Molim prosledite najmanje %(num)d formular." msgstr[1] " Molim prosledite najmanje %(num)d formulara." msgstr[2] " Molim prosledite najmanje %(num)d formulara." +#: forms/formsets.py:484 forms/formsets.py:491 msgid "Order" msgstr "Redosled" +#: forms/formsets.py:499 msgid "Delete" msgstr "Obriši" +#: forms/models.py:895 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Ispravite dupliran sadržaj za polja: %(field)s." +#: forms/models.py:900 #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." -msgstr "" -"Ispravite dupliran sadržaj za polja: %(field)s, koji mora da bude jedinstven." +msgstr "Ispravite dupliran sadržaj za polja: %(field)s, koji mora da bude jedinstven." +#: forms/models.py:907 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " "for the %(lookup)s in %(date_field)s." -msgstr "" -"Ispravite dupliran sadržaj za polja: %(field_name)s, koji mora da bude " -"jedinstven za %(lookup)s u %(date_field)s." +msgstr "Ispravite dupliran sadržaj za polja: %(field_name)s, koji mora da bude jedinstven za %(lookup)s u %(date_field)s." +#: forms/models.py:916 msgid "Please correct the duplicate values below." msgstr "Ispravite duplirane vrednosti dole." +#: forms/models.py:1353 msgid "The inline value did not match the parent instance." msgstr "Direktno uneta vrednost ne odgovara instanci roditelja." -msgid "Select a valid choice. That choice is not one of the available choices." +#: forms/models.py:1444 +msgid "" +"Select a valid choice. That choice is not one of the available choices." msgstr "Odabrana vrednost nije među ponuđenima. Odaberite jednu od ponuđenih." +#: forms/models.py:1583 #, python-format msgid "“%(pk)s” is not a valid value." msgstr "\"%(pk)s\" nije ispravna vrednost." +#: forms/utils.py:227 #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." -msgstr "" -"Vreme %(datetime)s se ne može protumačiti u vremenskoj zoni " -"%(current_timezone)s; možda je dvosmisleno ili ne postoji." +msgstr "Vreme %(datetime)s se ne može protumačiti u vremenskoj zoni %(current_timezone)s; možda je dvosmisleno ili ne postoji." +#: forms/widgets.py:457 msgid "Clear" msgstr "Očisti" +#: forms/widgets.py:458 msgid "Currently" msgstr "Trenutno" +#: forms/widgets.py:459 msgid "Change" msgstr "Izmeni" +#: forms/widgets.py:796 msgid "Unknown" msgstr "Nepoznato" +#: forms/widgets.py:797 msgid "Yes" msgstr "Da" +#: forms/widgets.py:798 msgid "No" msgstr "Ne" #. Translators: Please do not add spaces around commas. +#: template/defaultfilters.py:875 msgid "yes,no,maybe" msgstr "da,ne,možda" +#: template/defaultfilters.py:905 template/defaultfilters.py:922 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" @@ -890,269 +1083,347 @@ msgstr[0] "%(size)d bajt" msgstr[1] "%(size)d bajta" msgstr[2] "%(size)d bajtova" +#: template/defaultfilters.py:924 #, python-format msgid "%s KB" msgstr "%s KB" +#: template/defaultfilters.py:926 #, python-format msgid "%s MB" msgstr "%s MB" +#: template/defaultfilters.py:928 #, python-format msgid "%s GB" msgstr "%s GB" +#: template/defaultfilters.py:930 #, python-format msgid "%s TB" msgstr "%s TB" +#: template/defaultfilters.py:932 #, python-format msgid "%s PB" msgstr "%s PB" +#: utils/dateformat.py:73 msgid "p.m." msgstr "po p." +#: utils/dateformat.py:74 msgid "a.m." msgstr "pre p." +#: utils/dateformat.py:79 msgid "PM" msgstr "PM" +#: utils/dateformat.py:80 msgid "AM" msgstr "AM" +#: utils/dateformat.py:152 msgid "midnight" msgstr "ponoć" +#: utils/dateformat.py:154 msgid "noon" msgstr "podne" +#: utils/dates.py:7 msgid "Monday" msgstr "ponedeljak" +#: utils/dates.py:8 msgid "Tuesday" msgstr "utorak" +#: utils/dates.py:9 msgid "Wednesday" msgstr "sreda" +#: utils/dates.py:10 msgid "Thursday" msgstr "četvrtak" +#: utils/dates.py:11 msgid "Friday" msgstr "petak" +#: utils/dates.py:12 msgid "Saturday" msgstr "subota" +#: utils/dates.py:13 msgid "Sunday" msgstr "nedelja" +#: utils/dates.py:16 msgid "Mon" msgstr "pon." +#: utils/dates.py:17 msgid "Tue" msgstr "uto." +#: utils/dates.py:18 msgid "Wed" msgstr "sre." +#: utils/dates.py:19 msgid "Thu" msgstr "čet." +#: utils/dates.py:20 msgid "Fri" msgstr "pet." +#: utils/dates.py:21 msgid "Sat" msgstr "sub." +#: utils/dates.py:22 msgid "Sun" msgstr "ned." +#: utils/dates.py:25 msgid "January" msgstr "januar" +#: utils/dates.py:26 msgid "February" msgstr "februar" +#: utils/dates.py:27 msgid "March" msgstr "mart" +#: utils/dates.py:28 msgid "April" msgstr "april" +#: utils/dates.py:29 msgid "May" msgstr "maj" +#: utils/dates.py:30 msgid "June" msgstr "jun" +#: utils/dates.py:31 msgid "July" msgstr "jul" +#: utils/dates.py:32 msgid "August" msgstr "avgust" +#: utils/dates.py:33 msgid "September" msgstr "septembar" +#: utils/dates.py:34 msgid "October" msgstr "oktobar" +#: utils/dates.py:35 msgid "November" msgstr "novembar" +#: utils/dates.py:36 msgid "December" msgstr "decembar" +#: utils/dates.py:39 msgid "jan" msgstr "jan." +#: utils/dates.py:40 msgid "feb" msgstr "feb." +#: utils/dates.py:41 msgid "mar" msgstr "mar." +#: utils/dates.py:42 msgid "apr" msgstr "apr." +#: utils/dates.py:43 msgid "may" msgstr "maj." +#: utils/dates.py:44 msgid "jun" msgstr "jun." +#: utils/dates.py:45 msgid "jul" msgstr "jul." +#: utils/dates.py:46 msgid "aug" msgstr "aug." +#: utils/dates.py:47 msgid "sep" msgstr "sep." +#: utils/dates.py:48 msgid "oct" msgstr "okt." +#: utils/dates.py:49 msgid "nov" msgstr "nov." +#: utils/dates.py:50 msgid "dec" msgstr "dec." +#: utils/dates.py:53 msgctxt "abbrev. month" msgid "Jan." msgstr "Jan." +#: utils/dates.py:54 msgctxt "abbrev. month" msgid "Feb." msgstr "Feb." +#: utils/dates.py:55 msgctxt "abbrev. month" msgid "March" msgstr "Mart" +#: utils/dates.py:56 msgctxt "abbrev. month" msgid "April" msgstr "April" +#: utils/dates.py:57 msgctxt "abbrev. month" msgid "May" msgstr "Maj" +#: utils/dates.py:58 msgctxt "abbrev. month" msgid "June" msgstr "Jun" +#: utils/dates.py:59 msgctxt "abbrev. month" msgid "July" msgstr "Jul" +#: utils/dates.py:60 msgctxt "abbrev. month" msgid "Aug." msgstr "Avg." +#: utils/dates.py:61 msgctxt "abbrev. month" msgid "Sept." msgstr "Sept." +#: utils/dates.py:62 msgctxt "abbrev. month" msgid "Oct." msgstr "Okt." +#: utils/dates.py:63 msgctxt "abbrev. month" msgid "Nov." msgstr "Nov." +#: utils/dates.py:64 msgctxt "abbrev. month" msgid "Dec." msgstr "Dec." +#: utils/dates.py:67 msgctxt "alt. month" msgid "January" msgstr "Januar" +#: utils/dates.py:68 msgctxt "alt. month" msgid "February" msgstr "Februar" +#: utils/dates.py:69 msgctxt "alt. month" msgid "March" msgstr "Mart" +#: utils/dates.py:70 msgctxt "alt. month" msgid "April" msgstr "April" +#: utils/dates.py:71 msgctxt "alt. month" msgid "May" msgstr "Maj" +#: utils/dates.py:72 msgctxt "alt. month" msgid "June" msgstr "Jun" +#: utils/dates.py:73 msgctxt "alt. month" msgid "July" msgstr "Jul" +#: utils/dates.py:74 msgctxt "alt. month" msgid "August" msgstr "Avgust" +#: utils/dates.py:75 msgctxt "alt. month" msgid "September" msgstr "Septembar" +#: utils/dates.py:76 msgctxt "alt. month" msgid "October" msgstr "Oktobar" +#: utils/dates.py:77 msgctxt "alt. month" msgid "November" msgstr "Novembar" +#: utils/dates.py:78 msgctxt "alt. month" msgid "December" msgstr "Decembar" +#: utils/ipv6.py:8 msgid "This is not a valid IPv6 address." msgstr "Ovo nije ispravna IPv6 adresa." +#: utils/text.py:70 #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s…" msgstr "%(truncated_text)s..." +#: utils/text.py:255 msgid "or" msgstr "ili" #. Translators: This string is used as a separator between list elements +#: utils/text.py:274 utils/timesince.py:135 msgid ", " msgstr "," +#: utils/timesince.py:8 #, python-format msgid "%(num)d year" msgid_plural "%(num)d years" @@ -1160,6 +1431,7 @@ msgstr[0] "%(num)d godina" msgstr[1] "%(num)d godine" msgstr[2] "%(num)d godina" +#: utils/timesince.py:9 #, python-format msgid "%(num)d month" msgid_plural "%(num)d months" @@ -1167,6 +1439,7 @@ msgstr[0] "%(num)d mesec" msgstr[1] "%(num)d meseca" msgstr[2] "%(num)d meseci" +#: utils/timesince.py:10 #, python-format msgid "%(num)d week" msgid_plural "%(num)d weeks" @@ -1174,6 +1447,7 @@ msgstr[0] "%(num)d nedelja" msgstr[1] "%(num)d nedelje" msgstr[2] "%(num)d nedelja" +#: utils/timesince.py:11 #, python-format msgid "%(num)d day" msgid_plural "%(num)d days" @@ -1181,6 +1455,7 @@ msgstr[0] "%(num)d dan" msgstr[1] "%(num)d dana" msgstr[2] "%(num)d dana" +#: utils/timesince.py:12 #, python-format msgid "%(num)d hour" msgid_plural "%(num)d hours" @@ -1188,6 +1463,7 @@ msgstr[0] "%(num)d sat" msgstr[1] "%(num)d sata" msgstr[2] "%(num)d sati" +#: utils/timesince.py:13 #, python-format msgid "%(num)d minute" msgid_plural "%(num)d minutes" @@ -1195,159 +1471,168 @@ msgstr[0] "%(num)d minut" msgstr[1] "%(num)d minuta" msgstr[2] "%(num)d minuta" +#: views/csrf.py:29 msgid "Forbidden" msgstr "Zabranjeno" +#: views/csrf.py:30 msgid "CSRF verification failed. Request aborted." msgstr "CSRF verifikacija nije prošla. Zahtev odbijen." +#: views/csrf.py:34 msgid "" "You are seeing this message because this HTTPS site requires a “Referer " "header” to be sent by your web browser, but none was sent. This header is " "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." -msgstr "" -"Ova poruka je prikazana jer ovaj HTTPS sajt zahteva da \"Referer header\" " -"bude poslat od strane vašeg internet pregledača, što trenutno nije slučaj. " -"Pomenuto zaglavlje je potrebno iz bezbedonosnih razloga, da bi se osiguralo " -"da vaš pregledač nije pod kontrolom trećih lica." +msgstr "Ova poruka je prikazana jer ovaj HTTPS sajt zahteva da \"Referer header\" bude poslat od strane vašeg internet pregledača, što trenutno nije slučaj. Pomenuto zaglavlje je potrebno iz bezbedonosnih razloga, da bi se osiguralo da vaš pregledač nije pod kontrolom trećih lica." +#: views/csrf.py:40 msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." -msgstr "" -"Ako ste podesili internet pregledač da ne šalje \"Referer\" zaglavlja, " -"ponovo ih uključite, barem za ovaj sajt, ili za HTTPS konekcije, ili za " -"\"same-origin\" zahteve." +msgstr "Ako ste podesili internet pregledač da ne šalje \"Referer\" zaglavlja, ponovo ih uključite, barem za ovaj sajt, ili za HTTPS konekcije, ili za \"same-origin\" zahteve." +#: views/csrf.py:45 msgid "" -"If you are using the tag or " -"including the “Referrer-Policy: no-referrer” header, please remove them. The " -"CSRF protection requires the “Referer” header to do strict referer checking. " -"If you’re concerned about privacy, use alternatives like tag or" +" including the “Referrer-Policy: no-referrer” header, please remove them. " +"The CSRF protection requires the “Referer” header to do strict referer " +"checking. If you’re concerned about privacy, use alternatives like for links to third-party sites." -msgstr "" -"Ako koristite tag ili " -"\"Referrer-Policy: no-referrer\" zaglavlje, molimo da ih uklonite. CSRF " -"zaštita zahteva \"Referer\" zaglavlje da bi se obavila striktna \"referrer\" " -"provera. Ukoliko vas brine privatnost, koristite alternative kao za linkove ka drugim sajtovima." +msgstr "Ako koristite tag ili \"Referrer-Policy: no-referrer\" zaglavlje, molimo da ih uklonite. CSRF zaštita zahteva \"Referer\" zaglavlje da bi se obavila striktna \"referrer\" provera. Ukoliko vas brine privatnost, koristite alternative kao za linkove ka drugim sajtovima." +#: views/csrf.py:54 msgid "" "You are seeing this message because this site requires a CSRF cookie when " "submitting forms. This cookie is required for security reasons, to ensure " "that your browser is not being hijacked by third parties." -msgstr "" -"Ova poruka je prikazana jer ovaj sajt zahteva CSRF kuki kada se prosleđuju " -"podaci iz formi. Ovaj kuki je potreban iz sigurnosnih razloga, da bi se " -"osiguralo da vaš pretraživač nije pod kontrolom trećih lica." +msgstr "Ova poruka je prikazana jer ovaj sajt zahteva CSRF kuki kada se prosleđuju podaci iz formi. Ovaj kuki je potreban iz sigurnosnih razloga, da bi se osiguralo da vaš pretraživač nije pod kontrolom trećih lica." +#: views/csrf.py:60 msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." -msgstr "" -"Ako je vaš internet pregedač podešen da onemogući kolačiće, molimo da ih " -"uključite, barem za ovaj sajt, ili za \"same-origin\" zahteve." +msgstr "Ako je vaš internet pregedač podešen da onemogući kolačiće, molimo da ih uključite, barem za ovaj sajt, ili za \"same-origin\" zahteve." +#: views/csrf.py:66 msgid "More information is available with DEBUG=True." msgstr "Više informacija je dostupno sa DEBUG=True." +#: views/generic/dates.py:44 msgid "No year specified" msgstr "Godina nije naznačena" +#: views/generic/dates.py:64 views/generic/dates.py:115 +#: views/generic/dates.py:214 msgid "Date out of range" msgstr "Datum van opsega" +#: views/generic/dates.py:94 msgid "No month specified" msgstr "Mesec nije naznačen" +#: views/generic/dates.py:147 msgid "No day specified" msgstr "Dan nije naznačen" +#: views/generic/dates.py:194 msgid "No week specified" msgstr "Nedelja nije naznačena" +#: views/generic/dates.py:349 views/generic/dates.py:380 #, python-format msgid "No %(verbose_name_plural)s available" msgstr "Nedostupni objekti %(verbose_name_plural)s" +#: views/generic/dates.py:652 #, python-format msgid "" -"Future %(verbose_name_plural)s not available because %(class_name)s." -"allow_future is False." -msgstr "" -"Opcija „future“ nije dostupna za „%(verbose_name_plural)s“ jer " -"%(class_name)s.allow_future ima vrednost False." +"Future %(verbose_name_plural)s not available because " +"%(class_name)s.allow_future is False." +msgstr "Opcija „future“ nije dostupna za „%(verbose_name_plural)s“ jer %(class_name)s.allow_future ima vrednost False." +#: views/generic/dates.py:692 #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" msgstr "Neispravan datum \"%(datestr)s\" za format \"%(format)s\"" +#: views/generic/detail.py:56 #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "Nijedan objekat klase %(verbose_name)s nije nađen datim upitom." +#: views/generic/list.py:70 msgid "Page is not “last”, nor can it be converted to an int." msgstr "Stranica nije poslednja, niti može biti konvertovana u tip \"int\"." +#: views/generic/list.py:77 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Neispravna strana (%(page_number)s): %(message)s" +#: views/generic/list.py:169 #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." msgstr "Prazna lista i „%(class_name)s.allow_empty“ ima vrednost False." +#: views/static.py:48 msgid "Directory indexes are not allowed here." msgstr "Indeksi direktorijuma nisu dozvoljeni ovde." +#: views/static.py:50 #, python-format msgid "“%(path)s” does not exist" msgstr "„%(path)s“ ne postoji" +#: views/static.py:67 views/templates/directory_index.html:8 +#: views/templates/directory_index.html:11 #, python-format msgid "Index of %(directory)s" msgstr "Indeks direktorijuma %(directory)s" +#: views/templates/default_urlconf.html:7 +#: views/templates/default_urlconf.html:220 msgid "The install worked successfully! Congratulations!" msgstr "Instalacija je prošla uspešno. Čestitke!" +#: views/templates/default_urlconf.html:206 #, python-format msgid "" "View release notes for Django %(version)s" -msgstr "" -"Pogledajte napomene uz izdanje za Đango " -"%(version)s" +msgstr "Pogledajte napomene uz izdanje za Đango %(version)s" +#: views/templates/default_urlconf.html:221 #, python-format msgid "" -"You are seeing this page because DEBUG=True is in your settings file and you have not " -"configured any URLs." -msgstr "" -"Ova strana je prikazana jer je DEBUG=True u vašim podešavanjima i niste konfigurisali " -"nijedan URL." +"You are seeing this page because DEBUG=True is in your settings file " +"and you have not configured any URLs." +msgstr "Ova strana je prikazana jer je DEBUG=True u vašim podešavanjima i niste konfigurisali nijedan URL." +#: views/templates/default_urlconf.html:229 msgid "Django Documentation" msgstr "Đango dokumentacija" +#: views/templates/default_urlconf.html:230 msgid "Topics, references, & how-to’s" msgstr "Teme, reference, & kako-da" +#: views/templates/default_urlconf.html:238 msgid "Tutorial: A Polling App" msgstr "Uputstvo: aplikacija za glasanje" +#: views/templates/default_urlconf.html:239 msgid "Get started with Django" msgstr "Počnite sa Đangom" +#: views/templates/default_urlconf.html:247 msgid "Django Community" msgstr "Đango zajednica" +#: views/templates/default_urlconf.html:248 msgid "Connect, get help, or contribute" msgstr "Povežite se, potražite pomoć ili dajte doprinos" diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo index 6685971077..060ef0963c 100644 Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po index 897dde5f11..d2f455d514 100644 --- a/django/conf/locale/sv/LC_MESSAGES/django.po +++ b/django/conf/locale/sv/LC_MESSAGES/django.po @@ -10,6 +10,7 @@ # Gustaf Hansen , 2015 # Jannis Leidel , 2011 # Jonathan Lindén, 2015 +# Jörgen Olofsson, 2024 # Ken Lewerentz, 2022 # Jonathan Lindén, 2014 # Mattias Hansson , 2016 @@ -23,10 +24,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-17 02:13-0600\n" -"PO-Revision-Date: 2023-04-25 06:49+0000\n" -"Last-Translator: Anders Hovmöller , 2023\n" -"Language-Team: Swedish (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Jörgen Olofsson, 2024\n" +"Language-Team: Swedish (http://app.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -310,6 +311,9 @@ msgstr "Tatariska" msgid "Udmurt" msgstr "Udmurtiska" +msgid "Uyghur" +msgstr "Uiguriska" + msgid "Ukrainian" msgstr "Ukrainska" @@ -357,6 +361,9 @@ msgstr "Sidan innehåller inga resultat" msgid "Enter a valid value." msgstr "Fyll i ett giltigt värde." +msgid "Enter a valid domain name." +msgstr "Fyll i ett giltigt domännamn." + msgid "Enter a valid URL." msgstr "Fyll i en giltig URL." @@ -380,14 +387,18 @@ msgstr "" "Fyll i en giltig 'slug', beståendes av bokstäver, siffror, understreck eller " "bindestreck i Unicode." -msgid "Enter a valid IPv4 address." -msgstr "Fyll i en giltig IPv4-adress." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Fyll i en giltig %(protocol)s adress." -msgid "Enter a valid IPv6 address." -msgstr "Ange en giltig IPv6-adress." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Ange en giltig IPv4- eller IPv6-adress." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 eller IPv6" msgid "Enter only digits separated by commas." msgstr "Fyll enbart i siffror separerade med kommatecken." @@ -412,6 +423,15 @@ msgid "Ensure this value is a multiple of step size %(limit_value)s." msgstr "" "Kontrollera att detta värde är multipel av stegstorlek %(limit_value)s." +#, python-format +msgid "" +"Ensure this value is a multiple of step size %(limit_value)s, starting from " +"%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." +msgstr "" +"Kontrollera att detta värde är en multipel med stegstorlek %(limit_value)s, " +"med början från %(offset)s, t ex. %(offset)s, %(valid_value1)s, " +"%(valid_value2)s och så vidare" + #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " diff --git a/django/conf/locale/tk/LC_MESSAGES/django.mo b/django/conf/locale/tk/LC_MESSAGES/django.mo index cb4590d191..2858350fa1 100644 Binary files a/django/conf/locale/tk/LC_MESSAGES/django.mo and b/django/conf/locale/tk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/tk/LC_MESSAGES/django.po b/django/conf/locale/tk/LC_MESSAGES/django.po index 0d0f398b1e..ad0002618b 100644 --- a/django/conf/locale/tk/LC_MESSAGES/django.po +++ b/django/conf/locale/tk/LC_MESSAGES/django.po @@ -3,15 +3,15 @@ # Translators: # Mariusz Felisiak , 2020-2021 # Resul , 2020 -# Resul , 2022-2023 +# Resul , 2022-2024 # Welbeck Garli , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Resul , 2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: Resul , 2022-2024\n" "Language-Team: Turkmen (http://app.transifex.com/django/django/language/" "tk/)\n" "MIME-Version: 1.0\n" @@ -297,7 +297,7 @@ msgid "Udmurt" msgstr "Udmurt" msgid "Uyghur" -msgstr "" +msgstr "Uýgur" msgid "Ukrainian" msgstr "Ukrainçe" @@ -346,6 +346,9 @@ msgstr "Ol sahypada hiç hili netije ýok" msgid "Enter a valid value." msgstr "Dogry baha giriziň." +msgid "Enter a valid domain name." +msgstr "Dogry domen adyny giriziň." + msgid "Enter a valid URL." msgstr "Dogry URL giriziň." @@ -369,14 +372,18 @@ msgstr "" "Unikod harplaryndan, sanlardan, aşaky çyzyklardan ýa-da defislerden ybarat " "dogry “slug” giriziň." -msgid "Enter a valid IPv4 address." -msgstr "Dogry IPv4 salgysyny giriziň." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Dogry %(protocol)s adresi giriziň." -msgid "Enter a valid IPv6 address." -msgstr "Dogry IPv6 salgysyny giriziň." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Dogry IPv4 ýa-da IPv6 adresi giriziň." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 ýa IPv6" msgid "Enter only digits separated by commas." msgstr "Diňe otur bilen aýrylan sanlary giriziň." diff --git a/django/conf/locale/tr/LC_MESSAGES/django.mo b/django/conf/locale/tr/LC_MESSAGES/django.mo index dd8be7f237..70f6520400 100644 Binary files a/django/conf/locale/tr/LC_MESSAGES/django.mo and b/django/conf/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/tr/LC_MESSAGES/django.po b/django/conf/locale/tr/LC_MESSAGES/django.po index e9cee0499f..be5fa56bcb 100644 --- a/django/conf/locale/tr/LC_MESSAGES/django.po +++ b/django/conf/locale/tr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # Ahmet Emre Aladağ , 2013 -# BouRock, 2015-2023 +# BouRock, 2015-2024 # BouRock, 2014-2015 # Caner Başaran , 2013 # Cihad GÜNDOĞDU , 2012 @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: BouRock, 2015-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: BouRock, 2015-2024\n" "Language-Team: Turkish (http://app.transifex.com/django/django/language/" "tr/)\n" "MIME-Version: 1.0\n" @@ -354,6 +354,9 @@ msgstr "Bu sayfa hiç sonuç içermiyor" msgid "Enter a valid value." msgstr "Geçerli bir değer girin." +msgid "Enter a valid domain name." +msgstr "Geçerli bir etki alanı adı girin." + msgid "Enter a valid URL." msgstr "Geçerli bir URL girin." @@ -377,14 +380,18 @@ msgstr "" "Evrensel kod harflerden, sayılardan, altçizgilerden veya tirelerden oluşan " "geçerli bir “kısaltma” girin." -msgid "Enter a valid IPv4 address." -msgstr "Geçerli bir IPv4 adresi girin." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "Geçerli bir %(protocol)s adresi girin." -msgid "Enter a valid IPv6 address." -msgstr "Geçerli bir IPv6 adresi girin." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Geçerli bir IPv4 veya IPv6 adresi girin." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 veya IPv6" msgid "Enter only digits separated by commas." msgstr "Sadece virgülle ayrılmış rakamlar girin." diff --git a/django/conf/locale/ug/LC_MESSAGES/django.mo b/django/conf/locale/ug/LC_MESSAGES/django.mo index 4b9aed37fd..ce10d7df7f 100644 Binary files a/django/conf/locale/ug/LC_MESSAGES/django.mo and b/django/conf/locale/ug/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ug/LC_MESSAGES/django.po b/django/conf/locale/ug/LC_MESSAGES/django.po index ccaf4dae10..daa3973d8d 100644 --- a/django/conf/locale/ug/LC_MESSAGES/django.po +++ b/django/conf/locale/ug/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # abdl erkin <84247764@qq.com>, 2018 -# Abduqadir Abliz , 2023 +# Abduqadir Abliz , 2023-2024 # Abduqadir Abliz , 2023 # Azat, 2023 # Murat Orhun , 2023 @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 06:49+0000\n" -"Last-Translator: Abduqadir Abliz , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Abduqadir Abliz , 2023-2024\n" "Language-Team: Uyghur (http://app.transifex.com/django/django/language/ug/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -348,6 +348,9 @@ msgstr "ئۇ بەتتە ھېچقانداق نەتىجە يوق" msgid "Enter a valid value." msgstr "بىر ئىناۋەتلىك قىممەتنى تولدۇرۇڭ" +msgid "Enter a valid domain name." +msgstr "ئىناۋەتلىك دائىرە ئىسمى كىرگۈزۈلىدۇ." + msgid "Enter a valid URL." msgstr "ئىناۋەتلىك URL نى تولدۇرۇڭ" @@ -371,14 +374,18 @@ msgstr "" "يۇنىكودلۇق ھەرپ، سان، ئاستى سىزىق ياكى سىزىقچىلاردىن تەركىب تاپقان ئۈنۈملۈك " "«slug» نى كىرگۈزۈڭ." -msgid "Enter a valid IPv4 address." -msgstr "ئىناۋەتلىك IPv4 ئادرېسىنى كىرگۈزۈڭ." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "ئىناۋەتلىك %(protocol)sئادرېسى كىرگۈزۈلىدۇ." -msgid "Enter a valid IPv6 address." -msgstr "ئىناۋەتلىك IPv6 ئادرېسىنى كىرگۈزۈڭ." +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "ئىناۋەتلىك IPv4 ياكى IPv6 ئادرېسىنى كىرگۈزۈڭ." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 ياكى IPv6" msgid "Enter only digits separated by commas." msgstr "پەش ئارقىلىق ئايرىلغان رەقەملەرنىلا كىرگۈزۈڭ." diff --git a/django/conf/locale/uk/LC_MESSAGES/django.mo b/django/conf/locale/uk/LC_MESSAGES/django.mo index 7c96efb7d8..0e9dc9f079 100644 Binary files a/django/conf/locale/uk/LC_MESSAGES/django.mo and b/django/conf/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/uk/LC_MESSAGES/django.po b/django/conf/locale/uk/LC_MESSAGES/django.po index 8f50fc4d95..b2a71874be 100644 --- a/django/conf/locale/uk/LC_MESSAGES/django.po +++ b/django/conf/locale/uk/LC_MESSAGES/django.po @@ -11,6 +11,7 @@ # Max V. Stotsky , 2014 # Mikhail Kolesnik , 2015 # Mykola Zamkovoi , 2014 +# Natalia, 2024 # Alex Bolotov , 2013-2014 # Roman Kozlovskyi , 2012 # Sergiy Kuzmenko , 2011 @@ -21,10 +22,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-17 02:13-0600\n" -"PO-Revision-Date: 2023-04-25 06:49+0000\n" -"Last-Translator: Illia Volochii , 2019,2021-2023\n" -"Language-Team: Ukrainian (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: Natalia, 2024\n" +"Language-Team: Ukrainian (http://app.transifex.com/django/django/language/" "uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -311,6 +312,9 @@ msgstr "Татарська" msgid "Udmurt" msgstr "Удмуртська" +msgid "Uyghur" +msgstr "" + msgid "Ukrainian" msgstr "Українська" @@ -358,6 +362,9 @@ msgstr "Сторінка не містить результатів" msgid "Enter a valid value." msgstr "Введіть коректне значення." +msgid "Enter a valid domain name." +msgstr "" + msgid "Enter a valid URL." msgstr "Введіть коректний URL." @@ -379,14 +386,18 @@ msgstr "" "Введіть коректне значення 'slug' (короткого заголовку), що може містити " "тільки літери, числа, символи підкреслювання або дефіси." -msgid "Enter a valid IPv4 address." -msgstr "Введіть коректну IPv4 адресу." +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "" -msgid "Enter a valid IPv6 address." -msgstr "Введіть дійсну IPv6 адресу." +msgid "IPv4" +msgstr "" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "Введіть дійсну IPv4 чи IPv6 адресу." +msgid "IPv6" +msgstr "" + +msgid "IPv4 or IPv6" +msgstr "" msgid "Enter only digits separated by commas." msgstr "Введіть тільки цифри, що розділені комами." @@ -409,6 +420,12 @@ msgstr "Переконайтеся, що це значення більше чи msgid "Ensure this value is a multiple of step size %(limit_value)s." msgstr "" +#, python-format +msgid "" +"Ensure this value is a multiple of step size %(limit_value)s, starting from " +"%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." +msgstr "" + #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -799,7 +816,7 @@ msgid "Enter a complete value." msgstr "Введіть значення повністю." msgid "Enter a valid UUID." -msgstr "Введіть коректне значення UUID," +msgstr "Введіть коректне значення UUID." msgid "Enter a valid JSON." msgstr "Введіть коректний JSON." diff --git a/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo b/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo index 55517ea7b6..c68035c84d 100644 Binary files a/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_Hans/LC_MESSAGES/django.po b/django/conf/locale/zh_Hans/LC_MESSAGES/django.po index 097e77d4b4..012741fb5a 100644 --- a/django/conf/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_Hans/LC_MESSAGES/django.po @@ -15,6 +15,7 @@ # Le Yang , 2018 # li beite , 2020 # Liping Wang , 2016-2017 +# L., 2024 # matthew Yip , 2020 # mozillazg , 2016 # Ronald White , 2014 @@ -33,6 +34,7 @@ # ced773123cfad7b4e8b79ca80f736af9, 2011-2012 # Ziya Tang , 2018 # 付峥 , 2018 +# L., 2024 # LatteFang <370358679@qq.com>, 2020 # Kevin Sze , 2012 # 高乐喆 , 2023 @@ -40,9 +42,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-25 06:49+0000\n" -"Last-Translator: jack yang, 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 06:49+0000\n" +"Last-Translator: L., 2024\n" "Language-Team: Chinese (China) (http://app.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -377,6 +379,9 @@ msgstr "本页结果为空" msgid "Enter a valid value." msgstr "输入一个有效的值。" +msgid "Enter a valid domain name." +msgstr "输入一个有效的域名。" + msgid "Enter a valid URL." msgstr "输入一个有效的 URL。" @@ -396,14 +401,18 @@ msgid "" "hyphens." msgstr "输入由Unicode字母，数字，下划线或连字符号组成的有效“字段”。" -msgid "Enter a valid IPv4 address." -msgstr "输入一个有效的 IPv4 地址。" +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "输入一个有效的 %(protocol)s 地址。" -msgid "Enter a valid IPv6 address." -msgstr "输入一个有效的 IPv6 地址。" +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "输入一个有效的 IPv4 或 IPv6 地址." +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 或 IPv6" msgid "Enter only digits separated by commas." msgstr "只能输入用逗号分隔的数字。" diff --git a/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo b/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo index b6726c5585..c9be56e3c5 100644 Binary files a/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_Hant/LC_MESSAGES/django.po b/django/conf/locale/zh_Hant/LC_MESSAGES/django.po index 61d827a15b..1671ebd942 100644 --- a/django/conf/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,23 +2,26 @@ # # Translators: # Chen Chun-Chia , 2015 +# yubike, 2024 # Eric Ho , 2013 # ilay , 2012 # Jannis Leidel , 2011 # mail6543210 , 2013 -# ming hsien tzang , 2011 +# 0a3cb7bfd0810218facdfb511e592a6d_8d19d07 , 2011 # tcc , 2011 # Tzu-ping Chung , 2016-2017 +# YAO WEN LIANG, 2024 # Yeh-Yung , 2013 +# yubike, 2024 # Yeh-Yung , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-27 22:40+0200\n" -"PO-Revision-Date: 2019-11-05 00:38+0000\n" -"Last-Translator: Ramiro Morales\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 06:49+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,6 +35,9 @@ msgstr "南非語" msgid "Arabic" msgstr "阿拉伯語" +msgid "Algerian Arabic" +msgstr "阿爾及利亞式阿拉伯語" + msgid "Asturian" msgstr "阿斯圖里亞斯語" @@ -56,6 +62,9 @@ msgstr "波士尼亞語" msgid "Catalan" msgstr "加泰隆語" +msgid "Central Kurdish (Sorani)" +msgstr "中部庫爾德語 (Sorani)" + msgid "Czech" msgstr "捷克語" @@ -147,7 +156,7 @@ msgid "Hungarian" msgstr "匈牙利語" msgid "Armenian" -msgstr "" +msgstr "亞美尼亞語" msgid "Interlingua" msgstr "國際語" @@ -155,6 +164,9 @@ msgstr "國際語" msgid "Indonesian" msgstr "印尼語" +msgid "Igbo" +msgstr "伊博語" + msgid "Ido" msgstr "伊多語" @@ -185,6 +197,9 @@ msgstr "康納達語" msgid "Korean" msgstr "韓語" +msgid "Kyrgyz" +msgstr "吉爾吉斯語" + msgid "Luxembourgish" msgstr "盧森堡語" @@ -206,6 +221,9 @@ msgstr "蒙古語" msgid "Marathi" msgstr "馬拉提語" +msgid "Malay" +msgstr "馬來語" + msgid "Burmese" msgstr "緬甸語" @@ -269,9 +287,15 @@ msgstr "坦米爾語" msgid "Telugu" msgstr "泰盧固語" +msgid "Tajik" +msgstr "塔吉克語" + msgid "Thai" msgstr "泰語" +msgid "Turkmen" +msgstr "土庫曼語" + msgid "Turkish" msgstr "土耳其語" @@ -281,6 +305,9 @@ msgstr "韃靼語" msgid "Udmurt" msgstr "烏德穆爾特語" +msgid "Uyghur" +msgstr "維吾爾語" + msgid "Ukrainian" msgstr "烏克蘭語" @@ -288,7 +315,7 @@ msgid "Urdu" msgstr "烏爾都語" msgid "Uzbek" -msgstr "" +msgstr "烏茲別克語" msgid "Vietnamese" msgstr "越南語" @@ -311,6 +338,11 @@ msgstr "靜態文件" msgid "Syndication" msgstr "聯播" +#. Translators: String used to replace omitted page numbers in elided page +#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10]. +msgid "…" +msgstr "…" + msgid "That page number is not an integer" msgstr "該頁碼並非整數" @@ -323,6 +355,9 @@ msgstr "該頁未包含任何內容" msgid "Enter a valid value." msgstr "請輸入有效的值。" +msgid "Enter a valid domain name." +msgstr "輸入有效的網域名稱。" + msgid "Enter a valid URL." msgstr "請輸入有效的 URL。" @@ -335,21 +370,25 @@ msgstr "請輸入有效的電子郵件地址。" #. Translators: "letters" means latin letters: a-z and A-Z. msgid "" "Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." -msgstr "" +msgstr "輸入合適的 \"slug\" 字串，由字母、數字、底線與連字號組成。" msgid "" "Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." -msgstr "" +msgstr "輸入合適的 \"slug\" 字串，內含 Unicode 字元、數字、底線或減號。" -msgid "Enter a valid IPv4 address." -msgstr "請輸入有效的 IPv4 位址。" +#, python-format +msgid "Enter a valid %(protocol)s address." +msgstr "輸入正確的 %(protocol)s 位址。." -msgid "Enter a valid IPv6 address." -msgstr "請輸入有效的 IPv6 位址。" +msgid "IPv4" +msgstr "IPv4" -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "請輸入有效的 IPv4 或 IPv6 位址。" +msgid "IPv6" +msgstr "IPv6" + +msgid "IPv4 or IPv6" +msgstr "IPv4 或 IPv6" msgid "Enter only digits separated by commas." msgstr "請輸入以逗號分隔的數字。" @@ -366,6 +405,18 @@ msgstr "請確認此數值是否小於或等於 %(limit_value)s。" msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "請確認此數值是否大於或等於 %(limit_value)s。" +#, python-format +msgid "Ensure this value is a multiple of step size %(limit_value)s." +msgstr "請確認此數值是 %(limit_value)s 的倍數。" + +#, python-format +msgid "" +"Ensure this value is a multiple of step size %(limit_value)s, starting from " +"%(offset)s, e.g. %(offset)s, %(valid_value1)s, %(valid_value2)s, and so on." +msgstr "" +"請確認此數值是 %(limit_value)s的倍數。從 %(offset)s 起始，例如 %(offset)s, " +"%(valid_value1)s, %(valid_value2)s，以此類推。" + #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -397,20 +448,20 @@ msgstr[0] "請確認數字全長不超過 %(max)s 位。" #, python-format msgid "Ensure that there are no more than %(max)s decimal place." msgid_plural "Ensure that there are no more than %(max)s decimal places." -msgstr[0] "請確認十進位數字不多於 %(max)s 位。" +msgstr[0] "確認小數不超過 %(max)s 位。" #, python-format msgid "" "Ensure that there are no more than %(max)s digit before the decimal point." msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." -msgstr[0] "請確認小數點前不多於 %(max)s 位。" +msgstr[0] "請確認小數點前不超過 %(max)s 位。" #, python-format msgid "" "File extension “%(extension)s” is not allowed. Allowed extensions are: " "%(allowed_extensions)s." -msgstr "" +msgstr "不允許副檔名為 “%(extension)s” 。可用的像是: %(allowed_extensions)s。" msgid "Null characters are not allowed." msgstr "不允許空（null）字元。" @@ -420,24 +471,28 @@ msgstr "和" #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "這個 %(field_labels)s 在 %(model_name)s 已經存在。" +msgstr "包含 %(field_labels)s 的 %(model_name)s 已經存在。" + +#, python-format +msgid "Constraint “%(name)s” is violated." +msgstr "約束條件 “%(name)s” 被違反。" #, python-format msgid "Value %(value)r is not a valid choice." -msgstr "數值 %(value)r 不是有效的選擇。" +msgstr "數值 %(value)r 不是有效的選項。" msgid "This field cannot be null." msgstr "這個值不能是 null。" msgid "This field cannot be blank." -msgstr "這個欄位不能留白。" +msgstr "這個欄位不能為空。" #, python-format msgid "%(model_name)s with this %(field_label)s already exists." -msgstr "這個 %(field_label)s 在 %(model_name)s 已經存在。" +msgstr "包含 %(field_label)s 的 %(model_name)s 已經存在。" -#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. -#. Eg: "Title must be unique for pub_date year" +#. Translators: The 'lookup_type' is one of 'date', 'year' or +#. 'month'. Eg: "Title must be unique for pub_date year" #, python-format msgid "" "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." @@ -445,15 +500,15 @@ msgstr "%(field_label)s 在 %(date_field_label)s %(lookup_type)s 上必須唯一 #, python-format msgid "Field of type: %(field_type)s" -msgstr "欄位型態： %(field_type)s" +msgstr "欄位類型： %(field_type)s" #, python-format msgid "“%(value)s” value must be either True or False." -msgstr "" +msgstr "“%(value)s” 只能是 True 或 False。" #, python-format msgid "“%(value)s” value must be either True, False, or None." -msgstr "" +msgstr "“%(value)s” 只能是 True 或 False 或 None 。" msgid "Boolean (Either True or False)" msgstr "布林值 (True 或 False)" @@ -462,6 +517,9 @@ msgstr "布林值 (True 或 False)" msgid "String (up to %(max_length)s)" msgstr "字串 (至多 %(max_length)s 個字)" +msgid "String (unlimited)" +msgstr "字串 (無限)" + msgid "Comma-separated integers" msgstr "逗號分隔的整數" @@ -469,13 +527,13 @@ msgstr "逗號分隔的整數" msgid "" "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." -msgstr "" +msgstr "“%(value)s” 的日期格式錯誤。應該是 YYYY-MM-DD 才對。" #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." -msgstr "" +msgstr "“%(value)s” 的格式正確 (YYYY-MM-DD) 但日期有誤。" msgid "Date (without time)" msgstr "日期 (不包括時間)" @@ -485,19 +543,21 @@ msgid "" "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" +"“%(value)s” 的格式錯誤。應該是 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 才對。" #, python-format msgid "" "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) but it is an invalid date/time." msgstr "" +"“%(value)s” 的格式正確 (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) 但日期/時間有誤。" msgid "Date (with time)" msgstr "日期 (包括時間)" #, python-format msgid "“%(value)s” value must be a decimal number." -msgstr "" +msgstr "“%(value)s” 必須是十進位數。" msgid "Decimal number" msgstr "十進位數" @@ -506,10 +566,10 @@ msgstr "十進位數" msgid "" "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." -msgstr "" +msgstr "“%(value)s” 的格式錯誤。格式必須為 [DD] [[HH:]MM:]ss[.uuuuuu] 。" msgid "Duration" -msgstr "時間長" +msgstr "時長" msgid "Email address" msgstr "電子郵件地址" @@ -519,20 +579,23 @@ msgstr "檔案路徑" #, python-format msgid "“%(value)s” value must be a float." -msgstr "" +msgstr "“%(value)s” 必須是浮點小數。" msgid "Floating point number" msgstr "浮點數" #, python-format msgid "“%(value)s” value must be an integer." -msgstr "" +msgstr "“%(value)s” 必須是整數。" msgid "Integer" msgstr "整數" msgid "Big (8 byte) integer" -msgstr "大整數 (8 位元組)" +msgstr "大整數 (8位元組)" + +msgid "Small integer" +msgstr "小整數" msgid "IPv4 address" msgstr "IPv4 地址" @@ -542,11 +605,14 @@ msgstr "IP 位址" #, python-format msgid "“%(value)s” value must be either None, True or False." -msgstr "" +msgstr "“%(value)s” 必須是 None, True 或 False。" msgid "Boolean (Either True, False or None)" msgstr "布林值 (True, False 或 None)" +msgid "Positive big integer" +msgstr "大的正整數" + msgid "Positive integer" msgstr "正整數" @@ -555,10 +621,7 @@ msgstr "正小整數" #, python-format msgid "Slug (up to %(max_length)s)" -msgstr "可讀網址 (長度最多 %(max_length)s)" - -msgid "Small integer" -msgstr "小整數" +msgstr "Slug (最多 %(max_length)s個字)" msgid "Text" msgstr "文字" @@ -567,42 +630,48 @@ msgstr "文字" msgid "" "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." -msgstr "" +msgstr "“%(value)s” 格式錯誤。格式必須為 HH:MM[:ss[.uuuuuu]] 。" #, python-format msgid "" "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." -msgstr "" +msgstr "“%(value)s” 的格式正確 (HH:MM[:ss[.uuuuuu]])，但時間有誤。" msgid "Time" msgstr "時間" msgid "URL" -msgstr "URL" +msgstr "網址" msgid "Raw binary data" msgstr "原始二進制數據" #, python-format msgid "“%(value)s” is not a valid UUID." -msgstr "" +msgstr "“%(value)s” 不是有效的 UUID。" msgid "Universally unique identifier" -msgstr "" +msgstr "通用唯一識別碼" msgid "File" msgstr "檔案" msgid "Image" -msgstr "影像" +msgstr "圖像" + +msgid "A JSON object" +msgstr "JSON 物件" + +msgid "Value must be valid JSON." +msgstr "必須是有效的 JSON 值" #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "%(field)s 為 %(value)r 的 %(model)s 物件不存在。" msgid "Foreign Key (type determined by related field)" -msgstr "外鍵 (型態由關連欄位決定)" +msgstr "外鍵（類型由相關欄位決定）" msgid "One-to-one relationship" msgstr "一對一關連" @@ -644,7 +713,7 @@ msgstr "輸入有效的時間長。" #, python-brace-format msgid "The number of days must be between {min_days} and {max_days}." -msgstr "" +msgstr "天數必須介於 {min_days} 到 {max_days} 天" msgid "No file was submitted. Check the encoding type on the form." msgstr "沒有檔案被送出。請檢查表單的編碼類型。" @@ -662,16 +731,16 @@ msgid_plural "" msgstr[0] "請確認這個檔名至多包含 %(max)d 個字 (目前為 %(length)d)。" msgid "Please either submit a file or check the clear checkbox, not both." -msgstr "請提交一個檔案或確認清除核可項, 不能兩者都做。" +msgstr "請提交一個檔案或勾選清除選項，但不能同時進行。" msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." -msgstr "上傳一個有效的圖檔。你上傳的檔案為非圖片，不然就是損壞的圖檔。" +msgstr "請上傳一個有效的圖檔。你上傳的檔案不是圖片或是已損壞的圖檔。" #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "請選擇有效的項目, %(value)s 不是一個可用的選擇。" +msgstr "請選擇有效的選項, %(value)s 不是一個可用的選項。" msgid "Enter a list of values." msgstr "請輸入一個列表的值。" @@ -682,6 +751,9 @@ msgstr "請輸入完整的值。" msgid "Enter a valid UUID." msgstr "請輸入有效的 UUID。" +msgid "Enter a valid JSON." +msgstr "輸入有效的 JSON。" + #. Translators: This is the default suffix added to form field labels msgid ":" msgstr "：" @@ -690,18 +762,23 @@ msgstr "：" msgid "(Hidden field %(name)s) %(error)s" msgstr "(隱藏欄位 %(name)s) %(error)s" -msgid "ManagementForm data is missing or has been tampered with" -msgstr "ManagementForm 資料缺失或遭竄改" +#, python-format +msgid "" +"ManagementForm data is missing or has been tampered with. Missing fields: " +"%(field_names)s. You may need to file a bug report if the issue persists." +msgstr "" +"ManagementForm 資料遺失或被篡改。缺少欄位：%(field_names)s。如果問題持續存" +"在，您可能需要提交錯誤報告。" #, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "請送出不多於 %d 個表單。" +msgid "Please submit at most %(num)d form." +msgid_plural "Please submit at most %(num)d forms." +msgstr[0] "請送出最多 %(num)d 個表單。" #, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "請送出多於 %d 個表單。" +msgid "Please submit at least %(num)d form." +msgid_plural "Please submit at least %(num)d forms." +msgstr[0] "請送出最少 %(num)d 個表單。" msgid "Order" msgstr "排序" @@ -735,13 +812,15 @@ msgstr "選擇有效的選項： 此選擇不在可用的選項中。" #, python-format msgid "“%(pk)s” is not a valid value." -msgstr "" +msgstr "“%(pk)s” 不是一個有效的值。" #, python-format msgid "" "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" +"%(datetime)s 無法被轉換成 %(current_timezone)s時區格式; 可能內容有誤或不存" +"在。" msgid "Clear" msgstr "清除" @@ -761,15 +840,7 @@ msgstr "是" msgid "No" msgstr "否" -msgid "Year" -msgstr "" - -msgid "Month" -msgstr "" - -msgid "Day" -msgstr "" - +#. Translators: Please do not add spaces around commas. msgid "yes,no,maybe" msgstr "是、否、也許" @@ -1032,7 +1103,7 @@ msgstr "這是無效的 IPv6 位址。" #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s…" -msgstr "" +msgstr "%(truncated_text)s…" msgid "or" msgstr "或" @@ -1042,37 +1113,34 @@ msgid ", " msgstr ", " #, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "%d 年" +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d 年" #, python-format -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "%d 月" +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d 月" #, python-format -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "%d 週" +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d 週" #, python-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d 日" +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d 日" #, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d 時" +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d 小時" #, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d 分" - -msgid "0 minutes" -msgstr "0 分" +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d 分" msgid "Forbidden" msgstr "禁止" @@ -1082,24 +1150,32 @@ msgstr "CSRF 驗證失敗。已中止請求。" msgid "" "You are seeing this message because this HTTPS site requires a “Referer " -"header” to be sent by your Web browser, but none was sent. This header is " +"header” to be sent by your web browser, but none was sent. This header is " "required for security reasons, to ensure that your browser is not being " "hijacked by third parties." msgstr "" +"您看到此消息是因為這個 HTTPS 網站要求您的網路瀏覽器發送一個“Referer header”，" +"但並沒有被發送。出於安全原因，需要此標頭來確保您的瀏覽器沒有被第三方劫持。" msgid "" "If you have configured your browser to disable “Referer” headers, please re-" "enable them, at least for this site, or for HTTPS connections, or for “same-" "origin” requests." msgstr "" +"若您的瀏覽器設定為將「Referer」標頭關閉，請重新為這個網站、HTTPS 連線、或" +"「same-origin」請求啟用它。" msgid "" "If you are using the tag or " "including the “Referrer-Policy: no-referrer” header, please remove them. The " "CSRF protection requires the “Referer” header to do strict referer checking. " -"If you’re concerned about privacy, use alternatives like for links to third-party sites." +"If you’re concerned about privacy, use alternatives like for links to third-party sites." msgstr "" +"若您使用 標籤或包含" +"「Referrer-Policy: no-referrer」標頭，請將其移除。 CSRF 保護要求「Referer」標" +"頭進行嚴格參照檢查。若你擔心隱私問題，可使用如 來連" +"結到第三方網站。" msgid "" "You are seeing this message because this site requires a CSRF cookie when " @@ -1113,6 +1189,8 @@ msgid "" "If you have configured your browser to disable cookies, please re-enable " "them, at least for this site, or for “same-origin” requests." msgstr "" +"若你的瀏覽器設定為將 cookie 關閉，請重新為這個網站或「same-origin」請求啟用" +"它。" msgid "More information is available with DEBUG=True." msgstr "設定 DEBUG=True 以獲得更多資訊。" @@ -1124,13 +1202,13 @@ msgid "Date out of range" msgstr "日期超過範圍" msgid "No month specified" -msgstr "不指定月份" +msgstr "沒有指定月份" msgid "No day specified" -msgstr "不指定日期" +msgstr "沒有指定日期" msgid "No week specified" -msgstr "不指定週數" +msgstr "沒有指定週數" #, python-format msgid "No %(verbose_name_plural)s available" @@ -1141,19 +1219,19 @@ msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." "allow_future is False." msgstr "" -"未來的 %(verbose_name_plural)s 不可用，因 %(class_name)s.allow_future 為 " -"False." +"未來的 %(verbose_name_plural)s 不可用，因為 %(class_name)s.allow_future 設置" +"為 False." #, python-format msgid "Invalid date string “%(datestr)s” given format “%(format)s”" -msgstr "" +msgstr "日期字串 “%(datestr)s” 不符合 “%(format)s” 格式。" #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "無 %(verbose_name)s 符合本次搜尋" msgid "Page is not “last”, nor can it be converted to an int." -msgstr "" +msgstr "頁面不是最後一頁，也無法被轉換為整數。" #, python-format msgid "Invalid page (%(page_number)s): %(message)s" @@ -1161,49 +1239,46 @@ msgstr "無效的頁面 (%(page_number)s): %(message)s" #, python-format msgid "Empty list and “%(class_name)s.allow_empty” is False." -msgstr "" +msgstr "列表是空的，並且 “%(class_name)s.allow_empty” 是 False 。" msgid "Directory indexes are not allowed here." msgstr "這裡不允許目錄索引。" #, python-format msgid "“%(path)s” does not exist" -msgstr "" +msgstr "“%(path)s” 不存在。" #, python-format msgid "Index of %(directory)s" msgstr "%(directory)s 的索引" -msgid "Django: the Web framework for perfectionists with deadlines." -msgstr "Django：為有時間壓力的完美主義者設計的網站框架。" - -#, python-format -msgid "" -"View release notes for Django %(version)s" -msgstr "" -"查看 Django %(version)s 的發行筆記" - msgid "The install worked successfully! Congratulations!" msgstr "安裝成功！恭喜！" #, python-format msgid "" -"You are seeing this page because DEBUG=True is in your settings file and you have not configured any " -"URLs." +"View release notes for Django %(version)s" msgstr "" -"你看到這個訊息，是因為你在 Django 設定檔中包含 DEBUG = True，且尚未配置任何網址。開始工作吧！" +"查看 Django %(version)s 的 發行版本說明 " + +#, python-format +msgid "" +"You are seeing this page because DEBUG=True is in your settings file and you have not " +"configured any URLs." +msgstr "" +"你現在看到這個頁面，是因為在設定檔中設置了 DEBUG = True，且尚未配置任何網址。" msgid "Django Documentation" msgstr "Django 文件" msgid "Topics, references, & how-to’s" -msgstr "" +msgstr "主題、參考、教學" msgid "Tutorial: A Polling App" msgstr "教學：投票應用" @@ -1215,4 +1290,4 @@ msgid "Django Community" msgstr "Django 社群" msgid "Connect, get help, or contribute" -msgstr "聯繫、求助、貢獻" +msgstr "聯繫、獲得幫助、貢獻" diff --git a/django/conf/project_template/project_name/settings.py-tpl b/django/conf/project_template/project_name/settings.py-tpl index 3b6caab333..5631ec9a31 100644 --- a/django/conf/project_template/project_name/settings.py-tpl +++ b/django/conf/project_template/project_name/settings.py-tpl @@ -58,7 +58,6 @@ TEMPLATES = [ 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ - 'django.template.context_processors.debug', 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py index eefb63837e..865c16aff2 100644 --- a/django/contrib/admin/actions.py +++ b/django/contrib/admin/actions.py @@ -61,7 +61,7 @@ def delete_selected(modeladmin, request, queryset): if perms_needed or protected: title = _("Cannot delete %(name)s") % {"name": objects_name} else: - title = _("Are you sure?") + title = _("Delete multiple objects") context = { **modeladmin.admin_site.each_context(request), diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index 94e700cf68..a4d7066d10 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -1184,7 +1184,7 @@ class ModelAdminChecks(BaseModelAdminChecks): ) ] else: - if not isinstance(field, (models.DateField, models.DateTimeField)): + if field.get_internal_type() not in {"DateField", "DateTimeField"}: return must_be( "a DateField or DateTimeField", option="date_hierarchy", diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/django.mo b/django/contrib/admin/locale/az/LC_MESSAGES/django.mo index 356192130d..7c6990af6c 100644 Binary files a/django/contrib/admin/locale/az/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/az/LC_MESSAGES/django.po b/django/contrib/admin/locale/az/LC_MESSAGES/django.po index 1a028a3789..929b2945ba 100644 --- a/django/contrib/admin/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/az/LC_MESSAGES/django.po @@ -5,15 +5,17 @@ # Emin Mastizada , 2016 # Konul Allahverdiyeva , 2016 # Nicat Məmmədov , 2022 +# Nijat Mammadov, 2024 +# Sevdimali , 2024 # Zulfugar Ismayilzadeh , 2017 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-17 05:10-0500\n" -"PO-Revision-Date: 2022-07-25 07:05+0000\n" -"Last-Translator: Nicat Məmmədov \n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Sevdimali , 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +25,7 @@ msgstr "" #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "Seçilmiş %(verbose_name_plural)s-ləri sil" +msgstr "Seçilmiş \"%(verbose_name_plural)s\"ləri/ları sil" #, python-format msgid "Successfully deleted %(count)d %(items)s." @@ -31,10 +33,10 @@ msgstr "%(count)d %(items)s uğurla silindi." #, python-format msgid "Cannot delete %(name)s" -msgstr "%(name)s silinmir" +msgstr "%(name)s silinə bilməz" msgid "Are you sure?" -msgstr "Əminsiniz?" +msgstr "Əminsinizmi?" msgid "Administration" msgstr "Administrasiya" @@ -49,7 +51,7 @@ msgid "No" msgstr "Yox" msgid "Unknown" -msgstr "Bilinmir" +msgstr "Naməlum" msgid "Any date" msgstr "İstənilən tarix" @@ -83,8 +85,8 @@ msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Lütfən, istifadəçi hesabı üçün doğru %(username)s və parol daxil olun. " -"Nəzərə alın ki, hər iki sahə böyük/kiçik hərflərə həssasdırlar." +"Lütfən, istifadəçi hesabı üçün doğru %(username)s və şifrə daxil edin. " +"Nəzərə alın ki, hər iki xana böyük-kiçik hərflərə həssasdırlar." msgid "Action:" msgstr "Əməliyyat:" @@ -123,7 +125,7 @@ msgid "object repr" msgstr "obyekt repr" msgid "action flag" -msgstr "bayraq" +msgstr "əməliyyat bayrağı" msgid "change message" msgstr "dəyişmə mesajı" @@ -175,13 +177,16 @@ msgid "No fields changed." msgstr "Heç bir sahə dəyişmədi." msgid "None" -msgstr "Heç nə" +msgstr "Heç biri" msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" "Birdən çox seçmək üçün “Control” və ya Mac üçün “Command” düyməsini basılı " "tutun." +msgid "Select this object for an action - {}" +msgstr "Əməliyyat üçün bu obyekti seçin - {}" + #, python-brace-format msgid "The {name} “{obj}” was added successfully." msgstr "{name} “{obj}” uğurla əlavə edildi." @@ -202,11 +207,6 @@ msgid "" msgstr "" "{name} “{obj}” uğurla dəyişdirildi. Təkrar aşağıdan dəyişdirə bilərsiz." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} “{obj}” uğurla əlavə edildi. Bunu təkrar aşağıdan dəyişdirə bilərsiz." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -223,8 +223,8 @@ msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -"Biz elementlər üzərində nəsə əməliyyat aparmaq üçün siz onları seçməlisiniz. " -"Heç bir element dəyişmədi." +"Elementlər üzərində əməliyyat aparmaq üçün, siz onları seçməlisiniz. Heç bir " +"element dəyişmədi." msgid "No action selected." msgstr "Heç bir əməliyyat seçilmədi." @@ -235,7 +235,7 @@ msgstr "%(name)s “%(obj)s” uğurla silindi." #, python-format msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" -msgstr "“%(key)s” ID nömrəli %(name)s mövcud deyil. Silinmiş ola bilər?" +msgstr "“%(key)s” ID nömrəli %(name)s mövcud deyil. Bəlkə silinib?" #, python-format msgid "Add %s" @@ -250,23 +250,23 @@ msgid "View %s" msgstr "%s gör" msgid "Database error" -msgstr "Bazada xəta" +msgstr "Verilənlər bazası xətası" #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s uğurlu dəyişdirildi." -msgstr[1] "%(count)s %(name)s uğurlu dəyişdirildi." +msgstr[1] "%(count)s %(name)s uğurla dəyişdirildi." #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seçili" -msgstr[1] "Bütün %(total_count)s seçili" +msgstr[1] "Bütün %(total_count)s seçildi" #, python-format msgid "0 of %(cnt)s selected" -msgstr "%(cnt)s-dan 0 seçilib" +msgstr "%(cnt)s-dan/dən 0 seçilib" #, python-format msgid "Change history: %s" @@ -284,8 +284,8 @@ msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"%(class_name)s %(instance)s silmə əlaqəli qorunmalı obyektləri silməyi tələb " -"edir: %(related_objects)s" +"%(class_name)s %(instance)s silinməsi %(related_objects)s obyektlərinin də " +"silinməsinə gətirib çıxaracaq" msgid "Django site admin" msgstr "Django sayt administratoru" @@ -325,38 +325,41 @@ msgid "" "There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Xəta baş verdi. Problem sayt administratorlarına epoçt vasitəsi ilə " +"Xəta baş verdi. Problem sayt administratorlarına e-poçt vasitəsi ilə " "bildirildi və qısa bir zamanda həll olunacaq. Anlayışınız üçün təşəkkür " "edirik." msgid "Run the selected action" -msgstr "Seçdiyim əməliyyatı yerinə yetir" +msgstr "Seçilən əməliyyatı yerinə yetir" msgid "Go" -msgstr "Getdik" +msgstr "İrəli" msgid "Click here to select the objects across all pages" -msgstr "Bütün səhifələr üzrə obyektləri seçmək üçün bura tıqlayın" +msgstr "Bütün səhifələr üzrə obyektləri seçmək üçün bura klikləyin" #, python-format msgid "Select all %(total_count)s %(module_name)s" -msgstr "Bütün %(total_count)s sayda %(module_name)s seç" +msgstr "Hamısını seç (%(total_count)s %(module_name)s) " msgid "Clear selection" msgstr "Seçimi təmizlə" +msgid "Breadcrumbs" +msgstr "Menyu sətri" + #, python-format msgid "Models in the %(name)s application" -msgstr "%(name)s proqramındakı modellər" +msgstr "%(name)s tətbiqetməsindəki modellər" msgid "Add" msgstr "Əlavə et" msgid "View" -msgstr "Gör" +msgstr "Bax" msgid "You don’t have permission to view or edit anything." -msgstr "Nəyi isə görmək və ya redaktə etmək icazəniz yoxdur." +msgstr "Heç nəyə baxmağa və ya dəyişməyə icazəniz yoxdur." msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " @@ -371,24 +374,42 @@ msgstr "İstifadəçi adını və şifrəni daxil edin." msgid "Change password" msgstr "Şifrəni dəyiş" -msgid "Please correct the error below." -msgstr "Lütfən aşağıdakı xətanı düzəldin." +msgid "Set password" +msgstr "Şifrə təyin et" -msgid "Please correct the errors below." -msgstr "Lütfən aşağıdakı səhvləri düzəldin." +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Lütfən, aşağıdakı xətanı düzəldin." +msgstr[1] "Lütfən, aşağıdakı xətaları düzəldin." #, python-format msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s üçün yeni şifrə daxil edin." +msgstr "%(username)s istifadəçisi üçün yeni şifrə daxil edin." + +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Bu əməliyyat bu istifadəçi üçün şifrə əsaslı autentifikasiyanı aktiv " +"edəcək." + +msgid "Disable password-based authentication" +msgstr "Şifrə əsaslı autentifikasiyanı ləğv elə." + +msgid "Enable password-based authentication" +msgstr "Şifrə əsaslı autentifikasiyanı aktivləşdir." + +msgid "Skip to main content" +msgstr "Əsas məzmuna keç" msgid "Welcome," msgstr "Xoş gördük," msgid "View site" -msgstr "Saytı ziyarət et" +msgstr "Sayta bax" msgid "Documentation" -msgstr "Sənədləşdirmə" +msgstr "Dokumentasiya" msgid "Log out" msgstr "Çıx" @@ -401,11 +422,17 @@ msgid "History" msgstr "Tarix" msgid "View on site" -msgstr "Saytda göstər" +msgstr "Saytda bax" msgid "Filter" msgstr "Süzgəc" +msgid "Hide counts" +msgstr "Sayı gizlət" + +msgid "Show counts" +msgstr "Sayı göstər" + msgid "Clear all filters" msgstr "Bütün filterləri təmizlə" @@ -419,6 +446,15 @@ msgstr "Sıralama prioriteti: %(priority_number)s" msgid "Toggle sorting" msgstr "Sıralamanı çevir" +msgid "Toggle theme (current theme: auto)" +msgstr "Görünüşü dəyiş (halhazırkı: avtomatik)" + +msgid "Toggle theme (current theme: light)" +msgstr "Görünüşü dəyiş (halhazırkı: aydın)" + +msgid "Toggle theme (current theme: dark)" +msgstr "Görünüşü dəyiş (halhazırkı: qaranlıq)" + msgid "Delete" msgstr "Sil" @@ -455,7 +491,7 @@ msgid "Yes, I’m sure" msgstr "Bəli, əminəm" msgid "No, take me back" -msgstr "Xeyr, məni geri götür" +msgstr "Xeyr, geri qayıt" msgid "Delete multiple objects" msgstr "Bir neçə obyekt sil" @@ -487,7 +523,7 @@ msgstr "" "obyektlər və ona bağlı digər obyektlər də silinəcək:" msgid "Delete?" -msgstr "Silək?" +msgstr "Silinsin?" #, python-format msgid " By %(filter_title)s " @@ -505,14 +541,26 @@ msgstr "Mənim əməliyyatlarım" msgid "None available" msgstr "Heç nə yoxdur" +msgid "Added:" +msgstr "Əlavə olunub:" + +msgid "Changed:" +msgstr "Dəyişdirilib:" + +msgid "Deleted:" +msgstr "Silinib:" + msgid "Unknown content" -msgstr "Naməlum" +msgstr "Naməlum məzmun" msgid "" "Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" +"Verilənlər bazanızın quraşdırılması ilə bağlı problem var. Müvafiq " +"cədvəllərinin yaradıldığından və verilənlər bazasının müvafiq istifadəçi " +"tərəfindən oxuna biləcəyindən əmin olun." #, python-format msgid "" @@ -526,13 +574,16 @@ msgid "Forgotten your password or username?" msgstr "Şifrə və ya istifadəçi adını unutmusuz?" msgid "Toggle navigation" -msgstr "" +msgstr "Naviqasiyanı dəyiş" + +msgid "Sidebar" +msgstr "Yan panel" msgid "Start typing to filter…" msgstr "Filterləmək üçün yazın..." msgid "Filter navigation items" -msgstr "" +msgstr "Naviqasiya elementlərini filterlə" msgid "Date/time" msgstr "Tarix/vaxt" @@ -544,15 +595,16 @@ msgid "Action" msgstr "Əməliyyat" msgid "entry" -msgstr "" - -msgid "entries" -msgstr "" +msgid_plural "entries" +msgstr[0] "daxiletmə" +msgstr[1] "daxiletmələr" msgid "" "This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" +"Bu obyektin dəyişiklik tarixçəsi yoxdur. Yəqin ki, bu admin saytı vasitəsilə " +"əlavə olunmayıb." msgid "Show all" msgstr "Hamısını göstər" @@ -561,7 +613,7 @@ msgid "Save" msgstr "Yadda saxla" msgid "Popup closing…" -msgstr "Qəfil pəncərə qapatılır…" +msgstr "Qəfil pəncərə qapadılır…" msgid "Search" msgstr "Axtar" @@ -586,10 +638,10 @@ msgid "Save and continue editing" msgstr "Yadda saxla və redaktəyə davam et" msgid "Save and view" -msgstr "Saxla və gör" +msgstr "Yadda saxla və bax" msgid "Close" -msgstr "Qapat" +msgstr "Bağla" #, python-format msgid "Change selected %(model)s" @@ -605,10 +657,10 @@ msgstr "Seçilmiş %(model)s sil" #, python-format msgid "View selected %(model)s" -msgstr "" +msgstr "Bax: seçilmiş %(model)s " msgid "Thanks for spending some quality time with the web site today." -msgstr "" +msgstr "Bu gün veb saytla keyfiyyətli vaxt keçirdiyiniz üçün təşəkkür edirik." msgid "Log in again" msgstr "Yenidən daxil ol" @@ -623,6 +675,8 @@ msgid "" "Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" +"Zəhmət olmasa təhlükəsizlik naminə köhnə şifrənizi daxil edin və sonra yeni " +"şifrənizi iki dəfə daxil edin ki, düzgün daxil yazdığınızı yoxlaya bilək." msgid "Change my password" msgstr "Şifrəmi dəyiş" @@ -658,7 +712,7 @@ msgid "" "We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" -"Şifrəni təyin etmək üçün lazım olan addımlar sizə göndərildi (əgər bu epoçt " +"Şifrəni təyin etmək üçün lazım olan addımlar sizə göndərildi (əgər bu e-poçt " "ünvanı ilə hesab varsa təbii ki). Elektron məktub qısa bir müddət ərzində " "sizə çatacaq." @@ -666,6 +720,8 @@ msgid "" "If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" +"E-poçt gəlməsə, qeydiyyatdan keçdiyiniz e-poçt ünvanını doğru daxil " +"etdiyinizə əmin olun və spam qovluğunuzu yoxlayın." #, python-format msgid "" @@ -701,6 +757,9 @@ msgstr "E-poçt:" msgid "Reset my password" msgstr "Şifrəmi sıfırla" +msgid "Select all objects on this page for an action" +msgstr "Əməliyyat üçün bu səhifədəki bütün obyektləri seçin" + msgid "All dates" msgstr "Bütün tarixlərdə" diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/django.mo b/django/contrib/admin/locale/be/LC_MESSAGES/django.mo index e591705bb2..f23565c180 100644 Binary files a/django/contrib/admin/locale/be/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/be/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/be/LC_MESSAGES/django.po b/django/contrib/admin/locale/be/LC_MESSAGES/django.po index 8ce3066509..4904d355c2 100644 --- a/django/contrib/admin/locale/be/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/be/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Viktar Palstsiuk , 2015 -# znotdead , 2016-2017,2019-2021,2023 +# znotdead , 2016-2017,2019-2021,2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: znotdead , 2016-2017,2019-2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: znotdead , " +"2016-2017,2019-2021,2023-2024\n" "Language-Team: Belarusian (http://app.transifex.com/django/django/language/" "be/)\n" "MIME-Version: 1.0\n" @@ -201,10 +202,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "Пасьпяхова зьмянілі {name} \"{obj}\". Ніжэй яго можна зноўку правіць." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "Пасьпяхова дадалі {name} \"{obj}\". Ніжэй яго можна зноўку правіць." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -374,6 +371,9 @@ msgstr "Пазначце імя карыстальніка ды пароль." msgid "Change password" msgstr "Зьмяніць пароль" +msgid "Set password" +msgstr "Усталяваць пароль" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Калі ласка, выпраўце памылкy, адзначаную ніжэй." @@ -385,6 +385,19 @@ msgstr[3] "Калі ласка, выпраўце памылкі, адзнача msgid "Enter a new password for the user %(username)s." msgstr "Пазначце пароль для карыстальніка «%(username)s»." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Гэта дзеянне ўключыць аўтэнтыфікацыю на аснове пароля для " +"гэтага карыстальніка." + +msgid "Disable password-based authentication" +msgstr "Адключыць аўтэнтыфікацыю на аснове пароля" + +msgid "Enable password-based authentication" +msgstr "Уключыць аўтэнтыфікацыю на аснове пароля" + msgid "Skip to main content" msgstr "Перайсці да асноўнага зместу" diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo index 56a37d2239..3e89f3e437 100644 Binary files a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po index a49191498e..d8e8dc8a1e 100644 --- a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# arneatec , 2022-2023 +# arneatec , 2022-2024 # Boris Chervenkov , 2012 # Claude Paroz , 2014 # Jannis Leidel , 2011 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: arneatec , 2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: arneatec , 2022-2024\n" "Language-Team: Bulgarian (http://app.transifex.com/django/django/language/" "bg/)\n" "MIME-Version: 1.0\n" @@ -185,7 +185,7 @@ msgstr "" "Задръжте “Control”, или “Command” на Mac, за да изберете повече от едно." msgid "Select this object for an action - {}" -msgstr "" +msgstr "Изберете този обект за действие - {}" #, python-brace-format msgid "The {name} “{obj}” was added successfully." @@ -208,12 +208,6 @@ msgstr "" "Обектът {name} “{obj}” бе успешно променен. Можете да го промените отново по-" "долу." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"Обектът {name} “{obj}” бе успешно добавен. Можете да го промените отново по-" -"долу." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -381,6 +375,9 @@ msgstr "Въведете потребителско име и парола." msgid "Change password" msgstr "Промени парола" +msgid "Set password" +msgstr "Задайте парола" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Моля, поправете грешката по-долу." @@ -390,6 +387,19 @@ msgstr[1] "Моля, поправете грешките по-долу." msgid "Enter a new password for the user %(username)s." msgstr "Въведете нова парола за потребител %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Това действие ще включи автентикация чрез парола за този " +"потребител." + +msgid "Disable password-based authentication" +msgstr "Деактивиране на автентикация чрез парола." + +msgid "Enable password-based authentication" +msgstr "Разрешаване на автентикация чрез парола." + msgid "Skip to main content" msgstr "Пропуснете към основното съдържание" @@ -419,10 +429,10 @@ msgid "Filter" msgstr "Филтър" msgid "Hide counts" -msgstr "" +msgstr "Скрий брояча" msgid "Show counts" -msgstr "" +msgstr "Покажи брояча" msgid "Clear all filters" msgstr "Изчисти всички филтри" @@ -532,13 +542,13 @@ msgid "None available" msgstr "Няма налични" msgid "Added:" -msgstr "" +msgstr "Добавени:" msgid "Changed:" -msgstr "" +msgstr "Променени:" msgid "Deleted:" -msgstr "" +msgstr "Изтрити:" msgid "Unknown content" msgstr "Неизвестно съдържание" @@ -748,7 +758,7 @@ msgid "Reset my password" msgstr "Задай новата ми парола" msgid "Select all objects on this page for an action" -msgstr "" +msgstr "Изберете всички обекти на този страница за действие" msgid "All dates" msgstr "Всички дати" diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo index 31a2ae6934..a3eab438aa 100644 Binary files a/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po index 7716b0fcdc..4ec3a50a15 100644 --- a/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# arneatec , 2022-2023 +# arneatec , 2022-2024 # Jannis Leidel , 2011 # Venelin Stoykov , 2015-2016 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 15:04-0300\n" -"PO-Revision-Date: 2023-12-04 07:59+0000\n" -"Last-Translator: arneatec , 2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:59+0000\n" +"Last-Translator: arneatec , 2022-2024\n" "Language-Team: Bulgarian (http://app.transifex.com/django/django/language/" "bg/)\n" "MIME-Version: 1.0\n" @@ -243,53 +243,53 @@ msgid "Dec" msgstr "дек." msgid "Sunday" -msgstr "" +msgstr "неделя" msgid "Monday" -msgstr "" +msgstr "понеделник" msgid "Tuesday" -msgstr "" +msgstr "вторник" msgid "Wednesday" -msgstr "" +msgstr "сряда" msgid "Thursday" -msgstr "" +msgstr "четвъртък" msgid "Friday" -msgstr "" +msgstr "петък" msgid "Saturday" -msgstr "" +msgstr "събота" msgctxt "abbrev. day Sunday" msgid "Sun" -msgstr "" +msgstr "нед" msgctxt "abbrev. day Monday" msgid "Mon" -msgstr "" +msgstr "пон" msgctxt "abbrev. day Tuesday" msgid "Tue" -msgstr "" +msgstr "вт" msgctxt "abbrev. day Wednesday" msgid "Wed" -msgstr "" +msgstr "ср" msgctxt "abbrev. day Thursday" msgid "Thur" -msgstr "" +msgstr "чет" msgctxt "abbrev. day Friday" msgid "Fri" -msgstr "" +msgstr "пет" msgctxt "abbrev. day Saturday" msgid "Sat" -msgstr "" +msgstr "съб" msgctxt "one letter Sunday" msgid "S" @@ -318,9 +318,3 @@ msgstr "П" msgctxt "one letter Saturday" msgid "S" msgstr "С" - -msgid "Show" -msgstr "Покажи" - -msgid "Hide" -msgstr "Скрий" diff --git a/django/contrib/admin/locale/ckb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ckb/LC_MESSAGES/django.mo index e4625809b2..686f0925f3 100644 Binary files a/django/contrib/admin/locale/ckb/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ckb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ckb/LC_MESSAGES/django.po b/django/contrib/admin/locale/ckb/LC_MESSAGES/django.po index f6b80d6d80..b3157f5b2e 100644 --- a/django/contrib/admin/locale/ckb/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ckb/LC_MESSAGES/django.po @@ -4,15 +4,15 @@ # Abdulla Dlshad, 2023 # Bakhtawar Barzan, 2021 # Bakhtawar Barzan, 2021 -# kosar tofiq , 2020 +# Kosar Tofiq Saeed , 2020 # pejar hewrami , 2020 # Swara , 2022,2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2013-04-25 07:05+0000\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" "Last-Translator: Swara , 2022,2024\n" "Language-Team: Central Kurdish (http://app.transifex.com/django/django/" "language/ckb/)\n" @@ -207,12 +207,6 @@ msgstr "" "{name} “{obj}” بەسەرکەوتوویی گۆڕدرا. دەگونجێت تۆ لە خوارەوە دووبارە دەستکاری " "بکەیتەوە." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} “{obj}” بەسەرکەوتوویی زیادکرا. دەگونجێت تۆ لە خوارەوە دووبارە " -"دەستکاری بکەیتەوە." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -379,6 +373,9 @@ msgstr "ناوی بەکارهێنەر و تێپەڕەوشە بنوسە" msgid "Change password" msgstr "گۆڕینی تێپەڕەوشە" +msgid "Set password" +msgstr "دانانی تێپەڕەوشە" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "تکایە ئەم هەڵەیەی خوارەوە ڕاست بکەرەوە." @@ -388,6 +385,19 @@ msgstr[1] "تکایە هەڵەکانی خوارەوە ڕاست بکەرەوە." msgid "Enter a new password for the user %(username)s." msgstr "تێپەڕەوشەی نوێ بۆ بەکارهێنەری %(username)s بنوسە" +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"ئەم کردارە چالاک دەکات لەسەر بنەمای تێپەڕەوشەی ئەم " +"بەکارهێنەرە." + +msgid "Disable password-based authentication" +msgstr "ناچالاککردنی ڕەسەنایەتی لەسەر بنەمای تێپەڕەوشە" + +msgid "Enable password-based authentication" +msgstr "چالاککردنی ڕەسەنایەتی لەسەر بنەمای تێپەڕەوشە" + msgid "Skip to main content" msgstr "تێیپەڕێنە بۆ ناوەڕۆکی سەرەکی" diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo index d3bfdd7ea0..0dc5f9abc9 100644 Binary files a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.po b/django/contrib/admin/locale/cs/LC_MESSAGES/django.po index 65159b8166..39c3679caf 100644 --- a/django/contrib/admin/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/cs/LC_MESSAGES/django.po @@ -2,7 +2,9 @@ # # Translators: # Jannis Leidel , 2011 -# trendspotter , 2022 +# Jan Papež , 2024 +# Jiří Podhorecký , 2024 +# Jiří Podhorecký , 2022 # Jirka Vejrazka , 2011 # Tomáš Ehrlich , 2015 # Vláďa Macek , 2013-2014 @@ -12,10 +14,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-17 05:10-0500\n" -"PO-Revision-Date: 2022-07-25 07:05+0000\n" -"Last-Translator: trendspotter \n" -"Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Jan Papež , 2024\n" +"Language-Team: Czech (http://app.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -184,6 +186,9 @@ msgstr "" "Výběr více než jedné položky je možný přidržením klávesy \"Control\", na " "Macu \"Command\"." +msgid "Select this object for an action - {}" +msgstr "Vyberte tento objekt pro akci - {}" + #, python-brace-format msgid "The {name} “{obj}” was added successfully." msgstr "Položka typu {name} \"{obj}\" byla úspěšně přidána." @@ -205,12 +210,6 @@ msgstr "" "Položka typu {name} \"{obj}\" byla úspěšně změněna. Níže ji můžete dále " "upravovat." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"Položka \"{obj}\" typu {name} byla úspěšně přidána. Níže ji můžete dále " -"upravovat." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -352,6 +351,9 @@ msgstr "Vybrat všechny položky typu %(module_name)s, celkem %(total_count)s." msgid "Clear selection" msgstr "Zrušit výběr" +msgid "Breadcrumbs" +msgstr "Drobečky" + #, python-format msgid "Models in the %(name)s application" msgstr "Modely v aplikaci %(name)s" @@ -378,16 +380,36 @@ msgstr "Zadejte uživatelské jméno a heslo." msgid "Change password" msgstr "Změnit heslo" -msgid "Please correct the error below." -msgstr "Opravte níže uvedenou chybu." +msgid "Set password" +msgstr "Nastavit heslo" -msgid "Please correct the errors below." -msgstr "Opravte níže uvedené chyby." +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Opravte prosím níže uvedenou chybu." +msgstr[1] "Opravte prosím níže uvedené chyby." +msgstr[2] "Opravte prosím níže uvedené chyby." +msgstr[3] "Opravte prosím níže uvedené chyby." #, python-format msgid "Enter a new password for the user %(username)s." msgstr "Zadejte nové heslo pro uživatele %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Tato akce povolí pro tohoto uživatele ověřování na základě " +"hesla." + +msgid "Disable password-based authentication" +msgstr "Zakázat ověřování pomocí hesla" + +msgid "Enable password-based authentication" +msgstr "Povolit ověřování pomocí hesla" + +msgid "Skip to main content" +msgstr "Přeskočit na hlavní obsah" + msgid "Welcome," msgstr "Vítejte, uživateli" @@ -413,6 +435,12 @@ msgstr "Zobrazení na webu" msgid "Filter" msgstr "Filtr" +msgid "Hide counts" +msgstr "Skrýt počty" + +msgid "Show counts" +msgstr "Zobrazit počty" + msgid "Clear all filters" msgstr "Zrušit všechny filtry" @@ -426,6 +454,15 @@ msgstr "Priorita řazení: %(priority_number)s" msgid "Toggle sorting" msgstr "Přehodit řazení" +msgid "Toggle theme (current theme: auto)" +msgstr "Přepnout motiv (aktuální motiv: auto)" + +msgid "Toggle theme (current theme: light)" +msgstr "Přepnout motiv (aktuální motiv: světlý)" + +msgid "Toggle theme (current theme: dark)" +msgstr "Přepnout motiv (aktuální motiv: tmavý)" + msgid "Delete" msgstr "Odstranit" @@ -512,6 +549,15 @@ msgstr "Moje akce" msgid "None available" msgstr "Nic" +msgid "Added:" +msgstr "Přidáno:" + +msgid "Changed:" +msgstr "Změněno:" + +msgid "Deleted:" +msgstr "Smazáno:" + msgid "Unknown content" msgstr "Neznámý obsah" @@ -538,6 +584,9 @@ msgstr "Zapomněli jste heslo nebo uživatelské jméno?" msgid "Toggle navigation" msgstr "Přehodit navigaci" +msgid "Sidebar" +msgstr "Boční panel" + msgid "Start typing to filter…" msgstr "Filtrovat začnete vepsáním textu..." @@ -554,10 +603,11 @@ msgid "Action" msgstr "Operace" msgid "entry" -msgstr "" - -msgid "entries" -msgstr "" +msgid_plural "entries" +msgstr[0] "položka" +msgstr[1] "položky" +msgstr[2] "položek" +msgstr[3] "položek" msgid "" "This object doesn’t have a change history. It probably wasn’t added via this " @@ -719,6 +769,9 @@ msgstr "E-mailová adresa:" msgid "Reset my password" msgstr "Obnovit heslo" +msgid "Select all objects on this page for an action" +msgstr "Vyberte všechny objekty na této stránce pro akci" + msgid "All dates" msgstr "Všechna data" diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo index 828f705ac7..db715bc9fc 100644 Binary files a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po index f4b781881f..1e8fa73739 100644 --- a/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po @@ -2,7 +2,9 @@ # # Translators: # Jannis Leidel , 2011 -# trendspotter , 2022 +# Jan Papež , 2024 +# Jiří Podhorecký , 2024 +# Jiří Podhorecký , 2022 # Jirka Vejrazka , 2011 # Vláďa Macek , 2012,2014 # Vláďa Macek , 2015-2016,2020-2021 @@ -10,10 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-05-17 05:26-0500\n" -"PO-Revision-Date: 2022-07-25 07:59+0000\n" -"Last-Translator: trendspotter \n" -"Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:59+0000\n" +"Last-Translator: Jan Papež , 2024\n" +"Language-Team: Czech (http://app.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -67,6 +69,10 @@ msgstr "" "Seznam vybraných položek %s. Jednotlivě je lze odebrat tak, že na ně v " "rámečku klepnete a pak klepnete na šipku \"Odebrat mezi rámečky." +#, javascript-format +msgid "Type into this box to filter down the list of selected %s." +msgstr "Zadáním do tohoto pole vyfiltrujete seznam vybraných %s." + msgid "Remove all" msgstr "Odebrat vše" @@ -74,6 +80,14 @@ msgstr "Odebrat vše" msgid "Click to remove all chosen %s at once." msgstr "Chcete-li najednou odebrat všechny vybrané položky %s, klepněte sem." +#, javascript-format +msgid "%s selected option not visible" +msgid_plural "%s selected options not visible" +msgstr[0] "%s vybraná volba není viditelná" +msgstr[1] "%s vybrané volby nejsou viditelné" +msgstr[2] "%s vybrané volby nejsou viditelné" +msgstr[3] "%s vybrané volby nejsou viditelné" + msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "Vybrána je %(sel)s položka z celkem %(cnt)s." @@ -240,6 +254,55 @@ msgctxt "abbrev. month December" msgid "Dec" msgstr "Pro" +msgid "Sunday" +msgstr "Neděle" + +msgid "Monday" +msgstr "Pondělí" + +msgid "Tuesday" +msgstr "Úterý" + +msgid "Wednesday" +msgstr "Středa" + +msgid "Thursday" +msgstr "Čtvrtek" + +msgid "Friday" +msgstr "Pátek" + +msgid "Saturday" +msgstr "Sobota" + +msgctxt "abbrev. day Sunday" +msgid "Sun" +msgstr "Ned" + +msgctxt "abbrev. day Monday" +msgid "Mon" +msgstr "Pon" + +msgctxt "abbrev. day Tuesday" +msgid "Tue" +msgstr "Úte" + +msgctxt "abbrev. day Wednesday" +msgid "Wed" +msgstr "Stř" + +msgctxt "abbrev. day Thursday" +msgid "Thur" +msgstr "Čtv" + +msgctxt "abbrev. day Friday" +msgid "Fri" +msgstr "Pát" + +msgctxt "abbrev. day Saturday" +msgid "Sat" +msgstr "Sob" + msgctxt "one letter Sunday" msgid "S" msgstr "N" @@ -267,14 +330,3 @@ msgstr "P" msgctxt "one letter Saturday" msgid "S" msgstr "S" - -msgid "" -"You have already submitted this form. Are you sure you want to submit it " -"again?" -msgstr "Tento formulář jste již odeslali. Opravdu jej chcete odeslat znovu?" - -msgid "Show" -msgstr "Zobrazit" - -msgid "Hide" -msgstr "Skrýt" diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo index 7eaa256703..f909706469 100644 Binary files a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.po b/django/contrib/admin/locale/da/LC_MESSAGES/django.po index effde32e3f..293030a1c9 100644 --- a/django/contrib/admin/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/da/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Christian Joergensen , 2012 # Dimitris Glezos , 2012 -# Erik Ramsgaard Wognsen , 2020-2023 +# Erik Ramsgaard Wognsen , 2020-2024 # Erik Ramsgaard Wognsen , 2013,2015-2020 # Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Erik Ramsgaard Wognsen , 2020-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Erik Ramsgaard Wognsen , 2020-2024\n" "Language-Team: Danish (http://app.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -202,10 +202,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "{name} “{obj}” blev ændret. Du kan redigere den/det igen herunder." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "{name} “{obj}” blev tilføjet. Du kan redigere den/det igen herunder." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -372,6 +368,9 @@ msgstr "Indtast et brugernavn og en adgangskode." msgid "Change password" msgstr "Skift adgangskode" +msgid "Set password" +msgstr "Sæt adgangskode" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Ret venligst fejlen herunder." @@ -381,6 +380,19 @@ msgstr[1] "Ret venligst fejlene herunder." msgid "Enter a new password for the user %(username)s." msgstr "Indtast en ny adgangskode for brugeren %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Denne handling vil aktivere adgangskodebaseret " +"autentificering for denne bruger." + +msgid "Disable password-based authentication" +msgstr "Deaktivér adgangskodebaseret autentificering." + +msgid "Enable password-based authentication" +msgstr "Aktivér adgangskodebaseret autentificering." + msgid "Skip to main content" msgstr "Gå til hovedindhold" @@ -553,7 +565,7 @@ msgstr "" "denne site. Vil du logge ind med en anden brugerkonto?" msgid "Forgotten your password or username?" -msgstr "Har du glemt dit password eller brugernavn?" +msgstr "Har du glemt din adgangskode eller dit brugernavn?" msgid "Toggle navigation" msgstr "Vis/skjul navigation" diff --git a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo index db0f50af56..cc67569f54 100644 Binary files a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.po b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.po index 2c700c370f..31cbbba1e0 100644 --- a/django/contrib/admin/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/dsb/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2023 +# Michael Wolf , 2016-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Michael Wolf , 2016-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Michael Wolf , 2016-2024\n" "Language-Team: Lower Sorbian (http://app.transifex.com/django/django/" "language/dsb/)\n" "MIME-Version: 1.0\n" @@ -199,11 +199,6 @@ msgid "" msgstr "" "{name} „{obj}“ jo se wuspěšnje změnił. Móžośo jen dołojce znowego wobźěłowaś." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} „{obj}“ jo se wuspěšnje pśidał. Móžośo jen dołojce znowego wobźěłowaś." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -373,6 +368,9 @@ msgstr "Zapódajśo wužywarske mě a gronidło." msgid "Change password" msgstr "Gronidło změniś" +msgid "Set password" +msgstr "Gronidło póstajiś" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Pšosym korigěrujśo slědujucu zmólku." @@ -384,6 +382,19 @@ msgstr[3] "Pšosym korigěrujśo slědujuce zmólki." msgid "Enter a new password for the user %(username)s." msgstr "Zapódajśo nowe gronidło za wužywarja %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Toś ta akcija awtentifikaciju na zakłaźe gronidła za toś togo wužywarja " +" zmóžnijo ." + +msgid "Disable password-based authentication" +msgstr "Awtentifikaciju na zakłaźe gronidła znjemóžniś" + +msgid "Enable password-based authentication" +msgstr "Awtentifikaciju na zakłaźe gronidła zmóžniś" + msgid "Skip to main content" msgstr "Dalej ku głownemu wopśimjeśeju" diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo index 7ab92b04ee..379f20424b 100644 Binary files a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.po b/django/contrib/admin/locale/es/LC_MESSAGES/django.po index 2e3461b104..76348412b8 100644 --- a/django/contrib/admin/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es/LC_MESSAGES/django.po @@ -10,6 +10,7 @@ # Ignacio José Lizarán Rus , 2019 # Igor Támara , 2013 # Jannis Leidel , 2011 +# Jorge Andres Bravo Meza, 2024 # Jorge Puente Sarrín , 2014-2015 # José Luis , 2016 # Josue Naaman Nistal Guerra , 2014 @@ -17,17 +18,18 @@ # Marc Garcia , 2011 # Miguel Angel Tribaldos , 2017 # Miguel Gonzalez , 2023 +# Natalia, 2024 # Pablo, 2015 # Salomon Herrera, 2023 -# Uriel Medina , 2020-2023 +# Uriel Medina , 2020-2024 # Veronicabh , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Uriel Medina , 2020-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Uriel Medina , 2020-2024\n" "Language-Team: Spanish (http://app.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -221,12 +223,6 @@ msgstr "" "El {name} “{obj}” se cambió correctamente. Puede editarlo nuevamente a " "continuación." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"El {name} “{obj}” se agregó correctamente. Puede editarlo nuevamente a " -"continuación." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -395,6 +391,9 @@ msgstr "Introduzca un nombre de usuario y contraseña" msgid "Change password" msgstr "Cambiar contraseña" +msgid "Set password" +msgstr "Establecer contraseña" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Por favor, corrija el siguiente error." @@ -407,6 +406,19 @@ msgstr "" "Introduzca una nueva contraseña para el usuario %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Esta acción habilitará la autenticación basada en " +"contraseña para este usuario." + +msgid "Disable password-based authentication" +msgstr "Deshabilitar la autenticación basada en contraseña" + +msgid "Enable password-based authentication" +msgstr "Habilitar la autenticación basada en contraseña" + msgid "Skip to main content" msgstr "Saltar al contenido principal" diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo index 22f0ba35b2..6ffb9267c6 100644 Binary files a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po index b340729d81..67a4918604 100644 --- a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po @@ -3,16 +3,16 @@ # Translators: # Jannis Leidel , 2011 # Leonardo José Guzmán , 2013 -# Natalia (Django Fellow), 2023 -# Natalia (Django Fellow), 2023 -# Ramiro Morales, 2013-2023 +# Natalia, 2023 +# Natalia, 2023 +# Ramiro Morales, 2013-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Natalia (Django Fellow), 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Ramiro Morales, 2013-2024\n" "Language-Team: Spanish (Argentina) (http://app.transifex.com/django/django/" "language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -205,10 +205,6 @@ msgid "" msgstr "" "Se modificó con éxito {name} \"{obj}”. Puede modificarlo/a nuevamente abajo." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "Se agregó con éxito {name} \"{obj}”. Puede modificarlo/a abajo." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -377,6 +373,9 @@ msgstr "Introduzca un nombre de usuario y una contraseña." msgid "Change password" msgstr "Cambiar contraseña" +msgid "Set password" +msgstr "Establecer contraseña" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Por favor, corrija el siguiente error." @@ -389,6 +388,19 @@ msgstr "" "Introduzca una nueva contraseña para el usuario %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Esta acción activará la autenticación basada en contraseñas " +"para este usuario." + +msgid "Disable password-based authentication" +msgstr "Desactivar la autenticación basada en contraseñas" + +msgid "Enable password-based authentication" +msgstr "Activar la autenticación basada en contraseñas" + msgid "Skip to main content" msgstr "Ir al contenido principal" diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/django.mo b/django/contrib/admin/locale/et/LC_MESSAGES/django.mo index 6154110df0..0a51b4a9b7 100644 Binary files a/django/contrib/admin/locale/et/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/django.po b/django/contrib/admin/locale/et/LC_MESSAGES/django.po index 920652d28a..a689289e7a 100644 --- a/django/contrib/admin/locale/et/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/et/LC_MESSAGES/django.po @@ -2,10 +2,10 @@ # # Translators: # eallik , 2011 -# Erlend , 2020 +# Erlend Eelmets , 2020 # Jannis Leidel , 2011 # Janno Liivak , 2013-2015 -# Martin , 2015,2022-2023 +# Martin , 2015,2022-2024 # Martin , 2016,2019-2020 # Marti Raudsepp , 2016 # Ragnar Rebase , 2019 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Martin , 2015,2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Martin , 2015,2022-2024\n" "Language-Team: Estonian (http://app.transifex.com/django/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -204,10 +204,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "{name} “{obj}” muutmine õnnestus. Allpool saate seda uuesti muuta." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "{name} “{obj}” lisamine õnnestus. Allpool saate seda uuesti muuta." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -372,6 +368,9 @@ msgstr "Sisestage kasutajanimi ja salasõna." msgid "Change password" msgstr "Muuda salasõna" +msgid "Set password" +msgstr "Määra parool" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Palun parandage allolev viga." @@ -381,6 +380,17 @@ msgstr[1] "Palun parandage allolevad vead." msgid "Enter a new password for the user %(username)s." msgstr "Sisestage uus salasõna kasutajale %(username)s" +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" + +msgid "Disable password-based authentication" +msgstr "" + +msgid "Enable password-based authentication" +msgstr "" + msgid "Skip to main content" msgstr "Liigu põhisisu juurde" @@ -738,7 +748,7 @@ msgid "Email address:" msgstr "E-posti aadress:" msgid "Reset my password" -msgstr "Reseti parool" +msgstr "Lähtesta mu parool" msgid "Select all objects on this page for an action" msgstr "Vali toiminguks kõik objektid sellel lehel" diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo index e35ee4648e..2607e2777c 100644 Binary files a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po index 36e5a2a5ad..2e768e33aa 100644 --- a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po @@ -2,16 +2,16 @@ # # Translators: # Bruno Brouard , 2021 -# Claude Paroz , 2013-2023 +# Claude Paroz , 2013-2024 # Claude Paroz , 2011,2013 # Jannis Leidel , 2011 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Claude Paroz , 2013-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Claude Paroz , 2013-2024\n" "Language-Team: French (http://app.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -205,12 +205,6 @@ msgstr "" "L’objet {name} « {obj} » a été modifié avec succès. Vous pouvez l’éditer à " "nouveau ci-dessous." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"L’objet {name} « {obj} » a été ajouté avec succès. Vous pouvez l’éditer à " -"nouveau ci-dessous." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -382,6 +376,9 @@ msgstr "Saisissez un nom d’utilisateur et un mot de passe." msgid "Change password" msgstr "Modifier le mot de passe" +msgid "Set password" +msgstr "Définir un mot de passe" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Corrigez l’erreur ci-dessous." @@ -394,6 +391,19 @@ msgstr "" "Saisissez un nouveau mot de passe pour l’utilisateur %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Cette action va activer l'authentification par mot de passe " +"pour cet utilisateur." + +msgid "Disable password-based authentication" +msgstr "Désactiver l'authentification par mot de passe" + +msgid "Enable password-based authentication" +msgstr "Activer l'authentification par mot de passe" + msgid "Skip to main content" msgstr "Passer au contenu principal" diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo index 8c029af57b..4f4d286500 100644 Binary files a/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/django.po b/django/contrib/admin/locale/ga/LC_MESSAGES/django.po index 252e50d065..bc55f33531 100644 --- a/django/contrib/admin/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ga/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Luke Blaney , 2019 # Michael Thornhill , 2011-2012,2015 @@ -8,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-06-22 21:17+0000\n" -"Last-Translator: Luke Blaney \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,6 +20,10 @@ msgstr "" "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " "4);\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Scrios %(verbose_name_plural) roghnaithe" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "D'éirigh le scriosadh %(count)d %(items)s." @@ -30,10 +35,6 @@ msgstr "Ní féidir scriosadh %(name)s " msgid "Are you sure?" msgstr "An bhfuil tú cinnte?" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Scrios %(verbose_name_plural) roghnaithe" - msgid "Administration" msgstr "Riarachán" @@ -70,6 +71,12 @@ msgstr "Gan dáta" msgid "Has date" msgstr "Le dáta" +msgid "Empty" +msgstr "Folamh" + +msgid "Not empty" +msgstr "Gan folamh" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -89,7 +96,7 @@ msgid "Remove" msgstr "Tóg amach" msgid "Addition" -msgstr "" +msgstr "Suimiú" msgid "Change" msgstr "Athraigh" @@ -104,7 +111,7 @@ msgid "user" msgstr "úsáideoir" msgid "content type" -msgstr "" +msgstr "cineál ábhair" msgid "object id" msgstr "id oibiacht" @@ -127,23 +134,23 @@ msgid "log entries" msgstr "loga iontrálacha" #, python-format -msgid "Added \"%(object)s\"." -msgstr "\"%(object)s\" curtha isteach." +msgid "Added “%(object)s”." +msgstr "Curtha leis “%(object)s”." #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "\"%(object)s\" - %(changes)s aithrithe" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "Athraithe “%(object)s” — %(changes)s" #, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "\"%(object)s.\" scrioste" +msgid "Deleted “%(object)s.”" +msgstr "Scriosta “%(object)s.”" msgid "LogEntry Object" msgstr "Oibiacht LogEntry" #, python-brace-format -msgid "Added {name} \"{object}\"." -msgstr "{name} curtha leis \"{object}\"." +msgid "Added {name} “{object}”." +msgstr "Cuireadh {name} “{object}”." msgid "Added." msgstr "Curtha leis." @@ -152,16 +159,16 @@ msgid "and" msgstr "agus" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "{fields} athrithe don {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." +msgstr "Athraíodh {fields} le haghaidh {name} “{object}”." #, python-brace-format msgid "Changed {fields}." msgstr "{fields} athrithe." #, python-brace-format -msgid "Deleted {name} \"{object}\"." -msgstr "{name} scrioste: \"{object}\"." +msgid "Deleted {name} “{object}”." +msgstr "Scriosadh {name} “{object}”." msgid "No fields changed." msgstr "Dada réimse aithraithe" @@ -169,48 +176,46 @@ msgstr "Dada réimse aithraithe" msgid "None" msgstr "Dada" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -"Coinnigh síos \"Control\", nó \"Command\" ar Mac chun níos mó ná ceann " -"amháin a roghnú." +"Coinnigh síos “Rialú”, nó “Ordú” ar Mac, chun níos mó ná ceann amháin a " +"roghnú." + +msgid "Select this object for an action - {}" +msgstr "Roghnaigh an réad seo le haghaidh gnímh - {}" #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "Bhí {name} \"{obj}\" curtha leis go rathúil" +msgid "The {name} “{obj}” was added successfully." +msgstr "Cuireadh an {name} “{obj}” leis go rathúil." msgid "You may edit it again below." msgstr "Thig leat é a athrú arís faoi seo." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "" +"Cuireadh an {name} “{obj}” leis go rathúil. Is féidir leat {name} eile a " +"chur leis thíos." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "" +"Athraíodh an {name} “{obj}” go rathúil. Is féidir leat é a chur in eagar " +"arís thíos." + +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" +"Athraíodh an {name} “{obj}” go rathúil. Is féidir leat {name} eile a chur " +"leis thíos." #, python-brace-format -msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "" -"D'athraigh {name} \"{obj}\" go rathúil.\n" -"Thig leat é a athrú arís faoi seo." - -#, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "" - -#, python-brace-format -msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " -"below." -msgstr "" -"D'athraigh {name} \"{obj}\" go rathúil.\n" -"Thig leat {name} eile a chuir leis." - -#, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "D'athraigh {name} \"{obj}\" go rathúil." +msgid "The {name} “{obj}” was changed successfully." +msgstr "Athraíodh an {name} “{obj}” go rathúil." msgid "" "Items must be selected in order to perform actions on them. No items have " @@ -223,12 +228,12 @@ msgid "No action selected." msgstr "Uimh gníomh roghnaithe." #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Bhí %(name)s \"%(obj)s\" scrioste go rathúil." +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "D'éirigh le scriosadh %(name)s \"%(obj)s\"." #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" -msgstr "Níl%(name)s ann le aitheantais \"%(key)s\". B'fhéidir gur scriosadh é?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" +msgstr "Níl %(name)s le haitheantas “%(key)s” ann. B'fhéidir gur scriosadh é?" #, python-format msgid "Add %s" @@ -271,8 +276,9 @@ msgstr "0 as %(cnt)s roghnaithe." msgid "Change history: %s" msgstr "Athraigh stáir %s" -#. Translators: Model verbose name and instance representation, -#. suitable to be an item in a list. +#. Translators: Model verbose name and instance +#. representation, suitable to be an item in a +#. list. #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" @@ -304,8 +310,8 @@ msgstr "%(app)s riaracháin" msgid "Page not found" msgstr "Ní bhfuarthas an leathanach" -msgid "We're sorry, but the requested page could not be found." -msgstr "Tá brón orainn, ach ní bhfuarthas an leathanach iarraite." +msgid "We’re sorry, but the requested page could not be found." +msgstr "Ár leithscéal, ach níorbh fhéidir an leathanach iarrtha a aimsiú." msgid "Home" msgstr "Baile" @@ -320,11 +326,11 @@ msgid "Server Error (500)" msgstr "Botún Freastalaí (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Tharla earráid. Tuairiscíodh don riarthóirí suíomh tríd an ríomhphost agus " -"ba chóir a shocrú go luath. Go raibh maith agat as do foighne." +"Tharla earráid. Tuairiscíodh do riarthóirí an tsuímh trí ríomhphost agus ba " +"cheart é a shocrú go luath. Go raibh maith agat as do foighne." msgid "Run the selected action" msgstr "Rith an gníomh roghnaithe" @@ -343,12 +349,26 @@ msgstr "Roghnaigh gach %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "Scroiseadh modhnóir" +msgid "Breadcrumbs" +msgstr "Brioscáin aráin" + +#, python-format +msgid "Models in the %(name)s application" +msgstr "Samhlacha ins an %(name)s iarratais" + +msgid "Add" +msgstr "Cuir le" + +msgid "View" +msgstr "Amharc ar" + +msgid "You don’t have permission to view or edit anything." +msgstr "Níl cead agat aon rud a fheiceáil ná a chur in eagar." + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." -msgstr "" -"Ar dtús, iontráil ainm úsaideoir agus focal faire. Ansin, beidh tú in ann " -"cuir in eagar níos mó roghaí úsaideoira." +msgstr "Níl cead agat aon rud a fheiceáil ná a chur in eagar." msgid "Enter a username and password." msgstr "Cuir isteach ainm úsáideora agus focal faire." @@ -356,11 +376,16 @@ msgstr "Cuir isteach ainm úsáideora agus focal faire." msgid "Change password" msgstr "Athraigh focal faire" -msgid "Please correct the error below." -msgstr "Ceartaigh an botún thíos le do thoil." +msgid "Set password" +msgstr "Socraigh pasfhocal" -msgid "Please correct the errors below." -msgstr "Le do thoil cheartú earráidí thíos." +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Ceartaigh an earráid thíos le do thoil." +msgstr[1] "Ceartaigh na hearráidí thíos le do thoil." +msgstr[2] "Ceartaigh na hearráidí thíos le do thoil." +msgstr[3] "Ceartaigh na hearráidí thíos le do thoil." +msgstr[4] "Ceartaigh na hearráidí thíos le do thoil." #, python-format msgid "Enter a new password for the user %(username)s." @@ -368,6 +393,22 @@ msgstr "" "Iontráil focal faire nua le hadhaigh an úsaideor %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Cumasóidh an gníomh seo fhíordheimhniú pasfhocal-bhunaithe " +"don úsáideoir seo." + +msgid "Disable password-based authentication" +msgstr "Díchumasaigh fíordheimhniú pasfhocal-bhunaithe" + +msgid "Enable password-based authentication" +msgstr "Cumasaigh fíordheimhniú pasfhocal-bhunaithe" + +msgid "Skip to main content" +msgstr "Téigh ar aghaidh chuig an bpríomhábhar" + msgid "Welcome," msgstr "Fáilte" @@ -393,6 +434,15 @@ msgstr "Breath ar suíomh" msgid "Filter" msgstr "Scagaire" +msgid "Hide counts" +msgstr "Folaigh comhaireamh" + +msgid "Show counts" +msgstr "Taispeáin comhaireamh" + +msgid "Clear all filters" +msgstr "Glan na scagairí go léir" + msgid "Remove from sorting" msgstr "Bain as sórtáil" @@ -403,6 +453,15 @@ msgstr "Sórtáil tosaíocht: %(priority_number)s" msgid "Toggle sorting" msgstr "Toggle sórtáil" +msgid "Toggle theme (current theme: auto)" +msgstr "Scoránaigh an téama (téama reatha: uathoibríoch)" + +msgid "Toggle theme (current theme: light)" +msgstr "Scoránaigh an téama (téama reatha: solas)" + +msgid "Toggle theme (current theme: dark)" +msgstr "Scoránaigh an téama (téama reatha: dorcha)" + msgid "Delete" msgstr "Cealaigh" @@ -434,8 +493,8 @@ msgstr "" msgid "Objects" msgstr "Oibiachtaí" -msgid "Yes, I'm sure" -msgstr "Táim cinnte" +msgid "Yes, I’m sure" +msgstr "Sea, táim cinnte" msgid "No, take me back" msgstr "Ní hea, tóg ar ais mé" @@ -469,9 +528,6 @@ msgstr "" "An bhfuil tú cinnte gur mian leat a scriosadh %(objects_name)s roghnaithe? " "Beidh gach ceann de na nithe seo a leanas agus a n-ítimí gaolta scroiste:" -msgid "View" -msgstr "Amharc ar" - msgid "Delete?" msgstr "Cealaigh?" @@ -482,46 +538,59 @@ msgstr " Trí %(filter_title)s " msgid "Summary" msgstr "Achoimre" -#, python-format -msgid "Models in the %(name)s application" -msgstr "Samhlacha ins an %(name)s iarratais" - -msgid "Add" -msgstr "Cuir le" - -msgid "You don't have permission to view or edit anything." -msgstr "" - msgid "Recent actions" -msgstr "" +msgstr "Gníomhartha le déanaí" msgid "My actions" -msgstr "" +msgstr "Mo ghníomhartha" msgid "None available" msgstr "Dada ar fáil" +msgid "Added:" +msgstr "Curtha leis:" + +msgid "Changed:" +msgstr "Athraithe:" + +msgid "Deleted:" +msgstr "Scriosta:" + msgid "Unknown content" msgstr "Inneachair anaithnid" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Tá rud éigin mícheart le suitéail do bunachar sonraí. Déan cinnte go bhfuil " -"boird an bunachar sonraI cruthaithe cheana, agus déan cinnte go bhfuil do " -"úsaideoir in ann an bunacchar sonraí a léamh." +"Tá rud éigin cearr le suiteáil do bhunachar sonraí. Cinntigh go bhfuil na " +"táblaí bunachar sonraí cuí cruthaithe, agus cinntigh go bhfuil an bunachar " +"sonraí inléite ag an úsáideoir cuí." #, python-format msgid "" "You are authenticated as %(username)s, but are not authorized to access this " "page. Would you like to login to a different account?" msgstr "" +"Tá tú fíordheimhnithe mar %(username)s, ach níl cead agat an leathanach seo " +"a rochtain. Ar mhaith leat logáil isteach i gcuntas eile?" msgid "Forgotten your password or username?" msgstr "Dearmad déanta ar do focal faire nó ainm úsaideora" +msgid "Toggle navigation" +msgstr "Scoránaigh an nascleanúint" + +msgid "Sidebar" +msgstr "Barra Taoibh" + +msgid "Start typing to filter…" +msgstr "Tosaigh ag clóscríobh chun an scagaire…" + +msgid "Filter navigation items" +msgstr "Scag míreanna nascleanúna" + msgid "Date/time" msgstr "Dáta/am" @@ -531,12 +600,20 @@ msgstr "Úsaideoir" msgid "Action" msgstr "Aicsean" +msgid "entry" +msgid_plural "entries" +msgstr[0] "iontráil" +msgstr[1] "iontrálacha" +msgstr[2] "iontrálacha" +msgstr[3] "iontrálacha" +msgstr[4] "iontrálacha" + msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" -"Níl stáir aitraithe ag an oibiacht seo agús is dócha ná cuir le tríd an an " -"suíomh riarachán." +"Níl stair athruithe ag an réad seo. Is dócha nár cuireadh leis tríd an " +"suíomh riaracháin seo." msgid "Show all" msgstr "Taispéan gach rud" @@ -545,7 +622,7 @@ msgid "Save" msgstr "Sábháil" msgid "Popup closing…" -msgstr "" +msgstr "Preabfhuinneog ag dúnadh…" msgid "Search" msgstr "Cuardach" @@ -590,8 +667,14 @@ msgstr "Cuir le %(model)s" msgid "Delete selected %(model)s" msgstr "Scrios roghnaithe %(model)s" -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Go raibh maith agat le hadhaigh do cuairt ar an suíomh idirlínn inniú." +#, python-format +msgid "View selected %(model)s" +msgstr "Féach ar %(model)s roghnaithe" + +msgid "Thanks for spending some quality time with the web site today." +msgstr "" +"Go raibh maith agat as roinnt ama ardchaighdeáin a chaitheamh leis an suíomh " +"Gréasáin inniu." msgid "Log in again" msgstr "Logáil isteacj arís" @@ -603,12 +686,12 @@ msgid "Your password was changed." msgstr "Bhí do focal faire aithraithe." msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Le do thoil, iontráil do sean-focal faire, ar son slándáil, agus ansin " -"iontráil do focal faire dhá uaire cé go mbeimid in ann a seiceal go bhfuil " -"sé scríobhte isteach i gceart." +"Cuir isteach do sheanphasfhocal, ar mhaithe le slándáil, agus ansin cuir " +"isteach do phasfhocal nua faoi dhó ionas gur féidir linn a fhíorú gur " +"chlóscríobh tú i gceart é." msgid "Change my password" msgstr "Athraigh mo focal faire" @@ -643,28 +726,35 @@ msgstr "" "úsaidte cheana. Le do thoil, iarr ar athsocraigh focal faire nua." msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" +"Chuireamar ríomhphost chugat treoracha maidir le do phasfhocal a shocrú, má " +"tá cuntas ann leis an ríomhphost a chuir tú isteach. Ba cheart duit iad a " +"fháil go luath." msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" +"Mura bhfaigheann tú ríomhphost, cinntigh le do thoil gur chuir tú isteach an " +"seoladh ar chláraigh tú leis, agus seiceáil d’fhillteán turscair." #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" +"Tá an ríomhphost seo á fháil agat toisc gur iarr tú athshocrú pasfhocail do " +"do chuntas úsáideora ag %(site_name)s." msgid "Please go to the following page and choose a new password:" msgstr "" "Le do thoil té go dtí an leathanach a leanúint agus roghmaigh focal faire " "nua:" -msgid "Your username, in case you've forgotten:" -msgstr "Do ainm úsaideoir, má tá dearmad déanta agat." +msgid "Your username, in case you’ve forgotten:" +msgstr "D’ainm úsáideora, ar eagla go bhfuil dearmad déanta agat ar:" msgid "Thanks for using our site!" msgstr "Go raibh maith agat le hadhaigh do cuairt!" @@ -674,9 +764,11 @@ msgid "The %(site_name)s team" msgstr "Foireann an %(site_name)s" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" +"Dearmad déanta agat ar do phasfhocal? Cuir isteach do sheoladh ríomhphoist " +"thíos, agus seolfaimid treoracha ríomhphoist chun ceann nua a shocrú." msgid "Email address:" msgstr "Seoladh ríomhphoist:" @@ -684,6 +776,9 @@ msgstr "Seoladh ríomhphoist:" msgid "Reset my password" msgstr "Athsocraigh mo focal faire" +msgid "Select all objects on this page for an action" +msgstr "Roghnaigh gach oibiacht ar an leathanach seo le haghaidh gnímh" + msgid "All dates" msgstr "Gach dáta" @@ -697,7 +792,7 @@ msgstr "Roghnaigh %s a athrú" #, python-format msgid "Select %s to view" -msgstr "" +msgstr "Roghnaigh %s le féachaint" msgid "Date:" msgstr "Dáta:" diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo index ee000e278f..e46bd504c6 100644 Binary files a/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po index ce0a412d10..6f6e50dcc2 100644 --- a/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Luke Blaney , 2019 # Michael Thornhill , 2011-2012,2015 @@ -8,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-17 11:50+0200\n" -"PO-Revision-Date: 2019-06-22 21:36+0000\n" -"Last-Translator: Luke Blaney \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:59+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -66,6 +67,11 @@ msgstr "" "roghnaionn tú cuid acu sa bhosca thíos agus ansin cliceáil ar an saighead " "\"Bain\" idir an dá boscaí." +#, javascript-format +msgid "Type into this box to filter down the list of selected %s." +msgstr "" +"Clóscríobh isteach sa bhosca seo chun liosta na %s roghnaithe a scagadh." + msgid "Remove all" msgstr "Scrois gach ceann" @@ -73,6 +79,15 @@ msgstr "Scrois gach ceann" msgid "Click to remove all chosen %s at once." msgstr "Cliceáil anseo chun %s go léir roghnaithe a scroiseadh." +#, javascript-format +msgid "%s selected option not visible" +msgid_plural "%s selected options not visible" +msgstr[0] "Níl an rogha roghnaithe %s le feiceáil" +msgstr[1] "Níl %s roghanna roghnaithe le feiceáil" +msgstr[2] "Níl %s roghanna roghnaithe le feiceáil" +msgstr[3] "Níl %s roghanna roghnaithe le feiceáil" +msgstr[4] "Níl %s roghanna roghnaithe le feiceáil" + msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s roghnaithe" @@ -89,20 +104,21 @@ msgstr "" "gníomh, caillfidh tú do chuid aithrithe." msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " +"You have selected an action, but you haven’t saved your changes to " +"individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" -"Tá gníomh roghnaithe agat, ach níl do aithrithe sabhailte ar cuid de na " -"réímse. Clic OK chun iad a sábháil. Caithfidh tú an gníomh a rith arís." +"Tá gníomh roghnaithe agat, ach níor shábháil tú d'athruithe ar réimsí aonair " +"fós. Cliceáil OK le do thoil a shábháil. Beidh ort an t-aicsean a rith arís." msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " +"You have selected an action, and you haven’t made any changes on individual " +"fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" -"Tá gníomh roghnaithe agat, ach níl do aithrithe sabhailte ar cuid de na " -"réímse. Is dócha go bhfuil tú ag iarraidh an cnaipe Té ná an cnaipe Sábháil." +"Tá gníomh roghnaithe agat, agus níl aon athruithe déanta agat ar réimsí " +"aonair. Is dócha go bhfuil an cnaipe Téigh á lorg agat seachas an cnaipe " +"Sábháil." msgid "Now" msgstr "Anois" @@ -199,6 +215,103 @@ msgstr "Samhain" msgid "December" msgstr "Nollaig" +msgctxt "abbrev. month January" +msgid "Jan" +msgstr "Ean" + +msgctxt "abbrev. month February" +msgid "Feb" +msgstr "Feabh" + +msgctxt "abbrev. month March" +msgid "Mar" +msgstr "Már" + +msgctxt "abbrev. month April" +msgid "Apr" +msgstr "Aib" + +msgctxt "abbrev. month May" +msgid "May" +msgstr "Beal" + +msgctxt "abbrev. month June" +msgid "Jun" +msgstr "Meith" + +msgctxt "abbrev. month July" +msgid "Jul" +msgstr "Lúil" + +msgctxt "abbrev. month August" +msgid "Aug" +msgstr "Lún" + +msgctxt "abbrev. month September" +msgid "Sep" +msgstr "Meán Fóm" + +msgctxt "abbrev. month October" +msgid "Oct" +msgstr "Deireadh Fóm" + +msgctxt "abbrev. month November" +msgid "Nov" +msgstr "Sam" + +msgctxt "abbrev. month December" +msgid "Dec" +msgstr "Noll" + +msgid "Sunday" +msgstr "Domhnach" + +msgid "Monday" +msgstr "Dé Luain" + +msgid "Tuesday" +msgstr "Dé Máirt" + +msgid "Wednesday" +msgstr "Dé Céadaoin" + +msgid "Thursday" +msgstr "Déardaoin" + +msgid "Friday" +msgstr "Dé hAoine" + +msgid "Saturday" +msgstr "Dé Sathairn" + +msgctxt "abbrev. day Sunday" +msgid "Sun" +msgstr "Dom" + +msgctxt "abbrev. day Monday" +msgid "Mon" +msgstr "Lua" + +msgctxt "abbrev. day Tuesday" +msgid "Tue" +msgstr "Mái" + +msgctxt "abbrev. day Wednesday" +msgid "Wed" +msgstr "Céa" + +msgctxt "abbrev. day Thursday" +msgid "Thur" +msgstr "Déa" + +msgctxt "abbrev. day Friday" +msgid "Fri" +msgstr "Aoi" + +msgctxt "abbrev. day Saturday" +msgid "Sat" +msgstr "Sat" + msgctxt "one letter Sunday" msgid "S" msgstr "D" @@ -226,9 +339,3 @@ msgstr "A" msgctxt "one letter Saturday" msgid "S" msgstr "S" - -msgid "Show" -msgstr "Taispeán" - -msgid "Hide" -msgstr "Folaigh" diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo index 4b36d3d62a..daddcd3ea4 100644 Binary files a/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/django.po b/django/contrib/admin/locale/gl/LC_MESSAGES/django.po index 8d556628f3..0e4facab49 100644 --- a/django/contrib/admin/locale/gl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/gl/LC_MESSAGES/django.po @@ -9,14 +9,14 @@ # Leandro Regueiro , 2013 # 948a55bc37dd6d642f1875bb84258fff_07a28cc , 2011-2012 # Pablo, 2015 -# X Bello , 2023 +# X Bello , 2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: X Bello , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: X Bello , 2023-2024\n" "Language-Team: Galician (http://app.transifex.com/django/django/language/" "gl/)\n" "MIME-Version: 1.0\n" @@ -207,10 +207,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "Modificouse correctamente {name} “{obj}”. Pode editalo de novo abaixo." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "Engadiuse correctamente {name} “{obj}”. Pode editalo de novo abaixo." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -376,6 +372,9 @@ msgstr "Introduza un nome de usuario e contrasinal." msgid "Change password" msgstr "Cambiar contrasinal" +msgid "Set password" +msgstr "Configurar contrasinal" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Por favor corrixa o erro de abaixo." @@ -386,6 +385,19 @@ msgid "Enter a new password for the user %(username)s." msgstr "" "Insira un novo contrasinal para o usuario %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Esta acción vai habilitar a autentificación basada en " +"contrasinal para este usuario." + +msgid "Disable password-based authentication" +msgstr "Deshabilitar a autentificación basada en contrasinal" + +msgid "Enable password-based authentication" +msgstr "Habilitar a autentificación basada en contrasinal" + msgid "Skip to main content" msgstr "Saltar ó contido principal" diff --git a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo index e0e9215544..8d8267184e 100644 Binary files a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.po b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.po index 88d434108f..eca6bc4cf2 100644 --- a/django/contrib/admin/locale/hsb/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/hsb/LC_MESSAGES/django.po @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2023 +# Michael Wolf , 2016-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Michael Wolf , 2016-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Michael Wolf , 2016-2024\n" "Language-Team: Upper Sorbian (http://app.transifex.com/django/django/" "language/hsb/)\n" "MIME-Version: 1.0\n" @@ -199,10 +199,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "{name} „{obj}“ je so wuspěšnje změnił. Móžeće jón deleka wobdźěłować." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "{name} „{obj}“ je so wuspěšnje přidał. Móžeće jón deleka wobdźěłować." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -372,6 +368,9 @@ msgstr "Zapodajće wužiwarske mjeno a hesło." msgid "Change password" msgstr "Hesło změnić" +msgid "Set password" +msgstr "Hesło postajić" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Prošu porjedźće slědowacy zmylk." @@ -383,6 +382,19 @@ msgstr[3] "Prošu porjedźće slědowace zmylki." msgid "Enter a new password for the user %(username)s." msgstr "Zapodajće nowe hesło za %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Tuta akcija awtentifikacija na zakładźe hesła za tutoho wužiwarja " +"zmóžni ." + +msgid "Disable password-based authentication" +msgstr "Awtentifikaciju na zakładźe hesła znjemóžnić" + +msgid "Enable password-based authentication" +msgstr "Awtentifikaciju na zakładźe hesła zmóžnić" + msgid "Skip to main content" msgstr "Dale k hłownemu wobsahej" diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo index 3371e26ba6..dbba65c99a 100644 Binary files a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.po b/django/contrib/admin/locale/id/LC_MESSAGES/django.po index 9808809406..791412ed6a 100644 --- a/django/contrib/admin/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/id/LC_MESSAGES/django.po @@ -1,22 +1,23 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Bayu Satiyo , 2024 # Claude Paroz , 2014 -# Fery Setiawan , 2015-2019,2021-2023 +# Fery Setiawan , 2015-2019,2021-2024 # Jannis Leidel , 2011 # M Asep Indrayana , 2015 # oon arfiandwi (OonID) , 2016,2020 # rodin , 2011-2013 # rodin , 2013-2017 -# sag᠎e , 2019 +# sag​e , 2019 # Sutrisno Efendi , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Fery Setiawan , 2015-2019,2021-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Fery Setiawan , 2015-2019,2021-2024\n" "Language-Team: Indonesian (http://app.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" @@ -186,7 +187,7 @@ msgstr "" "Tekan “Control”, atau “Command” pada Mac, untuk memilih lebih dari satu." msgid "Select this object for an action - {}" -msgstr "" +msgstr "Pilih objek ini untuk suatu aksi - {}" #, python-brace-format msgid "The {name} “{obj}” was added successfully." @@ -208,11 +209,6 @@ msgid "" msgstr "" "{name} “{obj}” berhasil diubah. Anda dapat mengeditnya kembali di bawah." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} “{obj}” berhasil ditambahkan. Anda dapat mengeditnya kembali di bawah." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -375,6 +371,9 @@ msgstr "Masukkan nama pengguna dan sandi." msgid "Change password" msgstr "Ganti sandi" +msgid "Set password" +msgstr "Setel sandi" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Harap perbaiki kesalahan dibawah." @@ -383,6 +382,19 @@ msgstr[0] "Harap perbaiki kesalahan dibawah." msgid "Enter a new password for the user %(username)s." msgstr "Masukkan sandi baru untuk pengguna %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Tindakan ini akan enable autentifikasi brerdasarkan-sandi " +"untuk pengguna ini." + +msgid "Disable password-based authentication" +msgstr "Tiadakan autentifikasu berdasarkan-sandi" + +msgid "Enable password-based authentication" +msgstr "Adakan autentifikasu berdasarkan-sandi" + msgid "Skip to main content" msgstr "Lewati ke isi utama" @@ -412,10 +424,10 @@ msgid "Filter" msgstr "Filter" msgid "Hide counts" -msgstr "" +msgstr "Sembunyikan hitungan" msgid "Show counts" -msgstr "" +msgstr "Tampilkan hitungan" msgid "Clear all filters" msgstr "Hapus semua penyaringan" @@ -431,13 +443,13 @@ msgid "Toggle sorting" msgstr "Ubah pengurutan" msgid "Toggle theme (current theme: auto)" -msgstr "" +msgstr "Ganti tema (tema saat ini: otomatis)" msgid "Toggle theme (current theme: light)" -msgstr "" +msgstr "Ganti tema (tema saat ini: terang)" msgid "Toggle theme (current theme: dark)" -msgstr "" +msgstr "Ganti tema (tema saat ini: gelap)" msgid "Delete" msgstr "Hapus" @@ -526,13 +538,13 @@ msgid "None available" msgstr "Tidak ada yang tersedia" msgid "Added:" -msgstr "" +msgstr "Ditambahkan:" msgid "Changed:" -msgstr "" +msgstr "Berubah:" msgid "Deleted:" -msgstr "" +msgstr "Dihapus:" msgid "Unknown content" msgstr "Konten tidak diketahui" @@ -744,7 +756,7 @@ msgid "Reset my password" msgstr "Setel ulang sandi saya" msgid "Select all objects on this page for an action" -msgstr "" +msgstr "Pilih semua objek di halaman ini untuk suatu aksi" msgid "All dates" msgstr "Semua tanggal" diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo index dd076b723a..ec8a378297 100644 Binary files a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po index 55ea9d857c..ac42d389fe 100644 --- a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po @@ -9,18 +9,19 @@ # Masaya, 2023 # Shinichi Katsumata , 2019 # Shinya Okano , 2012-2018,2021,2023 -# Taichi Taniguchi, 2022 +# TANIGUCHI Taichi, 2022 # Takuro Onoue , 2020 # Takuya N , 2020 # Tetsuya Morimoto , 2011 # 上田慶祐 , 2015 +# 余田大輝, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Shinya Okano , 2012-2018,2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: 余田大輝, 2024\n" "Language-Team: Japanese (http://app.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -210,10 +211,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "{name} “{obj}” を変更しました。以下から再度編集できます。" -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "{name} “{obj}” を追加しました。続けて編集できます。" - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -376,6 +373,9 @@ msgstr "ユーザー名とパスワードを入力してください。" msgid "Change password" msgstr "パスワードの変更" +msgid "Set password" +msgstr "パスワードを設定" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "下記のエラーを修正してください。" @@ -385,6 +385,18 @@ msgid "Enter a new password for the user %(username)s." msgstr "" "%(username)sさんの新しいパスワードを入力してください。" +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"このアクションは、このユーザーに対するパスワードによる認証を有効にします。" + +msgid "Disable password-based authentication" +msgstr "パスワードによる認証の無効化" + +msgid "Enable password-based authentication" +msgstr "パスワードによる認証の有効化" + msgid "Skip to main content" msgstr "スキップしてメインコンテンツへ" diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo index f734d93b1b..2d1eb80a3d 100644 Binary files a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po index 88f02363bd..717f2d5995 100644 --- a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Translators: # Jiyoon, Ha , 2016 # DONGHO JEONG , 2020 -# 코딩 영, 2021 +# Dummy Iam, 2021 # Geonho Kim / Leo Kim , 2019 # Gihun Ham , 2018 # Hang Park , 2019 @@ -13,21 +13,24 @@ # Jannis Leidel , 2011 # Jay Oh , 2020 # Le Tartuffe , 2014,2016 +# Juyoung Lim, 2024 # LEE Hwanyong , 2023 # Seho Noh , 2018 # Seacbyul Lee , 2017 +# 최소영, 2024 # Taesik Yoon , 2015 # 정훈 이, 2021 # 박태진, 2021 # Yang Chan Woo , 2019 +# Youngkwang Yang, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-17 02:13-0600\n" -"PO-Revision-Date: 2023-04-25 07:05+0000\n" -"Last-Translator: LEE Hwanyong , 2023\n" -"Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Youngkwang Yang, 2024\n" +"Language-Team: Korean (http://app.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -195,6 +198,9 @@ msgstr "" "하나 이상을 선택하려면 \"Control\" 키를 누른 채로 선택해주세요. Mac의 경우에" "는 \"Command\" 키를 눌러주세요." +msgid "Select this object for an action - {}" +msgstr "작업에 대한 객체를 선택합니다." + #, python-brace-format msgid "The {name} “{obj}” was added successfully." msgstr "{name} \"{obj}\"가 성공적으로 추가되었습니다." @@ -216,12 +222,6 @@ msgstr "" "{name} \"{obj}\"가 성공적으로 변경되었습니다. 아래에서 다시 수정할 수 있습니" "다." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} \"{obj}\"가 성공적으로 추가되었습니다. 아래에서 다시 수정할 수 있습니" -"다." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -359,6 +359,9 @@ msgstr "%(total_count)s개의 %(module_name)s 모두를 선택합니다." msgid "Clear selection" msgstr "선택 해제" +msgid "Breadcrumbs" +msgstr "사용자 위치" + #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s 애플리케이션의 모델" @@ -385,14 +388,28 @@ msgstr "사용자 이름과 비밀번호를 입력하세요." msgid "Change password" msgstr "비밀번호 변경" +msgid "Set password" +msgstr "비밀번호 설정" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." -msgstr[0] "아래 오류를 수정하기 바랍니다. " +msgstr[0] "아래 오류들을 수정하기 바랍니다. " #, python-format msgid "Enter a new password for the user %(username)s." msgstr "%(username)s 새로운 비밀번호를 입력하세요." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" + +msgid "Disable password-based authentication" +msgstr "" + +msgid "Enable password-based authentication" +msgstr "" + msgid "Skip to main content" msgstr "메인 콘텐츠로 이동" @@ -408,9 +425,6 @@ msgstr "문서" msgid "Log out" msgstr "로그아웃" -msgid "Breadcrumbs" -msgstr "사용자 위치" - #, python-format msgid "Add %(name)s" msgstr "%(name)s 추가" @@ -424,6 +438,12 @@ msgstr "사이트에서 보기" msgid "Filter" msgstr "필터" +msgid "Hide counts" +msgstr "개수 숨기기" + +msgid "Show counts" +msgstr "개수 표시" + msgid "Clear all filters" msgstr "모든 필터 삭제" @@ -531,6 +551,15 @@ msgstr "나의 활동" msgid "None available" msgstr "이용할 수 없습니다." +msgid "Added:" +msgstr "추가되었습니다:" + +msgid "Changed:" +msgstr "변경:" + +msgid "Deleted:" +msgstr "삭제:" + msgid "Unknown content" msgstr "알 수 없는 형식입니다." @@ -737,6 +766,9 @@ msgstr "이메일 주소:" msgid "Reset my password" msgstr "비밀번호 초기화" +msgid "Select all objects on this page for an action" +msgstr "작업에 대한 이 페이지의 모든 객체를 선택합니다." + msgid "All dates" msgstr "언제나" diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo index 9f93c9536c..15ac7ec8ab 100644 Binary files a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po index e15c84137c..e4ac00a5ad 100644 --- a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # edgars , 2011 -# Edgars Voroboks , 2023 +# Edgars Voroboks , 2023-2024 # Edgars Voroboks , 2017,2022 # Edgars Voroboks , 2018 # Jannis Leidel , 2011 @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Edgars Voroboks , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Edgars Voroboks , 2023-2024\n" "Language-Team: Latvian (http://app.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -207,10 +207,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "{name} “{obj}” tika veiksmīgi mainīts. Zemāk varat to labot vēlreiz." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "{name} “{obj}” veiksmīgi pievienots. Zemāk to varat atkal labot." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -378,6 +374,9 @@ msgstr "Ievadi lietotājvārdu un paroli." msgid "Change password" msgstr "Paroles maiņa" +msgid "Set password" +msgstr "Iestatīt paroli" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Lūdzu, izlabojiet zemāk norādītās kļūdas." @@ -388,6 +387,19 @@ msgstr[2] "Lūdzu, izlabojiet zemāk norādītās kļūdas." msgid "Enter a new password for the user %(username)s." msgstr "Ievadiet jaunu paroli lietotājam %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Šī darbība šim lietotājam iespējos paroles bāzētu " +"autentifikāciju." + +msgid "Disable password-based authentication" +msgstr "Atspējot paroles bāzētu autentifikāciju" + +msgid "Enable password-based authentication" +msgstr "Iespējot paroles bāzētu autentifikāciju" + msgid "Skip to main content" msgstr "Pāriet uz galveno saturu" diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo index f6344b7912..b2181e2e71 100644 Binary files a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po b/django/contrib/admin/locale/nl/LC_MESSAGES/django.po index 17a7ff7c57..ee971ddff0 100644 --- a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/nl/LC_MESSAGES/django.po @@ -12,14 +12,14 @@ # Meteor0id, 2019-2020 # 8de006b1b0894aab6aef71979dcd8bd6_5c6b207 , 2014-2015 # Tino de Bruijn , 2011 -# Tonnes , 2017,2019-2020,2022-2023 +# Tonnes , 2017,2019-2020,2022-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Tonnes , 2017,2019-2020,2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Tonnes , 2017,2019-2020,2022-2024\n" "Language-Team: Dutch (http://app.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -212,12 +212,6 @@ msgstr "" "De {name} ‘{obj}’ is met succes gewijzigd. U kunt deze hieronder nogmaals " "bewerken." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"De {name} ‘{obj}’ is met succes toegevoegd. U kunt deze hieronder nogmaals " -"bewerken." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -385,6 +379,9 @@ msgstr "Voer een gebruikersnaam en wachtwoord in." msgid "Change password" msgstr "Wachtwoord wijzigen" +msgid "Set password" +msgstr "Wachtwoord instellen" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Corrigeer de onderstaande fout." @@ -395,6 +392,19 @@ msgid "Enter a new password for the user %(username)s." msgstr "" "Voer een nieuw wachtwoord in voor de gebruiker %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Deze actie schakelt op wachtwoord gebaseerde authenticatie in voor deze gebruiker." + +msgid "Disable password-based authentication" +msgstr "Op wachtwoord gebaseerde authenticatie uitschakelen" + +msgid "Enable password-based authentication" +msgstr "Op wachtwoord gebaseerde authenticatie inschakelen" + msgid "Skip to main content" msgstr "Naar hoofdinhoud" diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo index 5b34de4b23..4507529f5a 100644 Binary files a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po b/django/contrib/admin/locale/pl/LC_MESSAGES/django.po index bfb5a1a2d7..bb14e7d758 100644 --- a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pl/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ # Maciej Olko , 2016-2022 # Maciej Olko , 2023 # Maciej Olko , 2015 -# Mariusz Felisiak , 2020,2022-2023 +# Mariusz Felisiak , 2020,2022-2024 # Ola Sitarska , 2013 # Ola Sitarska , 2013 # Roman Barczyński, 2014 @@ -20,10 +20,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" "Last-Translator: Mariusz Felisiak , " -"2020,2022-2023\n" +"2020,2022-2024\n" "Language-Team: Polish (http://app.transifex.com/django/django/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -218,12 +218,6 @@ msgstr "" "{name} „{obj}” został(a)(-ło) pomyślnie zmieniony(-na)(-ne). Można edytować " "go/ją/je ponownie poniżej." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} „{obj}” został(a)(-ło) dodany(-na)(-ne) pomyślnie. Można edytować go/" -"ją/je ponownie poniżej." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -394,6 +388,9 @@ msgstr "Podaj nazwę użytkownika i hasło." msgid "Change password" msgstr "Zmień hasło" +msgid "Set password" +msgstr "Ustaw hasło" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Prosimy poprawić poniższy błąd." @@ -405,6 +402,19 @@ msgstr[3] "Prosimy poprawić poniższe błędy." msgid "Enter a new password for the user %(username)s." msgstr "Podaj nowe hasło dla użytkownika %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"To działanie włączy uwierzytelnianie oparte na haśle dla " +"tego użytkownika. " + +msgid "Disable password-based authentication" +msgstr "Wyłącz uwierzytelnianie oparte na haśle" + +msgid "Enable password-based authentication" +msgstr "Włącz uwierzytelnianie oparte na haśle" + msgid "Skip to main content" msgstr "Przejdź do głównej treści" diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo index 95113a5905..1a2a3b986c 100644 Binary files a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po index ab1f7169e3..8318b3779a 100644 --- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po @@ -4,10 +4,11 @@ # Allisson Azevedo , 2014 # Bruce de Sá , 2019 # bruno.devpod , 2014 -# Carlos C. Leite , 2019 -# Carlos C. Leite , 2019 +# Carlos Cadu “Cadu” Leite , 2019 +# Carlos Cadu “Cadu” Leite , 2019 # Filipe Cifali , 2016 # dudanogueira , 2012 +# Eduardo Felipe Castegnaro , 2024 # Elyézer Rezende , 2013 # Fábio C. Barrionuevo da Luz , 2015 # Fabio Cerqueira , 2019 @@ -36,9 +37,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Gabriel da Mota , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Eduardo Felipe Castegnaro , 2024\n" "Language-Team: Portuguese (Brazil) (http://app.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -57,7 +58,7 @@ msgstr "Removido %(count)d %(items)s com sucesso." #, python-format msgid "Cannot delete %(name)s" -msgstr "Não é possível excluir %(name)s " +msgstr "Não é possível remover %(name)s " msgid "Are you sure?" msgstr "Tem certeza?" @@ -129,7 +130,7 @@ msgid "Change" msgstr "Modificar" msgid "Deletion" -msgstr "Eliminação" +msgstr "Remoção" msgid "action time" msgstr "hora da ação" @@ -170,7 +171,7 @@ msgstr "Alterado “%(object)s” — %(changes)s" #, python-format msgid "Deleted “%(object)s.”" -msgstr "Deletado “%(object)s.”" +msgstr "Removido “%(object)s.”" msgid "LogEntry Object" msgstr "Objeto LogEntry" @@ -195,7 +196,7 @@ msgstr "Alterado {fields}." #, python-brace-format msgid "Deleted {name} “{object}”." -msgstr "Deletado {name} “{object}”." +msgstr "Removido {name} “{object}”." msgid "No fields changed." msgstr "Nenhum campo modificado." @@ -230,12 +231,6 @@ msgstr "" "O {name} “{obj}” foi alterado com sucesso. Você pode alterá-lo novamente " "abaixo." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"O {name} “{obj}” foi adicionado com sucesso. Você pode editá-lo novamente " -"abaixo." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -260,11 +255,11 @@ msgstr "Nenhuma ação selecionada." #, python-format msgid "The %(name)s “%(obj)s” was deleted successfully." -msgstr "O %(name)s “%(obj)s” foi deletado com sucesso." +msgstr "O %(name)s “%(obj)s” foi removido com sucesso." #, python-format msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" -msgstr "O %(name)s com ID “%(key)s” não existe. Talvez tenha sido deletado." +msgstr "O %(name)s com ID “%(key)s” não existe. Talvez tenha sido removido." #, python-format msgid "Add %s" @@ -315,7 +310,7 @@ msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Excluir o %(class_name)s %(instance)s exigiria excluir os seguintes objetos " +"Remover o %(class_name)s %(instance)s exigiria remover os seguintes objetos " "protegidos relacionados: %(related_objects)s" msgid "Django site admin" @@ -376,7 +371,7 @@ msgid "Clear selection" msgstr "Limpar seleção" msgid "Breadcrumbs" -msgstr "Migalhas de pão" +msgstr "Marcas de navegação" #, python-format msgid "Models in the %(name)s application" @@ -395,7 +390,7 @@ msgid "" "First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" -"Primeiro, informe seu nome de usuário e senha. Então, você poderá editar " +"Primeiro, informe um nome de usuário e senha. Então, você poderá editar " "outras opções do usuário." msgid "Enter a username and password." @@ -404,6 +399,9 @@ msgstr "Digite um nome de usuário e senha." msgid "Change password" msgstr "Alterar senha" +msgid "Set password" +msgstr "Definir senha" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Por favor corrija o erro abaixo." @@ -414,8 +412,21 @@ msgstr[2] "Por favor corrija os erros abaixo." msgid "Enter a new password for the user %(username)s." msgstr "Informe uma nova senha para o usuário %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Esta ação irá habilitarautenticação baseada em senha para " +"este usuário." + +msgid "Disable password-based authentication" +msgstr "Desabilitar autenticação baseada em senha" + +msgid "Enable password-based authentication" +msgstr "Habilitar autenticação baseada em senha" + msgid "Skip to main content" -msgstr "Pule o conteúdo principal" +msgstr "Ir para o conteúdo principal" msgid "Welcome," msgstr "Bem-vindo(a)," @@ -471,7 +482,7 @@ msgid "Toggle theme (current theme: dark)" msgstr "Alternar tema (tema atual: escuro)" msgid "Delete" -msgstr "Apagar" +msgstr "Remover" #, python-format msgid "" @@ -488,7 +499,7 @@ msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -"Excluir o %(object_name)s ' %(escaped_object)s ' exigiria excluir os " +"Remover o %(object_name)s ' %(escaped_object)s ' exigiria remover os " "seguintes objetos protegidos relacionados:" #, python-format @@ -517,8 +528,8 @@ msgid "" "objects, but your account doesn't have permission to delete the following " "types of objects:" msgstr "" -"Excluir o %(objects_name)s selecionado pode resultar na remoção de objetos " -"relacionados, mas sua conta não tem permissão para excluir os seguintes " +"Remover o %(objects_name)s selecionado pode resultar na remoção de objetos " +"relacionados, mas sua conta não tem permissão para remover os seguintes " "tipos de objetos:" #, python-format @@ -526,7 +537,7 @@ msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -"Excluir o %(objects_name)s selecionado exigiria excluir os seguintes objetos " +"Remover o %(objects_name)s selecionado exigiria remover os seguintes objetos " "relacionados protegidos:" #, python-format @@ -534,11 +545,11 @@ msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -"Tem certeza de que deseja apagar o %(objects_name)s selecionado? Todos os " +"Tem certeza de que deseja remover o %(objects_name)s selecionado? Todos os " "seguintes objetos e seus itens relacionados serão removidos:" msgid "Delete?" -msgstr "Apagar?" +msgstr "Remover?" #, python-format msgid " By %(filter_title)s " @@ -563,7 +574,7 @@ msgid "Changed:" msgstr "Alterado:" msgid "Deleted:" -msgstr "Apagado:" +msgstr "Removido:" msgid "Unknown content" msgstr "Conteúdo desconhecido" @@ -670,7 +681,7 @@ msgstr "Adicionar outro %(model)s" #, python-format msgid "Delete selected %(model)s" -msgstr "Excluir %(model)s selecionado" +msgstr "Remover %(model)s selecionado" #, python-format msgid "View selected %(model)s" diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo index ca2b002488..e8fe18a5f0 100644 Binary files a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po index 9d7ed9c756..10e5080e02 100644 --- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po @@ -4,6 +4,7 @@ # Allisson Azevedo , 2014 # andrewsmedina , 2016 # Eduardo Cereto Carvalho, 2011 +# Eduardo Felipe Castegnaro , 2024 # Gabriel da Mota , 2023 # fa9e10542e458baef0599ae856e43651_13d2225, 2012 # Jannis Leidel , 2011 @@ -17,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 15:04-0300\n" -"PO-Revision-Date: 2023-12-04 07:59+0000\n" -"Last-Translator: Gabriel da Mota , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:59+0000\n" +"Last-Translator: Eduardo Felipe Castegnaro , 2024\n" "Language-Team: Portuguese (Brazil) (http://app.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -118,7 +119,7 @@ msgid "" "button." msgstr "" "Você selecionou uma ação sem fazer mudanças nos campos individuais. Você " -"provavelmente está procurando pelo botão Go ao invés do botão Save." +"provavelmente está procurando pelo botão Ir ao invés do botão Salvar." msgid "Now" msgstr "Agora" @@ -330,9 +331,3 @@ msgstr "S" msgctxt "one letter Saturday" msgid "S" msgstr "S" - -msgid "Show" -msgstr "Mostrar" - -msgid "Hide" -msgstr "Esconder" diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo index 0668fbeead..f95653f5a0 100644 Binary files a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po b/django/contrib/admin/locale/ru/LC_MESSAGES/django.po index cd387a69e0..c77ffd1b07 100644 --- a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ru/LC_MESSAGES/django.po @@ -10,16 +10,16 @@ # Sergey , 2016 # Jannis Leidel , 2011 # SeryiMysh , 2020 -# Алексей Борискин , 2012-2015,2022-2023 +# Алексей Борискин , 2012-2015,2022-2024 # Дмитрий , 2019 # Bobsans , 2018 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Алексей Борискин , 2012-2015,2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Алексей Борискин , 2012-2015,2022-2024\n" "Language-Team: Russian (http://app.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -213,12 +213,6 @@ msgid "" msgstr "" "{name} “{obj}“ был изменен успешно. Вы можете отредактировать его снова ниже." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} “{obj}“ был успешно добавлен. Вы можете отредактировать его еще раз " -"ниже." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -387,6 +381,9 @@ msgstr "Введите имя пользователя и пароль." msgid "Change password" msgstr "Изменить пароль" +msgid "Set password" +msgstr "Задать пароль" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Пожалуйста, исправьте ошибку ниже." @@ -398,6 +395,19 @@ msgstr[3] "Пожалуйста, исправьте ошибки ниже." msgid "Enter a new password for the user %(username)s." msgstr "Введите новый пароль для пользователя %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Это действие разрешит парольную аутентификацию для этого " +"пользователя." + +msgid "Disable password-based authentication" +msgstr "Запретить аутентификацию по паролю" + +msgid "Enable password-based authentication" +msgstr "Разрешить аутентификацию по паролю" + msgid "Skip to main content" msgstr "К основному" diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo index 597165e2cf..dc548e5b07 100644 Binary files a/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/django.po b/django/contrib/admin/locale/sk/LC_MESSAGES/django.po index f0ae985eb6..7e18ff8e65 100644 --- a/django/contrib/admin/locale/sk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sk/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Adam Zahradník, 2023 +# Adam Zahradník, 2023-2024 # Jannis Leidel , 2011 # 18f25ad6fa9930fc67cb11aca9d16a27, 2012-2013 # Marian Andre , 2013-2015,2017 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Martin Tóth , 2017,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Adam Zahradník, 2023-2024\n" "Language-Team: Slovak (http://app.transifex.com/django/django/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -209,11 +209,6 @@ msgid "" msgstr "" "Objekt {name} „{obj}“ bol úspešne zmenený. Ďalšie zmeny môžete urobiť nižšie." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"Objekt {name} „{obj}“ bol úspešne pridaný. Ďalšie zmeny môžete urobiť nižšie." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -383,6 +378,9 @@ msgstr "Zadajte používateľské meno a heslo." msgid "Change password" msgstr "Zmeniť heslo" +msgid "Set password" +msgstr "Nastaviť heslo" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Prosím, opravte chybu uvedenú nižšie." @@ -394,6 +392,19 @@ msgstr[3] "Prosím, opravte chyby uvedené nižšie." msgid "Enter a new password for the user %(username)s." msgstr "Zadajte nové heslo pre používateľa %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Týmto povolíte tomuto používateľovi prihlasovanie pomocou " +"hesla." + +msgid "Disable password-based authentication" +msgstr "Vypnúť prihlasovanie pomocou hesla" + +msgid "Enable password-based authentication" +msgstr "Povoliť prihlasovanie pomocou hesla" + msgid "Skip to main content" msgstr "Preskočiť na hlavný obsah" diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo index 217e4bf54d..f01b6b48ce 100644 Binary files a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po index 6a5e140fff..08a77f67ec 100644 --- a/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Andrej Marsetič, 2022 +# Andrej Marsetič, 2022,2024 # Jannis Leidel , 2011 # zejn , 2016 # zejn , 2011-2012 @@ -9,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 07:59+0000\n" -"Last-Translator: Andrej Marsetič, 2022\n" -"Language-Team: Slovenian (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:59+0000\n" +"Last-Translator: Andrej Marsetič, 2022,2024\n" +"Language-Team: Slovenian (http://app.transifex.com/django/django/language/" "sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,7 +67,7 @@ msgstr "" #, javascript-format msgid "Type into this box to filter down the list of selected %s." -msgstr "" +msgstr "Vnesite v to polje, da filtrirate seznam izbranih %s ." msgid "Remove all" msgstr "Odstrani vse" @@ -79,10 +79,10 @@ msgstr "Kliknite za odstranitev vseh %s hkrati." #, javascript-format msgid "%s selected option not visible" msgid_plural "%s selected options not visible" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] " %s izbrana možnosti ni vidna" +msgstr[1] " %s izbrani možnosti nista vidni" +msgstr[2] " %s izbrane možnosti niso vidne" +msgstr[3] " %s izbrane možnosti niso vidne" msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" @@ -103,12 +103,16 @@ msgid "" "individual fields yet. Please click OK to save. You’ll need to re-run the " "action." msgstr "" +"Izbrali ste dejanje, vendar še niste shranili sprememb posameznih polj. Za " +"shranjevanje kliknite V redu. Akcijo boste morali ponovno zagnati." msgid "" "You have selected an action, and you haven’t made any changes on individual " "fields. You’re probably looking for the Go button rather than the Save " "button." msgstr "" +"Izbrali ste dejanje in niste spremenili posameznih polj. Verjetno iščete " +"gumb Pojdi in ne gumb Shrani." msgid "Now" msgstr "Takoj" @@ -246,6 +250,55 @@ msgctxt "abbrev. month December" msgid "Dec" msgstr "Dec" +msgid "Sunday" +msgstr "Nedelja" + +msgid "Monday" +msgstr "Ponedeljek" + +msgid "Tuesday" +msgstr "Torek" + +msgid "Wednesday" +msgstr "Sreda" + +msgid "Thursday" +msgstr "Četrtek" + +msgid "Friday" +msgstr "Petek" + +msgid "Saturday" +msgstr "Sobota" + +msgctxt "abbrev. day Sunday" +msgid "Sun" +msgstr "Ned" + +msgctxt "abbrev. day Monday" +msgid "Mon" +msgstr "Pon" + +msgctxt "abbrev. day Tuesday" +msgid "Tue" +msgstr "Tor" + +msgctxt "abbrev. day Wednesday" +msgid "Wed" +msgstr "Sre" + +msgctxt "abbrev. day Thursday" +msgid "Thur" +msgstr "Čet" + +msgctxt "abbrev. day Friday" +msgid "Fri" +msgstr "Pet" + +msgctxt "abbrev. day Saturday" +msgid "Sat" +msgstr "Sob" + msgctxt "one letter Sunday" msgid "S" msgstr "N" @@ -273,9 +326,3 @@ msgstr "P" msgctxt "one letter Saturday" msgid "S" msgstr "S" - -msgid "Show" -msgstr "Prikaži" - -msgid "Hide" -msgstr "Skrij" diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo index 18e613d4e7..292f2cb3ec 100644 Binary files a/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/django.po b/django/contrib/admin/locale/sq/LC_MESSAGES/django.po index b0cff5939f..9e571d047d 100644 --- a/django/contrib/admin/locale/sq/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sq/LC_MESSAGES/django.po @@ -2,15 +2,15 @@ # # Translators: # Besnik Bleta , 2011,2015 -# Besnik Bleta , 2020,2022-2023 +# Besnik Bleta , 2020,2022-2024 # Besnik Bleta , 2015,2018-2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Besnik Bleta , 2020,2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Besnik Bleta , 2020,2022-2024\n" "Language-Team: Albanian (http://app.transifex.com/django/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -203,10 +203,6 @@ msgid "" msgstr "" "{name} “{obj}” u ndryshua me sukses. Mund ta përpunoni sërish më poshtë." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "{name} “{obj}” u shtua me sukses. Mund ta përpunoni sërish më poshtë." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -372,6 +368,9 @@ msgstr "Jepni emër përdoruesi dhe fjalëkalim." msgid "Change password" msgstr "Ndryshoni fjalëkalimin" +msgid "Set password" +msgstr "Caktoni fjalëkalim" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Ju lutemi, ndreqni gabimin më poshtë." @@ -382,6 +381,19 @@ msgid "Enter a new password for the user %(username)s." msgstr "" "Jepni një fjalëkalim të ri për përdoruesin %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Ky veprim do të aktivizojë për këtë përdorues mirëfilltësim " +"me bazë fjalëkalimin." + +msgid "Disable password-based authentication" +msgstr "Çaktivizo mirëfilltësim me bazë fjalëkalimin" + +msgid "Enable password-based authentication" +msgstr "Aktivizo mirëfilltësim me bazë fjalëkalimin" + msgid "Skip to main content" msgstr "Kalo te lënda bazë" diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo index 8dbd5cd747..f794a8ccad 100644 Binary files a/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/django.po b/django/contrib/admin/locale/sr/LC_MESSAGES/django.po index e29cc45c92..1c9d7f945b 100644 --- a/django/contrib/admin/locale/sr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sr/LC_MESSAGES/django.po @@ -2,16 +2,16 @@ # # Translators: # Branko Kokanovic , 2018 -# Igor Jerosimić, 2019,2021,2023 +# Igor Jerosimić, 2019,2021,2023-2024 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Igor Jerosimić, 2019,2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Igor Jerosimić, 2019,2021,2023-2024\n" "Language-Team: Serbian (http://app.transifex.com/django/django/language/" "sr/)\n" "MIME-Version: 1.0\n" @@ -204,10 +204,6 @@ msgid "" msgstr "" "Објекат {name} \"{obj}\" успешно измењен. Можете га опет изменити испод." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "Објекат {name} \"{obj}\" успешно додат. Испод га можете изменити." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -376,6 +372,9 @@ msgstr "Унесите корисничко име и лозинку" msgid "Change password" msgstr "Промена лозинке" +msgid "Set password" +msgstr "Постави лозинку" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Молимо исправите грешку испод." @@ -386,6 +385,19 @@ msgstr[2] "Молимо исправите грешке испод." msgid "Enter a new password for the user %(username)s." msgstr "Унесите нову лозинку за корисника %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +" Ова акција ћеомогућити аутентификацију засновану на " +"лозинки за овог корисника." + +msgid "Disable password-based authentication" +msgstr "Онемогући аутентификацију засновану на лозинки" + +msgid "Enable password-based authentication" +msgstr "Омогући аутентификацију засновану на лозинки" + msgid "Skip to main content" msgstr "Пређи на главни садржај" diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo index 8ba81dda4b..1535c7199d 100644 Binary files a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po index a68dcf3a29..ec4e06e6ed 100644 --- a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po @@ -1,80 +1,89 @@ # This file is distributed under the same license as the Django package. -# +# # Translators: -# Igor Jerosimić, 2019,2021,2023 +# Igor Jerosimić, 2019,2021,2023-2024 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 07:59+0000\n" -"Last-Translator: Igor Jerosimić, 2019,2021,2023\n" -"Language-Team: Serbian (Latin) (http://www.transifex.com/django/django/" -"language/sr@latin/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:59+0000\n" +"Last-Translator: Igor Jerosimić, 2019,2021,2023-2024\n" +"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/language/sr@latin/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr@latin\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" +"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" +#: contrib/admin/static/admin/js/SelectFilter2.js:38 #, javascript-format msgid "Available %s" msgstr "Dostupni %s" +#: contrib/admin/static/admin/js/SelectFilter2.js:44 #, javascript-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." -msgstr "" -"Ovo je lista dostupnih „%s“. Možete izabrati elemente tako što ćete ih " -"izabrati u listi i kliknuti na „Izaberi“." +msgstr "Ovo je lista dostupnih „%s“. Možete izabrati elemente tako što ćete ih izabrati u listi i kliknuti na „Izaberi“." +#: contrib/admin/static/admin/js/SelectFilter2.js:60 #, javascript-format msgid "Type into this box to filter down the list of available %s." msgstr "Filtrirajte listu dostupnih elemenata „%s“." +#: contrib/admin/static/admin/js/SelectFilter2.js:65 +#: contrib/admin/static/admin/js/SelectFilter2.js:110 msgid "Filter" msgstr "Filter" +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Choose all" msgstr "Izaberi sve" +#: contrib/admin/static/admin/js/SelectFilter2.js:69 #, javascript-format msgid "Click to choose all %s at once." msgstr "Izaberite sve „%s“ odjednom." +#: contrib/admin/static/admin/js/SelectFilter2.js:75 msgid "Choose" msgstr "Izaberi" +#: contrib/admin/static/admin/js/SelectFilter2.js:77 msgid "Remove" msgstr "Ukloni" +#: contrib/admin/static/admin/js/SelectFilter2.js:83 #, javascript-format msgid "Chosen %s" msgstr "Izabrano „%s“" +#: contrib/admin/static/admin/js/SelectFilter2.js:89 #, javascript-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." -msgstr "" -"Ovo je lista izabranih „%s“. Možete ukloniti elemente tako što ćete ih " -"izabrati u listi i kliknuti na „Ukloni“." +msgstr "Ovo je lista izabranih „%s“. Možete ukloniti elemente tako što ćete ih izabrati u listi i kliknuti na „Ukloni“." +#: contrib/admin/static/admin/js/SelectFilter2.js:105 #, javascript-format msgid "Type into this box to filter down the list of selected %s." msgstr "Unesite u ovo polje da biste filtrirali listu izabranih %s." +#: contrib/admin/static/admin/js/SelectFilter2.js:120 msgid "Remove all" msgstr "Ukloni sve" +#: contrib/admin/static/admin/js/SelectFilter2.js:120 #, javascript-format msgid "Click to remove all chosen %s at once." msgstr "Uklonite sve izabrane „%s“ odjednom." +#: contrib/admin/static/admin/js/SelectFilter2.js:211 #, javascript-format msgid "%s selected option not visible" msgid_plural "%s selected options not visible" @@ -82,50 +91,55 @@ msgstr[0] "%s izabrana opcija nije vidljiva" msgstr[1] "%s izabrane opcije nisu vidljive" msgstr[2] "%s izabranih opcija nije vidljivo" +#: contrib/admin/static/admin/js/actions.js:67 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s od %(cnt)s izabran" msgstr[1] "%(sel)s od %(cnt)s izabrana" msgstr[2] "%(sel)s od %(cnt)s izabranih" +#: contrib/admin/static/admin/js/actions.js:161 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." -msgstr "" -"Imate nesačivane izmene. Ako pokrenete akciju, izmene će biti izgubljene." +msgstr "Imate nesačivane izmene. Ako pokrenete akciju, izmene će biti izgubljene." +#: contrib/admin/static/admin/js/actions.js:174 msgid "" "You have selected an action, but you haven’t saved your changes to " "individual fields yet. Please click OK to save. You’ll need to re-run the " "action." -msgstr "" -"Izabrali ste akciju, ali niste sačuvali vaše promene u pojedinačna polja. " -"Kliknite na OK da sačuvate promene. Biće neophodno da ponovo pokrenete " -"akciju." +msgstr "Izabrali ste akciju, ali niste sačuvali vaše promene u pojedinačna polja. Kliknite na OK da sačuvate promene. Biće neophodno da ponovo pokrenete akciju." +#: contrib/admin/static/admin/js/actions.js:175 msgid "" "You have selected an action, and you haven’t made any changes on individual " "fields. You’re probably looking for the Go button rather than the Save " "button." -msgstr "" -"Izabrali ste akciju i niste napravili nijednu promenu na pojedinačnim " -"poljima. Verovatno tražite Kreni dugme umesto Sačuvaj." +msgstr "Izabrali ste akciju i niste napravili nijednu promenu na pojedinačnim poljima. Verovatno tražite Kreni dugme umesto Sačuvaj." +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:13 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:110 msgid "Now" msgstr "Trenutno vreme" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:14 msgid "Midnight" msgstr "Ponoć" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:15 msgid "6 a.m." msgstr "18č" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:16 msgid "Noon" msgstr "Podne" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:17 msgid "6 p.m." msgstr "18č" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:78 #, javascript-format msgid "Note: You are %s hour ahead of server time." msgid_plural "Note: You are %s hours ahead of server time." @@ -133,6 +147,7 @@ msgstr[0] "Obaveštenje: Vi ste %s sat ispred serverskog vremena." msgstr[1] "Obaveštenje: Vi ste %s sata ispred serverskog vremena." msgstr[2] "Obaveštenje: Vi ste %s sati ispred serverskog vremena." +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:86 #, javascript-format msgid "Note: You are %s hour behind server time." msgid_plural "Note: You are %s hours behind server time." @@ -140,141 +155,238 @@ msgstr[0] "Obaveštenje: Vi ste %s sat iza serverskog vremena." msgstr[1] "Obaveštenje: Vi ste %s sata iza serverskog vremena." msgstr[2] "Obaveštenje: Vi ste %s sati iza serverskog vremena." +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:128 msgid "Choose a Time" msgstr "Odaberite vreme" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:158 msgid "Choose a time" msgstr "Odabir vremena" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:175 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:333 msgid "Cancel" msgstr "Poništi" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:238 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:318 msgid "Today" msgstr "Danas" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:255 msgid "Choose a Date" msgstr "Odaberite datum" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:312 msgid "Yesterday" msgstr "Juče" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:324 msgid "Tomorrow" msgstr "Sutra" +#: contrib/admin/static/admin/js/calendar.js:11 msgid "January" msgstr "Januar" +#: contrib/admin/static/admin/js/calendar.js:12 msgid "February" msgstr "Februar" +#: contrib/admin/static/admin/js/calendar.js:13 msgid "March" msgstr "Mart" +#: contrib/admin/static/admin/js/calendar.js:14 msgid "April" msgstr "April" +#: contrib/admin/static/admin/js/calendar.js:15 msgid "May" msgstr "Maj" +#: contrib/admin/static/admin/js/calendar.js:16 msgid "June" msgstr "Jun" +#: contrib/admin/static/admin/js/calendar.js:17 msgid "July" msgstr "Jul" +#: contrib/admin/static/admin/js/calendar.js:18 msgid "August" msgstr "Avgust" +#: contrib/admin/static/admin/js/calendar.js:19 msgid "September" msgstr "Septembar" +#: contrib/admin/static/admin/js/calendar.js:20 msgid "October" msgstr "Oktobar" +#: contrib/admin/static/admin/js/calendar.js:21 msgid "November" msgstr "Novembar" +#: contrib/admin/static/admin/js/calendar.js:22 msgid "December" msgstr "Decembar" +#: contrib/admin/static/admin/js/calendar.js:25 msgctxt "abbrev. month January" msgid "Jan" msgstr "jan" +#: contrib/admin/static/admin/js/calendar.js:26 msgctxt "abbrev. month February" msgid "Feb" msgstr "feb" +#: contrib/admin/static/admin/js/calendar.js:27 msgctxt "abbrev. month March" msgid "Mar" msgstr "mart" +#: contrib/admin/static/admin/js/calendar.js:28 msgctxt "abbrev. month April" msgid "Apr" msgstr "apr" +#: contrib/admin/static/admin/js/calendar.js:29 msgctxt "abbrev. month May" msgid "May" msgstr "maj" +#: contrib/admin/static/admin/js/calendar.js:30 msgctxt "abbrev. month June" msgid "Jun" msgstr "jun" +#: contrib/admin/static/admin/js/calendar.js:31 msgctxt "abbrev. month July" msgid "Jul" msgstr "jul" +#: contrib/admin/static/admin/js/calendar.js:32 msgctxt "abbrev. month August" msgid "Aug" msgstr "avg" +#: contrib/admin/static/admin/js/calendar.js:33 msgctxt "abbrev. month September" msgid "Sep" msgstr "sep" +#: contrib/admin/static/admin/js/calendar.js:34 msgctxt "abbrev. month October" msgid "Oct" msgstr "okt" +#: contrib/admin/static/admin/js/calendar.js:35 msgctxt "abbrev. month November" msgid "Nov" msgstr "nov" +#: contrib/admin/static/admin/js/calendar.js:36 msgctxt "abbrev. month December" msgid "Dec" msgstr "dec" +#: contrib/admin/static/admin/js/calendar.js:39 +msgid "Sunday" +msgstr "nedelja" + +#: contrib/admin/static/admin/js/calendar.js:40 +msgid "Monday" +msgstr "ponedeljak" + +#: contrib/admin/static/admin/js/calendar.js:41 +msgid "Tuesday" +msgstr "utorak" + +#: contrib/admin/static/admin/js/calendar.js:42 +msgid "Wednesday" +msgstr "sreda" + +#: contrib/admin/static/admin/js/calendar.js:43 +msgid "Thursday" +msgstr "četvrtak" + +#: contrib/admin/static/admin/js/calendar.js:44 +msgid "Friday" +msgstr "petak" + +#: contrib/admin/static/admin/js/calendar.js:45 +msgid "Saturday" +msgstr "subota" + +#: contrib/admin/static/admin/js/calendar.js:48 +msgctxt "abbrev. day Sunday" +msgid "Sun" +msgstr "ned" + +#: contrib/admin/static/admin/js/calendar.js:49 +msgctxt "abbrev. day Monday" +msgid "Mon" +msgstr "pon" + +#: contrib/admin/static/admin/js/calendar.js:50 +msgctxt "abbrev. day Tuesday" +msgid "Tue" +msgstr "uto" + +#: contrib/admin/static/admin/js/calendar.js:51 +msgctxt "abbrev. day Wednesday" +msgid "Wed" +msgstr "sre" + +#: contrib/admin/static/admin/js/calendar.js:52 +msgctxt "abbrev. day Thursday" +msgid "Thur" +msgstr "čet" + +#: contrib/admin/static/admin/js/calendar.js:53 +msgctxt "abbrev. day Friday" +msgid "Fri" +msgstr "pet" + +#: contrib/admin/static/admin/js/calendar.js:54 +msgctxt "abbrev. day Saturday" +msgid "Sat" +msgstr "sub" + +#: contrib/admin/static/admin/js/calendar.js:57 msgctxt "one letter Sunday" msgid "S" msgstr "N" +#: contrib/admin/static/admin/js/calendar.js:58 msgctxt "one letter Monday" msgid "M" msgstr "P" +#: contrib/admin/static/admin/js/calendar.js:59 msgctxt "one letter Tuesday" msgid "T" msgstr "U" +#: contrib/admin/static/admin/js/calendar.js:60 msgctxt "one letter Wednesday" msgid "W" msgstr "S" +#: contrib/admin/static/admin/js/calendar.js:61 msgctxt "one letter Thursday" msgid "T" msgstr "Č" +#: contrib/admin/static/admin/js/calendar.js:62 msgctxt "one letter Friday" msgid "F" msgstr "P" +#: contrib/admin/static/admin/js/calendar.js:63 msgctxt "one letter Saturday" msgid "S" msgstr "S" - -msgid "Show" -msgstr "Pokaži" - -msgid "Hide" -msgstr "Sakrij" diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo index e729444344..44dc92ddcc 100644 Binary files a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po index c81e13024a..bc85c431dd 100644 --- a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po @@ -12,6 +12,7 @@ # Jannis Leidel , 2011 # Johan Rohdin, 2021 # Jonathan Lindén, 2015 +# Jörgen Olofsson, 2024 # Jonathan Lindén, 2014 # metteludwig , 2019 # Mattias Hansson , 2016 @@ -21,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Albin Larsson , 2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Jörgen Olofsson, 2024\n" "Language-Team: Swedish (http://app.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -193,7 +194,7 @@ msgstr "" "Håll inne “Control”, eller “Command” på en Mac, för att välja fler än en." msgid "Select this object for an action - {}" -msgstr "" +msgstr "Välj detta objekt för en åtgärd - {}" #, python-brace-format msgid "The {name} “{obj}” was added successfully." @@ -212,10 +213,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "Ändrade {name} “{obj}”. Du kan göra ytterligare förändringar nedan." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "Lade till {name} “{obj}”. Du kan göra ytterligare förändringar nedan." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -379,6 +376,9 @@ msgstr "Mata in användarnamn och lösenord." msgid "Change password" msgstr "Ändra lösenord" +msgid "Set password" +msgstr "Sätt lösenord" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Var god rätta felet nedan." @@ -388,6 +388,19 @@ msgstr[1] "Vad god rätta felen nedan." msgid "Enter a new password for the user %(username)s." msgstr "Ange nytt lösenord för användare %(username)s." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Denna åtgärd aktiverar lösenordsbaserad autentisering för " +"denna användare." + +msgid "Disable password-based authentication" +msgstr "Inaktivera lösenordsbaserad autentisering" + +msgid "Enable password-based authentication" +msgstr "Aktivera lösenordsbaserad autentisering" + msgid "Skip to main content" msgstr "Hoppa till huvudinnehållet" @@ -417,10 +430,10 @@ msgid "Filter" msgstr "Filtrera" msgid "Hide counts" -msgstr "" +msgstr "Dölj antal" msgid "Show counts" -msgstr "" +msgstr "Visa antal" msgid "Clear all filters" msgstr "Rensa alla filter" @@ -531,13 +544,13 @@ msgid "None available" msgstr "Inga tillgängliga" msgid "Added:" -msgstr "" +msgstr "Lagt till:" msgid "Changed:" -msgstr "" +msgstr "Ändrade:" msgid "Deleted:" -msgstr "" +msgstr "Raderade:" msgid "Unknown content" msgstr "Okänt innehåll" @@ -749,7 +762,7 @@ msgid "Reset my password" msgstr "Nollställ mitt lösenord" msgid "Select all objects on this page for an action" -msgstr "" +msgstr "Välj alla objekt på denna sida för en åtgärd" msgid "All dates" msgstr "Alla datum" diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo index daccc9e09b..47d3efe969 100644 Binary files a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo and b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo differ diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po index 927f4b13f3..28bd355fbd 100644 --- a/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po @@ -2,10 +2,11 @@ # # Translators: # Anders Hovmöller , 2023 -# Andreas Pelme , 2012 +# Andreas Pelme , 2012,2024 # Danijel Grujicic, 2023 # Elias Johnstone , 2022 # Jannis Leidel , 2011 +# Jörgen Olofsson, 2024 # Jonathan Lindén, 2014 # Mattias Hansson , 2016 # Mattias Benjaminsson , 2011 @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 15:04-0300\n" -"PO-Revision-Date: 2023-12-04 07:59+0000\n" -"Last-Translator: Danijel Grujicic, 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:59+0000\n" +"Last-Translator: Jörgen Olofsson, 2024\n" "Language-Team: Swedish (http://app.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -85,8 +86,8 @@ msgstr "Klicka för att ta bort alla valda %s på en gång." #, javascript-format msgid "%s selected option not visible" msgid_plural "%s selected options not visible" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s valt alternativ inte synligt" +msgstr[1] "%s valda alternativ inte synliga" msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" @@ -250,53 +251,53 @@ msgid "Dec" msgstr "dec" msgid "Sunday" -msgstr "" +msgstr "Söndag" msgid "Monday" -msgstr "" +msgstr "Måndag" msgid "Tuesday" -msgstr "" +msgstr "Tisdag" msgid "Wednesday" -msgstr "" +msgstr "Onsdag" msgid "Thursday" -msgstr "" +msgstr "Torsdag" msgid "Friday" -msgstr "" +msgstr "Fredag" msgid "Saturday" -msgstr "" +msgstr "Lördag" msgctxt "abbrev. day Sunday" msgid "Sun" -msgstr "" +msgstr "sön" msgctxt "abbrev. day Monday" msgid "Mon" -msgstr "" +msgstr "mån" msgctxt "abbrev. day Tuesday" msgid "Tue" -msgstr "" +msgstr "tis" msgctxt "abbrev. day Wednesday" msgid "Wed" -msgstr "" +msgstr "ons" msgctxt "abbrev. day Thursday" msgid "Thur" -msgstr "" +msgstr "tors" msgctxt "abbrev. day Friday" msgid "Fri" -msgstr "" +msgstr "fre" msgctxt "abbrev. day Saturday" msgid "Sat" -msgstr "" +msgstr "lör" msgctxt "one letter Sunday" msgid "S" @@ -325,9 +326,3 @@ msgstr "F" msgctxt "one letter Saturday" msgid "S" msgstr "L" - -msgid "Show" -msgstr "Visa" - -msgid "Hide" -msgstr "Göm" diff --git a/django/contrib/admin/locale/tk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/tk/LC_MESSAGES/django.mo index 0b77d710e7..fd8f0e1f0a 100644 Binary files a/django/contrib/admin/locale/tk/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/tk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/tk/LC_MESSAGES/django.po b/django/contrib/admin/locale/tk/LC_MESSAGES/django.po index f0d75c5d80..ad73340b02 100644 --- a/django/contrib/admin/locale/tk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/tk/LC_MESSAGES/django.po @@ -2,15 +2,18 @@ # # Translators: # Mariusz Felisiak , 2022 +# Natalia, 2024 +# Resul , 2024 +# Rovshen Tagangylyjov, 2024 # Welbeck Garli , 2022 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-17 02:13-0600\n" -"PO-Revision-Date: 2023-04-25 07:05+0000\n" -"Last-Translator: Mariusz Felisiak , 2022\n" -"Language-Team: Turkmen (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: Natalia, 2024\n" +"Language-Team: Turkmen (http://app.transifex.com/django/django/language/" "tk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +49,7 @@ msgid "No" msgstr "Ýok" msgid "Unknown" -msgstr "Nätanyş" +msgstr "Näbelli" msgid "Any date" msgstr "Islendik sene" @@ -58,16 +61,16 @@ msgid "Past 7 days" msgstr "Soňky 7 gün" msgid "This month" -msgstr "Şul aý" +msgstr "Şu aý" msgid "This year" -msgstr "Şul ýyl" +msgstr "Şu ýyl" msgid "No date" msgstr "Senesiz" msgid "Has date" -msgstr "Seneli" +msgstr "Senesi bar" msgid "Empty" msgstr "Boş" @@ -80,7 +83,7 @@ msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Administratiw bolmadyk hasap üçin dogry %(username)swe parol ulanmagyňyzy " +"Administratiw bolmadyk hasap üçin dogry %(username)s we parol ulanmagyňyzy " "sizden haýyş edýäris. Giriziljek maglumatlaryň harp ýalňyşsyz bolmagyny göz " "öňünde tutmagy unutmaň." @@ -95,7 +98,7 @@ msgid "Remove" msgstr "Aýyr" msgid "Addition" -msgstr "Goşmaça" +msgstr "Goşmak" msgid "Change" msgstr "Üýtget" @@ -110,18 +113,18 @@ msgid "user" msgstr "ulanyjy" msgid "content type" -msgstr "maglumat görnüşi" +msgstr "mazmun görnüşi" msgid "object id" -msgstr "obýekt id'sy" +msgstr "obýekt id-sy" #. Translators: 'repr' means representation #. (https://docs.python.org/library/functions.html#repr) msgid "object repr" -msgstr "obýekt repr'y" +msgstr "obýekt repr-y" msgid "action flag" -msgstr "hereket baýdaklandyryşy" +msgstr "hereket belligi" msgid "change message" msgstr "Habarnamany üýtget" @@ -149,7 +152,7 @@ msgstr "GirişHabarnamasy Obýekty" #, python-brace-format msgid "Added {name} “{object}”." -msgstr "Goşuldy {name} \"{object}\"." +msgstr "Goşuldy {name} “{object}”." msgid "Added." msgstr "Goşuldy." @@ -163,7 +166,7 @@ msgstr "" #, python-brace-format msgid "Changed {fields}." -msgstr "" +msgstr "{fields} üýtgedildi." #, python-brace-format msgid "Deleted {name} “{object}”." @@ -178,6 +181,9 @@ msgstr "" msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" +msgid "Select this object for an action - {}" +msgstr "" + #, python-brace-format msgid "The {name} “{obj}” was added successfully." msgstr "" @@ -195,10 +201,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "" -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -328,6 +330,9 @@ msgstr "" msgid "Clear selection" msgstr "" +msgid "Breadcrumbs" +msgstr "" + #, python-format msgid "Models in the %(name)s application" msgstr "" @@ -352,6 +357,9 @@ msgstr "" msgid "Change password" msgstr "" +msgid "Set password" +msgstr "" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "" @@ -361,6 +369,17 @@ msgstr[1] "" msgid "Enter a new password for the user %(username)s." msgstr "" +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" + +msgid "Disable password-based authentication" +msgstr "" + +msgid "Enable password-based authentication" +msgstr "" + msgid "Skip to main content" msgstr "" @@ -376,9 +395,6 @@ msgstr "" msgid "Log out" msgstr "" -msgid "Breadcrumbs" -msgstr "" - #, python-format msgid "Add %(name)s" msgstr "" @@ -392,6 +408,12 @@ msgstr "" msgid "Filter" msgstr "" +msgid "Hide counts" +msgstr "" + +msgid "Show counts" +msgstr "" + msgid "Clear all filters" msgstr "" @@ -486,6 +508,15 @@ msgstr "" msgid "None available" msgstr "" +msgid "Added:" +msgstr "" + +msgid "Changed:" +msgstr "" + +msgid "Deleted:" +msgstr "" + msgid "Unknown content" msgstr "" @@ -673,6 +704,9 @@ msgstr "" msgid "Reset my password" msgstr "" +msgid "Select all objects on this page for an action" +msgstr "" + msgid "All dates" msgstr "" diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo index 3f2ee2536c..75038f36b5 100644 Binary files a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po index d2428b5a29..be27db296e 100644 --- a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# BouRock, 2015-2023 +# BouRock, 2015-2024 # BouRock, 2014-2015 # Caner Başaran , 2013 # Cihad GÜNDOĞDU , 2012 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: BouRock, 2015-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: BouRock, 2015-2024\n" "Language-Team: Turkish (http://app.transifex.com/django/django/language/" "tr/)\n" "MIME-Version: 1.0\n" @@ -210,11 +210,6 @@ msgstr "" "{name} “{obj}” başarılı olarak değiştirildi. Aşağıda tekrar " "düzenleyebilirsiniz." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} “{obj}” başarılı olarak eklendi. Aşağıda tekrar düzenleyebilirsiniz." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -381,6 +376,9 @@ msgstr "Kullanıcı adı ve parola girin." msgid "Change password" msgstr "Parolayı değiştir" +msgid "Set password" +msgstr "Parola ayarla" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Lütfen aşağıdaki hatayı düzeltin." @@ -390,6 +388,19 @@ msgstr[1] "Lütfen aşağıdaki hataları düzeltin." msgid "Enter a new password for the user %(username)s." msgstr "%(username)s kullanıcısı için yeni bir parola girin." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"Bu eylem, bu kullanıcı için parola tabanlı kimlik doğrulaması " +"etkinleştirecektir." + +msgid "Disable password-based authentication" +msgstr "Parola tabanlı kimlik doğrulamasını etkisizleştir" + +msgid "Enable password-based authentication" +msgstr "Parola tabanlı kimlik doğrulamasını etkinleştir" + msgid "Skip to main content" msgstr "Ana içeriğe atla" diff --git a/django/contrib/admin/locale/ug/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ug/LC_MESSAGES/django.mo index c517da6563..13b8d2c144 100644 Binary files a/django/contrib/admin/locale/ug/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/ug/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/ug/LC_MESSAGES/django.po b/django/contrib/admin/locale/ug/LC_MESSAGES/django.po index 5af1e41f54..bdac66a88d 100644 --- a/django/contrib/admin/locale/ug/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ug/LC_MESSAGES/django.po @@ -3,18 +3,18 @@ # Translators: # abdl erkin <84247764@qq.com>, 2018 # ABDULLA , 2014 -# Abduqadir Abliz , 2023 +# Abduqadir Abliz , 2023-2024 # Azat, 2023 # Murat Orhun , 2023 -# Natalia (Django Fellow), 2023 +# Natalia, 2023 # Serpidin Uyghur, 2023 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 07:05+0000\n" -"Last-Translator: Natalia (Django Fellow), 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 07:05+0000\n" +"Last-Translator: Abduqadir Abliz , 2023-2024\n" "Language-Team: Uyghur (http://app.transifex.com/django/django/language/ug/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -204,12 +204,6 @@ msgstr "" "{name} “{obj}” مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى. تۆۋەندە ئۇنى قايتا تەھرىرلىسىڭىز " "بولىدۇ." -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "" -"{name} “{obj}” مۇۋەپپەقىيەتلىك قوشۇلدى. تۆۋەندە ئۇنى قايتا تەھرىرلىسىڭىز " -"بولىدۇ." - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -376,6 +370,9 @@ msgstr "ئىشلەتكۈچى ئاتى ۋە پارول كىرگۈزۈڭ." msgid "Change password" msgstr "پارولنى ئۆزگەرتىش" +msgid "Set password" +msgstr "پارول تەڭشەك" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "تۆۋەندىكى خاتالىقلارنى توغرىلاڭ." @@ -385,6 +382,19 @@ msgstr[1] "تۆۋەندىكى خاتالىقلارنى توغرىلاڭ." msgid "Enter a new password for the user %(username)s." msgstr "ئىشلەتكۈچى %(username)s ئۈچۈن يېڭى پارول كىرگۈزۈڭ." +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "" +"بۇ مەشغۇلات مەزكۇر ئىشلەتكۈچىنىڭ ئىم ئاساسىدىكى دەلىللىشىنى " +"قوزغىتىدۇ" + +msgid "Disable password-based authentication" +msgstr "ئىم ئاساسىدىكى دەلىللەشنى چەكلەيدۇ" + +msgid "Enable password-based authentication" +msgstr "ئىم ئاساسىدىكى دەلىللەشنى قوزغىتىدۇ" + msgid "Skip to main content" msgstr "ئاساسلىق مەزمۇنغا ئاتلا" diff --git a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo index 4bee1a8d45..7bec9b7a2c 100644 Binary files a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po index abc545310c..c6fcf86e8f 100644 --- a/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po @@ -24,6 +24,7 @@ # yf zhan , 2018 # dykai , 2019 # ced773123cfad7b4e8b79ca80f736af9, 2012 +# 千百度, 2024 # LatteFang <370358679@qq.com>, 2020 # Kevin Sze , 2012 # 考证 李 , 2020 @@ -34,9 +35,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-25 07:05+0000\n" -"Last-Translator: jack yang, 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: 千百度, 2024\n" "Language-Team: Chinese (China) (http://app.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -223,10 +224,6 @@ msgid "" "The {name} “{obj}” was changed successfully. You may edit it again below." msgstr "成功修改了 {name}“{obj}”。你可以在下面再次编辑它。" -#, python-brace-format -msgid "The {name} “{obj}” was added successfully. You may edit it again below." -msgstr "成功添加了 {name}“{obj}”。你可以在下面再次编辑它。" - #, python-brace-format msgid "" "The {name} “{obj}” was changed successfully. You may add another {name} " @@ -385,6 +382,9 @@ msgstr "输入用户名和密码" msgid "Change password" msgstr "修改密码" +msgid "Set password" +msgstr "设置密码" + msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "请更正以下错误。" @@ -393,6 +393,17 @@ msgstr[0] "请更正以下错误。" msgid "Enter a new password for the user %(username)s." msgstr "为用户 %(username)s 输入一个新的密码。" +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "这将启用本用户基于密码的验证" + +msgid "Disable password-based authentication" +msgstr "禁用基于密码的验证" + +msgid "Enable password-based authentication" +msgstr "启用基于密码的验证" + msgid "Skip to main content" msgstr "跳到主要内容" diff --git a/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo index a96ef9a02b..da1da7026d 100644 Binary files a/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po index a2a1d9a3a5..89d0a940e2 100644 --- a/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po @@ -5,19 +5,21 @@ # ilay , 2012 # Jannis Leidel , 2011 # mail6543210 , 2013-2014 -# ming hsien tzang , 2011 +# 0a3cb7bfd0810218facdfb511e592a6d_8d19d07 , 2011 # tcc , 2011 # Tzu-ping Chung , 2016-2017 +# YAO WEN LIANG, 2024 # Yeh-Yung , 2013 +# yubike, 2024 # Yeh-Yung , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-19 16:40+0000\n" -"Last-Translator: Tzu-ping Chung \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 07:05+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,6 +27,10 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "刪除所選的 %(verbose_name_plural)s" + #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "成功的刪除了 %(count)d 個 %(items)s." @@ -36,10 +42,6 @@ msgstr "無法刪除 %(name)s" msgid "Are you sure?" msgstr "你確定嗎？" -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "刪除所選的 %(verbose_name_plural)s" - msgid "Administration" msgstr "管理" @@ -76,11 +78,17 @@ msgstr "沒有日期" msgid "Has date" msgstr "有日期" +msgid "Empty" +msgstr "空的" + +msgid "Not empty" +msgstr "非空的" + #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." -msgstr "請輸入正確的工作人員%(username)s及密碼。請注意兩者皆區分大小寫。" +msgstr "請輸入正確的工作人員帳號%(username)s及密碼。請注意兩者皆區分大小寫。" msgid "Action:" msgstr "動作:" @@ -92,6 +100,15 @@ msgstr "新增其它 %(verbose_name)s" msgid "Remove" msgstr "移除" +msgid "Addition" +msgstr "新增" + +msgid "Change" +msgstr "修改" + +msgid "Deletion" +msgstr "删除" + msgid "action time" msgstr "動作時間" @@ -105,7 +122,7 @@ msgid "object id" msgstr "物件 id" #. Translators: 'repr' means representation -#. (https://docs.python.org/3/library/functions.html#repr) +#. (https://docs.python.org/library/functions.html#repr) msgid "object repr" msgstr "物件 repr" @@ -113,31 +130,31 @@ msgid "action flag" msgstr "動作旗標" msgid "change message" -msgstr "變更訊息" +msgstr "修改訊息" msgid "log entry" -msgstr "紀錄項目" +msgstr "日誌記錄" msgid "log entries" -msgstr "紀錄項目" +msgstr "日誌紀錄" #, python-format -msgid "Added \"%(object)s\"." +msgid "Added “%(object)s”." msgstr "\"%(object)s\" 已新增。" #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "\"%(object)s\" - %(changes)s 已變更。" +msgid "Changed “%(object)s” — %(changes)s" +msgstr "\"%(object)s\" - %(changes)s 已修改。" #, python-format -msgid "Deleted \"%(object)s.\"" +msgid "Deleted “%(object)s.”" msgstr "\"%(object)s\" 已刪除。" msgid "LogEntry Object" -msgstr "紀錄項目" +msgstr "日誌記錄物件" #, python-brace-format -msgid "Added {name} \"{object}\"." +msgid "Added {name} “{object}”." msgstr "{name} \"{object}\" 已新增。" msgid "Added." @@ -147,71 +164,70 @@ msgid "and" msgstr "和" #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." -msgstr "{name} \"{object}\" 的 {fields} 已變更。" +msgid "Changed {fields} for {name} “{object}”." +msgstr "{name} \"{object}\" 的 {fields} 已修改。" #, python-brace-format msgid "Changed {fields}." -msgstr "{fields} 已變更。" +msgstr "{fields} 已修改。" #, python-brace-format -msgid "Deleted {name} \"{object}\"." +msgid "Deleted {name} “{object}”." msgstr "{name} \"{object}\" 已刪除。" msgid "No fields changed." -msgstr "沒有欄位被變更。" +msgstr "沒有欄位被修改。" msgid "None" msgstr "無" -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "按住 \"Control\" 或 \"Command\" (Mac)，可選取多個值" +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." +msgstr "按住 \"Control\", 或者在 Mac 上按 \"Command\", 以選取更多值" + +msgid "Select this object for an action - {}" +msgstr "選擇此對象進行操作 - {}" + +#, python-brace-format +msgid "The {name} “{obj}” was added successfully." +msgstr "{name} \"{obj}\" 已成功新增。" + +msgid "You may edit it again below." +msgstr "您可以在下面再次編輯它." #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "{name} \"{obj}\" 新增成功。你可以在下面再次編輯它。" - -#, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " -"below." +"The {name} “{obj}” was added successfully. You may add another {name} below." msgstr "{name} \"{obj}\" 新增成功。你可以在下方加入其他 {name}。" #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." -msgstr "{name} \"{obj}\" 已成功新增。" +msgid "" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "{name} \"{obj}\" 修改成功。你可以在下方再次編輯。" #, python-brace-format msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." -msgstr "{name} \"{obj}\" 變更成功。你可以在下方再次編輯。" - -#, python-brace-format -msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." -msgstr "{name} \"{obj}\" 變更成功。你可以在下方加入其他 {name}。" +msgstr "{name} \"{obj}\" 修改成功。你可以在下方加入其他 {name}。" #, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "{name} \"{obj}\" 已成功變更。" +msgid "The {name} “{obj}” was changed successfully." +msgstr "成功修改了 {name}“{obj}”。" msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." -msgstr "必須要有項目被選到才能對它們進行動作。沒有項目變更。" +msgstr "必須要有項目被選中才能進行動作。沒有任何項目被修改。" msgid "No action selected." -msgstr "沒有動作被選。" +msgstr "沒有動作被選取。" #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" 已成功刪除。" +msgid "The %(name)s “%(obj)s” was deleted successfully." +msgstr "成功删除了 %(name)s“%(obj)s”。" #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "不存在 ID 為「%(key)s」的 %(name)s。或許它已被刪除？" #, python-format @@ -220,7 +236,11 @@ msgstr "新增 %s" #, python-format msgid "Change %s" -msgstr "變更 %s" +msgstr "修改 %s" + +#, python-format +msgid "View %s" +msgstr "查看 %s" msgid "Database error" msgstr "資料庫錯誤" @@ -228,23 +248,24 @@ msgstr "資料庫錯誤" #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "共 %(count)s %(name)s 已變更成功。" +msgstr[0] "共 %(count)s %(name)s 已修改成功。" #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" -msgstr[0] "全部 %(total_count)s 個被選" +msgstr[0] "選取了 %(total_count)s 個" #, python-format msgid "0 of %(cnt)s selected" -msgstr "%(cnt)s 中 0 個被選" +msgstr "%(cnt)s 中 0 個被選取" #, python-format msgid "Change history: %s" -msgstr "變更歷史: %s" +msgstr "修改歷史: %s" -#. Translators: Model verbose name and instance representation, -#. suitable to be an item in a list. +#. Translators: Model verbose name and instance +#. representation, suitable to be an item in a +#. list. #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" @@ -274,10 +295,10 @@ msgid "%(app)s administration" msgstr "%(app)s 管理" msgid "Page not found" -msgstr "頁面沒有找到" +msgstr "找不到頁面" -msgid "We're sorry, but the requested page could not be found." -msgstr "很抱歉，請求頁面無法找到。" +msgid "We’re sorry, but the requested page could not be found." +msgstr "很抱歉，請求頁面不存在。" msgid "Home" msgstr "首頁" @@ -292,17 +313,17 @@ msgid "Server Error (500)" msgstr "伺服器錯誤 (500)" msgid "" -"There's been an error. It's been reported to the site administrators via " +"There’s been an error. It’s been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"存在一個錯誤。已透過電子郵件回報給網站管理員，並且應該很快就會被修正。謝謝你" -"的關心。" +"存在一個錯誤。已透過電子郵件回報給網站管理員，並且應該很快就會被修正。謝謝您" +"的耐心等待。" msgid "Run the selected action" -msgstr "執行選擇的動作" +msgstr "執行選取的動作" msgid "Go" -msgstr "去" +msgstr "執行" msgid "Click here to select the objects across all pages" msgstr "點選這裡可選取全部頁面的物件" @@ -314,27 +335,58 @@ msgstr "選擇全部 %(total_count)s %(module_name)s" msgid "Clear selection" msgstr "清除選擇" +msgid "Breadcrumbs" +msgstr "導覽路徑" + +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s 應用程式中的模型" + +msgid "Add" +msgstr "新增" + +msgid "View" +msgstr "查看" + +msgid "You don’t have permission to view or edit anything." +msgstr "你沒有查看或編輯的權限。" + msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." -msgstr "首先，輸入一個使用者名稱和密碼。然後你可以編輯更多使用者選項。" +msgstr "輸入使用者名稱和密碼後，你可以編輯更多使用者選項。" msgid "Enter a username and password." -msgstr "輸入一個使用者名稱和密碼。" +msgstr "輸入使用者名稱和密碼。" msgid "Change password" -msgstr "變更密碼" +msgstr "修改密碼" + +msgid "Set password" +msgstr "設定密碼" msgid "Please correct the error below." -msgstr "請更正下面的錯誤。" - -msgid "Please correct the errors below." -msgstr "請修正以下錯誤" +msgid_plural "Please correct the errors below." +msgstr[0] "請修正以下錯誤。" #, python-format msgid "Enter a new password for the user %(username)s." msgstr "為使用者%(username)s輸入一個新的密碼。" +msgid "" +"This action will enable password-based authentication for " +"this user." +msgstr "這會 啟用 本用戶基於密碼的驗證" + +msgid "Disable password-based authentication" +msgstr "停用基於密碼的驗證" + +msgid "Enable password-based authentication" +msgstr "啟用基於密碼的驗證" + +msgid "Skip to main content" +msgstr "跳到主要內容" + msgid "Welcome," msgstr "歡迎，" @@ -360,6 +412,15 @@ msgstr "在網站上檢視" msgid "Filter" msgstr "過濾器" +msgid "Hide counts" +msgstr "隱藏計數" + +msgid "Show counts" +msgstr "顯示計數" + +msgid "Clear all filters" +msgstr "清除所有篩選" + msgid "Remove from sorting" msgstr "從排序中移除" @@ -370,6 +431,15 @@ msgstr "優先排序：%(priority_number)s" msgid "Toggle sorting" msgstr "切換排序" +msgid "Toggle theme (current theme: auto)" +msgstr "切換主題（當前主題:自動）" + +msgid "Toggle theme (current theme: light)" +msgstr "切換主題（當前主題:淺色）" + +msgid "Toggle theme (current theme: dark)" +msgstr "切換主題（當前主題:深色）" + msgid "Delete" msgstr "刪除" @@ -400,11 +470,11 @@ msgstr "" msgid "Objects" msgstr "物件" -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "是的，我確定" msgid "No, take me back" -msgstr "不，請帶我回去" +msgstr "不，返回" msgid "Delete multiple objects" msgstr "刪除多個物件" @@ -431,9 +501,6 @@ msgid "" msgstr "" "你是否確定要刪除已選的 %(objects_name)s? 下面全部物件及其相關項目都將被刪除:" -msgid "Change" -msgstr "變更" - msgid "Delete?" msgstr "刪除？" @@ -444,16 +511,6 @@ msgstr " 以 %(filter_title)s" msgid "Summary" msgstr "總結" -#, python-format -msgid "Models in the %(name)s application" -msgstr "%(name)s 應用程式中的Model" - -msgid "Add" -msgstr "新增" - -msgid "You don't have permission to edit anything." -msgstr "你沒有編輯任何東西的權限。" - msgid "Recent actions" msgstr "最近的動作" @@ -461,13 +518,22 @@ msgid "My actions" msgstr "我的動作" msgid "None available" -msgstr "無可用的" +msgstr "無資料" + +msgid "Added:" +msgstr "已新增。" + +msgid "Changed:" +msgstr "已修改：" + +msgid "Deleted:" +msgstr "已刪除:" msgid "Unknown content" msgstr "未知內容" msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"Something’s wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" @@ -479,10 +545,23 @@ msgid "" "You are authenticated as %(username)s, but are not authorized to access this " "page. Would you like to login to a different account?" msgstr "" -"您已認證為 %(username)s，但並沒有瀏覽此頁面的權限。您是否希望以其他帳號登入？" +"您目前以%(username)s登入，但並沒有瀏覽此頁面的權限。您是否希望以其他帳號登" +"入？" msgid "Forgotten your password or username?" -msgstr "忘了你的密碼或是使用者名稱？" +msgstr "忘記您的密碼或是使用者名稱？" + +msgid "Toggle navigation" +msgstr "切換導航" + +msgid "Sidebar" +msgstr "側邊欄" + +msgid "Start typing to filter…" +msgstr "輸入內容開始篩選..." + +msgid "Filter navigation items" +msgstr "篩選導航項目" msgid "Date/time" msgstr "日期/時間" @@ -493,10 +572,14 @@ msgstr "使用者" msgid "Action" msgstr "動作" +msgid "entry" +msgid_plural "entries" +msgstr[0] "紀錄項目" + msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." -msgstr "這個物件沒有變更的歷史。它可能不是透過這個管理網站新增的。" +msgstr "該物件沒有修改的歷史紀錄。它可能不是透過此管理網站新增的。" msgid "Show all" msgstr "顯示全部" @@ -504,20 +587,8 @@ msgstr "顯示全部" msgid "Save" msgstr "儲存" -msgid "Popup closing..." -msgstr "關閉彈出視窗中⋯⋯" - -#, python-format -msgid "Change selected %(model)s" -msgstr "變更所選的 %(model)s" - -#, python-format -msgid "Add another %(model)s" -msgstr "新增其它 %(model)s" - -#, python-format -msgid "Delete selected %(model)s" -msgstr "刪除所選的 %(model)s" +msgid "Popup closing…" +msgstr "關閉彈跳視窗中..." msgid "Search" msgstr "搜尋" @@ -540,30 +611,50 @@ msgstr "儲存並新增另一個" msgid "Save and continue editing" msgstr "儲存並繼續編輯" -msgid "Thanks for spending some quality time with the Web site today." -msgstr "感謝你今天花了重要的時間停留在本網站。" +msgid "Save and view" +msgstr "儲存並查看" + +msgid "Close" +msgstr "關閉" + +#, python-format +msgid "Change selected %(model)s" +msgstr "修改所選的 %(model)s" + +#, python-format +msgid "Add another %(model)s" +msgstr "新增其它 %(model)s" + +#, python-format +msgid "Delete selected %(model)s" +msgstr "刪除所選的 %(model)s" + +#, python-format +msgid "View selected %(model)s" +msgstr "查看已選擇的%(model)s" + +msgid "Thanks for spending some quality time with the web site today." +msgstr "感謝您今天在網站上度過了一段美好的時光。" msgid "Log in again" msgstr "重新登入" msgid "Password change" -msgstr "密碼變更" +msgstr "密碼修改" msgid "Your password was changed." -msgstr "你的密碼已變更。" +msgstr "您的密碼已修改。" msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"Please enter your old password, for security’s sake, and then enter your new " "password twice so we can verify you typed it in correctly." -msgstr "" -"為了安全上的考量，請輸入你的舊密碼，再輸入新密碼兩次，讓我們核驗你已正確地輸" -"入。" +msgstr "為了安全上的考量，請輸入你的舊密碼，然後輸入兩次新密碼已確保輸入正確。" msgid "Change my password" -msgstr "變更我的密碼" +msgstr "修改我的密碼" msgid "Password reset" -msgstr "密碼重設" +msgstr "重設密碼" msgid "Your password has been set. You may go ahead and log in now." msgstr "你的密碼已設置，現在可以繼續登入。" @@ -574,7 +665,7 @@ msgstr "密碼重設確認" msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." -msgstr "請輸入你的新密碼兩次, 這樣我們才能檢查你的輸入是否正確。" +msgstr "請輸入新密碼兩次, 以便系統確認輸入無誤。" msgid "New password:" msgstr "新密碼：" @@ -585,17 +676,17 @@ msgstr "確認密碼：" msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." -msgstr "密碼重設連結無效，可能因為他已使用。請重新請求密碼重設。" +msgstr "密碼重設連結無效，可能已被使用。請重新申請密碼重設。" msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" "若您提交的電子郵件地址存在對應帳號，我們已寄出重設密碼的相關指示。您應該很快" "就會收到。" msgid "" -"If you don't receive an email, please make sure you've entered the address " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" "如果您未收到電子郵件，請確認您輸入的電子郵件地址與您註冊時輸入的一致，並檢查" @@ -605,13 +696,13 @@ msgstr "" msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." -msgstr "這封電子郵件來自 %(site_name)s，因為你要求為帳號重新設定密碼。" +msgstr "這封電子郵件來自 %(site_name)s，因為您要求為帳號重新設定密碼。" msgid "Please go to the following page and choose a new password:" msgstr "請到該頁面選擇一個新的密碼：" -msgid "Your username, in case you've forgotten:" -msgstr "你的使用者名稱，萬一你已經忘記的話:" +msgid "Your username, in case you’ve forgotten:" +msgstr "提醒一下，您的用戶名是：" msgid "Thanks for using our site!" msgstr "感謝使用本網站！" @@ -621,11 +712,10 @@ msgid "The %(site_name)s team" msgstr "%(site_name)s 團隊" msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" -"忘記你的密碼? 請在下面輸入你的電子郵件位址, 然後我們會寄出設定新密碼的操作指" -"示。" +"忘記您的密碼? 請在下面輸入您的電子郵件, 然後我們會寄出設定新密碼的操作指示。" msgid "Email address:" msgstr "電子信箱：" @@ -633,6 +723,9 @@ msgstr "電子信箱：" msgid "Reset my password" msgstr "重設我的密碼" +msgid "Select all objects on this page for an action" +msgstr "選擇此頁面上的所有物件執行操作" + msgid "All dates" msgstr "所有日期" @@ -642,7 +735,11 @@ msgstr "選擇 %s" #, python-format msgid "Select %s to change" -msgstr "選擇 %s 來變更" +msgstr "選擇 %s 來修改" + +#, python-format +msgid "Select %s to view" +msgstr "選擇%s查看" msgid "Date:" msgstr "日期" @@ -651,7 +748,7 @@ msgid "Time:" msgstr "時間" msgid "Lookup" -msgstr "查詢" +msgstr "查找" msgid "Currently:" msgstr "目前：" diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 2257b3072e..6d5c0708a3 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -2229,7 +2229,7 @@ class ModelAdmin(BaseModelAdmin): if perms_needed or protected: title = _("Cannot delete %(name)s") % {"name": object_name} else: - title = _("Are you sure?") + title = _("Delete") context = { **self.admin_site.each_context(request), diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index 769195af13..37910431a0 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -13,6 +13,7 @@ html[data-theme="light"], --body-fg: #333; --body-bg: #fff; --body-quiet-color: #666; + --body-medium-color: #444; --body-loud-color: #000; --header-color: #ffc; @@ -149,7 +150,6 @@ h1 { margin: 0 0 20px; font-weight: 300; font-size: 1.25rem; - color: var(--body-quiet-color); } h2 { @@ -165,7 +165,7 @@ h2.subhead { h3 { font-size: 0.875rem; margin: .8em 0 .3em 0; - color: var(--body-quiet-color); + color: var(--body-medium-color); font-weight: bold; } @@ -173,6 +173,7 @@ h4 { font-size: 0.75rem; margin: 1em 0 .8em 0; padding-bottom: 3px; + color: var(--body-medium-color); } h5 { @@ -319,7 +320,7 @@ td, th { } th { - font-weight: 600; + font-weight: 500; text-align: left; } @@ -340,7 +341,7 @@ tfoot td { } thead th.required { - color: var(--body-loud-color); + font-weight: bold; } tr.alt { @@ -1120,6 +1121,7 @@ a.deletelink:focus, a.deletelink:hover { margin: 0; border-top: 1px solid var(--hairline-color); width: 100%; + box-sizing: border-box; } .paginator a:link, .paginator a:visited { diff --git a/django/contrib/admin/static/admin/css/dark_mode.css b/django/contrib/admin/static/admin/css/dark_mode.css index 2123be05c4..7e12a81578 100644 --- a/django/contrib/admin/static/admin/css/dark_mode.css +++ b/django/contrib/admin/static/admin/css/dark_mode.css @@ -5,7 +5,8 @@ --body-fg: #eeeeee; --body-bg: #121212; - --body-quiet-color: #e0e0e0; + --body-quiet-color: #d0d0d0; + --body-medium-color: #e0e0e0; --body-loud-color: #ffffff; --breadcrumbs-link-fg: #e0e0e0; @@ -41,7 +42,8 @@ html[data-theme="dark"] { --body-fg: #eeeeee; --body-bg: #121212; - --body-quiet-color: #e0e0e0; + --body-quiet-color: #d0d0d0; + --body-medium-color: #e0e0e0; --body-loud-color: #ffffff; --breadcrumbs-link-fg: #e0e0e0; diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css index 8b24fad39f..c6ce78833e 100644 --- a/django/contrib/admin/static/admin/css/forms.css +++ b/django/contrib/admin/static/admin/css/forms.css @@ -44,7 +44,6 @@ label { .required label, label.required { font-weight: bold; - color: var(--body-fg); } /* RADIO BUTTONS */ @@ -170,6 +169,10 @@ form .aligned select + div.help { padding-left: 10px; } +form .aligned select option:checked { + background-color: var(--selected-row); +} + form .aligned ul li { list-style: none; } @@ -381,7 +384,7 @@ body.popup .submit-row { .inline-related h4, .inline-related:not(.tabular) .collapse summary { margin: 0; - color: var(--body-quiet-color); + color: var(--body-medium-color); padding: 5px; font-size: 0.8125rem; background: var(--darkened-bg); @@ -390,10 +393,6 @@ body.popup .submit-row { border-right-color: var(--darkened-bg); } -.inline-related h3 { - color: var(--body-loud-color); -} - .inline-related h3 span.delete { float: right; } @@ -450,17 +449,6 @@ body.popup .submit-row { _width: 700px; } -.inline-group ul.tools { - padding: 0; - margin: 0; - list-style: none; -} - -.inline-group ul.tools li { - display: inline; - padding: 0 5px; -} - .inline-group div.add-row, .inline-group .tabular tr.add-row td { color: var(--body-quiet-color); @@ -474,11 +462,8 @@ body.popup .submit-row { border-bottom: 1px solid var(--hairline-color); } -.inline-group ul.tools a.add, .inline-group div.add-row a, .inline-group .tabular tr.add-row td a { - background: url(../img/icon-addlink.svg) 0 1px no-repeat; - padding-left: 16px; font-size: 0.75rem; } diff --git a/django/contrib/admin/static/admin/css/responsive_rtl.css b/django/contrib/admin/static/admin/css/responsive_rtl.css index 33b5784842..f7c90adb23 100644 --- a/django/contrib/admin/static/admin/css/responsive_rtl.css +++ b/django/contrib/admin/static/admin/css/responsive_rtl.css @@ -28,7 +28,6 @@ margin-left: 0; } - [dir="rtl"] .inline-group ul.tools a.add, [dir="rtl"] .inline-group div.add-row a, [dir="rtl"] .inline-group .tabular tr.add-row td a { padding: 8px 26px 8px 10px; diff --git a/django/contrib/admin/static/admin/js/SelectFilter2.js b/django/contrib/admin/static/admin/js/SelectFilter2.js index 6957412462..133d809d52 100644 --- a/django/contrib/admin/static/admin/js/SelectFilter2.js +++ b/django/contrib/admin/static/admin/js/SelectFilter2.js @@ -118,7 +118,7 @@ Requires core.js and SelectBox.js. const warning_footer = quickElement('div', selector_chosen, '', 'class', 'list-footer-display'); quickElement('span', warning_footer, '', 'id', field_id + '_list-footer-display-text'); - quickElement('span', warning_footer, ' (click to clear)', 'class', 'list-footer-display__clear'); + quickElement('span', warning_footer, ' ' + gettext('(click to clear)'), 'class', 'list-footer-display__clear'); const clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_remove_all_link'); clear_all.className = 'selector-clearall'; diff --git a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js index bc3accea37..74d17bfc3e 100644 --- a/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js +++ b/django/contrib/admin/static/admin/js/admin/RelatedObjectLookups.js @@ -87,7 +87,7 @@ } } - function updateRelatedSelectsOptions(currentSelect, win, objId, newRepr, newId) { + function updateRelatedSelectsOptions(currentSelect, win, objId, newRepr, newId, skipIds = []) { // After create/edit a model from the options next to the current // select (+ or :pencil:) update ForeignKey PK of the rest of selects // in the page. @@ -100,7 +100,7 @@ const selectsRelated = document.querySelectorAll(`[data-model-ref="${modelName}"] [data-context="available-source"]`); selectsRelated.forEach(function(select) { - if (currentSelect === select) { + if (currentSelect === select || skipIds && skipIds.includes(select.id)) { return; } @@ -109,6 +109,11 @@ if (!option) { option = new Option(newRepr, newId); select.options.add(option); + // Update SelectBox cache for related fields. + if (window.SelectBox !== undefined && !SelectBox.cache[currentSelect.id]) { + SelectBox.add_to_cache(select.id, option); + SelectBox.redisplay(select.id); + } return; } @@ -136,9 +141,14 @@ $(elem).trigger('change'); } else { const toId = name + "_to"; + const toElem = document.getElementById(toId); const o = new Option(newRepr, newId); SelectBox.add_to_cache(toId, o); SelectBox.redisplay(toId); + if (toElem && toElem.nodeName.toUpperCase() === 'SELECT') { + const skipIds = [name + "_from"]; + updateRelatedSelectsOptions(toElem, win, null, newRepr, newId, skipIds); + } } const index = relatedWindows.indexOf(win); if (index > -1) { diff --git a/django/contrib/admin/static/admin/js/inlines.js b/django/contrib/admin/static/admin/js/inlines.js index e9a1dfe122..a4246d6e12 100644 --- a/django/contrib/admin/static/admin/js/inlines.js +++ b/django/contrib/admin/static/admin/js/inlines.js @@ -50,11 +50,11 @@ // If forms are laid out as table rows, insert the // "add" button in a new table row: const numCols = $this.eq(-1).children().length; - $parent.append('' + options.addText + ""); + $parent.append('' + options.addText + ""); addButton = $parent.find("tr:last a"); } else { // Otherwise, insert it immediately after the last form: - $this.filter(":last").after('
' + options.addText + "
"); + $this.filter(":last").after('
' + options.addText + "
"); addButton = $this.filter(":last").next().find("a"); } } diff --git a/django/contrib/admin/templates/admin/app_list.html b/django/contrib/admin/templates/admin/app_list.html index 3b67b5feab..60d874b2b6 100644 --- a/django/contrib/admin/templates/admin/app_list.html +++ b/django/contrib/admin/templates/admin/app_list.html @@ -7,6 +7,13 @@ {{ app.name }} + + + {% translate 'Model name' %} + {% translate 'Add link' %} + {% translate 'Change or view list link' %} + + {% for model in app.models %} {% with model_name=model.object_name|lower %} diff --git a/django/contrib/admin/templates/admin/auth/user/add_form.html b/django/contrib/admin/templates/admin/auth/user/add_form.html index 48406f11a2..a13e75e89a 100644 --- a/django/contrib/admin/templates/admin/auth/user/add_form.html +++ b/django/contrib/admin/templates/admin/auth/user/add_form.html @@ -3,9 +3,7 @@ {% block form_top %} {% if not is_popup %} -

{% translate 'First, enter a username and password. Then, you’ll be able to edit more user options.' %}

- {% else %} -

{% translate "Enter a username and password." %}

+

{% translate "After you've created a user, you’ll be able to edit more user options." %}

{% endif %} {% endblock %} {% block extrahead %} diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html index 6801fe5fa7..2f96a71436 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -2,6 +2,7 @@ {% load i18n static %} {% load admin_urls %} +{% block title %}{% if form.errors %}{% translate "Error:" %} {% endif %}{{ block.super }}{% endblock %} {% block extrastyle %} {{ block.super }} diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index 18e3a2a9fc..f4df6b30af 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -10,7 +10,6 @@ {% endblock %} {% if not is_popup and is_nav_sidebar_enabled %} - {% endif %} {% block extrastyle %}{% endblock %} {% if LANGUAGE_BIDI %}{% endif %} diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 31ff5d6c10..8e7ced9a48 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -1,6 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n admin_urls static admin_modify %} +{% block title %}{% if errors %}{% translate "Error:" %} {% endif %}{{ block.super }}{% endblock %} {% block extrahead %}{{ block.super }} {{ media }} @@ -47,7 +48,7 @@ {% block field_sets %} {% for fieldset in adminform %} - {% include "admin/includes/fieldset.html" with heading_level=2 id_suffix=forloop.counter0 %} + {% include "admin/includes/fieldset.html" with heading_level=2 prefix="fieldset" id_prefix=0 id_suffix=forloop.counter0 %} {% endfor %} {% endblock %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 310872b015..b0b4c31619 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -1,6 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n admin_urls static admin_list %} +{% block title %}{% if cl.formset and cl.formset.errors %}{% translate "Error:" %} {% endif %}{{ block.super }}{% endblock %} {% block extrastyle %} {{ block.super }} diff --git a/django/contrib/admin/templates/admin/edit_inline/stacked.html b/django/contrib/admin/templates/admin/edit_inline/stacked.html index 73f459ee47..a6939f4ea2 100644 --- a/django/contrib/admin/templates/admin/edit_inline/stacked.html +++ b/django/contrib/admin/templates/admin/edit_inline/stacked.html @@ -26,7 +26,7 @@ {% with parent_counter=forloop.counter0 %} {% for fieldset in inline_admin_form %} - {% include "admin/includes/fieldset.html" with heading_level=4 id_prefix=parent_counter id_suffix=forloop.counter0 %} + {% include "admin/includes/fieldset.html" with heading_level=4 prefix=fieldset.formset.prefix id_prefix=parent_counter id_suffix=forloop.counter0 %} {% endfor %} {% endwith %} diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html index b4eef47547..8c1830da62 100644 --- a/django/contrib/admin/templates/admin/includes/fieldset.html +++ b/django/contrib/admin/templates/admin/includes/fieldset.html @@ -1,4 +1,4 @@ -{% with prefix=fieldset.formset.prefix|default:"fieldset" id_prefix=id_prefix|default:"0" id_suffix=id_suffix|default:"0" name=fieldset.name|default:""|slugify %} +{% with name=fieldset.name|default:""|slugify %}
{% if name %} {% if fieldset.is_collapsible %}
{% endif %} @@ -27,7 +27,7 @@ {% endif %} {% if field.field.help_text %} -
+
{{ field.field.help_text|safe }}
{% endif %} diff --git a/django/contrib/admin/templates/admin/login.html b/django/contrib/admin/templates/admin/login.html index b61d9ec603..fa0dcbc01d 100644 --- a/django/contrib/admin/templates/admin/login.html +++ b/django/contrib/admin/templates/admin/login.html @@ -1,6 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n static %} +{% block title %}{% if form.errors %}{% translate "Error:" %} {% endif %}{{ block.super }}{% endblock %} {% block extrastyle %}{{ block.super }} {{ form.media }} {% endblock %} @@ -56,7 +57,7 @@ {% url 'admin_password_reset' as password_reset_url %} {% if password_reset_url %}
- {% translate 'Forgotten your password or username?' %} + {% translate 'Forgotten your login credentials?' %}
{% endif %}
diff --git a/django/contrib/admin/templates/admin/nav_sidebar.html b/django/contrib/admin/templates/admin/nav_sidebar.html index a413e23754..37cdac2184 100644 --- a/django/contrib/admin/templates/admin/nav_sidebar.html +++ b/django/contrib/admin/templates/admin/nav_sidebar.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load i18n static %} + diff --git a/django/contrib/admin/templates/admin/widgets/foreign_key_raw_id.html b/django/contrib/admin/templates/admin/widgets/foreign_key_raw_id.html index be93e0581d..a6eba931c4 100644 --- a/django/contrib/admin/templates/admin/widgets/foreign_key_raw_id.html +++ b/django/contrib/admin/templates/admin/widgets/foreign_key_raw_id.html @@ -1,2 +1,2 @@ -{% include 'django/forms/widgets/input.html' %}{% if related_url %}{% endif %}{% if link_label %} -{% if link_url %}{{ link_label }}{% else %}{{ link_label }}{% endif %}{% endif %} +{% if related_url %}
{% endif %}{% include 'django/forms/widgets/input.html' %}{% if related_url %}{% endif %}{% if link_label %} +{% if link_url %}{{ link_label }}{% else %}{{ link_label }}{% endif %}{% endif %}{% if related_url %}
{% endif %} diff --git a/django/contrib/admin/templates/registration/password_change_form.html b/django/contrib/admin/templates/registration/password_change_form.html index fde2373e08..3d66aeb162 100644 --- a/django/contrib/admin/templates/registration/password_change_form.html +++ b/django/contrib/admin/templates/registration/password_change_form.html @@ -1,5 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n static %} + +{% block title %}{% if form.errors %}{% translate "Error:" %} {% endif %}{{ block.super }}{% endblock %} {% block extrastyle %}{{ block.super }}{% endblock %} {% block userlinks %} {% url 'django-admindocs-docroot' as docsroot %}{% if docsroot %}{% translate 'Documentation' %} / {% endif %} {% translate 'Change password' %} / diff --git a/django/contrib/admin/templates/registration/password_reset_confirm.html b/django/contrib/admin/templates/registration/password_reset_confirm.html index a07645c97a..5e1478be83 100644 --- a/django/contrib/admin/templates/registration/password_reset_confirm.html +++ b/django/contrib/admin/templates/registration/password_reset_confirm.html @@ -1,6 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n static %} +{% block title %}{% if form.new_password1.errors or form.new_password2.errors %}{% translate "Error:" %} {% endif %}{{ block.super }}{% endblock %} {% block extrastyle %}{{ block.super }}{% endblock %} {% block breadcrumbs %}
diff --git a/django/contrib/admin/templates/registration/password_reset_email.html b/django/contrib/admin/templates/registration/password_reset_email.html index 64822091d1..2a428c48ce 100644 --- a/django/contrib/admin/templates/registration/password_reset_email.html +++ b/django/contrib/admin/templates/registration/password_reset_email.html @@ -5,7 +5,7 @@ {% block reset_link %} {{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %} {% endblock %} -{% translate 'Your username, in case you’ve forgotten:' %} {{ user.get_username }} +{% translate 'In case you’ve forgotten, you are:' %} {{ user.get_username }} {% translate "Thanks for using our site!" %} diff --git a/django/contrib/admin/templates/registration/password_reset_form.html b/django/contrib/admin/templates/registration/password_reset_form.html index 0edfea8ec2..e12189af54 100644 --- a/django/contrib/admin/templates/registration/password_reset_form.html +++ b/django/contrib/admin/templates/registration/password_reset_form.html @@ -1,6 +1,7 @@ {% extends "admin/base_site.html" %} {% load i18n static %} +{% block title %}{% if form.email.errors %}{% translate "Error:" %} {% endif %}{{ block.super }}{% endblock %} {% block extrastyle %}{{ block.super }}{% endblock %} {% block breadcrumbs %}
diff --git a/django/contrib/admin/tests.py b/django/contrib/admin/tests.py index dc857055b1..3810c359e5 100644 --- a/django/contrib/admin/tests.py +++ b/django/contrib/admin/tests.py @@ -6,6 +6,9 @@ from django.test.selenium import SeleniumTestCase from django.utils.deprecation import MiddlewareMixin from django.utils.translation import gettext as _ +# Make unittest ignore frames in this module when reporting failures. +__unittest = True + class CSPMiddleware(MiddlewareMixin): """The admin's JavaScript should be compatible with CSP.""" diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 70b6590811..ada8ce39fc 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -395,7 +395,7 @@ class ChangeList: ordering = list( self.model_admin.get_ordering(request) or self._get_default_ordering() ) - if ORDER_VAR in params: + if params.get(ORDER_VAR): # Clear ordering and used params ordering = [] order_params = params[ORDER_VAR].split(".") diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py index b361598a00..7851a298ed 100644 --- a/django/contrib/admin/widgets.py +++ b/django/contrib/admin/widgets.py @@ -393,7 +393,7 @@ class AdminURLFieldWidget(forms.URLInput): context["current_label"] = _("Currently:") context["change_label"] = _("Change:") context["widget"]["href"] = ( - smart_urlquote(context["widget"]["value"]) if value else "" + smart_urlquote(context["widget"]["value"]) if url_valid else "" ) context["url_valid"] = url_valid return context diff --git a/django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo index 3e0d63b1ae..b9aaf2adbf 100644 Binary files a/django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/az/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/az/LC_MESSAGES/django.po index 76156dccde..0e9eec202f 100644 --- a/django/contrib/admindocs/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/az/LC_MESSAGES/django.po @@ -3,14 +3,15 @@ # Translators: # Ali Ismayilov , 2011 # Nicat Məmmədov , 2022 +# Nijat Mammadov, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-15 09:00+0100\n" -"PO-Revision-Date: 2022-07-24 20:19+0000\n" -"Last-Translator: Nicat Məmmədov \n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"PO-Revision-Date: 2024-08-07 20:19+0000\n" +"Last-Translator: Nijat Mammadov, 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,33 +26,37 @@ msgid "Home" msgstr "Ev" msgid "Documentation" -msgstr "Sənədləşmə" +msgstr "Dokumentasiya" msgid "Bookmarklets" -msgstr "Əlfəcinciklər (Bookmarklets)" +msgstr "Bukmarkletlər" msgid "Documentation bookmarklets" -msgstr "Sənədləşmə əlfəcincikləri (bookmarklets)" +msgstr "Dokumentasiya bukmarkletləri" msgid "" "To install bookmarklets, drag the link to your bookmarks toolbar, or right-" "click the link and add it to your bookmarks. Now you can select the " "bookmarklet from any page in the site." msgstr "" +"Bukmarkletləri quraşdırmaq üçün linki əlfəcin alətləri panelinizə sürükləyin " +"və ya linki sağ klikləyin və onu əlfəcinlərinizə əlavə edin. İndi siz saytın " +"istənilən səhifəsindən bukmarklet seçə bilərsiniz." msgid "Documentation for this page" -msgstr "Bu səhifənin sənədləşməsi" +msgstr "Bu səhifənin dokumentasiyası" msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." -msgstr "Hər hansı səhifəni əmələ gətirən funksiyanın sənədləşməsini göstərir." +msgstr "" +"Hər hansı səhifəni əmələ gətirən funksiyanın dokumentasiyasını göstərir." msgid "Tags" -msgstr "" +msgstr "Teqlər" msgid "List of all the template tags and their functions." -msgstr "" +msgstr "Bütün şablon teqləri və onların funksiyaları." msgid "Filters" msgstr "Filterlər" @@ -60,156 +65,172 @@ msgid "" "Filters are actions which can be applied to variables in a template to alter " "the output." msgstr "" +"Filterlər şablondakı dəyişənlərə nəticəni dəyişmək üçün tətbiq oluna bilən " +"əməliyyatlarıdr." msgid "Models" -msgstr "" +msgstr "Modellər" msgid "" "Models are descriptions of all the objects in the system and their " "associated fields. Each model has a list of fields which can be accessed as " "template variables" msgstr "" +"Modellər sistemdəki bütün obyektlərin və onlarla əlaqəli xanaların " +"təsviridir. Hər bir modeldə şablon dəyişənləri kimi istifadə oluna bilən " +"xanaların siyahısı var" msgid "Views" -msgstr "" +msgstr "Görüntülər" msgid "" "Each page on the public site is generated by a view. The view defines which " "template is used to generate the page and which objects are available to " "that template." msgstr "" +"İctimai saytdakı hər bir səhifə bir görüntü tərəfindən yaradılıb. Görüntü " +"səhifəni yaratmaq üçün hansı şablondan istifadə olunacağını və həmin şablon " +"üçün hansı obyektlərin mövcud olduğunu müəyyən edir." msgid "Tools for your browser to quickly access admin functionality." -msgstr "" +msgstr "Admin funksionallığına tez çatmağa kömək edən səyyah alətləri." msgid "Please install docutils" -msgstr "" +msgstr "Lütfən \"docutils\"i quraşdırın" #, python-format msgid "" -"The admin documentation system requires Python’s docutils library." +"The admin documentation system requires Python’s docutils library." msgstr "" +"Admin dokumentasiyası üçün Python-un docutils " +"kitabxanası tələb olunur." #, python-format msgid "" "Please ask your administrators to install docutils." msgstr "" +"Lütfən administrasiyanızdan docutilsin qurulmasını " +"istəyin." #, python-format msgid "Model: %(name)s" -msgstr "" +msgstr "Model: %(name)s" msgid "Fields" -msgstr "" +msgstr "Sahələr" msgid "Field" -msgstr "" +msgstr "Sahə" msgid "Type" -msgstr "" +msgstr "Növ" msgid "Description" -msgstr "" +msgstr "Təsvir" msgid "Methods with arguments" -msgstr "" +msgstr "Arqumentli metodlar" msgid "Method" -msgstr "" +msgstr "Metod" msgid "Arguments" -msgstr "" +msgstr "Arqumentlər" msgid "Back to Model documentation" -msgstr "" +msgstr "Model dokumentasiyaına qayıt" msgid "Model documentation" -msgstr "" +msgstr "Model dokumentasiyası" msgid "Model groups" -msgstr "" +msgstr "Model qrupları" msgid "Templates" -msgstr "" +msgstr "Şablonlar" #, python-format msgid "Template: %(name)s" -msgstr "" +msgstr "Şablon: %(name)s" #, python-format msgid "Template: %(name)s" -msgstr "" +msgstr "Şablon: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format msgid "Search path for template %(name)s:" -msgstr "" +msgstr "%(name)s şablonu üçün axtarış yolu:" msgid "(does not exist)" msgstr "(mövcud deyil)" msgid "Back to Documentation" -msgstr "" +msgstr "Dokumentasiyaya qayıt" msgid "Template filters" -msgstr "" +msgstr "Şablon filterləri" msgid "Template filter documentation" -msgstr "" +msgstr "Şablon filter dokumentasiyası" msgid "Built-in filters" -msgstr "" +msgstr "Qurlu filterlər" #, python-format msgid "" "To use these filters, put %(code)s in your template before " "using the filter." msgstr "" +"Bu filterləri istifadə etmək üçün, şablonun əvvəlinə bunu qoyun: " +"%(code)s " msgid "Template tags" -msgstr "" +msgstr "Şablon teqləri" msgid "Template tag documentation" -msgstr "" +msgstr "Şablon teq dokumentasiyası" msgid "Built-in tags" -msgstr "" +msgstr "Qurulu teqlər" #, python-format msgid "" "To use these tags, put %(code)s in your template before using " "the tag." msgstr "" +"Bu teqləri istifadə etmək üçün, şablonun əvvəlinə bunu qoyun: " +"%(code)s" #, python-format msgid "View: %(name)s" -msgstr "" +msgstr "Bax: %(name)s" msgid "Context:" -msgstr "" +msgstr "Məzmun:" msgid "Templates:" -msgstr "" +msgstr "Şablonlar:" msgid "Back to View documentation" -msgstr "" +msgstr "Görüntü dokumentasiyasına qayıdın" msgid "View documentation" -msgstr "" +msgstr "Görüntü dokumentasiyası" msgid "Jump to namespace" -msgstr "" +msgstr "Ad sahəsinə keç" msgid "Empty namespace" -msgstr "" +msgstr "Boş ad sahəsi" #, python-format msgid "Views by namespace %(name)s" -msgstr "" +msgstr "Ad sahəsinə görə görünüşlər %(name)s" msgid "Views by empty namespace" -msgstr "" +msgstr "Boş ad sahələrinə görə görünüşlər" #, python-format msgid "" @@ -217,6 +238,9 @@ msgid "" " View function: %(full_name)s. Name: %(url_name)s.\n" msgstr "" +"\n" +" Funksiyaya bax: %(full_name)s. Ad: %(url_name)s.\n" msgid "tag:" msgstr "teq:" @@ -229,11 +253,11 @@ msgstr "baxış:" #, python-format msgid "App %(app_label)r not found" -msgstr "" +msgstr "%(app_label)r tətbiqi tapılmadı" #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" -msgstr "%(model_name)r modelini %(app_label)r tətbiqetməsində tapa bilmədik" +msgstr "%(model_name)r modelini %(app_label)r tətbiqetməsində tapılmadı" msgid "model:" msgstr "model:" @@ -252,7 +276,7 @@ msgstr "bütün %s" #, python-format msgid "number of %s" -msgstr "%s-in sayı" +msgstr "%s sayı" #, python-format msgid "%s does not appear to be a urlpattern object" diff --git a/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.mo index ebd4321e4b..201694dd51 100644 Binary files a/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.po index d786e704f6..5fde076b13 100644 --- a/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/ga/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Luke Blaney , 2019 # Michael Thornhill , 2012 @@ -8,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2019-06-22 21:37+0000\n" -"Last-Translator: Luke Blaney \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2024-10-07 20:19+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,7 +21,7 @@ msgstr "" "4);\n" msgid "Administrative Documentation" -msgstr "" +msgstr "Doiciméadúchán Riaracháin" msgid "Home" msgstr "Baile" @@ -39,6 +40,10 @@ msgid "" "click the link and add it to your bookmarks. Now you can select the " "bookmarklet from any page in the site." msgstr "" +"Chun leabharmharcanna a shuiteáil, tarraing an nasc chuig do bharra uirlisí " +"leabharmharcanna, nó deaschliceáil ar an nasc agus cuir le do " +"leabharmharcanna é. Anois is féidir leat an leabharmharc a roghnú ó aon " +"leathanach ar an suíomh." msgid "Documentation for this page" msgstr "Doiciméadúchán le hadhaigh an leathanach seo" @@ -54,7 +59,7 @@ msgid "Tags" msgstr "Clibeanna" msgid "List of all the template tags and their functions." -msgstr "" +msgstr "Liosta de na clibeanna teimpléid go léir agus a bhfeidhmeanna." msgid "Filters" msgstr "Scagairí" @@ -63,6 +68,8 @@ msgid "" "Filters are actions which can be applied to variables in a template to alter " "the output." msgstr "" +"Is gníomhartha iad na scagairí is féidir a chur i bhfeidhm ar athróga i " +"dteimpléad chun an t-aschur a athrú." msgid "Models" msgstr "Samhla" @@ -72,6 +79,9 @@ msgid "" "associated fields. Each model has a list of fields which can be accessed as " "template variables" msgstr "" +"Is éard atá i múnlaí ná cur síos ar na réada go léir sa chóras agus ar na " +"réimsí a bhaineann leo. Tá liosta réimsí ag gach samhail ar féidir rochtain " +"a fháil orthu mar athróga teimpléid" msgid "Views" msgstr "Radharcanna" @@ -81,138 +91,149 @@ msgid "" "template is used to generate the page and which objects are available to " "that template." msgstr "" +"Gintear gach leathanach ar an suíomh poiblí trí radharc. Sainmhíníonn an t-" +"amharc cén teimpléad a úsáidtear chun an leathanach a ghiniúint agus na " +"rudaí atá ar fáil don teimpléad sin." msgid "Tools for your browser to quickly access admin functionality." msgstr "" +"Uirlisí do do bhrabhsálaí chun rochtain tapa a fháil ar fheidhmiúlacht " +"riaracháin." msgid "Please install docutils" -msgstr "" +msgstr "Suiteáil docutils le do thoil" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." +"The admin documentation system requires Python’s docutils library." msgstr "" +"Teastaíonn leabharlann Python docutils ón gcóras " +"doiciméadúcháin riaracháin." #, python-format msgid "" "Please ask your administrators to install docutils." -msgstr "" +msgstr "Iarr ar do riarthóirí docutils a shuiteáil." #, python-format msgid "Model: %(name)s" -msgstr "" +msgstr "Múnla: %(name)s" msgid "Fields" -msgstr "" +msgstr "Réimsí" msgid "Field" -msgstr "" +msgstr "Réimse" msgid "Type" msgstr "Cineál" msgid "Description" -msgstr "" +msgstr "Cur síos" msgid "Methods with arguments" -msgstr "" +msgstr "Modhanna le hargóintí" msgid "Method" -msgstr "" +msgstr "Modh" msgid "Arguments" -msgstr "" +msgstr "Argóintí" msgid "Back to Model documentation" -msgstr "" +msgstr "Ar ais chuig an doiciméadú Múnla" msgid "Model documentation" -msgstr "" +msgstr "Doiciméadú múnla" msgid "Model groups" -msgstr "" +msgstr "Grúpaí samhlacha" msgid "Templates" msgstr "Teimpléid" #, python-format msgid "Template: %(name)s" -msgstr "" +msgstr "Teimpléad: %(name)s" #, python-format -msgid "Template: \"%(name)s\"" -msgstr "" +msgid "Template: %(name)s" +msgstr "Teimpléad: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) #, python-format -msgid "Search path for template \"%(name)s\":" -msgstr "" +msgid "Search path for template %(name)s:" +msgstr "Teimpléad cuardaigh cosán %(name)s:" msgid "(does not exist)" -msgstr "" +msgstr "(níl ann)" msgid "Back to Documentation" -msgstr "" +msgstr "Ar ais go Doiciméadúchán" msgid "Template filters" -msgstr "" +msgstr "Ar ais go Doiciméadúchán" msgid "Template filter documentation" -msgstr "" +msgstr "Doiciméadú scagaire teimpléid" msgid "Built-in filters" -msgstr "" +msgstr "scagairí ionsuite" #, python-format msgid "" "To use these filters, put %(code)s in your template before " "using the filter." msgstr "" +"Chun na scagairí seo a úsáid, cuir%(code)s i do theimpléad sula " +"n-úsáideann tú an scagaire." msgid "Template tags" -msgstr "" +msgstr "Clibeanna teimpléid" msgid "Template tag documentation" -msgstr "" +msgstr "Doiciméadú clib teimpléad" msgid "Built-in tags" -msgstr "" +msgstr "Insuite i clibeanna" #, python-format msgid "" "To use these tags, put %(code)s in your template before using " "the tag." msgstr "" +"Chun na clibeanna seo a úsáid, cuir %(code)s i do theimpléad " +"sula n-úsáideann tú an chlib." #, python-format msgid "View: %(name)s" -msgstr "" +msgstr "Amharc: %(name)s" msgid "Context:" -msgstr "" +msgstr "Comhthéacs:" msgid "Templates:" -msgstr "" +msgstr "Teimpléid:" msgid "Back to View documentation" -msgstr "" +msgstr "Ar ais go dtí Féach ar na doiciméid" msgid "View documentation" -msgstr "" +msgstr "Féach ar cháipéisíocht" msgid "Jump to namespace" -msgstr "" +msgstr "Léim go spás ainm" msgid "Empty namespace" -msgstr "" +msgstr "Ainmspás folamh" #, python-format msgid "Views by namespace %(name)s" -msgstr "" +msgstr "Radhairc de réir ainmspáis %(name)s" msgid "Views by empty namespace" -msgstr "" +msgstr "Radhairc de réir ainmspás folamh" #, python-format msgid "" @@ -220,6 +241,9 @@ msgid "" " View function: %(full_name)s. Name: %(url_name)s.\n" msgstr "" +"\n" +" Féach ar fheidhm: %(full_name)s. Ainm: %(url_name)s.\n" msgid "tag:" msgstr "clib:" @@ -232,7 +256,7 @@ msgstr "radharc:" #, python-format msgid "App %(app_label)r not found" -msgstr "" +msgstr "Aip %(app_label)r gan aimsiú" #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" diff --git a/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.mo index cfa870b9d7..8e6bfddf71 100644 Binary files a/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.po index d8cb1cbe42..b796a5f667 100644 --- a/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/sr_Latn/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. -# +# # Translators: -# Igor Jerosimić, 2023 +# Igor Jerosimić, 2023-2024 # Jannis Leidel , 2011 # Janos Guljas , 2012 msgid "" @@ -9,263 +9,355 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-15 09:00+0100\n" -"PO-Revision-Date: 2023-12-04 20:19+0000\n" -"Last-Translator: Igor Jerosimić, 2023\n" -"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/" -"language/sr@latin/)\n" +"PO-Revision-Date: 2024-08-07 20:19+0000\n" +"Last-Translator: Igor Jerosimić, 2023-2024\n" +"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/language/sr@latin/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr@latin\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" +"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" +#: contrib/admindocs/apps.py:7 msgid "Administrative Documentation" msgstr "Administrativna dokumentacija" +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:6 +#: contrib/admindocs/templates/admin_doc/index.html:6 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:6 +#: contrib/admindocs/templates/admin_doc/model_detail.html:14 +#: contrib/admindocs/templates/admin_doc/model_index.html:8 +#: contrib/admindocs/templates/admin_doc/template_detail.html:6 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:7 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:7 +#: contrib/admindocs/templates/admin_doc/view_detail.html:6 +#: contrib/admindocs/templates/admin_doc/view_index.html:7 msgid "Home" msgstr "Početna" +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:7 +#: contrib/admindocs/templates/admin_doc/index.html:7 +#: contrib/admindocs/templates/admin_doc/index.html:10 +#: contrib/admindocs/templates/admin_doc/index.html:14 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:7 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:14 +#: contrib/admindocs/templates/admin_doc/model_detail.html:15 +#: contrib/admindocs/templates/admin_doc/model_index.html:9 +#: contrib/admindocs/templates/admin_doc/template_detail.html:7 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:8 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:8 +#: contrib/admindocs/templates/admin_doc/view_detail.html:7 +#: contrib/admindocs/templates/admin_doc/view_index.html:8 msgid "Documentation" msgstr "Dokumentacija" +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:8 +#: contrib/admindocs/templates/admin_doc/index.html:29 msgid "Bookmarklets" msgstr "Bukmarkleti" +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:11 msgid "Documentation bookmarklets" msgstr "Bukmarkleti dokumentacije" +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:15 msgid "" "To install bookmarklets, drag the link to your bookmarks toolbar, or right-" "click the link and add it to your bookmarks. Now you can select the " "bookmarklet from any page in the site." -msgstr "" -"Da biste instalirali obeleživače, prevucite vezu na traku sa alatkama za " -"obeleživače ili kliknite desnim tasterom miša na vezu i dodajte je u " -"obeleživače. Sada možete da izaberete bookmarklet sa bilo koje stranice na " -"sajtu." +msgstr "Da biste instalirali obeleživače, prevucite vezu na traku sa alatkama za obeleživače ili kliknite desnim tasterom miša na vezu i dodajte je u obeleživače. Sada možete da izaberete bookmarklet sa bilo koje stranice na sajtu." +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:22 msgid "Documentation for this page" msgstr "Dokumentacija za ovu stranicu" +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:23 msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." -msgstr "" -"Vodi od bilo koje stranice do dokumentaicje pogleda koji je generisao tu " -"stranicu." +msgstr "Vodi od bilo koje stranice do dokumentaicje pogleda koji je generisao tu stranicu." +#: contrib/admindocs/templates/admin_doc/index.html:17 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:9 msgid "Tags" msgstr "Tagovi" +#: contrib/admindocs/templates/admin_doc/index.html:18 msgid "List of all the template tags and their functions." msgstr "Lista svih oznaka šablona i njihovih funkcija." +#: contrib/admindocs/templates/admin_doc/index.html:20 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:9 msgid "Filters" msgstr "Filteri" +#: contrib/admindocs/templates/admin_doc/index.html:21 msgid "" -"Filters are actions which can be applied to variables in a template to alter " -"the output." -msgstr "" -"Filteri su radnje koje se mogu primeniti na promenljive u šablonu da bi se " -"promenio izlaz." +"Filters are actions which can be applied to variables in a template to alter" +" the output." +msgstr "Filteri su radnje koje se mogu primeniti na promenljive u šablonu da bi se promenio izlaz." +#: contrib/admindocs/templates/admin_doc/index.html:23 +#: contrib/admindocs/templates/admin_doc/model_detail.html:16 +#: contrib/admindocs/templates/admin_doc/model_index.html:10 +#: contrib/admindocs/templates/admin_doc/model_index.html:14 msgid "Models" msgstr "Modeli" +#: contrib/admindocs/templates/admin_doc/index.html:24 msgid "" "Models are descriptions of all the objects in the system and their " "associated fields. Each model has a list of fields which can be accessed as " "template variables" -msgstr "" -"Modeli su opisi svih objekata u sistemu i njihovih povezanih polja. Svaki " -"model ima listu polja kojima se može pristupiti kao promenljive šablona" +msgstr "Modeli su opisi svih objekata u sistemu i njihovih povezanih polja. Svaki model ima listu polja kojima se može pristupiti kao promenljive šablona" +#: contrib/admindocs/templates/admin_doc/index.html:26 +#: contrib/admindocs/templates/admin_doc/view_detail.html:8 +#: contrib/admindocs/templates/admin_doc/view_index.html:9 +#: contrib/admindocs/templates/admin_doc/view_index.html:12 msgid "Views" msgstr "Vjuevi" +#: contrib/admindocs/templates/admin_doc/index.html:27 msgid "" "Each page on the public site is generated by a view. The view defines which " "template is used to generate the page and which objects are available to " "that template." -msgstr "" +msgstr "Svaku stranicu na javnom sajtu generiše pogled. Pogled definiše koji šablon se koristi za generisanje stranice i koji objekti su dostupni tom šablonu." +#: contrib/admindocs/templates/admin_doc/index.html:30 msgid "Tools for your browser to quickly access admin functionality." -msgstr "" +msgstr "Alatke za vaš pretraživač za brzi pristup funkcijama administratora." +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:10 msgid "Please install docutils" -msgstr "" +msgstr "Molimo instalirajte docutils" +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:17 #, python-format msgid "" "The admin documentation system requires Python’s docutils library." -msgstr "" +msgstr "Sistem administrativne dokumentacije zahteva Pajton docutils biblioteku." +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:19 #, python-format msgid "" "Please ask your administrators to install docutils." -msgstr "" +msgstr "Zamolite svoje administratore da instaliraju docutils." +#: contrib/admindocs/templates/admin_doc/model_detail.html:21 #, python-format msgid "Model: %(name)s" -msgstr "" +msgstr "Model: %(name)s" +#: contrib/admindocs/templates/admin_doc/model_detail.html:30 msgid "Fields" -msgstr "" +msgstr "Polja" +#: contrib/admindocs/templates/admin_doc/model_detail.html:35 msgid "Field" -msgstr "" +msgstr "Polje" +#: contrib/admindocs/templates/admin_doc/model_detail.html:36 msgid "Type" -msgstr "" +msgstr "Tip" +#: contrib/admindocs/templates/admin_doc/model_detail.html:37 +#: contrib/admindocs/templates/admin_doc/model_detail.html:60 msgid "Description" -msgstr "" +msgstr "Opis" +#: contrib/admindocs/templates/admin_doc/model_detail.html:53 msgid "Methods with arguments" -msgstr "" +msgstr "Metoda sa argumentima" +#: contrib/admindocs/templates/admin_doc/model_detail.html:58 msgid "Method" -msgstr "" +msgstr "Metod" +#: contrib/admindocs/templates/admin_doc/model_detail.html:59 msgid "Arguments" -msgstr "" +msgstr "Argumenti" +#: contrib/admindocs/templates/admin_doc/model_detail.html:76 msgid "Back to Model documentation" -msgstr "" +msgstr "Nazad na dokumentaciju o Modelima" +#: contrib/admindocs/templates/admin_doc/model_index.html:18 msgid "Model documentation" -msgstr "" +msgstr "Dokumentacija o Modelima" +#: contrib/admindocs/templates/admin_doc/model_index.html:43 msgid "Model groups" -msgstr "" +msgstr "Grupe modela" +#: contrib/admindocs/templates/admin_doc/template_detail.html:8 msgid "Templates" msgstr "Šabloni" +#: contrib/admindocs/templates/admin_doc/template_detail.html:13 #, python-format msgid "Template: %(name)s" -msgstr "" +msgstr "Šablon: %(name)s" +#: contrib/admindocs/templates/admin_doc/template_detail.html:16 #, python-format msgid "Template: %(name)s" -msgstr "" +msgstr "Šablon: %(name)s" #. Translators: Search is not a verb here, it qualifies path (a search path) +#: contrib/admindocs/templates/admin_doc/template_detail.html:19 #, python-format msgid "Search path for template %(name)s:" -msgstr "" +msgstr "Putanja za traženje šablona %(name)s:" +#: contrib/admindocs/templates/admin_doc/template_detail.html:22 msgid "(does not exist)" -msgstr "" +msgstr "(ne postoji)" +#: contrib/admindocs/templates/admin_doc/template_detail.html:26 msgid "Back to Documentation" -msgstr "" +msgstr "Nazad na dokumentaciju" +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:12 msgid "Template filters" -msgstr "" +msgstr "Filteri šablona" +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:16 msgid "Template filter documentation" -msgstr "" +msgstr "Dokumentacija filtera šablona" +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:22 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:43 msgid "Built-in filters" -msgstr "" +msgstr "Ugrađeni filteri" +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:23 #, python-format msgid "" "To use these filters, put %(code)s in your template before " "using the filter." -msgstr "" +msgstr "Da biste koristili ove filtere, stavite %(code)s u svoj šablon pre upotrebe filtera." +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:12 msgid "Template tags" -msgstr "" +msgstr "Oznake šablona" +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:16 msgid "Template tag documentation" -msgstr "" +msgstr "Dokumentacija oznake šablona" +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:22 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:43 msgid "Built-in tags" -msgstr "" +msgstr "Ugrađene oznake" +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:23 #, python-format msgid "" "To use these tags, put %(code)s in your template before using " "the tag." -msgstr "" +msgstr "Da biste koristili ove oznake, stavite %(code)s u svoj šablon pre upotrebe oznake." +#: contrib/admindocs/templates/admin_doc/view_detail.html:12 #, python-format msgid "View: %(name)s" -msgstr "" +msgstr "Pogled: %(name)s" +#: contrib/admindocs/templates/admin_doc/view_detail.html:23 msgid "Context:" -msgstr "" +msgstr "Kontekst:" +#: contrib/admindocs/templates/admin_doc/view_detail.html:28 msgid "Templates:" -msgstr "" +msgstr "Šabloni:" +#: contrib/admindocs/templates/admin_doc/view_detail.html:32 msgid "Back to View documentation" -msgstr "" +msgstr "Nazad na dokumentaciju o pogledima" +#: contrib/admindocs/templates/admin_doc/view_index.html:16 msgid "View documentation" -msgstr "" +msgstr "Dokumentacija o pogledima" +#: contrib/admindocs/templates/admin_doc/view_index.html:22 msgid "Jump to namespace" -msgstr "" +msgstr "Skoči na imenski prostor" +#: contrib/admindocs/templates/admin_doc/view_index.html:27 msgid "Empty namespace" -msgstr "" +msgstr "Prazan imenski prostor" +#: contrib/admindocs/templates/admin_doc/view_index.html:40 #, python-format msgid "Views by namespace %(name)s" -msgstr "" +msgstr "Pogledi po imenskom prostoru %(name)s" +#: contrib/admindocs/templates/admin_doc/view_index.html:42 msgid "Views by empty namespace" -msgstr "" +msgstr "Pogledi po praznom imenskom prostoru" +#: contrib/admindocs/templates/admin_doc/view_index.html:49 #, python-format msgid "" "\n" -" View function: %(full_name)s. Name: %(url_name)s.\n" -msgstr "" +" View function: %(full_name)s. Name: %(url_name)s.\n" +msgstr "\n Funkcija pogleda: %(full_name)s. Ime: %(url_name)s.\n" +#: contrib/admindocs/views.py:72 contrib/admindocs/views.py:73 +#: contrib/admindocs/views.py:75 msgid "tag:" msgstr "tag:" +#: contrib/admindocs/views.py:103 contrib/admindocs/views.py:104 +#: contrib/admindocs/views.py:106 msgid "filter:" msgstr "filter:" +#: contrib/admindocs/views.py:162 contrib/admindocs/views.py:163 +#: contrib/admindocs/views.py:165 msgid "view:" msgstr "vju:" +#: contrib/admindocs/views.py:192 #, python-format msgid "App %(app_label)r not found" -msgstr "" +msgstr "Aplikacija %(app_label)r nije pronađena" +#: contrib/admindocs/views.py:196 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Model %(model_name)r nije pronađen u aplikaciji %(app_label)r" +#: contrib/admindocs/views.py:201 contrib/admindocs/views.py:202 +#: contrib/admindocs/views.py:217 contrib/admindocs/views.py:240 +#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:260 +#: contrib/admindocs/views.py:301 contrib/admindocs/views.py:306 msgid "model:" msgstr "model:" +#: contrib/admindocs/views.py:213 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "povezani objekti klase `%(app_label)s.%(data_type)s`" +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:293 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "klase `%(app_label)s.%(object_name)s`" +#: contrib/admindocs/views.py:240 contrib/admindocs/views.py:301 #, python-format msgid "all %s" msgstr "svi povezani objekti %s" +#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:306 #, python-format msgid "number of %s" msgstr "broj povezanih objekata %s" +#: contrib/admindocs/views.py:398 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s ne izgleda kao „urlpattern“ objekat" diff --git a/django/contrib/admindocs/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/admindocs/locale/zh_Hant/LC_MESSAGES/django.mo index 922dd0e8b1..6028ae9f52 100644 Binary files a/django/contrib/admindocs/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/admindocs/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/admindocs/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/zh_Hant/LC_MESSAGES/django.po index b4060d4a7d..47b4b3bd25 100644 --- a/django/contrib/admindocs/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/admindocs/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,19 +2,21 @@ # # Translators: # Chen Chun-Chia , 2015 +# yubike, 2024 # Jannis Leidel , 2011 # mail6543210 , 2013 # 619e61dbdb61c57213f62815aaf60e01, 2011 # Tzu-ping Chung , 2016,2019 +# YAO WEN LIANG, 2024 # Yeh-Yung , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-18 09:05+0000\n" -"Last-Translator: Tzu-ping Chung \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2024-08-07 20:19+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,15 +37,15 @@ msgid "Bookmarklets" msgstr "書籤" msgid "Documentation bookmarklets" -msgstr "文件 bookmarklets" +msgstr "文件書籤" msgid "" "To install bookmarklets, drag the link to your bookmarks toolbar, or right-" "click the link and add it to your bookmarks. Now you can select the " "bookmarklet from any page in the site." msgstr "" -"要安裝 bookmarklet，把連結拖進你的書籤工具列，或右擊該連結後新增到你的書籤" -"裡。現在你可以從網站的任何頁面來選擇 bookmarklet。" +"要安裝書籤，把連結拖進你的書籤工具列，或右擊該連結後新增到你的書籤裡。現在你" +"可以從網站的任何頁面來選擇書籤。" msgid "Documentation for this page" msgstr "本頁面的文件" @@ -51,7 +53,7 @@ msgstr "本頁面的文件" msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." -msgstr "讓你跳到用來產生該頁面之檢視的任何一頁文件。" +msgstr "從任何頁面跳到產生該頁面的視圖的文件。" msgid "Tags" msgstr "標籤" @@ -65,7 +67,7 @@ msgstr "過濾器" msgid "" "Filters are actions which can be applied to variables in a template to alter " "the output." -msgstr "" +msgstr "過瀘器可套用在模板內的變數，用來改變輸出。" msgid "Models" msgstr "模型" @@ -75,6 +77,7 @@ msgid "" "associated fields. Each model has a list of fields which can be accessed as " "template variables" msgstr "" +"模型是對系統裡所有物件及相關欄位的描述。模型裡的欄位都可能以模板變數來取用。" msgid "Views" msgstr "視圖" @@ -84,17 +87,19 @@ msgid "" "template is used to generate the page and which objects are available to " "that template." msgstr "" +"網站上的每個頁面都是由視圖 \"view\" 來生成。每個視圖定義了生成頁面的模板，以" +"及模板裡有什麼物件可使用。" msgid "Tools for your browser to quickly access admin functionality." -msgstr "方便使用管理功能的瀏覽器工具。" +msgstr "讓您的瀏覽器快速存取管理功能的工具。" msgid "Please install docutils" msgstr "請安裝 docutils" #, python-format msgid "" -"The admin documentation system requires Python's docutils library." +"The admin documentation system requires Python’s docutils library." msgstr "管理文件系統需要 Python 的 docutils 函式庫。" #, python-format @@ -119,7 +124,7 @@ msgid "Description" msgstr "描述" msgid "Methods with arguments" -msgstr "" +msgstr "方法和參數" msgid "Method" msgstr "方法" @@ -172,6 +177,7 @@ msgid "" "To use these filters, put %(code)s in your template before " "using the filter." msgstr "" +"要使用這些過濾器, 在你使用過濾器之前需要在模板中放置 %(code)s 。" msgid "Template tags" msgstr "模版標籤" @@ -187,13 +193,14 @@ msgid "" "To use these tags, put %(code)s in your template before using " "the tag." msgstr "" +"要使用這些標籤, 在你使用標籤之前需要在模板中放置 %(code)s 。" #, python-format msgid "View: %(name)s" msgstr "視圖：%(name)s" msgid "Context:" -msgstr "" +msgstr "內容:" msgid "Templates:" msgstr "模版：" @@ -212,10 +219,10 @@ msgstr "空的名稱空間" #, python-format msgid "Views by namespace %(name)s" -msgstr "名稱空間 %(name)s 之視圖" +msgstr "按命名空間分類 %(name)s 的視圖" msgid "Views by empty namespace" -msgstr "空名稱空間之視圖" +msgstr "未指定命名空間的視圖" #, python-format msgid "" @@ -224,7 +231,7 @@ msgid "" "code>.\n" msgstr "" "\n" -"視圖函式：%(full_name)s，名稱：%(url_name)s\n" +"視圖函數：%(full_name)s，名稱：%(url_name)s\n" msgid "tag:" msgstr "標籤：" diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py index 3db1445d9e..689567ca6c 100644 --- a/django/contrib/auth/__init__.py +++ b/django/contrib/auth/__init__.py @@ -1,8 +1,6 @@ import inspect import re -from asgiref.sync import sync_to_async - from django.apps import apps as django_apps from django.conf import settings from django.core.exceptions import ImproperlyConfigured, PermissionDenied @@ -40,6 +38,39 @@ def get_backends(): return _get_backends(return_tuples=False) +def _get_compatible_backends(request, **credentials): + for backend, backend_path in _get_backends(return_tuples=True): + backend_signature = inspect.signature(backend.authenticate) + try: + backend_signature.bind(request, **credentials) + except TypeError: + # This backend doesn't accept these credentials as arguments. Try + # the next one. + continue + yield backend, backend_path + + +def _get_backend_from_user(user, backend=None): + try: + backend = backend or user.backend + except AttributeError: + backends = _get_backends(return_tuples=True) + if len(backends) == 1: + _, backend = backends[0] + else: + raise ValueError( + "You have multiple authentication backends configured and " + "therefore must provide the `backend` argument or set the " + "`backend` attribute on the user." + ) + else: + if not isinstance(backend, str): + raise TypeError( + "backend must be a dotted import path string (got %r)." % backend + ) + return backend + + @sensitive_variables("credentials") def _clean_credentials(credentials): """ @@ -62,19 +93,21 @@ def _get_user_session_key(request): return get_user_model()._meta.pk.to_python(request.session[SESSION_KEY]) +async def _aget_user_session_key(request): + # This value in the session is always serialized to a string, so we need + # to convert it back to Python whenever we access it. + session_key = await request.session.aget(SESSION_KEY) + if session_key is None: + raise KeyError() + return get_user_model()._meta.pk.to_python(session_key) + + @sensitive_variables("credentials") def authenticate(request=None, **credentials): """ If the given credentials are valid, return a User object. """ - for backend, backend_path in _get_backends(return_tuples=True): - backend_signature = inspect.signature(backend.authenticate) - try: - backend_signature.bind(request, **credentials) - except TypeError: - # This backend doesn't accept these credentials as arguments. Try - # the next one. - continue + for backend, backend_path in _get_compatible_backends(request, **credentials): try: user = backend.authenticate(request, **credentials) except PermissionDenied: @@ -96,7 +129,23 @@ def authenticate(request=None, **credentials): @sensitive_variables("credentials") async def aauthenticate(request=None, **credentials): """See authenticate().""" - return await sync_to_async(authenticate)(request, **credentials) + for backend, backend_path in _get_compatible_backends(request, **credentials): + try: + user = await backend.aauthenticate(request, **credentials) + except PermissionDenied: + # This backend says to stop in our tracks - this user should not be + # allowed in at all. + break + if user is None: + continue + # Annotate the user object with the path of the backend. + user.backend = backend_path + return user + + # The credentials supplied are invalid to all backends, fire signal. + await user_login_failed.asend( + sender=__name__, credentials=_clean_credentials(credentials), request=request + ) def login(request, user, backend=None): @@ -125,23 +174,7 @@ def login(request, user, backend=None): else: request.session.cycle_key() - try: - backend = backend or user.backend - except AttributeError: - backends = _get_backends(return_tuples=True) - if len(backends) == 1: - _, backend = backends[0] - else: - raise ValueError( - "You have multiple authentication backends configured and " - "therefore must provide the `backend` argument or set the " - "`backend` attribute on the user." - ) - else: - if not isinstance(backend, str): - raise TypeError( - "backend must be a dotted import path string (got %r)." % backend - ) + backend = _get_backend_from_user(user=user, backend=backend) request.session[SESSION_KEY] = user._meta.pk.value_to_string(user) request.session[BACKEND_SESSION_KEY] = backend @@ -154,7 +187,36 @@ def login(request, user, backend=None): async def alogin(request, user, backend=None): """See login().""" - return await sync_to_async(login)(request, user, backend) + session_auth_hash = "" + if user is None: + user = await request.auser() + if hasattr(user, "get_session_auth_hash"): + session_auth_hash = user.get_session_auth_hash() + + if await request.session.ahas_key(SESSION_KEY): + if await _aget_user_session_key(request) != user.pk or ( + session_auth_hash + and not constant_time_compare( + await request.session.aget(HASH_SESSION_KEY, ""), + session_auth_hash, + ) + ): + # To avoid reusing another user's session, create a new, empty + # session if the existing session corresponds to a different + # authenticated user. + await request.session.aflush() + else: + await request.session.acycle_key() + + backend = _get_backend_from_user(user=user, backend=backend) + + await request.session.aset(SESSION_KEY, user._meta.pk.value_to_string(user)) + await request.session.aset(BACKEND_SESSION_KEY, backend) + await request.session.aset(HASH_SESSION_KEY, session_auth_hash) + if hasattr(request, "user"): + request.user = user + rotate_token(request) + await user_logged_in.asend(sender=user.__class__, request=request, user=user) def logout(request): @@ -177,7 +239,19 @@ def logout(request): async def alogout(request): """See logout().""" - return await sync_to_async(logout)(request) + # Dispatch the signal before the user is logged out so the receivers have a + # chance to find out *who* logged out. + user = getattr(request, "auser", None) + if user is not None: + user = await user() + if not getattr(user, "is_authenticated", True): + user = None + await user_logged_out.asend(sender=user.__class__, request=request, user=user) + await request.session.aflush() + if hasattr(request, "user"): + from django.contrib.auth.models import AnonymousUser + + request.user = AnonymousUser() def get_user_model(): @@ -243,7 +317,43 @@ def get_user(request): async def aget_user(request): """See get_user().""" - return await sync_to_async(get_user)(request) + from .models import AnonymousUser + + user = None + try: + user_id = await _aget_user_session_key(request) + backend_path = await request.session.aget(BACKEND_SESSION_KEY) + except KeyError: + pass + else: + if backend_path in settings.AUTHENTICATION_BACKENDS: + backend = load_backend(backend_path) + user = await backend.aget_user(user_id) + # Verify the session + if hasattr(user, "get_session_auth_hash"): + session_hash = await request.session.aget(HASH_SESSION_KEY) + if not session_hash: + session_hash_verified = False + else: + session_auth_hash = user.get_session_auth_hash() + session_hash_verified = session_hash and constant_time_compare( + session_hash, user.get_session_auth_hash() + ) + if not session_hash_verified: + # If the current secret does not verify the session, try + # with the fallback secrets and stop when a matching one is + # found. + if session_hash and any( + constant_time_compare(session_hash, fallback_auth_hash) + for fallback_auth_hash in user.get_session_auth_fallback_hash() + ): + await request.session.acycle_key() + await request.session.aset(HASH_SESSION_KEY, session_auth_hash) + else: + await request.session.aflush() + user = None + + return user or AnonymousUser() def get_permission_codename(action, opts): diff --git a/django/contrib/auth/admin.py b/django/contrib/auth/admin.py index 8e1d63ef07..e977d3ded5 100644 --- a/django/contrib/auth/admin.py +++ b/django/contrib/auth/admin.py @@ -5,8 +5,8 @@ from django.contrib.admin.utils import unquote from django.contrib.auth import update_session_auth_hash from django.contrib.auth.forms import ( AdminPasswordChangeForm, + AdminUserCreationForm, UserChangeForm, - UserCreationForm, ) from django.contrib.auth.models import Group, User from django.core.exceptions import PermissionDenied @@ -71,7 +71,7 @@ class UserAdmin(admin.ModelAdmin): ), ) form = UserChangeForm - add_form = UserCreationForm + add_form = AdminUserCreationForm change_password_form = AdminPasswordChangeForm list_display = ("username", "email", "first_name", "last_name", "is_staff") list_filter = ("is_staff", "is_superuser", "is_active", "groups") diff --git a/django/contrib/auth/backends.py b/django/contrib/auth/backends.py index dd3c2e527b..8352530665 100644 --- a/django/contrib/auth/backends.py +++ b/django/contrib/auth/backends.py @@ -1,3 +1,5 @@ +from asgiref.sync import sync_to_async + from django.contrib.auth import get_user_model from django.contrib.auth.models import Permission from django.db.models import Exists, OuterRef, Q @@ -9,24 +11,45 @@ class BaseBackend: def authenticate(self, request, **kwargs): return None + async def aauthenticate(self, request, **kwargs): + return await sync_to_async(self.authenticate)(request, **kwargs) + def get_user(self, user_id): return None + async def aget_user(self, user_id): + return await sync_to_async(self.get_user)(user_id) + def get_user_permissions(self, user_obj, obj=None): return set() + async def aget_user_permissions(self, user_obj, obj=None): + return await sync_to_async(self.get_user_permissions)(user_obj, obj) + def get_group_permissions(self, user_obj, obj=None): return set() + async def aget_group_permissions(self, user_obj, obj=None): + return await sync_to_async(self.get_group_permissions)(user_obj, obj) + def get_all_permissions(self, user_obj, obj=None): return { *self.get_user_permissions(user_obj, obj=obj), *self.get_group_permissions(user_obj, obj=obj), } + async def aget_all_permissions(self, user_obj, obj=None): + return { + *await self.aget_user_permissions(user_obj, obj=obj), + *await self.aget_group_permissions(user_obj, obj=obj), + } + def has_perm(self, user_obj, perm, obj=None): return perm in self.get_all_permissions(user_obj, obj=obj) + async def ahas_perm(self, user_obj, perm, obj=None): + return perm in await self.aget_all_permissions(user_obj, obj) + class ModelBackend(BaseBackend): """ @@ -48,6 +71,23 @@ class ModelBackend(BaseBackend): if user.check_password(password) and self.user_can_authenticate(user): return user + async def aauthenticate(self, request, username=None, password=None, **kwargs): + if username is None: + username = kwargs.get(UserModel.USERNAME_FIELD) + if username is None or password is None: + return + try: + user = await UserModel._default_manager.aget_by_natural_key(username) + except UserModel.DoesNotExist: + # Run the default password hasher once to reduce the timing + # difference between an existing and a nonexistent user (#20760). + UserModel().set_password(password) + else: + if await user.acheck_password(password) and self.user_can_authenticate( + user + ): + return user + def user_can_authenticate(self, user): """ Reject users with is_active=False. Custom user models that don't have @@ -59,9 +99,7 @@ class ModelBackend(BaseBackend): return user_obj.user_permissions.all() def _get_group_permissions(self, user_obj): - user_groups_field = get_user_model()._meta.get_field("groups") - user_groups_query = "group__%s" % user_groups_field.related_query_name() - return Permission.objects.filter(**{user_groups_query: user_obj}) + return Permission.objects.filter(group__in=user_obj.groups.all()) def _get_permissions(self, user_obj, obj, from_name): """ @@ -84,6 +122,25 @@ class ModelBackend(BaseBackend): ) return getattr(user_obj, perm_cache_name) + async def _aget_permissions(self, user_obj, obj, from_name): + """See _get_permissions().""" + if not user_obj.is_active or user_obj.is_anonymous or obj is not None: + return set() + + perm_cache_name = "_%s_perm_cache" % from_name + if not hasattr(user_obj, perm_cache_name): + if user_obj.is_superuser: + perms = Permission.objects.all() + else: + perms = getattr(self, "_get_%s_permissions" % from_name)(user_obj) + perms = perms.values_list("content_type__app_label", "codename").order_by() + setattr( + user_obj, + perm_cache_name, + {"%s.%s" % (ct, name) async for ct, name in perms}, + ) + return getattr(user_obj, perm_cache_name) + def get_user_permissions(self, user_obj, obj=None): """ Return a set of permission strings the user `user_obj` has from their @@ -91,6 +148,10 @@ class ModelBackend(BaseBackend): """ return self._get_permissions(user_obj, obj, "user") + async def aget_user_permissions(self, user_obj, obj=None): + """See get_user_permissions().""" + return await self._aget_permissions(user_obj, obj, "user") + def get_group_permissions(self, user_obj, obj=None): """ Return a set of permission strings the user `user_obj` has from the @@ -98,6 +159,10 @@ class ModelBackend(BaseBackend): """ return self._get_permissions(user_obj, obj, "group") + async def aget_group_permissions(self, user_obj, obj=None): + """See get_group_permissions().""" + return await self._aget_permissions(user_obj, obj, "group") + def get_all_permissions(self, user_obj, obj=None): if not user_obj.is_active or user_obj.is_anonymous or obj is not None: return set() @@ -108,6 +173,9 @@ class ModelBackend(BaseBackend): def has_perm(self, user_obj, perm, obj=None): return user_obj.is_active and super().has_perm(user_obj, perm, obj=obj) + async def ahas_perm(self, user_obj, perm, obj=None): + return user_obj.is_active and await super().ahas_perm(user_obj, perm, obj=obj) + def has_module_perms(self, user_obj, app_label): """ Return True if user_obj has any permissions in the given app_label. @@ -117,6 +185,13 @@ class ModelBackend(BaseBackend): for perm in self.get_all_permissions(user_obj) ) + async def ahas_module_perms(self, user_obj, app_label): + """See has_module_perms()""" + return user_obj.is_active and any( + perm[: perm.index(".")] == app_label + for perm in await self.aget_all_permissions(user_obj) + ) + def with_perm(self, perm, is_active=True, include_superusers=True, obj=None): """ Return users that have permission "perm". By default, filter out @@ -159,6 +234,13 @@ class ModelBackend(BaseBackend): return None return user if self.user_can_authenticate(user) else None + async def aget_user(self, user_id): + try: + user = await UserModel._default_manager.aget(pk=user_id) + except UserModel.DoesNotExist: + return None + return user if self.user_can_authenticate(user) else None + class AllowAllUsersModelBackend(ModelBackend): def user_can_authenticate(self, user): @@ -210,6 +292,29 @@ class RemoteUserBackend(ModelBackend): user = self.configure_user(request, user, created=created) return user if self.user_can_authenticate(user) else None + async def aauthenticate(self, request, remote_user): + """See authenticate().""" + if not remote_user: + return + created = False + user = None + username = self.clean_username(remote_user) + + # Note that this could be accomplished in one try-except clause, but + # instead we use get_or_create when creating unknown users since it has + # built-in safeguards for multiple threads. + if self.create_unknown_user: + user, created = await UserModel._default_manager.aget_or_create( + **{UserModel.USERNAME_FIELD: username} + ) + else: + try: + user = await UserModel._default_manager.aget_by_natural_key(username) + except UserModel.DoesNotExist: + pass + user = await self.aconfigure_user(request, user, created=created) + return user if self.user_can_authenticate(user) else None + def clean_username(self, username): """ Perform any cleaning on the "username" prior to using it to get or @@ -227,6 +332,10 @@ class RemoteUserBackend(ModelBackend): """ return user + async def aconfigure_user(self, request, user, created=True): + """See configure_user()""" + return await sync_to_async(self.configure_user)(request, user, created) + class AllowAllUsersRemoteUserBackend(RemoteUserBackend): def user_can_authenticate(self, user): diff --git a/django/contrib/auth/base_user.py b/django/contrib/auth/base_user.py index 0c9538d69d..5bb88ac4dd 100644 --- a/django/contrib/auth/base_user.py +++ b/django/contrib/auth/base_user.py @@ -36,6 +36,9 @@ class BaseUserManager(models.Manager): def get_by_natural_key(self, username): return self.get(**{self.model.USERNAME_FIELD: username}) + async def aget_by_natural_key(self, username): + return await self.aget(**{self.model.USERNAME_FIELD: username}) + class AbstractBaseUser(models.Model): password = models.CharField(_("password"), max_length=128) diff --git a/django/contrib/auth/decorators.py b/django/contrib/auth/decorators.py index 78e76a9ae9..77fbc79855 100644 --- a/django/contrib/auth/decorators.py +++ b/django/contrib/auth/decorators.py @@ -111,7 +111,7 @@ def permission_required(perm, login_url=None, raise_exception=False): async def check_perms(user): # First check if the user has the permission (even anon users). - if await sync_to_async(user.has_perms)(perms): + if await user.ahas_perms(perms): return True # In case the 403 handler should be called raise the exception. if raise_exception: diff --git a/django/contrib/auth/forms.py b/django/contrib/auth/forms.py index 31e96ff91c..edf672a6e5 100644 --- a/django/contrib/auth/forms.py +++ b/django/contrib/auth/forms.py @@ -1,3 +1,4 @@ +import logging import unicodedata from django import forms @@ -16,6 +17,7 @@ from django.utils.translation import gettext from django.utils.translation import gettext_lazy as _ UserModel = get_user_model() +logger = logging.getLogger("django.contrib.auth") def _unicode_ci_compare(s1, s2): @@ -96,18 +98,11 @@ class UsernameField(forms.CharField): class SetPasswordMixin: """ Form mixin that validates and sets a password for a user. - - This mixin also support setting an unusable password for a user. """ error_messages = { "password_mismatch": _("The two password fields didn’t match."), } - usable_password_help_text = _( - "Whether the user will be able to authenticate using a password or not. " - "If disabled, they may still be able to authenticate using other backends, " - "such as Single Sign-On or LDAP." - ) @staticmethod def create_password_fields(label1=_("Password"), label2=_("Password confirmation")): @@ -127,33 +122,14 @@ class SetPasswordMixin: ) return password1, password2 - @staticmethod - def create_usable_password_field(help_text=usable_password_help_text): - return forms.ChoiceField( - label=_("Password-based authentication"), - required=False, - initial="true", - choices={"true": _("Enabled"), "false": _("Disabled")}, - widget=forms.RadioSelect(attrs={"class": "radiolist inline"}), - help_text=help_text, - ) - def validate_passwords( self, password1_field_name="password1", password2_field_name="password2", - usable_password_field_name="usable_password", ): - usable_password = ( - self.cleaned_data.pop(usable_password_field_name, None) != "false" - ) - self.cleaned_data["set_usable_password"] = usable_password password1 = self.cleaned_data.get(password1_field_name) password2 = self.cleaned_data.get(password2_field_name) - if not usable_password: - return self.cleaned_data - if not password1 and password1_field_name not in self.errors: error = ValidationError( self.fields[password1_field_name].error_messages["required"], @@ -177,30 +153,81 @@ class SetPasswordMixin: def validate_password_for_user(self, user, password_field_name="password2"): password = self.cleaned_data.get(password_field_name) - if password and self.cleaned_data["set_usable_password"]: + if password: try: password_validation.validate_password(password, user) except ValidationError as error: self.add_error(password_field_name, error) def set_password_and_save(self, user, password_field_name="password1", commit=True): - if self.cleaned_data["set_usable_password"]: - user.set_password(self.cleaned_data[password_field_name]) - else: - user.set_unusable_password() + user.set_password(self.cleaned_data[password_field_name]) if commit: user.save() return user +class SetUnusablePasswordMixin: + """ + Form mixin that allows setting an unusable password for a user. + + This mixin should be used in combination with `SetPasswordMixin`. + """ + + usable_password_help_text = _( + "Whether the user will be able to authenticate using a password or not. " + "If disabled, they may still be able to authenticate using other backends, " + "such as Single Sign-On or LDAP." + ) + + @staticmethod + def create_usable_password_field(help_text=usable_password_help_text): + return forms.ChoiceField( + label=_("Password-based authentication"), + required=False, + initial="true", + choices={"true": _("Enabled"), "false": _("Disabled")}, + widget=forms.RadioSelect(attrs={"class": "radiolist inline"}), + help_text=help_text, + ) + + def validate_passwords( + self, + *args, + usable_password_field_name="usable_password", + **kwargs, + ): + usable_password = ( + self.cleaned_data.pop(usable_password_field_name, None) != "false" + ) + self.cleaned_data["set_usable_password"] = usable_password + + if usable_password: + super().validate_passwords(*args, **kwargs) + + def validate_password_for_user(self, user, **kwargs): + if self.cleaned_data["set_usable_password"]: + super().validate_password_for_user(user, **kwargs) + + def set_password_and_save(self, user, commit=True, **kwargs): + if self.cleaned_data["set_usable_password"]: + user = super().set_password_and_save(user, **kwargs, commit=commit) + else: + user.set_unusable_password() + if commit: + user.save() + return user + + class BaseUserCreationForm(SetPasswordMixin, forms.ModelForm): """ A form that creates a user, with no privileges, from the given username and password. + + This is the documented base class for customizing the user creation form. + It should be kept mostly unchanged to ensure consistency and compatibility. """ password1, password2 = SetPasswordMixin.create_password_fields() - usable_password = SetPasswordMixin.create_usable_password_field() class Meta: model = User @@ -393,7 +420,12 @@ class PasswordResetForm(forms.Form): html_email = loader.render_to_string(html_email_template_name, context) email_message.attach_alternative(html_email, "text/html") - email_message.send() + try: + email_message.send() + except Exception: + logger.exception( + "Failed to send password reset email to %s", context["user"].pk + ) def get_users(self, email): """Given an email, return matching user(s) who should receive a reset. @@ -520,13 +552,13 @@ class PasswordChangeForm(SetPasswordForm): return old_password -class AdminPasswordChangeForm(SetPasswordMixin, forms.Form): +class AdminPasswordChangeForm(SetUnusablePasswordMixin, SetPasswordMixin, forms.Form): """ A form used to change the password of a user in the admin interface. """ required_css_class = "required" - usable_password_help_text = SetPasswordMixin.usable_password_help_text + ( + usable_password_help_text = SetUnusablePasswordMixin.usable_password_help_text + ( '
  • ' "If disabled, the current password for this user will be lost.
" ) @@ -538,7 +570,7 @@ class AdminPasswordChangeForm(SetPasswordMixin, forms.Form): self.fields["password1"].widget.attrs["autofocus"] = True if self.user.has_usable_password(): self.fields["usable_password"] = ( - SetPasswordMixin.create_usable_password_field( + SetUnusablePasswordMixin.create_usable_password_field( self.usable_password_help_text ) ) @@ -558,3 +590,8 @@ class AdminPasswordChangeForm(SetPasswordMixin, forms.Form): if "set_usable_password" in data or "password1" in data and "password2" in data: return ["password"] return [] + + +class AdminUserCreationForm(SetUnusablePasswordMixin, UserCreationForm): + + usable_password = SetUnusablePasswordMixin.create_usable_password_field() diff --git a/django/contrib/auth/locale/az/LC_MESSAGES/django.mo b/django/contrib/auth/locale/az/LC_MESSAGES/django.mo index c14fb27f31..ec6b23dd48 100644 Binary files a/django/contrib/auth/locale/az/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/az/LC_MESSAGES/django.po b/django/contrib/auth/locale/az/LC_MESSAGES/django.po index 7dd8670ded..39a2c8f7db 100644 --- a/django/contrib/auth/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/az/LC_MESSAGES/django.po @@ -5,14 +5,16 @@ # Emin Mastizada , 2018,2020 # Emin Mastizada , 2016 # Nicat Məmmədov , 2022 +# Nijat Mammadov, 2024 +# Sevdimali , 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-21 10:22+0200\n" -"PO-Revision-Date: 2022-07-25 08:09+0000\n" -"Last-Translator: Nicat Məmmədov \n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Sevdimali , 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,13 +35,23 @@ msgstr "Vacib tarixlər" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Əsas %(key)r açarı ilə %(name)s obyekti mövcud deyil." +msgid "Conflicting form data submitted. Please try again." +msgstr "Konfliktli form məlumatları daxil edildi. Təkrar cəhd edin." + msgid "Password changed successfully." msgstr "Şifrə uğurla dəyişdirildi." +msgid "Password-based authentication was disabled." +msgstr "Şifrə əsaslı autentifikasiyanı ləğv edildi." + #, python-format msgid "Change password: %s" msgstr "Şifrəni dəyiş: %s" +#, python-format +msgid "Set password: %s" +msgstr "Şifrə təyin et: %s" + msgid "Authentication and Authorization" msgstr "Təsdiqləmə və Səlahiyyət" @@ -47,7 +59,7 @@ msgid "password" msgstr "şifrə" msgid "last login" -msgstr "son dəfə daxil olub" +msgstr "son daxilolma" msgid "No password set." msgstr "Şifrə təyin olunmayıb." @@ -55,9 +67,24 @@ msgstr "Şifrə təyin olunmayıb." msgid "Invalid password format or unknown hashing algorithm." msgstr "Xətalı şifrə formatı və ya bilinməyən heş alqoritması." +msgid "Reset password" +msgstr "Şifrəni sıfırla" + +msgid "Set password" +msgstr "Şifrə təyin et" + msgid "The two password fields didn’t match." msgstr "Şifrə xanalarının dəyərləri eyni deyil." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"İstifadəçinin şifrə ilə autentifikasiya edib-etməyəcəyi. Əgər deaktiv " +"edilsə, onlar yenə də Single Sign-On və ya LDAP kimi digər backend-lərdən " +"istifadə edərək autentifikasiya edə bilərlər." + msgid "Password" msgstr "Şifrə" @@ -67,13 +94,26 @@ msgstr "Şifrənin təsdiqi" msgid "Enter the same password as before, for verification." msgstr "Təsdiqləmək üçün əvvəlki ilə eyni şifrəni daxil edin." +msgid "Password-based authentication" +msgstr "Şifrə əsaslı autentifikasiya" + +msgid "Enabled" +msgstr "Aktivləşdi" + +msgid "Disabled" +msgstr "Ləğv edildi" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Şifrələr açıq formada saxlanılmadığı üçün bu istifadəçinin şifrəsini görmək " -"mümkün deyil, amma bu formadan istifadə edərək şifrəni " -"dəyişə bilərsiz." +"Şifrələr mətn və ya olduğu kimi saxlanılmır, buna görə də istifadəçinin " +"şifrəsini görmək mümkün deyil." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Bu istifadəçi üçün şifrə təyin edərək şifrə əsaslı autentifikasiyanı aktiv " +"edin." #, python-format msgid "" @@ -101,14 +141,11 @@ msgstr "Köhnə şifrəni yanlış daxil etdiniz. Zəhmət olmasa bir daha yoxla msgid "Old password" msgstr "Köhnə şifrə" -msgid "Password (again)" -msgstr "Şifrə (bir daha)" - msgid "algorithm" msgstr "alqoritm" msgid "iterations" -msgstr "təkrarlama" +msgstr "təkrarlanmalar" msgid "salt" msgstr "duz" @@ -123,10 +160,10 @@ msgid "version" msgstr "versiya" msgid "memory cost" -msgstr "yaddaş xərci" +msgstr "yaddaş məsrəfi" msgid "time cost" -msgstr "vaxt xərci" +msgstr "vaxt məsrəfi" msgid "parallelism" msgstr "paralellik" @@ -138,7 +175,7 @@ msgid "checksum" msgstr "yoxlama dəyəri" msgid "block size" -msgstr "" +msgstr "blok ölçüsü" msgid "name" msgstr "ad" @@ -167,17 +204,17 @@ msgstr "superistifadəçi statusu" msgid "" "Designates that this user has all permissions without explicitly assigning " "them." -msgstr "İstifadəçiyə bütün icazələri verir." +msgstr "Bu istifadəçinin bütün icazələrə malik olduğunu bildirir." msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." msgstr "" -"Bu istifadəçinin aid olduğu qruplar. İstifadə bu qruplardan hər birinə " +"Bu istifadəçinin aid olduğu qruplar. İstifadəçi bu qruplardan hər birinə " "verilən bütün icazələri alacaq." msgid "user permissions" -msgstr "səlahiyyətləri" +msgstr "istifadəçi səlahiyyətləri" msgid "Specific permissions for this user." msgstr "Bu istifadəçiyə aid xüsusi icazələr." @@ -186,7 +223,7 @@ msgid "username" msgstr "istifadəçi adı" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "Tələb edilir. Ən az 150 simvol. Ancaq hərf, rəqəm və @/./+/-/_." +msgstr "Vacibdir. Ən az 150 simvol. Ancaq hərf, rəqəm və @/./+/-/_." msgid "A user with that username already exists." msgstr "Bu istifadəçi adı altında başqa istifadəçi var." @@ -204,10 +241,10 @@ msgid "staff status" msgstr "admin statusu" msgid "Designates whether the user can log into this admin site." -msgstr "İstifadəçinin admin panelinə daxil olub, olmayacağını təyin edir." +msgstr "İstifadəçinin admin panelinə daxil olub-olmayacağını təyin edir." msgid "active" -msgstr "Aktiv" +msgstr "aktiv" msgid "" "Designates whether this user should be treated as active. Unselect this " @@ -234,7 +271,7 @@ msgid_plural "" "characters." msgstr[0] "Bu parol çox qısadır. Ən az %(min_length)d işarə olmalıdır." msgstr[1] "" -"Bu şifrə çox qısadır. Ən az %(min_length)d simvoldan ibarət olmalıdır." +"Bu şifrə çox qısadır. Ən azı %(min_length)d simvoldan ibarət olmalıdır." #, python-format msgid "Your password must contain at least %(min_length)d character." @@ -266,18 +303,19 @@ msgid "Password reset on %(site_name)s" msgstr "%(site_name)s, şifrənin sıfırlanması" msgid "" -"Enter a valid username. This value may contain only English letters, " -"numbers, and @/./+/-/_ characters." +"Enter a valid username. This value may contain only unaccented lowercase a-z " +"and uppercase A-Z letters, numbers, and @/./+/-/_ characters." msgstr "" -"Düzgün istifadəçi adı daxil edin. Bu dəyən ancaq İngiliscə hərflərdən, rəqəm " -"və @/./+/-/_ işarətlərindən ibarət ola bilər." +"Düzgün istifadəçi adı daxil edin. Bu dəyər yalnız diakritik olmayan kiçik (a-" +"z) və böyük (A-Z) hərflərdən, rəqəmlərdən və @/./+/-/_ simvollardan ibarət " +"ola bilər." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" -"Düzgün istifadəçi adı daxil edin. Bu dəyən ancaq hərf, rəqəm və @/./+/-/_ " -"işarətlərindən ibarət ola bilər." +"Düzgün istifadəçi adı daxil edin. Bu dəyər ancaq hərf, rəqəm və @/./+/-/_ " +"simvollarından ibarət ola bilər." msgid "Logged out" msgstr "Çıxdınız" diff --git a/django/contrib/auth/locale/be/LC_MESSAGES/django.mo b/django/contrib/auth/locale/be/LC_MESSAGES/django.mo index 42c2a0cd2a..b598394859 100644 Binary files a/django/contrib/auth/locale/be/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/be/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/be/LC_MESSAGES/django.po b/django/contrib/auth/locale/be/LC_MESSAGES/django.po index 692bea2fed..c90782900d 100644 --- a/django/contrib/auth/locale/be/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/be/LC_MESSAGES/django.po @@ -2,15 +2,16 @@ # # Translators: # Viktar Palstsiuk , 2015 -# znotdead , 2016-2017,2019,2021,2023 +# znotdead , 2016-2017,2019,2021,2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" -"Last-Translator: znotdead , 2016-2017,2019,2021,2023\n" -"Language-Team: Belarusian (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: znotdead , " +"2016-2017,2019,2021,2023-2024\n" +"Language-Team: Belarusian (http://app.transifex.com/django/django/language/" "be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,13 +34,23 @@ msgstr "Важныя даты" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Аб'ект %(name)s з першасным ключом %(key)r не існуе." +msgid "Conflicting form data submitted. Please try again." +msgstr "Адпраўлены супярэчлівыя даныя формы. Калі ласка, паспрабуйце яшчэ раз." + msgid "Password changed successfully." msgstr "Пароль зьмянілі." +msgid "Password-based authentication was disabled." +msgstr "Аўтэнтыфікацыя на аснове пароля адключана." + #, python-format msgid "Change password: %s" msgstr "Зьмяніць пароль: %s" +#, python-format +msgid "Set password: %s" +msgstr "Усталяваць пароль: %s" + msgid "Authentication and Authorization" msgstr "Аўтэнтыфікацыя і аўтарызацыя" @@ -55,9 +66,24 @@ msgstr "Пароль не зададзены." msgid "Invalid password format or unknown hashing algorithm." msgstr "Няправільны фармат паролю або невядомы алгарытм хэшавання." +msgid "Reset password" +msgstr "Узнавіць пароль" + +msgid "Set password" +msgstr "Усталяваць пароль" + msgid "The two password fields didn’t match." msgstr "Не супадаюць паролі ў двух палях." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Зможа карыстальнік прайсці аўтэнтыфікацыю з дапамогай пароля ці не. Калі " +"гэта функцыя адключана, яны ўсё роўна могуць прайсці аўтэнтыфікацыю з " +"дапамогай іншых бэкэндаў, такіх як Single Sign-On або LDAP." + msgid "Password" msgstr "Пароль" @@ -67,13 +93,26 @@ msgstr "Пацьвердзіце пароль" msgid "Enter the same password as before, for verification." msgstr "Дзеля пэўнасьці набярыце такі самы пароль яшчэ раз." +msgid "Password-based authentication" +msgstr "Аўтэнтыфікацыя на аснове пароля" + +msgid "Enabled" +msgstr "Уключана" + +msgid "Disabled" +msgstr "Адключана" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Паролі не захоўваюцца ў такім выглядзе, як іх набралі, таму ўбачыць пароль " -"карыстальніка нельга, але яго можна зьмяніць выкарыстоўваючыгэту форму ." +"Неапрацаваныя паролі не захоўваюцца, таму няма магчымасці ўбачыць пароль " +"карыстальніка." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Уключыць аўтэнтыфікацыю на аснове пароля для гэтага карыстальніка, " +"усталяваўшы пароль." #, python-format msgid "" @@ -101,9 +140,6 @@ msgstr "Пазначылі неадпаведны стары пароль. На msgid "Old password" msgstr "Стары пароль" -msgid "Password (again)" -msgstr "Пароль (яшчэ раз)" - msgid "algorithm" msgstr "альґарытм" diff --git a/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo b/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo index 8587fcf62a..3a5e1a2246 100644 Binary files a/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/bg/LC_MESSAGES/django.po b/django/contrib/auth/locale/bg/LC_MESSAGES/django.po index d80b51bc5b..b8144ef841 100644 --- a/django/contrib/auth/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/bg/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# arneatec , 2022-2023 +# arneatec , 2022-2024 # Boris Chervenkov , 2012 # Georgi Kostadinov , 2012 # Jannis Leidel , 2011 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: arneatec , 2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: arneatec , 2022-2024\n" "Language-Team: Bulgarian (http://app.transifex.com/django/django/language/" "bg/)\n" "MIME-Version: 1.0\n" @@ -37,13 +37,23 @@ msgstr "Важни дати" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s обект с първичен ключ %(key)r не съществува." +msgid "Conflicting form data submitted. Please try again." +msgstr "Изпратихте данни с противоречия чрез формата. Моля опитайте отново." + msgid "Password changed successfully." msgstr "Паролата беше променена успешно. " +msgid "Password-based authentication was disabled." +msgstr "Автентикацията с парола беше спряна." + #, python-format msgid "Change password: %s" msgstr "Промени парола: %s" +#, python-format +msgid "Set password: %s" +msgstr "Задай парола: %s" + msgid "Authentication and Authorization" msgstr "Аутентикация и оторизация" @@ -59,9 +69,23 @@ msgstr "Не е зададена парола." msgid "Invalid password format or unknown hashing algorithm." msgstr "Невалиден формат за парола или неизвестен алгоритъм за хеширане." +msgid "Reset password" +msgstr "Възстановяване на парола" + +msgid "Set password" +msgstr "Задаване на парола" + msgid "The two password fields didn’t match." msgstr "Двете полета за паролата не съвпадат. " +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Дали потребителят можи да влиза с парола или не. Ако е забранено, те могат " +"да влизат чрез други способи, като Единно Влизане /Single Sign-On/ или LDAP." + msgid "Password" msgstr "Парола" @@ -71,13 +95,24 @@ msgstr "Потвърждение на паролата" msgid "Enter the same password as before, for verification." msgstr "Въведете същата парола като преди, за да потвърдите." +msgid "Password-based authentication" +msgstr "Влизане чрез парола" + +msgid "Enabled" +msgstr "Включено" + +msgid "Disabled" +msgstr "Изключено" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Паролите не се съхраняват в чист вид, така че е невъзможно да видите " -"паролата на този потребител, но можете да промените паролата чрез този формуляр." +"Паролите не се съхраняват в чист вид, така че няма начин да се види паролата " +"на потребителя." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "Включете влизането с парола за този потребител като зададете парола." #, python-format msgid "" @@ -105,9 +140,6 @@ msgstr "Въвели сте погрешна стара парола. Въвед msgid "Old password" msgstr "Стара парола" -msgid "Password (again)" -msgstr "Парола (отново)" - msgid "algorithm" msgstr "алгоритъм" diff --git a/django/contrib/auth/locale/ckb/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ckb/LC_MESSAGES/django.mo index 9814f3295a..6cd1795891 100644 Binary files a/django/contrib/auth/locale/ckb/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ckb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ckb/LC_MESSAGES/django.po b/django/contrib/auth/locale/ckb/LC_MESSAGES/django.po index 30e02c1819..1b689c6c33 100644 --- a/django/contrib/auth/locale/ckb/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ckb/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2024-01-25 08:09+0000\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" "Last-Translator: Swara , 2022,2024\n" "Language-Team: Central Kurdish (http://app.transifex.com/django/django/" "language/ckb/)\n" @@ -30,13 +30,23 @@ msgstr "بەروارە گرنگەکان" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s ئۆبجێکت لەگەڵ کلیلی سەرەکیی %(key)r بوونی نیە." +msgid "Conflicting form data submitted. Please try again." +msgstr "داتای ناکۆکی فۆڕم نێردراوە. تکایە دووبارە هەوڵ بدەوە." + msgid "Password changed successfully." msgstr "تێپەڕەوشە بەسەرکەوتوویی گۆڕدرا." +msgid "Password-based authentication was disabled." +msgstr "ڕەسەنایەتی لەسەر بنەمای تێپەڕەوشە ناچالاککراوە." + #, python-format msgid "Change password: %s" msgstr "گۆڕینی تێپەڕەوشەی: %s" +#, python-format +msgid "Set password: %s" +msgstr "دانانی تێپەڕەوشە: %s" + msgid "Authentication and Authorization" msgstr "ڕەسەنایەتی و ڕێگەپێدان" @@ -52,9 +62,24 @@ msgstr "تێپەڕەوشە جێگیرنەکراوە." msgid "Invalid password format or unknown hashing algorithm." msgstr "شێوازی تێپەڕەوشە نادروستە یان ئەلگۆریتمێکی هاشکراوی نەناسراوە." +msgid "Reset password" +msgstr "دانانەوەی تێپەڕەوشە" + +msgid "Set password" +msgstr "دانانی تێپەڕەوشە" + msgid "The two password fields didn’t match." msgstr "هەردوو خانەی تێپەڕەوشە وەک یەک نین." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"ئایا بەکارهێنەر دەتوانێت بە بەکارهێنانی تێپەڕەوشە خۆی بناسێنێت یان نا. ئەگەر " +"ناچالاک کرابێت، لەوانەیە هێشتا بتوانێت خۆی بناسێنێت بە بەکارهێنانی سیستەمی " +"تر لە پشتەوە، وەک چوونەژوورەوەی یەکجار Single Sign-On یان LDAP." + msgid "Password" msgstr "تێپەڕەوشە" @@ -64,13 +89,26 @@ msgstr "دووپاتکردنەوەی تێپەڕەوشە" msgid "Enter the same password as before, for verification." msgstr "بۆ پشتڕاستکردنەوە هەمان تێپەڕەوشەی پێشوو بنوسە." +msgid "Password-based authentication" +msgstr "ڕەسەنایەتی لەسەر بنەمای تێپەڕەوشە" + +msgid "Enabled" +msgstr "چالاککراوە" + +msgid "Disabled" +msgstr "ناچالاککراوە" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"تێپەڕەوشەی خاو هەڵناگیرێت, لەبەرئەوە هیچ ڕێگەیەک نییە بۆ بینینی تێپەڕەوشەی " -"ئەم بەکارهێنەرە, بەڵام دەتوانیت تێپەڕەوشەکە بگۆڕیت بە بەکارهێنانی ئەم فۆڕمە." +"تێپەڕەوشە خاوەکان هەڵناگیرێن، کەواتە هیچ ڕێگایەک نییە بۆ بینینی تێپەڕەوشەی " +"بەکارهێنەر." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"ڕەسەنایەتی لەسەر بنەمای تێپەڕەوشە بۆ ئەم بەکارهێنەر چالاک بکە بەهۆی دانانی " +"تێپەڕەوشەیەکەوە." #, python-format msgid "" @@ -98,9 +136,6 @@ msgstr "تێپەڕەوشە کۆنەکەت بە هەڵە نوسراوە. تکای msgid "Old password" msgstr "تێپەڕەوشەی کۆن" -msgid "Password (again)" -msgstr "تێپەڕەوشە(دووبارە)" - msgid "algorithm" msgstr "ئەلگۆریتم" diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo index 71403aec13..0bdcc7b633 100644 Binary files a/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po index 78b6fc49e2..6b5cf6b2d4 100644 --- a/django/contrib/auth/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/cs/LC_MESSAGES/django.po @@ -3,6 +3,7 @@ # Translators: # Jan Munclinger , 2013 # Jannis Leidel , 2011 +# Jiří Podhorecký , 2024 # Tomáš Ehrlich , 2015 # Vláďa Macek , 2013-2014 # Vláďa Macek , 2015-2017,2019,2021-2022 @@ -10,10 +11,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-21 10:22+0200\n" -"PO-Revision-Date: 2022-01-04 18:49+0000\n" -"Last-Translator: Vláďa Macek \n" -"Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" +"Last-Translator: Jiří Podhorecký , 2024\n" +"Language-Team: Czech (http://app.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -34,13 +35,23 @@ msgstr "Důležitá data" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Položka \"%(name)s\" s primárním klíčem \"%(key)r\" neexistuje." +msgid "Conflicting form data submitted. Please try again." +msgstr "Odeslání protichůdných údajů z formuláře. Zkuste to prosím znovu." + msgid "Password changed successfully." msgstr "Změna hesla byla úspěšná." +msgid "Password-based authentication was disabled." +msgstr "Ověřování pomocí hesla bylo zakázáno." + #, python-format msgid "Change password: %s" msgstr "Heslo pro uživatele %s: změnit" +#, python-format +msgid "Set password: %s" +msgstr "Nastavit heslo: %s" + msgid "Authentication and Authorization" msgstr "Autentizace a autorizace" @@ -56,9 +67,24 @@ msgstr "Heslo nenastaveno." msgid "Invalid password format or unknown hashing algorithm." msgstr "Neplatný formát hesla nebo neplatný hashovací algoritmus." +msgid "Reset password" +msgstr "Resetovat heslo" + +msgid "Set password" +msgstr "Nastavit heslo" + msgid "The two password fields didn’t match." msgstr "Hesla se neshodují." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Zda se uživatel bude moci ověřit pomocí hesla, nebo ne. Pokud je zakázáno, " +"může být stále schopen ověřit se pomocí jiných backendů, například Single " +"Sign-On nebo LDAP." + msgid "Password" msgstr "Heslo" @@ -68,12 +94,24 @@ msgstr "Potvrzení hesla" msgid "Enter the same password as before, for verification." msgstr "Zadejte pro ověření stejné heslo jako předtím." +msgid "Password-based authentication" +msgstr "Ověřování pomocí hesla" + +msgid "Enabled" +msgstr "Zapnuto" + +msgid "Disabled" +msgstr "Vypnuto" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Hesla se neukládají přímo a tak je nelze zobrazit. Je ale možné je změnit " -"pomocí tohoto formuláře." +"Neupravená hesla se neukládají, takže není možné zjistit heslo uživatele." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Povolit ověřování na základě hesla pro tohoto uživatele nastavením hesla." #, python-format msgid "" @@ -101,9 +139,6 @@ msgstr "Vaše současné heslo nebylo zadáno správně. Zkuste to znovu." msgid "Old password" msgstr "Současné heslo" -msgid "Password (again)" -msgstr "Heslo (znovu)" - msgid "algorithm" msgstr "algoritmus" @@ -271,11 +306,11 @@ msgid "Password reset on %(site_name)s" msgstr "Obnovení hesla na webu %(site_name)s" msgid "" -"Enter a valid username. This value may contain only English letters, " -"numbers, and @/./+/-/_ characters." +"Enter a valid username. This value may contain only unaccented lowercase a-z " +"and uppercase A-Z letters, numbers, and @/./+/-/_ characters." msgstr "" -"Zadejte platné uživatelské jméno. Hodnota může obsahovat pouze písmena bez " -"diakritiky, tj. háčků a čárek, číslice a znaky @/./+/-/_." +"Zadejte platné uživatelské jméno. Tato hodnota může obsahovat pouze malá " +"písmena bez diakritiky a-z a velká písmena A-Z, číslice a znaky @/./+/-/_." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " diff --git a/django/contrib/auth/locale/da/LC_MESSAGES/django.mo b/django/contrib/auth/locale/da/LC_MESSAGES/django.mo index 861a1c2839..488c5f755f 100644 Binary files a/django/contrib/auth/locale/da/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/da/LC_MESSAGES/django.po b/django/contrib/auth/locale/da/LC_MESSAGES/django.po index 25db7117ab..7f1336e206 100644 --- a/django/contrib/auth/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/da/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # Christian Joergensen , 2012 -# Erik Ramsgaard Wognsen , 2021,2023 +# Erik Ramsgaard Wognsen , 2021,2023-2024 # Erik Ramsgaard Wognsen , 2013-2017,2019 # Jannis Leidel , 2011 # 85794379431c3e0f5c85c0e72a78d45b_658ddd9, 2013 @@ -12,10 +12,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" -"Last-Translator: Erik Ramsgaard Wognsen , 2021,2023\n" -"Language-Team: Danish (http://www.transifex.com/django/django/language/da/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Erik Ramsgaard Wognsen , 2021,2023-2024\n" +"Language-Team: Danish (http://app.transifex.com/django/django/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -35,13 +35,23 @@ msgstr "Vigtige datoer" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Der findes ikke et %(name)s-objekt med primærnøgle %(key)r." +msgid "Conflicting form data submitted. Please try again." +msgstr "Uoverensstemmende formulardata indsendt. Prøv igen." + msgid "Password changed successfully." msgstr "Adgangskoden blev ændret." +msgid "Password-based authentication was disabled." +msgstr "Adgangskodebaseret autentificering blev deaktiveret." + #, python-format msgid "Change password: %s" msgstr "Skift adgangskode: %s" +#, python-format +msgid "Set password: %s" +msgstr "Sæt adgangskode: %s" + msgid "Authentication and Authorization" msgstr "Godkendelse og autorisation" @@ -57,9 +67,24 @@ msgstr "Ingen adgangskode valgt." msgid "Invalid password format or unknown hashing algorithm." msgstr "Ugyldigt adgangskodeformat eller hashing-algoritme." +msgid "Reset password" +msgstr "Nulstil adgangskode" + +msgid "Set password" +msgstr "Sæt adgangskode" + msgid "The two password fields didn’t match." msgstr "De to adgangskoder var ikke identiske." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Om brugeren kan logge ind med adgangskode eller ej. Hvis deaktiveret kan " +"brugeren muligvis stadig logge ind vha. andre backends så som Single Sign-On " +"eller LDAP." + msgid "Password" msgstr "Adgangskode" @@ -69,13 +94,26 @@ msgstr "Bekræftelse af adgangskode" msgid "Enter the same password as before, for verification." msgstr "Indtast den samme adgangskode som før, for bekræftelse." +msgid "Password-based authentication" +msgstr "Adgangskodebaseret autentificering" + +msgid "Enabled" +msgstr "Aktiveret" + +msgid "Disabled" +msgstr "Deaktiveret" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Rå adgangskoder gemmes ikke, så det er ikke muligt at se denne brugers " -"adgangskode, men du kan ændre adgangskoden ved hjælp af denne " -"formular." +"Rå adgangskoder gemmes ikke, så det er ikke muligt at se brugerens " +"adgangskode." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Aktivér adgangskodebaseret autentificering for denne bruger ved at sætte en " +"adgangskode." #, python-format msgid "" @@ -104,9 +142,6 @@ msgstr "" msgid "Old password" msgstr "Gammel adgangskode" -msgid "Password (again)" -msgstr "Adgangskode (igen)" - msgid "algorithm" msgstr "algoritme" diff --git a/django/contrib/auth/locale/dsb/LC_MESSAGES/django.mo b/django/contrib/auth/locale/dsb/LC_MESSAGES/django.mo index 473025927e..0f26ac6d56 100644 Binary files a/django/contrib/auth/locale/dsb/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/dsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/dsb/LC_MESSAGES/django.po b/django/contrib/auth/locale/dsb/LC_MESSAGES/django.po index a2cf9e981e..2d37b97fca 100644 --- a/django/contrib/auth/locale/dsb/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/dsb/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2017,2020-2021,2023 +# Michael Wolf , 2016-2017,2020-2021,2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" "Last-Translator: Michael Wolf , " -"2016-2017,2020-2021,2023\n" -"Language-Team: Lower Sorbian (http://www.transifex.com/django/django/" +"2016-2017,2020-2021,2023-2024\n" +"Language-Team: Lower Sorbian (http://app.transifex.com/django/django/" "language/dsb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,13 +32,23 @@ msgstr "Wažne daty" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekt %(name)s z primarnym klucom %(key)r njeeksistěrujo." +msgid "Conflicting form data submitted. Please try again." +msgstr "Pśeśiwne formularowe daty zapódane. Pšosym wopytajśo hyšći raz." + msgid "Password changed successfully." msgstr "Gronidło jo se změniło." +msgid "Password-based authentication was disabled." +msgstr "Awtentifikacija na zakłaźe gronidła jo se znjemóžniła." + #, python-format msgid "Change password: %s" msgstr "Gronidło změniś: %s" +#, python-format +msgid "Set password: %s" +msgstr "Nastajone gronidło: %s" + msgid "Authentication and Authorization" msgstr "Awtentifikacija a awtorizacija" @@ -54,9 +64,24 @@ msgstr "Žedno gronidło nastajone." msgid "Invalid password format or unknown hashing algorithm." msgstr "Njepłaśiwy gronidłowy format abo njeznaty kontrolny algoritmus." +msgid "Reset password" +msgstr "Gronidło slědk stajiś" + +msgid "Set password" +msgstr "Gronidło póstajis" + msgid "The two password fields didn’t match." msgstr "Dwě gronidlowej póli njejstej jadnakej." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Lěc wužywaŕ móžo z gronidłom awtentificěrowaś abo nic. Jolic to jo " +"znjemóžnjone, jo hyšći móžno, z pomocu drugich backendami awtentificěrowaś, " +"na pśikład Single Sign-On abo LDAP." + msgid "Password" msgstr "Gronidło" @@ -66,13 +91,26 @@ msgstr "Gronidłowe wobkšuśenje" msgid "Enter the same password as before, for verification." msgstr "Zapódajśo to samske gronidło, za pśespytanje." +msgid "Password-based authentication" +msgstr "Awtentifikacija na zakłaźe gronidła" + +msgid "Enabled" +msgstr "Źmóžnjony" + +msgid "Disabled" +msgstr "Znjemóžnjony" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Grube gronidła se njeskładuju, togodla njejo móžno, gronidło wužywarja " -"wiźeś, ale móžośo gronidło z pomocu toś togo formulara " -"změniś." +"Gropne gronidła se njeskładuju, njedajo pótakem žednu móžnosć, gronidło " +"wužywarja wiźeś." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Póstajśo gronidło, aby awtentifkaciju na zakłaźe gronidła za toś togo " +"wužywarja zmóžnił." #, python-format msgid "" @@ -101,9 +139,6 @@ msgstr "" msgid "Old password" msgstr "Stare gronidło" -msgid "Password (again)" -msgstr "Gronidło (znowego)" - msgid "algorithm" msgstr "algoritmus" diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo index 27db448de3..9323380d97 100644 Binary files a/django/contrib/auth/locale/es/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/es/LC_MESSAGES/django.po b/django/contrib/auth/locale/es/LC_MESSAGES/django.po index f6d08755b4..060af415c6 100644 --- a/django/contrib/auth/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es/LC_MESSAGES/django.po @@ -9,17 +9,19 @@ # guillem , 2012 # Igor Támara , 2015 # Jannis Leidel , 2011 +# Jorge Andres Bravo Meza, 2024 # Josue Naaman Nistal Guerra , 2014 # Leonardo J. Caballero G. , 2011 -# Uriel Medina , 2020-2021,2023 +# Natalia, 2024 +# Uriel Medina , 2020-2021,2023-2024 # Veronicabh , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Uriel Medina , 2020-2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" +"Last-Translator: Uriel Medina , 2020-2021,2023-2024\n" "Language-Team: Spanish (http://app.transifex.com/django/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -41,13 +43,25 @@ msgstr "Fechas importantes" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "el objeto %(name)s con clave primaria %(key)r no existe." +msgid "Conflicting form data submitted. Please try again." +msgstr "" +"Se enviaron datos contradictorios en el formulario. Por favor inténtalo de " +"nuevo." + msgid "Password changed successfully." msgstr "La contraseña se ha cambiado con éxito." +msgid "Password-based authentication was disabled." +msgstr "La autenticación basada en contraseña fue deshabilitada." + #, python-format msgid "Change password: %s" msgstr "Cambiar contraseña: %s" +#, python-format +msgid "Set password: %s" +msgstr "Establecer contraseña: %s" + msgid "Authentication and Authorization" msgstr "Autenticación y autorización" @@ -63,9 +77,24 @@ msgstr "No se ha establecido la clave." msgid "Invalid password format or unknown hashing algorithm." msgstr "Formato de clave incorrecto o algoritmo de hash desconocido." +msgid "Reset password" +msgstr "Restablecer contraseña" + +msgid "Set password" +msgstr "Establecer contraseña" + msgid "The two password fields didn’t match." msgstr "Los dos campos de contraseña no coinciden." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Determina si el usuario podrá autenticarse usando una contraseña. Si está " +"deshabilitado, el usuario aún podría autenticarse mediante otros métodos, " +"como Single Sign-On o LDAP." + msgid "Password" msgstr "Contraseña" @@ -75,13 +104,26 @@ msgstr "Contraseña (confirmación)" msgid "Enter the same password as before, for verification." msgstr "Para verificar, introduzca la misma contraseña anterior." +msgid "Password-based authentication" +msgstr "Autenticación basada en contraseña" + +msgid "Enabled" +msgstr "Habilitado" + +msgid "Disabled" +msgstr "Deshabilitado" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Las contraseñas no se almacenan en bruto, así que no hay manera de ver la " -"contraseña del usuario, pero se puede cambiar la contraseña mediante este formulario." +"Las contraseñas en texto plano no se almacenan, por lo que no se puede ver " +"la contraseña del usuario." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Habilite la autenticación por contraseña para este usuario estableciendo una " +"contraseña." #, python-format msgid "" @@ -110,9 +152,6 @@ msgstr "" msgid "Old password" msgstr "Contraseña antigua" -msgid "Password (again)" -msgstr "Contraseña (de nuevo)" - msgid "algorithm" msgstr "algoritmo" diff --git a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo index d985402b26..80cd087426 100644 Binary files a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po index bd89b28f39..c5f59b6971 100644 --- a/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/es_AR/LC_MESSAGES/django.po @@ -2,14 +2,14 @@ # # Translators: # Jannis Leidel , 2011 -# Ramiro Morales, 2013-2017,2019,2021,2023 +# Ramiro Morales, 2013-2017,2019,2021,2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Ramiro Morales, 2013-2017,2019,2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" +"Last-Translator: Ramiro Morales, 2013-2017,2019,2021,2023-2024\n" "Language-Team: Spanish (Argentina) (http://app.transifex.com/django/django/" "language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -31,13 +31,23 @@ msgstr "Fechas importantes" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existe un objeto %(name)s con una clave primaria %(key)r." +msgid "Conflicting form data submitted. Please try again." +msgstr "Los datos enviados se contradicen. Por favor intente de nuevo." + msgid "Password changed successfully." msgstr "Cambio de contraseña exitoso" +msgid "Password-based authentication was disabled." +msgstr "La autenticación basada en contraseñas fue desactivada." + #, python-format msgid "Change password: %s" msgstr "Cambiar contraseña: %s" +#, python-format +msgid "Set password: %s" +msgstr "Establecer contraseña: %s" + msgid "Authentication and Authorization" msgstr "Autenticación y Autorización" @@ -53,9 +63,24 @@ msgstr "No se ha establecido una contraseña." msgid "Invalid password format or unknown hashing algorithm." msgstr "Formato de contraseña inválido o algoritmo de hashing desconocido." +msgid "Reset password" +msgstr "Restablecer contraseña" + +msgid "Set password" +msgstr "Establecer contraseña" + msgid "The two password fields didn’t match." msgstr "Los dos campos de contraseñas no coinciden entre si." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Determina si el usuario podrá autenticarse usando una contraseña. Si está " +"desactivado, el usuario aún podría autenticarse mediante otros métodos, como " +"Single Sign-On o LDAP." + msgid "Password" msgstr "Contraseña" @@ -66,13 +91,26 @@ msgid "Enter the same password as before, for verification." msgstr "" "Introduzca la misma contraseña nuevamente, para poder verificar la misma." +msgid "Password-based authentication" +msgstr "Autenticación basada en contraseñas" + +msgid "Enabled" +msgstr "Activo" + +msgid "Disabled" +msgstr "Inactivo" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"El sistema no almacena las contraseñas originales por lo cual no es posible " -"visualizar la contraseña de este usuario, pero puede modificarla usando este formulario." +"Las contraseñas en texto plano no se almacenan, por lo que no se puede ver " +"la contraseña del usuario." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Active la autenticación por contraseña para este usuario estableciendo una " +"contraseña." #, python-format msgid "" @@ -102,9 +140,6 @@ msgstr "" msgid "Old password" msgstr "Contraseña antigua" -msgid "Password (again)" -msgstr "Contraseña (de nuevo)" - msgid "algorithm" msgstr "algoritmo" diff --git a/django/contrib/auth/locale/et/LC_MESSAGES/django.mo b/django/contrib/auth/locale/et/LC_MESSAGES/django.mo index 3f13c02b7c..57d2bb03d2 100644 Binary files a/django/contrib/auth/locale/et/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/et/LC_MESSAGES/django.po b/django/contrib/auth/locale/et/LC_MESSAGES/django.po index 604a407a8f..e0dc81d3c0 100644 --- a/django/contrib/auth/locale/et/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/et/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # Jannis Leidel , 2011 # Janno Liivak , 2013,2015 # madisvain , 2011 -# Martin , 2015,2023 +# Martin , 2015,2023-2024 # Martin , 2016-2017 # Marti Raudsepp , 2014,2016 # Ragnar Rebase , 2019 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Martin , 2015,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Martin , 2015,2023-2024\n" "Language-Team: Estonian (http://app.transifex.com/django/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -36,13 +36,23 @@ msgstr "Tähtsad kuupäevad" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s objekt primaarvõtmega %(key)r ei eksisteeri." +msgid "Conflicting form data submitted. Please try again." +msgstr "" + msgid "Password changed successfully." msgstr "Salasõna edukalt muudetud." +msgid "Password-based authentication was disabled." +msgstr "" + #, python-format msgid "Change password: %s" msgstr "Muuda salasõna: %s" +#, python-format +msgid "Set password: %s" +msgstr "" + msgid "Authentication and Authorization" msgstr "Autentimine ja Volitamine" @@ -58,9 +68,21 @@ msgstr "Parool on määramata." msgid "Invalid password format or unknown hashing algorithm." msgstr "Lubamatu parooli formaat või tundmatu räsialgoritm." +msgid "Reset password" +msgstr "Lähtesta parool" + +msgid "Set password" +msgstr "Määra parool" + msgid "The two password fields didn’t match." msgstr "Sisestatud paroolid polnud identsed." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" + msgid "Password" msgstr "Salasõna" @@ -71,13 +93,22 @@ msgid "Enter the same password as before, for verification." msgstr "" "Sisestage sama salasõna uuesti veendumaks, et sisestamisel ei tekkinud vigu" -msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +msgid "Password-based authentication" +msgstr "" + +msgid "Enabled" +msgstr "" + +msgid "Disabled" +msgstr "" + +msgid "" +"Raw passwords are not stored, so there is no way to see the user’s password." +msgstr "" + +msgid "" +"Enable password-based authentication for this user by setting a password." msgstr "" -"Salasõnu ei salvestata töötlemata kujul, seega puudub võimalus selle " -"kasutaja salasõna nägemiseks, kuid saate seda muuta kasutades seda vormi." #, python-format msgid "" @@ -105,9 +136,6 @@ msgstr "Te sisestasite oma vana parooli vigaselt. Palun sisestage see uuesti." msgid "Old password" msgstr "Vana salasõna" -msgid "Password (again)" -msgstr "Salasõna (uuesti)" - msgid "algorithm" msgstr "algoritm" @@ -276,6 +304,8 @@ msgid "" "Enter a valid username. This value may contain only unaccented lowercase a-z " "and uppercase A-Z letters, numbers, and @/./+/-/_ characters." msgstr "" +"Sisesta korrektne kasutajatunnus. See väärtus võib sisaldada ainult suuri ja " +"väikseid ladina tähti, numbreid ning @/./+/-/_ tähemärke." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " diff --git a/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo index b69f2c1f51..054f9ba4a8 100644 Binary files a/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/fr/LC_MESSAGES/django.po b/django/contrib/auth/locale/fr/LC_MESSAGES/django.po index bd652e6617..be32041495 100644 --- a/django/contrib/auth/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/fr/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Claude Paroz , 2013-2019,2021,2023 +# Claude Paroz , 2013-2019,2021,2023-2024 # Claude Paroz , 2013 # Jannis Leidel , 2011 # mlorant , 2014 @@ -9,10 +9,11 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" -"Last-Translator: Claude Paroz , 2013-2019,2021,2023\n" -"Language-Team: French (http://www.transifex.com/django/django/language/fr/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Claude Paroz , " +"2013-2019,2021,2023-2024\n" +"Language-Team: French (http://app.transifex.com/django/django/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -32,13 +33,25 @@ msgstr "Dates importantes" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "L'objet %(name)s avec la clef primaire %(key)r n’existe pas." +msgid "Conflicting form data submitted. Please try again." +msgstr "" +"Conflit détecté dans les données de formulaire envoyées. Veuillez essayer à " +"nouveau." + msgid "Password changed successfully." msgstr "Mot de passe modifié avec succès" +msgid "Password-based authentication was disabled." +msgstr "L'authentification par mot de passe a été désactivée." + #, python-format msgid "Change password: %s" msgstr "Modifier le mot de passe : %s" +#, python-format +msgid "Set password: %s" +msgstr "Définir un mot de passe : %s" + msgid "Authentication and Authorization" msgstr "Authentification et autorisation" @@ -55,9 +68,25 @@ msgid "Invalid password format or unknown hashing algorithm." msgstr "" "Format de mot de passe non valide ou algorithme de hachage non reconnu." +msgid "Reset password" +msgstr "Réinitialiser le mot de passe" + +msgid "Set password" +msgstr "Définir un mot de passe" + msgid "The two password fields didn’t match." msgstr "Les deux mots de passe ne correspondent pas." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Indique si cet utilisateur pourra s'authentifier avec un mot de passe ou " +"pas. Si ce n'est pas le cas, il est possible que l'authentification puisse " +"tout de même se faire par d'autres procédés, comme l'authentification unique " +"(Single Sign-On) ou LDAP." + msgid "Password" msgstr "Mot de passe" @@ -67,13 +96,26 @@ msgstr "Confirmation du mot de passe" msgid "Enter the same password as before, for verification." msgstr "Saisissez le même mot de passe que précédemment, pour vérification." +msgid "Password-based authentication" +msgstr "Authentification par mot de passe" + +msgid "Enabled" +msgstr "Activée" + +msgid "Disabled" +msgstr "Désactivée" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Les mots de passe ne sont pas enregistrés en clair, ce qui ne permet pas " -"d’afficher le mot de passe de cet utilisateur, mais il est possible de le " -"changer en utilisant ce formulaire. " +"Les mots de passe ne sont jamais stockés de manière brute, il n'est donc pas " +"possible de les voir." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Activer l'authentification par mot de passe pour cette personne en " +"définissant un mot de passe." #, python-format msgid "" @@ -102,9 +144,6 @@ msgstr "Votre ancien mot de passe est incorrect. Veuillez le rectifier." msgid "Old password" msgstr "Ancien mot de passe" -msgid "Password (again)" -msgstr "Mot de passe (à nouveau)" - msgid "algorithm" msgstr "algorithme" diff --git a/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo index 3221b186d7..84d1451989 100644 Binary files a/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ga/LC_MESSAGES/django.po b/django/contrib/auth/locale/ga/LC_MESSAGES/django.po index a91375aa8f..2d51e6dd28 100644 --- a/django/contrib/auth/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ga/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Michael Thornhill , 2012,2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-24 13:46+0200\n" -"PO-Revision-Date: 2017-09-24 14:24+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,17 +30,28 @@ msgstr "Dáta tábhactach" #, python-format msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "Níl %(name)s réad le príomheochair %(key)r ann." + +msgid "Conflicting form data submitted. Please try again." msgstr "" +"Sonraí foirmeacha contrártha curtha isteach. Déan iarracht eile le do thoil." msgid "Password changed successfully." msgstr "Focal faire aithraithe rathúil" +msgid "Password-based authentication was disabled." +msgstr "Díchumasaíodh fíordheimhniú pasfhocal-bhunaithe." + #, python-format msgid "Change password: %s" msgstr "Athraigh focal faire: %s" +#, python-format +msgid "Set password: %s" +msgstr "Socraigh pasfhocal: %s" + msgid "Authentication and Authorization" -msgstr "" +msgstr "Fíordheimhniú agus Údarú" msgid "password" msgstr "focal faire" @@ -48,13 +60,29 @@ msgid "last login" msgstr "logáil deirneach" msgid "No password set." -msgstr "" +msgstr "Uimh pasfhocal socraithe." msgid "Invalid password format or unknown hashing algorithm." -msgstr "" +msgstr "Formáid pasfhocail neamhbhailí nó algartam hashing anaithnid." -msgid "The two password fields didn't match." -msgstr "Níl an dá focla faire comhoiriúnigh" +msgid "Reset password" +msgstr "Athshocraigh pasfhocal" + +msgid "Set password" +msgstr "Socraigh pasfhocal" + +msgid "The two password fields didn’t match." +msgstr "Níorbh ionann an dá réimse pasfhocal." + +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Cé acu an mbeidh an t-úsáideoir in ann a fhíordheimhniú ag baint úsáide as " +"pasfhocal nó nach bhfuil. Má tá sé díchumasaithe, seans go mbeidh siad fós " +"in ann fíordheimhniú a dhéanamh trí úsáid a bhaint as hinnill eile, mar " +"shampla Sign-On Aonair nó LDAP." msgid "Password" msgstr "Focal faire" @@ -64,17 +92,37 @@ msgstr "Focal faire deimhniú" msgid "Enter the same password as before, for verification." msgstr "" +"Cuir isteach an pasfhocal céanna agus a rinneadh roimhe seo, le haghaidh " +"fíorú." + +msgid "Password-based authentication" +msgstr "Fíordheimhniú pasfhocal-bhunaithe" + +msgid "Enabled" +msgstr "Cumasaithe" + +msgid "Disabled" +msgstr "Faoi ​​mhíchumas" msgid "" -"Raw passwords are not stored, so there is no way to see this user's " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" +"Ní stóráiltear pasfhocail amh, mar sin níl aon bhealach ann pasfhocal an " +"úsáideora a fheiceáil." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Cumasaigh fíordheimhniú pasfhocal-bhunaithe don úsáideoir seo trí phasfhocal " +"a shocrú." #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" +"Cuir isteach %(username)sagus pasfhocal ceart. Tabhair faoi deara go " +"bhféadfadh an dá réimse a bheith cás-íogair." msgid "This account is inactive." msgstr "Tá an cuntas seo neamhghníomhach." @@ -95,9 +143,6 @@ msgstr "" msgid "Old password" msgstr "Sean-focal faire " -msgid "Password (again)" -msgstr "Focal faire (arís)" - msgid "algorithm" msgstr "algartam" @@ -111,19 +156,19 @@ msgid "hash" msgstr "haiseáil" msgid "variety" -msgstr "" +msgstr "éagsúlacht" msgid "version" -msgstr "" +msgstr "leagan" msgid "memory cost" -msgstr "" +msgstr "costas cuimhne" msgid "time cost" -msgstr "" +msgstr "costas ama" msgid "parallelism" -msgstr "" +msgstr "comhthreomhaireacht" msgid "work factor" msgstr "fachtóir oibre" @@ -131,11 +176,14 @@ msgstr "fachtóir oibre" msgid "checksum" msgstr "suim sheiceála" +msgid "block size" +msgstr "méid bloc" + msgid "name" msgstr "ainm" msgid "content type" -msgstr "" +msgstr "cineál ábhair" msgid "codename" msgstr "Ainm cód" @@ -166,18 +214,22 @@ msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." msgstr "" +"Na grúpaí ar leis an úsáideoir seo iad. Gheobhaidh úsáideoir gach cead a " +"thugtar do gach ceann dá ngrúpa." msgid "user permissions" msgstr "ceada úsáideoira" msgid "Specific permissions for this user." -msgstr "" +msgstr "Ceadanna sonracha don úsáideoir seo." msgid "username" msgstr "Ainm úsáideoir" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" +"Ag teastáil. 150 carachtar nó níos lú. Litreacha, digití agus @/./+/-/_ " +"amháin." msgid "A user with that username already exists." msgstr "In ann do úsáideoir leis an ainm úsáideora." @@ -226,52 +278,73 @@ msgid_plural "" "This password is too short. It must contain at least %(min_length)d " "characters." msgstr[0] "" +"Tá an pasfhocal seo ró-ghearr. Caithfidh %(min_length)d carachtar ar a " +"laghad a bheith ann." msgstr[1] "" +"Tá an pasfhocal seo ró-ghearr. Caithfidh %(min_length)d carachtair ar a " +"laghad a bheith ann." msgstr[2] "" +"Tá an pasfhocal seo ró-ghearr. Caithfidh %(min_length)d carachtair ar a " +"laghad a bheith ann." msgstr[3] "" +"Tá an pasfhocal seo ró-ghearr. Caithfidh %(min_length)d carachtair ar a " +"laghad a bheith ann." msgstr[4] "" +"Tá an pasfhocal seo ró-ghearr. Caithfidh %(min_length)d carachtair ar a " +"laghad a bheith ann." #, python-format msgid "Your password must contain at least %(min_length)d character." msgid_plural "Your password must contain at least %(min_length)d characters." msgstr[0] "" +"Caithfidh %(min_length)d carachtar ar a laghad a bheith i do phasfhocal." msgstr[1] "" +"Caithfidh %(min_length)d carachtair ar a laghad a bheith i do phasfhocal." msgstr[2] "" +"Caithfidh %(min_length)d carachtair ar a laghad a bheith i do phasfhocal." msgstr[3] "" +"Caithfidh %(min_length)d carachtair ar a laghad a bheith i do phasfhocal." msgstr[4] "" +"Caithfidh %(min_length)d carachtair ar a laghad a bheith i do phasfhocal." #, python-format msgid "The password is too similar to the %(verbose_name)s." -msgstr "" +msgstr "Tá an focal faire róchosúil le %(verbose_name)s." -msgid "Your password can't be too similar to your other personal information." +msgid "Your password can’t be too similar to your other personal information." msgstr "" +"Ní féidir le do phasfhocal a bheith róchosúil le d'fhaisnéis phearsanta eile." msgid "This password is too common." -msgstr "" +msgstr "Tá an pasfhocal seo ró-choitianta." -msgid "Your password can't be a commonly used password." +msgid "Your password can’t be a commonly used password." msgstr "" +"Ní féidir le do phasfhocal a bheith ina phasfhocal a úsáidtear go coitianta." msgid "This password is entirely numeric." -msgstr "" +msgstr "Tá an pasfhocal seo go hiomlán uimhriúil." -msgid "Your password can't be entirely numeric." -msgstr "" +msgid "Your password can’t be entirely numeric." +msgstr "Ní féidir le do phasfhocal a bheith uimhriúil go hiomlán." #, python-format msgid "Password reset on %(site_name)s" msgstr "Athshocraigh focal faire ar %(site_name)s" msgid "" -"Enter a valid username. This value may contain only English letters, " -"numbers, and @/./+/-/_ characters." +"Enter a valid username. This value may contain only unaccented lowercase a-z " +"and uppercase A-Z letters, numbers, and @/./+/-/_ characters." msgstr "" +"Cuir isteach ainm úsáideora bailí. Ní fhéadfaidh an luach seo ach litreacha, " +"uimhreacha, agus @/./+//_ A bheith i gceist leis an luach seo." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" +"Cuir isteach ainm úsáideora bailí. Seans nach bhfuil sa luach seo ach " +"litreacha, uimhreacha, agus carachtair @/./+/-/_." msgid "Logged out" msgstr "Logáilte amach" @@ -283,16 +356,16 @@ msgid "Password reset sent" msgstr "Pasfhocal athshocrú sheoladh" msgid "Enter new password" -msgstr "" +msgstr "Cuir isteach pasfhocal nua" msgid "Password reset unsuccessful" -msgstr "" +msgstr "Níor éirigh le hathshocrú pasfhocail" msgid "Password reset complete" -msgstr "" +msgstr "Athshocrú pasfhocail críochnaithe" msgid "Password change" -msgstr "" +msgstr "Athrú pasfhocal" msgid "Password change successful" -msgstr "" +msgstr "D'éirigh le hathrú pasfhocal" diff --git a/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo index 4387835a2e..78adb821d1 100644 Binary files a/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/gl/LC_MESSAGES/django.po b/django/contrib/auth/locale/gl/LC_MESSAGES/django.po index 3fa92e7dcf..92df09f494 100644 --- a/django/contrib/auth/locale/gl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/gl/LC_MESSAGES/django.po @@ -6,15 +6,15 @@ # fasouto , 2019 # Jannis Leidel , 2011 # Leandro Regueiro , 2011,2013 -# X Bello , 2023 +# X Bello , 2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" -"Last-Translator: X Bello , 2023\n" -"Language-Team: Galician (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: X Bello , 2023-2024\n" +"Language-Team: Galician (http://app.transifex.com/django/django/language/" "gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,13 +35,23 @@ msgstr "Datas importantes" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "O obxeto %(name)s ca clave primaria %(key)r non existe." +msgid "Conflicting form data submitted. Please try again." +msgstr "Datos do formulario en conflicto. Por favor, tente de novo." + msgid "Password changed successfully." msgstr "O contrasinal cambiouse correctamente." +msgid "Password-based authentication was disabled." +msgstr "A autentificación por contrasinal foi deshabilitada." + #, python-format msgid "Change password: %s" msgstr "Cambiar o contrasinal: %s" +#, python-format +msgid "Set password: %s" +msgstr "Configurar contrasinal: %s" + msgid "Authentication and Authorization" msgstr "Autenticación e Autorización" @@ -57,9 +67,24 @@ msgstr "Non se configurou ningún contrasinal." msgid "Invalid password format or unknown hashing algorithm." msgstr "Formato de contrasinal non válido ou algoritmo de hash descoñecido." +msgid "Reset password" +msgstr "Reconfigurar contrasinal" + +msgid "Set password" +msgstr "Configurar contrasinal" + msgid "The two password fields didn’t match." msgstr "Os dous campos de contrasinal non coinciden." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Se o usuario vai poder autentificarse usando un contrasinal ou non. Si se " +"deshabilita, poderían ser capaces de autentificarse usando outros medios, " +"como Single Sign-On ou LDAP." + msgid "Password" msgstr "Contrasinal" @@ -69,13 +94,26 @@ msgstr "Confirmación do contrasinal" msgid "Enter the same password as before, for verification." msgstr "Introduza o mesmo contrasinal que antes, para verificalo." +msgid "Password-based authentication" +msgstr "Autentificación basada en contrasinal" + +msgid "Enabled" +msgstr "Habilitada" + +msgid "Disabled" +msgstr "Deshabilitada" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Non se gardan os contrasinais sen cifrar, de maneira que non se pode ver o " -"contrasinal deste usuario, pero pode modificar o contrasinal mediante este formulario." +"Non se gardan os contrasináis en claro, así que non hai maneira de ver o " +"contrasinal do usuario." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Habilite a autentificación basada en contrasinal para este usuario " +"configurando un contrasinal." #, python-format msgid "" @@ -103,9 +141,6 @@ msgstr "Inseriu incorrectamente o seu contrasinal actual. Insírao de novo." msgid "Old password" msgstr "Contrasinal antigo" -msgid "Password (again)" -msgstr "Contrasinal (outra vez)" - msgid "algorithm" msgstr "algoritmo" diff --git a/django/contrib/auth/locale/hsb/LC_MESSAGES/django.mo b/django/contrib/auth/locale/hsb/LC_MESSAGES/django.mo index 5b76e7b43f..ecc53cdd46 100644 Binary files a/django/contrib/auth/locale/hsb/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/hsb/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/hsb/LC_MESSAGES/django.po b/django/contrib/auth/locale/hsb/LC_MESSAGES/django.po index 1293c03bb5..a6ddea5cec 100644 --- a/django/contrib/auth/locale/hsb/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/hsb/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Michael Wolf , 2016-2017,2019,2021,2023 +# Michael Wolf , 2016-2017,2019,2021,2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" "Last-Translator: Michael Wolf , " -"2016-2017,2019,2021,2023\n" -"Language-Team: Upper Sorbian (http://www.transifex.com/django/django/" +"2016-2017,2019,2021,2023-2024\n" +"Language-Team: Upper Sorbian (http://app.transifex.com/django/django/" "language/hsb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,13 +32,23 @@ msgstr "Wažne daty" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekt %(name)s z primarnym klučom %(key)r njeeksistuje." +msgid "Conflicting form data submitted. Please try again." +msgstr "Přećiwne formularowe daty zapodate. Prošu spytajće hišće raz." + msgid "Password changed successfully." msgstr "Hesło je so wuspěšnje změniło." +msgid "Password-based authentication was disabled." +msgstr "Awtentifikacija na zakładźe hesła je so znjemóžniła." + #, python-format msgid "Change password: %s" msgstr "Hesło změnić: %s" +#, python-format +msgid "Set password: %s" +msgstr "Nastajene hesło: %s" + msgid "Authentication and Authorization" msgstr "Awtentifikacija a awtorizacija" @@ -54,9 +64,24 @@ msgstr "Žane hesło nastajene." msgid "Invalid password format or unknown hashing algorithm." msgstr "Njepłaćiwy hesłowy format abo njeznaty kontrolny algoritmus." +msgid "Reset password" +msgstr "Hesło wróćo stajić" + +msgid "Set password" +msgstr "Hesło postajić" + msgid "The two password fields didn’t match." msgstr "Dwě heslowej poli sej njewotpowědujetej." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Hač wužiwar móže z hesłom awtentifikować abo nic. Jeli to je znjemóžnjene, " +"je hišće móžno, z druhimi backendami awtentifikować, na přikład Single Sign-" +"On abo LDAP." + msgid "Password" msgstr "Hesło" @@ -66,12 +91,25 @@ msgstr "Hesłowe wobkrućenje" msgid "Enter the same password as before, for verification." msgstr "Zapodajće samsne hesło kaž do toho, za přepruwowanje." +msgid "Password-based authentication" +msgstr "Awtentifikacija na zakładźe hesła" + +msgid "Enabled" +msgstr "Zmóžnjeny" + +msgid "Disabled" +msgstr "Znjemóžnjeny" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Hrube hesła so njeskładuja, tohodla njeda so hesło tutoho wužwarja widźeć, " -"ale móžeće hesło z pomocu tutoho formulara změnić. " +"Hrube hesła so njeskładuja, tohodla móžnosć njeje, hesło wužiwarja widźeć." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Postajće hesło, zo byšće awtentifikaciju na zakładźe hesło za tutoho " +"wužiwarja zmóžnił." #, python-format msgid "" @@ -99,9 +137,6 @@ msgstr "Waše stare hesło je so wopak zapodało. Prošu zapodajće jo hišće r msgid "Old password" msgstr "Stare hesło" -msgid "Password (again)" -msgstr "Hesło (znowa)" - msgid "algorithm" msgstr "algoritmus" diff --git a/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo index a6d3789919..c3c329f515 100644 Binary files a/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ja/LC_MESSAGES/django.po b/django/contrib/auth/locale/ja/LC_MESSAGES/django.po index a1cbcfcf67..4dcc3fdc21 100644 --- a/django/contrib/auth/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ja/LC_MESSAGES/django.po @@ -5,15 +5,16 @@ # arupakan125 , 2020 # Masashi SHIBATA , 2017 # Nikita K , 2019 -# Shinya Okano , 2013-2016,2021,2023 +# Shinya Okano , 2013-2016,2021,2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" -"Last-Translator: Shinya Okano , 2013-2016,2021,2023\n" -"Language-Team: Japanese (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Shinya Okano , " +"2013-2016,2021,2023-2024\n" +"Language-Team: Japanese (http://app.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,13 +35,23 @@ msgstr "重要な日程" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "主キーが %(key)r である %(name)s オブジェクトは存在しません。" +msgid "Conflicting form data submitted. Please try again." +msgstr "送信されたフォームデータは競合しています。もう一度試してみてください。" + msgid "Password changed successfully." msgstr "パスワードを変更しました" +msgid "Password-based authentication was disabled." +msgstr "パスワードによる認証は無効化されました。" + #, python-format msgid "Change password: %s" msgstr "パスワードの変更: %s" +#, python-format +msgid "Set password: %s" +msgstr "パスワード設定: %s" + msgid "Authentication and Authorization" msgstr "認証と認可" @@ -56,9 +67,23 @@ msgstr "パスワードは設定されませんでした。" msgid "Invalid password format or unknown hashing algorithm." msgstr "無効なパスワードか不明なハッシュアルゴリズムです。" +msgid "Reset password" +msgstr "パスワードをリセット" + +msgid "Set password" +msgstr "パスワードを設定" + msgid "The two password fields didn’t match." msgstr "確認用パスワードが一致しません。" +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"ユーザーがパスワードを使用して認証できるかどうか。無効にしても、シングルサイ" +"ンオンや LDAP などの他のバックエンドを使用して認証できる可能性があります。" + msgid "Password" msgstr "パスワード" @@ -68,13 +93,23 @@ msgstr "パスワード(確認用)" msgid "Enter the same password as before, for verification." msgstr "確認のため、再度パスワードを入力してください。" +msgid "Password-based authentication" +msgstr "パスワードによる認証" + +msgid "Enabled" +msgstr "有効" + +msgid "Disabled" +msgstr "無効" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"生のパスワードは格納されていないため、このユーザのパスワードを確認する方法は" -"ありません。しかしこのフォームを使用してパスワードを変更で" -"きます。" +"パスワードは平文では保存されず、ユーザーのパスワードを見る方法もありません。" + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "パスワードを設定し、このユーザーでパスワードによる認証を有効にします。" #, python-format msgid "" @@ -102,9 +137,6 @@ msgstr "元のパスワードが間違っています。もう一度入力して msgid "Old password" msgstr "元のパスワード" -msgid "Password (again)" -msgstr "パスワード(確認用)" - msgid "algorithm" msgstr "アルゴリズム" diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo index 8d9d49f49d..cb8ce59dfb 100644 Binary files a/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po index 2c8e742c0e..00379eabff 100644 --- a/django/contrib/auth/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/lv/LC_MESSAGES/django.po @@ -1,10 +1,11 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Edgars Voroboks , 2023 +# Edgars Voroboks , 2023-2024 # Edgars Voroboks , 2017,2022 # Edgars Voroboks , 2017 # Jannis Leidel , 2011 +# Kaspars Gūtmanis, 2024 # Edgars Voroboks , 2019,2021 # peterisb , 2016 # Pēteris Caune, 2023 @@ -12,10 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" -"Last-Translator: Pēteris Caune, 2023\n" -"Language-Team: Latvian (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Edgars Voroboks , 2023-2024\n" +"Language-Team: Latvian (http://app.transifex.com/django/django/language/" "lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,13 +38,23 @@ msgstr "Svarīgi datumi" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s objekts ar primāro atslēgu %(key)r neeksistē." +msgid "Conflicting form data submitted. Please try again." +msgstr "Iesniegti pretrunīgi veidlapas dati. Lūdzu mēģiniet vēlreiz." + msgid "Password changed successfully." msgstr "Parole nomainīta sekmīgi." +msgid "Password-based authentication was disabled." +msgstr "Paroles bāzēta autentifikācija tika atspējota." + #, python-format msgid "Change password: %s" msgstr "Paroles maiņa: %s" +#, python-format +msgid "Set password: %s" +msgstr "Iestatīt paroli: %s" + msgid "Authentication and Authorization" msgstr "Autentifikācija un autorizācija" @@ -59,9 +70,25 @@ msgstr "Nav norādīta parole" msgid "Invalid password format or unknown hashing algorithm." msgstr "Nederīgs paroles formāts vai nezināms hash algoritms." +msgid "Reset password" +msgstr "Atiestatīt paroli" + +msgid "Set password" +msgstr "Iestatīt paroli" + msgid "The two password fields didn’t match." msgstr "Paroles lauki nesakrita." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Vai lietotājs varēs autentificēties, izmantojot paroli, vai nē. Ja " +"atspējots, lietotāji joprojām varēs autentificēties, izmantojot citas " +"autentifikācijas sistēmas, piemēram, vienreizējo pierakstīšanos (Single Sign-" +"On) vai LDAP." + msgid "Password" msgstr "Parole" @@ -71,12 +98,25 @@ msgstr "Paroles apstiprinājums" msgid "Enter the same password as before, for verification." msgstr "Ievadi iepriekš norādīto paroli verifikācijai." +msgid "Password-based authentication" +msgstr "Paroles bāzēta autentifikācija" + +msgid "Enabled" +msgstr "Iespējots" + +msgid "Disabled" +msgstr "Atspējots" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Paroles netiek glabātas brīvā tekstā, tāpēc nav iespējams apskatīt lietotāja " -"paroli, bet jūs varat to nomainīt, izmantojot šo formu." +"Nešifrētas paroles netiek saglabātas, tāpēc nav iespējams apskatīt lietotāja " +"paroli." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Iespējojiet šim lietotājam paroles balstītu autentifikāciju, iestatot paroli." #, python-format msgid "" @@ -96,7 +136,7 @@ msgid "New password" msgstr "Jaunā parole" msgid "New password confirmation" -msgstr "Jaunās parole vēlreiz" +msgstr "Jaunā parole vēlreiz" msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" @@ -105,9 +145,6 @@ msgstr "" msgid "Old password" msgstr "Vecā parole" -msgid "Password (again)" -msgstr "Parole (vēlreiz)" - msgid "algorithm" msgstr "algoritms" diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo index a3dd8c6c96..03cc863b42 100644 Binary files a/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po index f1524f3148..b9c8eb97ed 100644 --- a/django/contrib/auth/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/nl/LC_MESSAGES/django.po @@ -12,14 +12,14 @@ # 6a27f10aef159701c7a5ff07f0fb0a78_05545ed , 2011-2012 # 8de006b1b0894aab6aef71979dcd8bd6_5c6b207 , 2015 # Tino de Bruijn , 2011 -# Tonnes , 2019,2022-2023 +# Tonnes , 2019,2022-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Tonnes , 2019,2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Tonnes , 2019,2022-2024\n" "Language-Team: Dutch (http://app.transifex.com/django/django/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -40,13 +40,23 @@ msgstr "Belangrijke datums" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-object met primaire sleutel %(key)r bestaat niet." +msgid "Conflicting form data submitted. Please try again." +msgstr "Conflicterende formuliergegevens ingediend. Probeer het opnieuw." + msgid "Password changed successfully." msgstr "Het wachtwoord is gewijzigd." +msgid "Password-based authentication was disabled." +msgstr "Op wachtwoord gebaseerde authenticatie is uitgeschakeld." + #, python-format msgid "Change password: %s" msgstr "Wachtwoord wijzigen: %s" +#, python-format +msgid "Set password: %s" +msgstr "Wachtwoord instellen: %s" + msgid "Authentication and Authorization" msgstr "Authenticatie en autorisatie" @@ -62,9 +72,24 @@ msgstr "Er is geen wachtwoord ingesteld." msgid "Invalid password format or unknown hashing algorithm." msgstr "Ongeldige wachtwoordindeling of onbekend hash-algoritme." +msgid "Reset password" +msgstr "Wachtwoord opnieuw instellen" + +msgid "Set password" +msgstr "Wachtwoord instellen" + msgid "The two password fields didn’t match." msgstr "De twee wachtwoordvelden komen niet overeen." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Of de gebruiker zich kan authenticeren via een wachtwoord of niet. Wanneer " +"uitgeschakeld, kan deze zich mogelijk alsnog authenticeren via andere " +"backends, zoals Eenmalige aanmelding (SSO) of LDAP." + msgid "Password" msgstr "Wachtwoord" @@ -74,13 +99,26 @@ msgstr "Bevestiging wachtwoord" msgid "Enter the same password as before, for verification." msgstr "Voer ter verificatie nogmaals het wachtwoord in." +msgid "Password-based authentication" +msgstr "Op wachtwoord gebaseerde authenticatie" + +msgid "Enabled" +msgstr "Ingeschakeld" + +msgid "Disabled" +msgstr "Uitgeschakeld" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Wachtwoorden worden niet als tekst opgeslagen, dus u kunt het wachtwoord van " -"deze gebruiker niet zien. U kunt het wel wijzigen via dit " -"formulier." +"Wachtwoorden in tekstvorm worden niet bewaard, dus er is geen manier om het " +"wachtwoord van de gebruiker te zien." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Schakel op wachtwoord gebaseerde authenticatie in voor deze gebruiker door " +"een wachtwoord in te stellen." #, python-format msgid "" @@ -108,9 +146,6 @@ msgstr "Uw oude wachtwoord is niet juist ingevoerd. Voer het opnieuw in." msgid "Old password" msgstr "Oud wachtwoord" -msgid "Password (again)" -msgstr "Wachtwoord (nogmaals)" - msgid "algorithm" msgstr "algoritme" diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo index 21adcc39a1..0adb538f1d 100644 Binary files a/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po index 4861a4347b..369d7ea878 100644 --- a/django/contrib/auth/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/pl/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ # Maciej Olko , 2016-2017,2019,2021 # Maciej Olko , 2023 # Maciej Olko , 2014-2015 -# Mariusz Felisiak , 2023 +# Mariusz Felisiak , 2023-2024 # muszalski , 2016 # c10516f0462e552b4c3672569f0745a7_cc5cca2 <841826256cd8f47d0e443806a8e56601_19204>, 2014 # Mattia Procopio , 2014 @@ -19,10 +19,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" -"Last-Translator: Mariusz Felisiak , 2023\n" -"Language-Team: Polish (http://www.transifex.com/django/django/language/pl/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Mariusz Felisiak , 2023-2024\n" +"Language-Team: Polish (http://app.transifex.com/django/django/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -44,13 +44,23 @@ msgstr "Ważne daty" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Obiekt %(name)s o kluczu podstawowym %(key)r nie istnieje." +msgid "Conflicting form data submitted. Please try again." +msgstr "Przesłano konfliktujące dane w formularzu. Proszę spróbować ponownie." + msgid "Password changed successfully." msgstr "Hasło zostało zmienione pomyślnie." +msgid "Password-based authentication was disabled." +msgstr "Uwierzytelnianie oparte na haśle zostało wyłączone." + #, python-format msgid "Change password: %s" msgstr "Zmień hasło: %s" +#, python-format +msgid "Set password: %s" +msgstr "Ustaw hasło: %s" + msgid "Authentication and Authorization" msgstr "Uwierzytelnienie i autoryzacja" @@ -68,9 +78,25 @@ msgstr "" "Format hasła jest niewłaściwy, bądź zastosowana została nieznana funkcja " "skrótu (hash)." +msgid "Reset password" +msgstr "Zresetuj hasło" + +msgid "Set password" +msgstr "Ustaw hasło" + msgid "The two password fields didn’t match." msgstr "Hasła w obu polach nie są zgodne." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Czy użytkownik będzie mógł zostać uwierzytelniony przy użyciu hasła, czy " +"nie. Jeżeli wyłączone, użytkownik może ciągle być w stanie zostać " +"uwierzytelnionym przy użyciu innego mechanizmu takiego jak pojedyncze " +"logowanie - SSO lub LDAP." + msgid "Password" msgstr "Hasło" @@ -80,13 +106,26 @@ msgstr "Potwierdzenie hasła" msgid "Enter the same password as before, for verification." msgstr "Wprowadź to samo hasło ponownie, dla weryfikacji." +msgid "Password-based authentication" +msgstr "Uwierzytelnianie oparte na haśle" + +msgid "Enabled" +msgstr "Włączone" + +msgid "Disabled" +msgstr "Wyłączone" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Nie przechowujemy surowych haseł, więc nie da się zobaczyć hasła tego " -"użytkownika. Możesz jednak je zmienić używając tego " -"formularza." +"Hasła nie są przechowywane w postaci jawnej, dlatego nie ma możliwości " +"zobaczenia hasła użytkownika." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Włącz uwierzytelnianie oparte na haśle dla tego użytkownika poprzez " +"ustawienie hasła." #, python-format msgid "" @@ -114,9 +153,6 @@ msgstr "Podane stare hasło jest niepoprawne. Proszę podać je jeszcze raz." msgid "Old password" msgstr "Stare hasło" -msgid "Password (again)" -msgstr "Hasło (powtórz)" - msgid "algorithm" msgstr "algorytm" diff --git a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo index 35f0116987..cfcca90d86 100644 Binary files a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po index 2fd5867458..2572ebfaf9 100644 --- a/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/pt_BR/LC_MESSAGES/django.po @@ -5,12 +5,13 @@ # Amanda Savluchinske , 2019 # amcorreia , 2018 # Camilo B. Moreira , 2017 -# Carlos C. Leite , 2016 +# Carlos Cadu “Cadu” Leite , 2016 # Filipe Cifali , 2016 # Claudemiro Alves Feitosa Neto , 2015 # dudanogueira , 2012 # dudanogueira , 2014 # Eduardo Cereto Carvalho, 2013 +# Eduardo Felipe Castegnaro , 2024 # Elyézer Rezende , 2013 # Evandro da Costa , 2023 # Fábio C. Barrionuevo da Luz , 2015 @@ -25,9 +26,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Evandro da Costa , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Eduardo Felipe Castegnaro , 2024\n" "Language-Team: Portuguese (Brazil) (http://app.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -49,13 +50,23 @@ msgstr "Datas importantes" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "objeto %(name)s com chave primária %(key)r não existe." +msgid "Conflicting form data submitted. Please try again." +msgstr "Formulário com datos conflitantes. Por favor, tente novamente." + msgid "Password changed successfully." msgstr "Senha modificada com sucesso." +msgid "Password-based authentication was disabled." +msgstr "Autenticação baseada em senha foi desabilitada." + #, python-format msgid "Change password: %s" msgstr "Alterar senha: %s" +#, python-format +msgid "Set password: %s" +msgstr "Configurar senha: %s" + msgid "Authentication and Authorization" msgstr "Autenticação e Autorização" @@ -71,9 +82,24 @@ msgstr "Nenhuma senha definida." msgid "Invalid password format or unknown hashing algorithm." msgstr "Formato de senha inválido ou algoritmo de hash desconhecido." +msgid "Reset password" +msgstr "Reconfigurar senha" + +msgid "Set password" +msgstr "Configurar senha" + msgid "The two password fields didn’t match." msgstr "Os dois campos de senha não correspondem." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Se este usuário conseguirá autenticar usando uma senha ou não. Se " +"desabilitado ainda será possível autenticar utilizando outros métodos, como " +"Login Único ou LDAP." + msgid "Password" msgstr "Senha" @@ -83,13 +109,26 @@ msgstr "Confirmação de senha" msgid "Enter the same password as before, for verification." msgstr "Informe a mesma senha informada anteriormente, para verificação." +msgid "Password-based authentication" +msgstr "Autenticação baseada em senha" + +msgid "Enabled" +msgstr "Habilitado" + +msgid "Disabled" +msgstr "Desabilitado" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Senhas brutas não são armazenadas, então não há como visualizar a senha " -"desse usuário, porém você pode mudar a senha usando esse " -"form." +"Senhas não são armazenadas diretamente, então não é possível ver a senha do " +"usuário." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Habilitar autenticação baseada em senha para este usuário ao configurar uma " +"senha." #, python-format msgid "" @@ -118,9 +157,6 @@ msgstr "" msgid "Old password" msgstr "Senha antiga" -msgid "Password (again)" -msgstr "Senha (novamente)" - msgid "algorithm" msgstr "algoritmo" diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo index 447f166a99..8e29fa81dd 100644 Binary files a/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po index a7f209dbbb..16430cf1ff 100644 --- a/django/contrib/auth/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ru/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # crazyzubr , 2020 # Ivan Khomutov , 2017 # Jannis Leidel , 2011 -# Алексей Борискин , 2012-2015,2022-2023 +# Алексей Борискин , 2012-2015,2022-2024 # Андрей Щуров , 2016 # Влад Мещеряков , 2021 # Bobsans , 2016 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Алексей Борискин , 2012-2015,2022-2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Алексей Борискин , 2012-2015,2022-2024\n" "Language-Team: Russian (http://app.transifex.com/django/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -38,13 +38,24 @@ msgstr "Важные даты" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s с первичным ключом %(key)r не существует." +msgid "Conflicting form data submitted. Please try again." +msgstr "" +"Отправлены взаимоисключающие данные. Измените данные и попробуйте снова." + msgid "Password changed successfully." msgstr "Пароль успешно изменен." +msgid "Password-based authentication was disabled." +msgstr "Аутентификация по паролю была запрещена." + #, python-format msgid "Change password: %s" msgstr "Изменить пароль: %s" +#, python-format +msgid "Set password: %s" +msgstr "Задать пароль: %s" + msgid "Authentication and Authorization" msgstr "Пользователи и группы" @@ -60,9 +71,24 @@ msgstr "Пароль не задан." msgid "Invalid password format or unknown hashing algorithm." msgstr "Неизвестный формат пароля или алгоритм хеширования." +msgid "Reset password" +msgstr "Сбросить пароль" + +msgid "Set password" +msgstr "Задать пароль" + msgid "The two password fields didn’t match." msgstr "Введенные пароли не совпадают." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Может ли пользователь аутентифироваться по паролю. Если эта возможность " +"выключена, пользователь всё ещё может аутентифицироваться иными способами, " +"например, Single Sing-On или LDAP, если они сконфигурированы и разрешены." + msgid "Password" msgstr "Пароль" @@ -72,13 +98,25 @@ msgstr "Подтверждение пароля" msgid "Enter the same password as before, for verification." msgstr "Для подтверждения введите, пожалуйста, пароль ещё раз." +msgid "Password-based authentication" +msgstr "Аутентификация по паролю" + +msgid "Enabled" +msgstr "Разрешена" + +msgid "Disabled" +msgstr "Запрещена" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Пароли хранятся в зашифрованном виде, поэтому нет возможности посмотреть " -"пароль этого пользователя, но вы можете изменить его используя эту форму." +"Мы не храним сырые пароли, поэтому не существует способа посмотреть пароль " +"пользователя." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Разрешить аутентификацию по паролю для этого пользователя, задав его пароль." #, python-format msgid "" @@ -106,9 +144,6 @@ msgstr "Ваш старый пароль введен неправильно. П msgid "Old password" msgstr "Старый пароль" -msgid "Password (again)" -msgstr "Пароль (еще раз)" - msgid "algorithm" msgstr "алгоритм" diff --git a/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo index fa6e2e03a0..c6df60e4e9 100644 Binary files a/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sk/LC_MESSAGES/django.po b/django/contrib/auth/locale/sk/LC_MESSAGES/django.po index 63483a7ac1..dfa64b7b25 100644 --- a/django/contrib/auth/locale/sk/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sk/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Adam Zahradník, 2023 +# Adam Zahradník, 2023-2024 # Jannis Leidel , 2011 # 18f25ad6fa9930fc67cb11aca9d16a27, 2012-2014 # Marian Andre , 2015,2017 @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Martin Tóth , 2017-2018,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" +"Last-Translator: Adam Zahradník, 2023-2024\n" "Language-Team: Slovak (http://app.transifex.com/django/django/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,13 +36,23 @@ msgstr "Dôležité dátumy" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekt %(name)s s primárnym kľúčom %(key)r neexistuje." +msgid "Conflicting form data submitted. Please try again." +msgstr "Neplatná požiadavka. Skúste to prosím znova." + msgid "Password changed successfully." msgstr "Heslo úspešne zmenené." +msgid "Password-based authentication was disabled." +msgstr "Prihlasovanie pomocou hesla bolo vypnuté." + #, python-format msgid "Change password: %s" msgstr "Zmeniť heslo: %s" +#, python-format +msgid "Set password: %s" +msgstr "Nastaviť heslo: %s" + msgid "Authentication and Authorization" msgstr "Autentifikácia a autorizácia" @@ -58,9 +68,24 @@ msgstr "Žiadne heslo." msgid "Invalid password format or unknown hashing algorithm." msgstr "Neplatný formát hesla alebo neznámy hašovací algoritmus." +msgid "Reset password" +msgstr "Obnoviť heslo" + +msgid "Set password" +msgstr "Nastaviť heslo" + msgid "The two password fields didn’t match." msgstr "Heslo a jeho potvrdenie sa nezhodujú." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Určuje, či sa bude používateľ môcť prihlásiť pomocou hesla. Ak je " +"prihlasovanie pomocou hesla vypnuté, stále sa bude môcť vedieť prihlásiť " +"pomocou iných metód, ako napríklad Single Sign-On alebo LDAP." + msgid "Password" msgstr "Heslo" @@ -70,13 +95,25 @@ msgstr "Potvrdenie hesla" msgid "Enter the same password as before, for verification." msgstr "Kvôli overeniu, znovu zadajte rovnaké heslo." +msgid "Password-based authentication" +msgstr "Prihlasovanie pomocou hesla" + +msgid "Enabled" +msgstr "Povolené" + +msgid "Disabled" +msgstr "Vypnuté" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Heslá v pôvodnom tvare nie sú ukladané, takže neexistuje spôsob zobraziť " -"heslo užívateľa. Môžete ho však zmeniť pomocou tohoto " -"formulára." +"Nie je možné zobraziť si používateľovo heslo, nakoľko sa samotné heslá " +"neukladajú." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Nastavením hesla povolíte používateľovi prihlasovanie sa pomocou hesla." #, python-format msgid "" @@ -104,9 +141,6 @@ msgstr "Nezadali ste správne svoje staré heslo. Napíšte ho znovu, prosím." msgid "Old password" msgstr "Staré heslo" -msgid "Password (again)" -msgstr "Heslo (znova)" - msgid "algorithm" msgstr "algoritmus" diff --git a/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo index 8f64e2e75d..8a94a846ca 100644 Binary files a/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sq/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sq/LC_MESSAGES/django.po b/django/contrib/auth/locale/sq/LC_MESSAGES/django.po index fa5eb0f42a..2e52bbc278 100644 --- a/django/contrib/auth/locale/sq/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sq/LC_MESSAGES/django.po @@ -2,15 +2,15 @@ # # Translators: # Besnik Bleta , 2011,2015 -# Besnik Bleta , 2023 +# Besnik Bleta , 2023-2024 # Besnik Bleta , 2015,2017,2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Besnik Bleta , 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Besnik Bleta , 2023-2024\n" "Language-Team: Albanian (http://app.transifex.com/django/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -32,13 +32,23 @@ msgstr "Të dhëna të rëndësishme" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "S’ekziston objekt %(name)s me kyç parësor %(key)r." +msgid "Conflicting form data submitted. Please try again." +msgstr "U parashtruar të dhëna formulari me përplasje. Ju lutemi, riprovoni." + msgid "Password changed successfully." msgstr "Fjalëkalimi u ndryshua me sukses." +msgid "Password-based authentication was disabled." +msgstr "Mirëfilltësimi me bazë fjalëkalimin u çaktivizua." + #, python-format msgid "Change password: %s" msgstr "Ndryshoni fjalëkalimin: %s" +#, python-format +msgid "Set password: %s" +msgstr "Caktoni fjalëkalim: %s" + msgid "Authentication and Authorization" msgstr "Mirëfilltësim dhe Autorizim" @@ -54,9 +64,25 @@ msgstr "S’ka fjalëkalim të caktuar." msgid "Invalid password format or unknown hashing algorithm." msgstr "Format i pavlefshëm fjalëkalimi ose algoritëm i panjohur hashi." +msgid "Reset password" +msgstr "Ricaktoni fjalëkalim" + +msgid "Set password" +msgstr "Caktoni fjalëkalim" + msgid "The two password fields didn’t match." msgstr "Dy fushat për fjalëkalim s’u përputhën." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Do të jetë apo jo në gjendje përdoruesi të bëjë mirëfilltësimin me " +"fjalëkalim. Në u çaktivizoftë, prapë mund të jetë në gjendje të bëjë " +"mirëfilltësimin duke përdorur mekanizma të tjera, fjala vjen, Hyrje Njëshe " +"(Single Sign-On), ose LDAP." + msgid "Password" msgstr "Fjalëkalim" @@ -66,13 +92,26 @@ msgstr "Ripohim fjalëkalimi" msgid "Enter the same password as before, for verification." msgstr "Jepni, për verifikim, të njëjtin fjalëkalim si më parë." +msgid "Password-based authentication" +msgstr "Mirëfilltësim me bazë fjalëkalimin" + +msgid "Enabled" +msgstr "I aktivizuar" + +msgid "Disabled" +msgstr "I çaktivizuar" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Nuk depozitohen fjalëkalime të papërpunuar, ndaj s’ka ndonjë mënyrë për të " -"parë fjalëkalimin e këtij përdoruesi, por mund ta ndryshoni fjalëkalimin " -"duke përdorur këtë formular." +"Nuk ruhen fjalëkalime shqeto, ndaj s’ka ndonjë rrugë për të parë " +"fjalëkalimin e përdoruesit." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Aktivizoni mirëfilltësim me bazë fjalëkalime për këtë përdorues, duke " +"caktuar një fjalëkalim." #, python-format msgid "" @@ -102,9 +141,6 @@ msgstr "" msgid "Old password" msgstr "Fjalëkalim i vjetër" -msgid "Password (again)" -msgstr "Fjalëkalim (sërish)" - msgid "algorithm" msgstr "algoritëm" diff --git a/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo index 106347a42f..997c566d3c 100644 Binary files a/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sr/LC_MESSAGES/django.po b/django/contrib/auth/locale/sr/LC_MESSAGES/django.po index 9a770c5588..27c945b11f 100644 --- a/django/contrib/auth/locale/sr/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sr/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Igor Jerosimić, 2020-2021,2023 +# Igor Jerosimić, 2020-2021,2023-2024 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Igor Jerosimić, 2020-2021,2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Igor Jerosimić, 2020-2021,2023-2024\n" "Language-Team: Serbian (http://app.transifex.com/django/django/language/" "sr/)\n" "MIME-Version: 1.0\n" @@ -33,13 +33,23 @@ msgstr "Важни датуми" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s објекат са примарним кључем %(key)r не постоји." +msgid "Conflicting form data submitted. Please try again." +msgstr "Послати су конфликтни подаци из обрасца. Молим вас, покушајте поново." + msgid "Password changed successfully." msgstr "Лозинка успешно измењена." +msgid "Password-based authentication was disabled." +msgstr "Потврда идентитета заснована на лозинки је онемогућена." + #, python-format msgid "Change password: %s" msgstr "Измени лозинку: %s" +#, python-format +msgid "Set password: %s" +msgstr "Постави лозинку: %s" + msgid "Authentication and Authorization" msgstr "Аутентикација и Ауторизација" @@ -55,9 +65,24 @@ msgstr "Лозинка није унета." msgid "Invalid password format or unknown hashing algorithm." msgstr "Инвалидан формат лозинке или непознат hashing алгоритам." +msgid "Reset password" +msgstr "Ресетуј лозинку" + +msgid "Set password" +msgstr "Постави лозинку" + msgid "The two password fields didn’t match." msgstr "Два поља за лозинке се не поклапају." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Да ли ће корисник моћи да се аутентификује помоћу лозинке или не. Ако је " +"онемогућено, можда ће и даље моћи да се аутентификују помоћу других " +"позадинских делова, као што су једнократно пријављивање (SSO) или LDAP." + msgid "Password" msgstr "Лозинка" @@ -67,13 +92,26 @@ msgstr "Потврда лозинке" msgid "Enter the same password as before, for verification." msgstr "Унесите исту лозинку као малопре ради верификације." +msgid "Password-based authentication" +msgstr "Потврда идентитета заснована на лозинки" + +msgid "Enabled" +msgstr "Омогућено" + +msgid "Disabled" +msgstr "Онемогућено" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Лозинке се не чувају у изворном облику па не постоји могућност приказа " -"лозинке овог корисника, али можете променити лозинку коришћењем ове форме." +"Необрађене лозинке се не чувају, тако да не постоји начин да се види " +"корисничка лозинка." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Омогући аутентификацију засновану на лозинки за овог корисника постављањем " +"лозинке." #, python-format msgid "" @@ -101,9 +139,6 @@ msgstr "Ваша стара лознка није правилно унесен msgid "Old password" msgstr "Стара лозинка" -msgid "Password (again)" -msgstr "Лозинка (поновите)" - msgid "algorithm" msgstr "алгоритам" diff --git a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo index f335b55f30..17f9bb3aef 100644 Binary files a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po index fdfda7d123..7798e5472a 100644 --- a/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sr_Latn/LC_MESSAGES/django.po @@ -1,228 +1,333 @@ # This file is distributed under the same license as the Django package. -# +# # Translators: -# Igor Jerosimić, 2021,2023 +# Igor Jerosimić, 2021,2023-2024 # Jannis Leidel , 2011 # Janos Guljas , 2011-2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Igor Jerosimić, 2021,2023\n" -"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/" -"language/sr@latin/)\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Igor Jerosimić, 2021,2023-2024\n" +"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/language/sr@latin/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr@latin\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" +"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" +#: contrib/auth/admin.py:49 msgid "Personal info" msgstr "Lični podaci" +#: contrib/auth/admin.py:51 msgid "Permissions" msgstr "Dozvole" +#: contrib/auth/admin.py:62 msgid "Important dates" msgstr "Važni datumi" +#: contrib/auth/admin.py:156 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "" +msgstr "Objekat %(name)s sa primarnim ključem %(key)r ne postoji." +#: contrib/auth/admin.py:177 +msgid "Conflicting form data submitted. Please try again." +msgstr "Poslati su konfliktni podaci iz obrasca. Molim vas, pokušajte ponovo." + +#: contrib/auth/admin.py:168 msgid "Password changed successfully." msgstr "Lozinka uspešno izmenjena." +#: contrib/auth/admin.py:187 +msgid "Password-based authentication was disabled." +msgstr "Potvrda identiteta zasnovana na lozinki je onemogućena." + +#: contrib/auth/admin.py:189 #, python-format msgid "Change password: %s" msgstr "Izmeni lozinku: %s" +#: contrib/auth/admin.py:210 +#, python-format +msgid "Set password: %s" +msgstr "Postavi lozinku: %s" + +#: contrib/auth/apps.py:16 msgid "Authentication and Authorization" msgstr "Autentikacija i Autorizacija" +#: contrib/auth/base_user.py:58 msgid "password" msgstr "lozinka" +#: contrib/auth/base_user.py:59 msgid "last login" msgstr "poslednja prijava" +#: contrib/auth/forms.py:41 msgid "No password set." msgstr "Lozinka nije uneta." +#: contrib/auth/forms.py:49 msgid "Invalid password format or unknown hashing algorithm." msgstr "Neispravan format lozinke ili nepoznat heš algoritam." +#: contrib/auth/forms.py:59 +msgid "Reset password" +msgstr "Resetuj lozinku" + +#: contrib/auth/forms.py:59 +msgid "Set password" +msgstr "Postavi lozinku" + +#: contrib/auth/forms.py:91 contrib/auth/forms.py:379 +#: contrib/auth/forms.py:457 msgid "The two password fields didn’t match." msgstr "Dva polja za lozinke se ne poklapaju." +#: contrib/auth/forms.py:107 +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "Da li će korisnik moći da se autentifikuje pomoću lozinke ili ne. Ako je onemogućeno, možda će i dalje moći da se autentifikuju pomoću drugih pozadinskih delova, kao što su jednokratno prijavljivanje (SSO) ili LDAP." + +#: contrib/auth/forms.py:94 contrib/auth/forms.py:166 +#: contrib/auth/forms.py:201 contrib/auth/forms.py:461 msgid "Password" msgstr "Lozinka" +#: contrib/auth/forms.py:100 msgid "Password confirmation" msgstr "Potvrda lozinke" +#: contrib/auth/forms.py:103 contrib/auth/forms.py:472 msgid "Enter the same password as before, for verification." msgstr "Unesite istu lozinku kao malopre radi verifikacije." -msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." -msgstr "" +#: contrib/auth/forms.py:133 +msgid "Password-based authentication" +msgstr "Potvrda identiteta zasnovana na lozinki" +#: contrib/auth/forms.py:136 +msgid "Enabled" +msgstr "Omogućeno" + +#: contrib/auth/forms.py:136 +msgid "Disabled" +msgstr "Onemogućeno" + +#: contrib/auth/forms.py:260 +msgid "" +"Raw passwords are not stored, so there is no way to see the user’s password." +msgstr "Neobrađene lozinke se ne čuvaju, tako da ne postoji način da se vidi korisnička lozinka." + +#: contrib/auth/forms.py:276 +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "Omogući autentifikaciju zasnovanu na lozinki za ovog korisnika postavljanjem lozinke." + +#: contrib/auth/forms.py:208 #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." -msgstr "" +msgstr "Molim vas unesite ispravno %(username)s i lozinku. Obratite pažnju da mala i velika slova predstavljaju različite karaktere." +#: contrib/auth/forms.py:211 msgid "This account is inactive." msgstr "Ovaj nalog je neaktivan." +#: contrib/auth/forms.py:276 msgid "Email" msgstr "I-mejl" +#: contrib/auth/forms.py:382 msgid "New password" msgstr "Nova lozinka" +#: contrib/auth/forms.py:388 msgid "New password confirmation" msgstr "Potvrda nove lozinke" +#: contrib/auth/forms.py:425 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Vaša stara loznka nije pravilno unesena. Unesite je ponovo." +#: contrib/auth/forms.py:429 msgid "Old password" msgstr "Stara lozinka" -msgid "Password (again)" -msgstr "Lozinka (ponovite)" - +#: contrib/auth/hashers.py:327 contrib/auth/hashers.py:420 +#: contrib/auth/hashers.py:510 contrib/auth/hashers.py:605 +#: contrib/auth/hashers.py:665 contrib/auth/hashers.py:707 +#: contrib/auth/hashers.py:765 contrib/auth/hashers.py:820 +#: contrib/auth/hashers.py:878 msgid "algorithm" msgstr "algoritam" +#: contrib/auth/hashers.py:328 msgid "iterations" msgstr "iteracije" +#: contrib/auth/hashers.py:329 contrib/auth/hashers.py:426 +#: contrib/auth/hashers.py:512 contrib/auth/hashers.py:609 +#: contrib/auth/hashers.py:666 contrib/auth/hashers.py:708 +#: contrib/auth/hashers.py:879 msgid "salt" msgstr "začin" +#: contrib/auth/hashers.py:330 contrib/auth/hashers.py:427 +#: contrib/auth/hashers.py:610 contrib/auth/hashers.py:667 +#: contrib/auth/hashers.py:709 contrib/auth/hashers.py:766 +#: contrib/auth/hashers.py:821 contrib/auth/hashers.py:880 msgid "hash" msgstr "heš" +#: contrib/auth/hashers.py:421 msgid "variety" msgstr "varijanta" +#: contrib/auth/hashers.py:422 msgid "version" msgstr "verzija" +#: contrib/auth/hashers.py:423 msgid "memory cost" msgstr "memorijska zahtevnost" +#: contrib/auth/hashers.py:424 msgid "time cost" msgstr "vremenska zahtevnost" +#: contrib/auth/hashers.py:425 contrib/auth/hashers.py:608 msgid "parallelism" msgstr "paralelizam" +#: contrib/auth/hashers.py:511 contrib/auth/hashers.py:606 msgid "work factor" msgstr "faktor rada" +#: contrib/auth/hashers.py:513 msgid "checksum" msgstr "suma za proveru" +#: contrib/auth/hashers.py:607 msgid "block size" msgstr "veličina bloka" +#: contrib/auth/models.py:62 contrib/auth/models.py:116 msgid "name" msgstr "ime" +#: contrib/auth/models.py:66 msgid "content type" msgstr "tip sadržaja" +#: contrib/auth/models.py:68 msgid "codename" msgstr "šifra dozvole" +#: contrib/auth/models.py:73 msgid "permission" msgstr "dozvola" +#: contrib/auth/models.py:74 contrib/auth/models.py:119 msgid "permissions" msgstr "dozvole" +#: contrib/auth/models.py:126 msgid "group" msgstr "grupa" +#: contrib/auth/models.py:127 contrib/auth/models.py:258 msgid "groups" msgstr "grupe" +#: contrib/auth/models.py:249 msgid "superuser status" msgstr "status administratora" +#: contrib/auth/models.py:252 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." -msgstr "" -"Označava da li korisnik ima sve dozvole bez dodeljivanja pojedinačnih " -"dozvola." +msgstr "Označava da li korisnik ima sve dozvole bez dodeljivanja pojedinačnih dozvola." +#: contrib/auth/models.py:261 msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." -msgstr "" -"Grupe kojima pripada ovaj korisnik. Korisnik će dobiti sve dozvole koje su " -"date grupama kojima pripada." +msgstr "Grupe kojima pripada ovaj korisnik. Korisnik će dobiti sve dozvole koje su date grupama kojima pripada." +#: contrib/auth/models.py:269 msgid "user permissions" msgstr "korisničke dozvole" +#: contrib/auth/models.py:271 msgid "Specific permissions for this user." msgstr "Dozvole koje se odnose na ovog korisnika." +#: contrib/auth/models.py:345 msgid "username" msgstr "korisničko ime" +#: contrib/auth/models.py:349 msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "" +msgstr "Obavezan podatak. 150 karaktera ili manje. Dozvoljena su samo slova, cifre i karakteri @/./+/-/_ ." +#: contrib/auth/models.py:353 msgid "A user with that username already exists." msgstr "Korisnik sa tim korisničkim imenom već postoji." +#: contrib/auth/models.py:356 msgid "first name" msgstr "ime" +#: contrib/auth/models.py:357 msgid "last name" msgstr "prezime" +#: contrib/auth/models.py:358 msgid "email address" msgstr "Adresa e-pošte:" +#: contrib/auth/models.py:360 msgid "staff status" msgstr "status člana posade" +#: contrib/auth/models.py:362 msgid "Designates whether the user can log into this admin site." -msgstr "" -"Označava da li korisnik može da se prijavi na ovaj sajt za administraciju." +msgstr "Označava da li korisnik može da se prijavi na ovaj sajt za administraciju." +#: contrib/auth/models.py:365 msgid "active" msgstr "aktivan" +#: contrib/auth/models.py:368 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." -msgstr "" -"Označava da li se korisnik smatra aktivnim. Deselektujte ovo umesto da " -"brišete nalog." +msgstr "Označava da li se korisnik smatra aktivnim. Deselektujte ovo umesto da brišete nalog." +#: contrib/auth/models.py:372 msgid "date joined" msgstr "datum registracije" +#: contrib/auth/models.py:381 msgid "user" msgstr "korisnik" +#: contrib/auth/models.py:382 msgid "users" msgstr "korisnici" +#: contrib/auth/password_validation.py:111 #, python-format msgid "" "This password is too short. It must contain at least %(min_length)d " @@ -230,70 +335,88 @@ msgid "" msgid_plural "" "This password is too short. It must contain at least %(min_length)d " "characters." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Ova lozinka je previše kratka, mora sadržati najmanje %(min_length)d karakter." +msgstr[1] "Ova lozinka je previše kratka, mora sadržati najmanje %(min_length)d karaktera." +msgstr[2] "Ova lozinka je previše kratka, mora sadržati najmanje %(min_length)d karaktera." +#: contrib/auth/password_validation.py:123 #, python-format msgid "Your password must contain at least %(min_length)d character." msgid_plural "Your password must contain at least %(min_length)d characters." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Vaša lozinka mora sadržati najmanje %(min_length)d karakter." +msgstr[1] "Vaša lozinka mora sadržati najmanje %(min_length)d karaktera." +msgstr[2] "Vaša lozinka mora sadržati najmanje %(min_length)d karaktera." +#: contrib/auth/password_validation.py:206 #, python-format msgid "The password is too similar to the %(verbose_name)s." -msgstr "" +msgstr "Lozinka je previše slična %(verbose_name)s." +#: contrib/auth/password_validation.py:213 msgid "Your password can’t be too similar to your other personal information." -msgstr "" +msgstr "Vaša lozinka ne može biti slična vašim ličnim podacima." +#: contrib/auth/password_validation.py:245 msgid "This password is too common." -msgstr "" +msgstr "Ova lozinka je među najčešće korišćenim lozinkama." +#: contrib/auth/password_validation.py:250 msgid "Your password can’t be a commonly used password." -msgstr "" +msgstr "Vaša lozinka ne može biti među najčešće korišćenim lozinkama." +#: contrib/auth/password_validation.py:261 msgid "This password is entirely numeric." -msgstr "" +msgstr "Ova lozinka sadrži samo cifre." +#: contrib/auth/password_validation.py:266 msgid "Your password can’t be entirely numeric." -msgstr "" +msgstr "Vaša lozinka ne može sadržati samo cifre." +#: contrib/auth/templates/registration/password_reset_subject.txt:2 #, python-format msgid "Password reset on %(site_name)s" msgstr "Resetovanje lozinke na sajtu %(site_name)s" +#: contrib/auth/validators.py:12 msgid "" -"Enter a valid username. This value may contain only unaccented lowercase a-z " -"and uppercase A-Z letters, numbers, and @/./+/-/_ characters." -msgstr "" +"Enter a valid username. This value may contain only unaccented lowercase a-z" +" and uppercase A-Z letters, numbers, and @/./+/-/_ characters." +msgstr "Unesite ispravno korisničko ime. Ono može sadržati samo neakcentovana mala slova a-z i velika slova A-Z, cifre i karaktere @/./+/-/_ ." +#: contrib/auth/validators.py:22 msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." -msgstr "" +msgstr "Unesite ispravno korisničko ime. Ono može sadržati samo slova, cifre i karaktere @/./+/-/_ ." +#: contrib/auth/views.py:178 msgid "Logged out" msgstr "Odjavljen" +#: contrib/auth/views.py:237 msgid "Password reset" -msgstr "" +msgstr "Resetovanje lozinke" +#: contrib/auth/views.py:264 msgid "Password reset sent" -msgstr "" +msgstr "Zahtev za reset lozinke je poslat" +#: contrib/auth/views.py:274 msgid "Enter new password" -msgstr "" +msgstr "Unesite novu lozinku" +#: contrib/auth/views.py:346 msgid "Password reset unsuccessful" -msgstr "" +msgstr "Resetovanje lozinke neuspešno" +#: contrib/auth/views.py:355 msgid "Password reset complete" -msgstr "" +msgstr "Resetovanje lozinke uspešno" +#: contrib/auth/views.py:367 msgid "Password change" -msgstr "" +msgstr "Izmena lozinke" +#: contrib/auth/views.py:390 msgid "Password change successful" -msgstr "" +msgstr "Lozinka uspešno izmenjena" diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo index 4461738c17..6a6cd504b2 100644 Binary files a/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po index 8f2ed9d7bc..52e1eae47e 100644 --- a/django/contrib/auth/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/sv/LC_MESSAGES/django.po @@ -3,9 +3,11 @@ # Translators: # Albin Larsson , 2022 # Alex Nordlund , 2012 +# Anders Hovmöller , 2023 # Cybjit , 2012 # Jannis Leidel , 2011 # Jonathan Lindén, 2015 +# Jörgen Olofsson, 2024 # Jonathan Lindén, 2014 # Mattias Hansson , 2016 # nip3o , 2014 @@ -17,10 +19,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-21 10:22+0200\n" -"PO-Revision-Date: 2022-07-25 08:09+0000\n" -"Last-Translator: Albin Larsson \n" -"Language-Team: Swedish (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: Jörgen Olofsson, 2024\n" +"Language-Team: Swedish (http://app.transifex.com/django/django/language/" "sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,13 +43,23 @@ msgstr "Viktiga datum" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-objekt med primärnyckel %(key)r finns inte." +msgid "Conflicting form data submitted. Please try again." +msgstr "Motstridiga formulärdata skickades. Försök igen." + msgid "Password changed successfully." msgstr "Lösenordet ändrades framgångsrikt." +msgid "Password-based authentication was disabled." +msgstr "Lösenordsbaserad autentisering inaktiverades." + #, python-format msgid "Change password: %s" msgstr "Ändra lösenord: %s" +#, python-format +msgid "Set password: %s" +msgstr "Sätt lösenord: %s" + msgid "Authentication and Authorization" msgstr "Autentisering och auktorisering" @@ -63,9 +75,24 @@ msgstr "Inget lösenord angivet." msgid "Invalid password format or unknown hashing algorithm." msgstr "Ogiltigt lösenordsformat eller okänd hashalgoritm." +msgid "Reset password" +msgstr "Återställ lösenord" + +msgid "Set password" +msgstr "Sätt lösenord" + msgid "The two password fields didn’t match." msgstr "De två lösenordsfälten stämmer inte överens." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Om användaren kommer att kunna autentisera sig med ett lösenord eller inte. " +"Om inaktiverat, kan användaren fortfarande ha möjlighet att autentisera sig " +"via andra backend-lösningar, såsom Single Sign-On eller LDAP." + msgid "Password" msgstr "Lösenord" @@ -75,12 +102,26 @@ msgstr "Lösenordsbekräftelse" msgid "Enter the same password as before, for verification." msgstr "Fyll i samma lösenord som tidigare för verifiering." +msgid "Password-based authentication" +msgstr "Lösenordsbaserad autentisering." + +msgid "Enabled" +msgstr "Aktiverad" + +msgid "Disabled" +msgstr "Avstängd" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Lösenord lagras inte direkt, så det finns inget sätt att se denna användares " -"lösenord, men du kan ändra lösenorden med detta formulär." +"Lösenord lagras inte i klartext, det finns inget sätt att se användarens " +"lösenord." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Aktivera lösenordsbaserad autentisering för denna användare genom att sätta " +"ett lösenord." #, python-format msgid "" @@ -108,9 +149,6 @@ msgstr "Ditt gamla lösenord var felaktigt ifyllt. Var vänlig fyll i det igen." msgid "Old password" msgstr "Gammalt lösenord" -msgid "Password (again)" -msgstr "Lösenord (igen)" - msgid "algorithm" msgstr "algoritm" @@ -186,7 +224,7 @@ msgstr "" "rättigheter som deras grupper har." msgid "user permissions" -msgstr "användarättigheter" +msgstr "användarrättigheter" msgid "Specific permissions for this user." msgstr "Specifika rättigheter för denna användare." @@ -279,11 +317,11 @@ msgid "Password reset on %(site_name)s" msgstr "Lösenord nollställt på %(site_name)s" msgid "" -"Enter a valid username. This value may contain only English letters, " -"numbers, and @/./+/-/_ characters." +"Enter a valid username. This value may contain only unaccented lowercase a-z " +"and uppercase A-Z letters, numbers, and @/./+/-/_ characters." msgstr "" -"Fyll i ett giltigt användarnamn. Detta värde får endast innehålla bokstäver " -"a-z, siffror och @/./+/-/_." +"Fyll i ett giltigt användarnamn. Det får endast innehålla icke-accentsatta " +"små och stora bokstäver a-z, A-Z, siffror samt tecknen @/./+/-/_." msgid "" "Enter a valid username. This value may contain only letters, numbers, and " diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo index 09b4e4726f..9333144251 100644 Binary files a/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po index 734662d1c8..99cb7f93e3 100644 --- a/django/contrib/auth/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/tr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # # Translators: # Ahmet Emre Aladağ , 2013 -# BouRock, 2015-2017,2019-2021,2023 +# BouRock, 2015-2017,2019-2021,2023-2024 # BouRock, 2014-2015 # Caner Başaran , 2013 # Cihad GÜNDOĞDU , 2014 @@ -15,10 +15,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-04-25 08:09+0000\n" -"Last-Translator: BouRock, 2015-2017,2019-2021,2023\n" -"Language-Team: Turkish (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: BouRock, 2015-2017,2019-2021,2023-2024\n" +"Language-Team: Turkish (http://app.transifex.com/django/django/language/" "tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,13 +39,23 @@ msgstr "Önemli tarihler" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r birincil anahtarı olan %(name)s nesnesi mevcut değil." +msgid "Conflicting form data submitted. Please try again." +msgstr "Çakışan form verileri gönderildi. Lütfen tekrar deneyin." + msgid "Password changed successfully." msgstr "Parola başarılı olarak değiştirildi." +msgid "Password-based authentication was disabled." +msgstr "Parola tabanlı kimlik doğrulaması etkisizleştirildi." + #, python-format msgid "Change password: %s" msgstr "Parolayı değiştir: %s" +#, python-format +msgid "Set password: %s" +msgstr "Parola ayarla: %s" + msgid "Authentication and Authorization" msgstr "Kimlik Doğrulama ve Yetkilendirme" @@ -61,9 +71,24 @@ msgstr "Ayarlı parola yok." msgid "Invalid password format or unknown hashing algorithm." msgstr "Geçersiz parola biçimi veya bilinmeyen adresleme algoritması." +msgid "Reset password" +msgstr "Parolayı sıfırla" + +msgid "Set password" +msgstr "Parola ayarla" + msgid "The two password fields didn’t match." msgstr "İki parola alanı eşleşmedi." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"Kullanıcının parola kullanarak ya da kullanmadan kimlik doğrulaması yapıp " +"yapamayacağı. Eğer etkisizleştirildiyse, Tek Oturum Açma veya LDAP gibi " +"diğer arka uçları kullanarak kimlik doğrulaması yapmaya devam edebilirler." + msgid "Password" msgstr "Parola" @@ -73,13 +98,26 @@ msgstr "Parola onayı" msgid "Enter the same password as before, for verification." msgstr "Doğrulama için önceki gibi aynı parolayı girin." +msgid "Password-based authentication" +msgstr "Parola tabanlı kimlik doğrulaması" + +msgid "Enabled" +msgstr "Etkinleştirildi" + +msgid "Disabled" +msgstr "Etkisizleştirildi" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." msgstr "" -"Ham parolalar saklanmaz, bu yüzden bu kullanıcının parolasını görmenin yolu " -"yoktur, fakat bu formu kullanarak parolayı " -"değiştirebilirsiniz." +"Ham parolalar saklanmaz, dolayısıyla kullanıcının parolasını görmenin bir " +"yolu yoktur." + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "" +"Bir parola ayarlayarak bu kullanıcı için parola tabanlı kimlik doğrulamasını " +"etkinleştirin." #, python-format msgid "" @@ -107,9 +145,6 @@ msgstr "Eski parolanız yanlış girildi. Lütfen tekrar girin." msgid "Old password" msgstr "Eski parola" -msgid "Password (again)" -msgstr "Parola (tekrar)" - msgid "algorithm" msgstr "algoritma" diff --git a/django/contrib/auth/locale/ug/LC_MESSAGES/django.mo b/django/contrib/auth/locale/ug/LC_MESSAGES/django.mo index 2228f92e68..481d10ada0 100644 Binary files a/django/contrib/auth/locale/ug/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/ug/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/ug/LC_MESSAGES/django.po b/django/contrib/auth/locale/ug/LC_MESSAGES/django.po index ef15de3fd3..e231cc2c3f 100644 --- a/django/contrib/auth/locale/ug/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/ug/LC_MESSAGES/django.po @@ -1,16 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Abduqadir Abliz , 2023 +# Abduqadir Abliz , 2023-2024 # Azat, 2023 # Murat Orhun , 2023 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Azat, 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" +"Last-Translator: Abduqadir Abliz , 2023-2024\n" "Language-Team: Uyghur (http://app.transifex.com/django/django/language/ug/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,13 +31,23 @@ msgstr "مۇھىم چېسلا" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r ئاساسىي ئاچقۇچى بار %(name)s ئوبيېكت مەۋجۇت ئەمەس." +msgid "Conflicting form data submitted. Please try again." +msgstr "تاپشۇرغان جەدۋەل سانلىق مەلۇماتىدا توقۇنۇش بار. قايتا سىناڭ." + msgid "Password changed successfully." msgstr "پارول مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى." +msgid "Password-based authentication was disabled." +msgstr "ئىم ئاساسىدىكى دەلىللەش چەكلەنگەن." + #, python-format msgid "Change password: %s" msgstr "پارول ئۆزگەرتىش: %s" +#, python-format +msgid "Set password: %s" +msgstr "ئىم تەڭشەك %s" + msgid "Authentication and Authorization" msgstr "دەلىللەش ۋە ھوقۇق بېرىش" @@ -54,9 +64,24 @@ msgid "Invalid password format or unknown hashing algorithm." msgstr "" "ئىناۋەتسىز پارول پىچىمى ياكى يوچۇن مۇكەممەللىكىنى تەكشۈرۈش ھېسابلاش ئۇسۇلى." +msgid "Reset password" +msgstr "ئىم ئەسلىگە قايتۇر" + +msgid "Set password" +msgstr "ئىم تەڭشەك" + msgid "The two password fields didn’t match." msgstr "ئىككى پارول بۆلىكى ماس كەلمىدى." +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"ئىشلەتكۈچى ئىم ئارقىلىق دەلىللەشنى ئىشلىتەلەمدۇ يوق. ئەگەر چەكلەنسە، ئۇلار " +"يەنىلا باشقا ئارقا ئۇچ پىروگراممىسى يەنى يەككە تىزىمغا كىرىش ياكى LDAP " +"ئارقىلىق دەلىللىيەلەيدۇ." + msgid "Password" msgstr "پارول" @@ -66,13 +91,23 @@ msgstr "پارول جەزملەش" msgid "Enter the same password as before, for verification." msgstr "دەلىللەش ئۈچۈن، ئىلگىرىكى ئوخشاش ئىمنى قايتا كىرگۈزۈڭ." +msgid "Password-based authentication" +msgstr "ئىم ئاساسىدىكى دەلىللەش" + +msgid "Enabled" +msgstr "قوزغىتىلدى" + +msgid "Disabled" +msgstr "چەكلەندى" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." +"Raw passwords are not stored, so there is no way to see the user’s password." +msgstr "ئەسلى ئىم ساقلانمىدى، شۇڭلاشقا ئىشلەتكۈچى ئىمنى كۆرسىتەلمەيدۇ." + +msgid "" +"Enable password-based authentication for this user by setting a password." msgstr "" -"ئەسلى پارول سىستېمىغا ساقلانمايدۇ، شۇڭلاشقا بۇ ئىشلەتكۈچى ئىشلەتكەن پارولىنى " -"كۆرگىلى بولمايدۇ، ئەمما بۇ جەدۋەل نى ئىشلىتىپ پارولنى " -"ئۆزگەرتەلەيسىز." +"بۇ ئىشلەتكۈچىگە ئىم تەڭشەش ئارقىلىق ئىم ئاساسىدىكى دەلىللەشنى قوزغىتىدۇ." #, python-format msgid "" @@ -100,9 +135,6 @@ msgstr "كونا پارولنى توغرا كىرگۈزمىدىڭىز. قايت msgid "Old password" msgstr "كونا پارول" -msgid "Password (again)" -msgstr "پارول (قايتا)" - msgid "algorithm" msgstr "ئالگورىزىم" diff --git a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo index d4d2485b3a..5622927c44 100644 Binary files a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po index 000822e86a..1b2f624f12 100644 --- a/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/zh_Hans/LC_MESSAGES/django.po @@ -11,6 +11,7 @@ # Kevin Sze , 2012 # Lele Long , 2011,2015 # Liping Wang , 2016-2017 +# L., 2024 # mozillazg , 2016 # Lemon Li , 2012-2013 # Wentao Han , 2020 @@ -22,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-17 03:19-0500\n" -"PO-Revision-Date: 2023-12-04 08:09+0000\n" -"Last-Translator: Kaiqi Zhu, 2023\n" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-10-07 08:09+0000\n" +"Last-Translator: L., 2024\n" "Language-Team: Chinese (China) (http://app.transifex.com/django/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -46,13 +47,23 @@ msgstr "重要日期" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "具有主键 %(key)r 的对象 %(name)s 不存在。" +msgid "Conflicting form data submitted. Please try again." +msgstr "提交的表单数据存在冲突。请再试一次。" + msgid "Password changed successfully." msgstr "密码修改成功。" +msgid "Password-based authentication was disabled." +msgstr "基于密码的验证已禁用。" + #, python-format msgid "Change password: %s" msgstr "修改密码：%s" +#, python-format +msgid "Set password: %s" +msgstr "设置密码: %s" + msgid "Authentication and Authorization" msgstr "认证和授权" @@ -68,9 +79,23 @@ msgstr "密码未设置。" msgid "Invalid password format or unknown hashing algorithm." msgstr "不可用的密码格式或未知的哈希算法。" +msgid "Reset password" +msgstr "重置密码" + +msgid "Set password" +msgstr "设置密码" + msgid "The two password fields didn’t match." msgstr "输入的两个密码不一致。" +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"用户是否能够使用密码进行认证。如果禁用，他们仍可能能够使用其他后端进行认证，" +"例如单一登入或LDAP。" + msgid "Password" msgstr "密码" @@ -80,12 +105,22 @@ msgstr "密码确认" msgid "Enter the same password as before, for verification." msgstr "为了校验，请输入与上面相同的密码。" +msgid "Password-based authentication" +msgstr "基于密码的验证" + +msgid "Enabled" +msgstr "启用" + +msgid "Disabled" +msgstr "禁用" + msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." -msgstr "" -"密码原文未存储在系统中，因此无法看到该用户的密码。然而你可以通过这个表单来修改密码。" +"Raw passwords are not stored, so there is no way to see the user’s password." +msgstr "原始密码不会被储存，因此无法查看用户的密码。" + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "通过设定密码为此用户启用基于密码的认证。" #, python-format msgid "" @@ -111,9 +146,6 @@ msgstr "你的旧密码不正确。请重新输入。" msgid "Old password" msgstr "旧密码" -msgid "Password (again)" -msgstr "密码（重复）" - msgid "algorithm" msgstr "算法" diff --git a/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo index c127d27445..290c5ab600 100644 Binary files a/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po index 2542623f00..bc443328cc 100644 --- a/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/zh_Hant/LC_MESSAGES/django.po @@ -3,20 +3,23 @@ # Translators: # Chen Chun-Chia , 2015 # Claude Paroz , 2016 +# yubike, 2024 # ilay , 2012 # Jannis Leidel , 2011 # tcc , 2011 # Tzu-ping Chung , 2016-2017,2019 +# YAO WEN LIANG, 2024 # Yeh-Yung , 2013 +# yubike, 2024 # Yeh-Yung , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-18 09:03+0000\n" -"Last-Translator: Tzu-ping Chung \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"POT-Creation-Date: 2024-05-22 11:46-0300\n" +"PO-Revision-Date: 2024-08-07 08:09+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,13 +40,23 @@ msgstr "重要日期" msgid "%(name)s object with primary key %(key)r does not exist." msgstr "主鍵 %(key)r 的 %(name)s 物件不存在。" +msgid "Conflicting form data submitted. Please try again." +msgstr "提交的表單資料有衝突。請再試一次。" + msgid "Password changed successfully." msgstr "密碼修改成功" +msgid "Password-based authentication was disabled." +msgstr "基於密碼的驗證已停用。" + #, python-format msgid "Change password: %s" msgstr "修改密碼: %s" +#, python-format +msgid "Set password: %s" +msgstr "設定密碼: %s" + msgid "Authentication and Authorization" msgstr "認證與授權" @@ -57,10 +70,24 @@ msgid "No password set." msgstr "無設定密碼。" msgid "Invalid password format or unknown hashing algorithm." -msgstr "無效的密碼格式或不知名的雜湊演算法。" +msgstr "無效的密碼格式或未知的雜湊演算法。" + +msgid "Reset password" +msgstr "重設密碼" + +msgid "Set password" +msgstr "設定密碼" msgid "The two password fields didn’t match." -msgstr "兩個密碼欄位不相符。" +msgstr "輸入的兩個密碼不一致。" + +msgid "" +"Whether the user will be able to authenticate using a password or not. If " +"disabled, they may still be able to authenticate using other backends, such " +"as Single Sign-On or LDAP." +msgstr "" +"用戶是否能夠使用密碼進行認證。如果禁用，他們仍可能能夠使用其他後端進行認證，" +"例如單一登入或LDAP。" msgid "Password" msgstr "密碼" @@ -69,14 +96,24 @@ msgid "Password confirmation" msgstr "密碼確認" msgid "Enter the same password as before, for verification." -msgstr "為檢查用，請輸入與前面相同的密碼。" +msgstr "輸入與之前相同的密碼以進行驗證。" + +msgid "Password-based authentication" +msgstr "基於密碼的驗證" + +msgid "Enabled" +msgstr "啟用" + +msgid "Disabled" +msgstr "停用" msgid "" -"Raw passwords are not stored, so there is no way to see this user’s " -"password, but you can change the password using this form." -msgstr "" -"原始密碼尚未儲存，因此無法存取此帳號的密碼，但你可以透過這個表" -"單來變更密碼。" +"Raw passwords are not stored, so there is no way to see the user’s password." +msgstr "原始密碼不會被儲存，因此無法查看用戶的密碼。" + +msgid "" +"Enable password-based authentication for this user by setting a password." +msgstr "通過設定密碼為此用戶啟用基於密碼的認證。" #, python-format msgid "" @@ -102,9 +139,6 @@ msgstr "你的舊密碼不正確。請重新輸入。" msgid "Old password" msgstr "舊密碼" -msgid "Password (again)" -msgstr "密碼(重複)" - msgid "algorithm" msgstr "演算法" @@ -112,22 +146,22 @@ msgid "iterations" msgstr "迭代" msgid "salt" -msgstr "隨機值" +msgstr "鹽值" msgid "hash" -msgstr "哈希碼" +msgstr "哈希" msgid "variety" -msgstr "變種" +msgstr "類型" msgid "version" msgstr "版本" msgid "memory cost" -msgstr "記憶體用量" +msgstr "記憶體成本" msgid "time cost" -msgstr "耗時" +msgstr "時間成本" msgid "parallelism" msgstr "平行性" @@ -138,6 +172,9 @@ msgstr "作用因素" msgid "checksum" msgstr "校驗" +msgid "block size" +msgstr "區塊大小" + msgid "name" msgstr "名稱" @@ -165,12 +202,12 @@ msgstr "超級使用者狀態" msgid "" "Designates that this user has all permissions without explicitly assigning " "them." -msgstr "指定是否使用者可以登入到這個管理網站" +msgstr "指定這個用戶擁有所有權限，無需特別指定。" msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." -msgstr "此為帳號可加入的群組。其所屬的群組將授予該帳號對應的權限。" +msgstr "此用戶所屬的群組。用戶將獲得其所屬每個群組的所有權限。" msgid "user permissions" msgstr "使用者權限" @@ -182,7 +219,7 @@ msgid "username" msgstr "使用者名稱" msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." -msgstr "必要的。150 個字或更少，只包含字母、數字和 @/./+/-/_。" +msgstr "必填。長度為150個字或以下，僅限字母、數字和 @/./+/-/_。" msgid "A user with that username already exists." msgstr "一個相同名稱的使用者已經存在。" @@ -194,13 +231,13 @@ msgid "last name" msgstr "姓氏" msgid "email address" -msgstr "電子信箱" +msgstr "電子郵件" msgid "staff status" msgstr "工作人員狀態" msgid "Designates whether the user can log into this admin site." -msgstr "指定是否使用者可以登入此管理網站。" +msgstr "指定用戶是否可以登入此管理網站。" msgid "active" msgstr "有效" @@ -208,7 +245,7 @@ msgstr "有效" msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." -msgstr "指定使用者是否有效。請取消選擇而不是刪除帳號。" +msgstr "指定是否將此用戶視為活躍用戶。取消選擇此選項而不是刪除帳戶。" msgid "date joined" msgstr "加入日期" @@ -226,7 +263,7 @@ msgid "" msgid_plural "" "This password is too short. It must contain at least %(min_length)d " "characters." -msgstr[0] "這個密碼過短。請至少使用 %(min_length)d 個字元。" +msgstr[0] "此密碼過短。請至少使用 %(min_length)d 個字元。" #, python-format msgid "Your password must contain at least %(min_length)d character." @@ -241,7 +278,7 @@ msgid "Your password can’t be too similar to your other personal information." msgstr "你的密碼不能與其他個人資訊太相近。" msgid "This password is too common." -msgstr "這個密碼太普通。" +msgstr "這個密碼太常見了。" msgid "Your password can’t be a commonly used password." msgstr "你不能使用常見的密碼。" @@ -250,42 +287,42 @@ msgid "This password is entirely numeric." msgstr "這個密碼只包含數字。" msgid "Your password can’t be entirely numeric." -msgstr "你的密碼不能完全是數字。" +msgstr "你的密碼不能全都是數字。" #, python-format msgid "Password reset on %(site_name)s" msgstr "在 %(site_name)s 進行密碼重置" msgid "" -"Enter a valid username. This value may contain only English letters, " -"numbers, and @/./+/-/_ characters." -msgstr "輸入合法的使用者名稱。只能包含英語字母、數字和 @/./+/-/_ 字元。" +"Enter a valid username. This value may contain only unaccented lowercase a-z " +"and uppercase A-Z letters, numbers, and @/./+/-/_ characters." +msgstr "輸入合法的使用者名稱。只能包含大寫和小寫字母、數字和 @/./+/-/_ 符號。" msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." -msgstr "輸入合法的使用者名稱。只能包含字母、數字和 @/./+/-/_ 字元。" +msgstr "輸入合法的使用者名稱。只能包含字母、數字和 @/./+/-/_ 符號。" msgid "Logged out" msgstr "登出" msgid "Password reset" -msgstr "密碼重設" +msgstr "重設密碼" msgid "Password reset sent" -msgstr "已送出密碼重設" +msgstr "密碼重設連結已發送" msgid "Enter new password" -msgstr "輸入新的密碼" +msgstr "輸入新密碼" msgid "Password reset unsuccessful" msgstr "密碼重設失敗" msgid "Password reset complete" -msgstr "密碼重設成功" +msgstr "密碼重設完成" msgid "Password change" -msgstr "變更密碼" +msgstr "修改密碼" msgid "Password change successful" -msgstr "成功變更密碼" +msgstr "成功修改密碼" diff --git a/django/contrib/auth/middleware.py b/django/contrib/auth/middleware.py index cb409ee778..85f58ec9a5 100644 --- a/django/contrib/auth/middleware.py +++ b/django/contrib/auth/middleware.py @@ -1,6 +1,8 @@ from functools import partial from urllib.parse import urlsplit +from asgiref.sync import iscoroutinefunction, markcoroutinefunction + from django.conf import settings from django.contrib import auth from django.contrib.auth import REDIRECT_FIELD_NAME, load_backend @@ -88,7 +90,7 @@ class LoginRequiredMiddleware(MiddlewareMixin): ) -class RemoteUserMiddleware(MiddlewareMixin): +class RemoteUserMiddleware: """ Middleware for utilizing web-server-provided authentication. @@ -102,13 +104,27 @@ class RemoteUserMiddleware(MiddlewareMixin): different header. """ + sync_capable = True + async_capable = True + + def __init__(self, get_response): + if get_response is None: + raise ValueError("get_response must be provided.") + self.get_response = get_response + self.is_async = iscoroutinefunction(get_response) + if self.is_async: + markcoroutinefunction(self) + super().__init__() + # Name of request header to grab username from. This will be the key as # used in the request.META dictionary, i.e. the normalization of headers to # all uppercase and the addition of "HTTP_" prefix apply. header = "REMOTE_USER" force_logout_if_no_header = True - def process_request(self, request): + def __call__(self, request): + if self.is_async: + return self.__acall__(request) # AuthenticationMiddleware is required so that request.user exists. if not hasattr(request, "user"): raise ImproperlyConfigured( @@ -126,13 +142,13 @@ class RemoteUserMiddleware(MiddlewareMixin): # AnonymousUser by the AuthenticationMiddleware). if self.force_logout_if_no_header and request.user.is_authenticated: self._remove_invalid_user(request) - return + return self.get_response(request) # If the user is already authenticated and that user is the user we are # getting passed in the headers, then the correct user is already # persisted in the session and we don't need to continue. if request.user.is_authenticated: if request.user.get_username() == self.clean_username(username, request): - return + return self.get_response(request) else: # An authenticated user is associated with the request, but # it does not match the authorized user in the header. @@ -146,6 +162,51 @@ class RemoteUserMiddleware(MiddlewareMixin): # by logging the user in. request.user = user auth.login(request, user) + return self.get_response(request) + + async def __acall__(self, request): + # AuthenticationMiddleware is required so that request.user exists. + if not hasattr(request, "user"): + raise ImproperlyConfigured( + "The Django remote user auth middleware requires the" + " authentication middleware to be installed. Edit your" + " MIDDLEWARE setting to insert" + " 'django.contrib.auth.middleware.AuthenticationMiddleware'" + " before the RemoteUserMiddleware class." + ) + try: + username = request.META["HTTP_" + self.header] + except KeyError: + # If specified header doesn't exist then remove any existing + # authenticated remote-user, or return (leaving request.user set to + # AnonymousUser by the AuthenticationMiddleware). + if self.force_logout_if_no_header: + user = await request.auser() + if user.is_authenticated: + await self._aremove_invalid_user(request) + return await self.get_response(request) + user = await request.auser() + # If the user is already authenticated and that user is the user we are + # getting passed in the headers, then the correct user is already + # persisted in the session and we don't need to continue. + if user.is_authenticated: + if user.get_username() == self.clean_username(username, request): + return await self.get_response(request) + else: + # An authenticated user is associated with the request, but + # it does not match the authorized user in the header. + await self._aremove_invalid_user(request) + + # We are seeing this user for the first time in this session, attempt + # to authenticate the user. + user = await auth.aauthenticate(request, remote_user=username) + if user: + # User is valid. Set request.user and persist user in the session + # by logging the user in. + request.user = user + await auth.alogin(request, user) + + return await self.get_response(request) def clean_username(self, username, request): """ @@ -176,6 +237,22 @@ class RemoteUserMiddleware(MiddlewareMixin): if isinstance(stored_backend, RemoteUserBackend): auth.logout(request) + async def _aremove_invalid_user(self, request): + """ + Remove the current authenticated user in the request which is invalid + but only if the user is authenticated via the RemoteUserBackend. + """ + try: + stored_backend = load_backend( + await request.session.aget(auth.BACKEND_SESSION_KEY, "") + ) + except ImportError: + # Backend failed to load. + await auth.alogout(request) + else: + if isinstance(stored_backend, RemoteUserBackend): + await auth.alogout(request) + class PersistentRemoteUserMiddleware(RemoteUserMiddleware): """ diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index e5ef1bb523..d4a8dd902b 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -95,6 +95,9 @@ class GroupManager(models.Manager): def get_by_natural_key(self, name): return self.get(name=name) + async def aget_by_natural_key(self, name): + return await self.aget(name=name) + class Group(models.Model): """ @@ -137,10 +140,7 @@ class Group(models.Model): class UserManager(BaseUserManager): use_in_migrations = True - def _create_user(self, username, email, password, **extra_fields): - """ - Create and save a user with the given username, email, and password. - """ + def _create_user_object(self, username, email, password, **extra_fields): if not username: raise ValueError("The given username must be set") email = self.normalize_email(email) @@ -153,14 +153,32 @@ class UserManager(BaseUserManager): username = GlobalUserModel.normalize_username(username) user = self.model(username=username, email=email, **extra_fields) user.password = make_password(password) + return user + + def _create_user(self, username, email, password, **extra_fields): + """ + Create and save a user with the given username, email, and password. + """ + user = self._create_user_object(username, email, password, **extra_fields) user.save(using=self._db) return user + async def _acreate_user(self, username, email, password, **extra_fields): + """See _create_user()""" + user = self._create_user_object(username, email, password, **extra_fields) + await user.asave(using=self._db) + return user + def create_user(self, username, email=None, password=None, **extra_fields): extra_fields.setdefault("is_staff", False) extra_fields.setdefault("is_superuser", False) return self._create_user(username, email, password, **extra_fields) + async def acreate_user(self, username, email=None, password=None, **extra_fields): + extra_fields.setdefault("is_staff", False) + extra_fields.setdefault("is_superuser", False) + return await self._acreate_user(username, email, password, **extra_fields) + def create_superuser(self, username, email=None, password=None, **extra_fields): extra_fields.setdefault("is_staff", True) extra_fields.setdefault("is_superuser", True) @@ -172,6 +190,19 @@ class UserManager(BaseUserManager): return self._create_user(username, email, password, **extra_fields) + async def acreate_superuser( + self, username, email=None, password=None, **extra_fields + ): + extra_fields.setdefault("is_staff", True) + extra_fields.setdefault("is_superuser", True) + + if extra_fields.get("is_staff") is not True: + raise ValueError("Superuser must have is_staff=True.") + if extra_fields.get("is_superuser") is not True: + raise ValueError("Superuser must have is_superuser=True.") + + return await self._acreate_user(username, email, password, **extra_fields) + def with_perm( self, perm, is_active=True, include_superusers=True, backend=None, obj=None ): @@ -210,6 +241,15 @@ def _user_get_permissions(user, obj, from_name): return permissions +async def _auser_get_permissions(user, obj, from_name): + permissions = set() + name = "aget_%s_permissions" % from_name + for backend in auth.get_backends(): + if hasattr(backend, name): + permissions.update(await getattr(backend, name)(user, obj)) + return permissions + + def _user_has_perm(user, perm, obj): """ A backend can raise `PermissionDenied` to short-circuit permission checking. @@ -225,6 +265,19 @@ def _user_has_perm(user, perm, obj): return False +async def _auser_has_perm(user, perm, obj): + """See _user_has_perm()""" + for backend in auth.get_backends(): + if not hasattr(backend, "ahas_perm"): + continue + try: + if await backend.ahas_perm(user, perm, obj): + return True + except PermissionDenied: + return False + return False + + def _user_has_module_perms(user, app_label): """ A backend can raise `PermissionDenied` to short-circuit permission checking. @@ -240,6 +293,19 @@ def _user_has_module_perms(user, app_label): return False +async def _auser_has_module_perms(user, app_label): + """See _user_has_module_perms()""" + for backend in auth.get_backends(): + if not hasattr(backend, "ahas_module_perms"): + continue + try: + if await backend.ahas_module_perms(user, app_label): + return True + except PermissionDenied: + return False + return False + + class PermissionsMixin(models.Model): """ Add the fields and methods necessary to support the Group and Permission @@ -285,6 +351,10 @@ class PermissionsMixin(models.Model): """ return _user_get_permissions(self, obj, "user") + async def aget_user_permissions(self, obj=None): + """See get_user_permissions()""" + return await _auser_get_permissions(self, obj, "user") + def get_group_permissions(self, obj=None): """ Return a list of permission strings that this user has through their @@ -293,9 +363,16 @@ class PermissionsMixin(models.Model): """ return _user_get_permissions(self, obj, "group") + async def aget_group_permissions(self, obj=None): + """See get_group_permissions()""" + return await _auser_get_permissions(self, obj, "group") + def get_all_permissions(self, obj=None): return _user_get_permissions(self, obj, "all") + async def aget_all_permissions(self, obj=None): + return await _auser_get_permissions(self, obj, "all") + def has_perm(self, perm, obj=None): """ Return True if the user has the specified permission. Query all @@ -311,6 +388,15 @@ class PermissionsMixin(models.Model): # Otherwise we need to check the backends. return _user_has_perm(self, perm, obj) + async def ahas_perm(self, perm, obj=None): + """See has_perm()""" + # Active superusers have all permissions. + if self.is_active and self.is_superuser: + return True + + # Otherwise we need to check the backends. + return await _auser_has_perm(self, perm, obj) + def has_perms(self, perm_list, obj=None): """ Return True if the user has each of the specified permissions. If @@ -320,6 +406,15 @@ class PermissionsMixin(models.Model): raise ValueError("perm_list must be an iterable of permissions.") return all(self.has_perm(perm, obj) for perm in perm_list) + async def ahas_perms(self, perm_list, obj=None): + """See has_perms()""" + if not isinstance(perm_list, Iterable) or isinstance(perm_list, str): + raise ValueError("perm_list must be an iterable of permissions.") + for perm in perm_list: + if not await self.ahas_perm(perm, obj): + return False + return True + def has_module_perms(self, app_label): """ Return True if the user has any permissions in the given app label. @@ -331,6 +426,14 @@ class PermissionsMixin(models.Model): return _user_has_module_perms(self, app_label) + async def ahas_module_perms(self, app_label): + """See has_module_perms()""" + # Active superusers have all permissions. + if self.is_active and self.is_superuser: + return True + + return await _auser_has_module_perms(self, app_label) + class AbstractUser(AbstractBaseUser, PermissionsMixin): """ @@ -471,23 +574,46 @@ class AnonymousUser: def get_user_permissions(self, obj=None): return _user_get_permissions(self, obj, "user") + async def aget_user_permissions(self, obj=None): + return await _auser_get_permissions(self, obj, "user") + def get_group_permissions(self, obj=None): return set() + async def aget_group_permissions(self, obj=None): + return self.get_group_permissions(obj) + def get_all_permissions(self, obj=None): return _user_get_permissions(self, obj, "all") + async def aget_all_permissions(self, obj=None): + return await _auser_get_permissions(self, obj, "all") + def has_perm(self, perm, obj=None): return _user_has_perm(self, perm, obj=obj) + async def ahas_perm(self, perm, obj=None): + return await _auser_has_perm(self, perm, obj=obj) + def has_perms(self, perm_list, obj=None): if not isinstance(perm_list, Iterable) or isinstance(perm_list, str): raise ValueError("perm_list must be an iterable of permissions.") return all(self.has_perm(perm, obj) for perm in perm_list) + async def ahas_perms(self, perm_list, obj=None): + if not isinstance(perm_list, Iterable) or isinstance(perm_list, str): + raise ValueError("perm_list must be an iterable of permissions.") + for perm in perm_list: + if not await self.ahas_perm(perm, obj): + return False + return True + def has_module_perms(self, module): return _user_has_module_perms(self, module) + async def ahas_module_perms(self, module): + return await _auser_has_module_perms(self, module) + @property def is_anonymous(self): return True diff --git a/django/contrib/contenttypes/forms.py b/django/contrib/contenttypes/forms.py index 741824e2fc..34a88f655f 100644 --- a/django/contrib/contenttypes/forms.py +++ b/django/contrib/contenttypes/forms.py @@ -31,7 +31,7 @@ class BaseGenericInlineFormSet(BaseModelFormSet): + self.ct_fk_field.name ) self.save_as_new = save_as_new - if self.instance is None or self.instance.pk is None: + if self.instance is None or not self.instance._is_pk_set(): qs = self.model._default_manager.none() else: if queryset is None: diff --git a/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo index cac6053dda..0aede690ed 100644 Binary files a/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.po index 993c107281..f7fe8bc3b2 100644 --- a/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/az/LC_MESSAGES/django.po @@ -4,14 +4,15 @@ # Ali Ismayilov , 2011 # Emin Mastizada , 2020 # Emin Mastizada , 2016 +# Nijat Mammadov, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-12 07:28+0000\n" -"Last-Translator: Emin Mastizada \n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"PO-Revision-Date: 2024-08-07 19:22+0000\n" +"Last-Translator: Nijat Mammadov, 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgstr "məzmun tipləri" #, python-format msgid "Content type %(ct_id)s object has no associated model" -msgstr "%(ct_id)s Məzmun növü obyektinə bağlı model yoxdur" +msgstr "%(ct_id)s məzmun növü obyekti ilə əlaqəli model yoxdur" #, python-format msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" diff --git a/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.mo index 6b0363a868..4b96fe58d0 100644 Binary files a/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.po index 864119019b..40229fc763 100644 --- a/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/ga/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Luke Blaney , 2019 # Michael Thornhill , 2012 @@ -8,10 +9,10 @@ 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: 2019-06-22 21:48+0000\n" -"Last-Translator: Luke Blaney \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2024-10-07 19:22+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,9 +37,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "Ní bhaineann samhail leis an cineál inneachar %(ct_id)s" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "Níl cineál inneachar %(ct_id)s oibiacht %(obj_id)s ann" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "Níl cineál ábhair %(ct_id)s réad %(obj_id)s ann" #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "Níl modh get_absolute_url() ag %(ct_name)s oibiachtaí" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "Níl modh get_absolute_url() ag réada %(ct_name)s" diff --git a/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.mo b/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.mo index 2ba31b9dd0..c4c14c77d5 100644 Binary files a/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.mo and b/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.po index 95e193d363..4ddb9f4711 100644 --- a/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/pt/LC_MESSAGES/django.po @@ -3,15 +3,16 @@ # Translators: # Jannis Leidel , 2011 # Nuno Mariz , 2011-2012 +# pedromcaraujo , 2024 # Raúl Pedro Fernandes Santos, 2014 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: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Portuguese (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2024-08-07 19:22+0000\n" +"Last-Translator: pedromcaraujo , 2024\n" +"Language-Team: Portuguese (http://app.transifex.com/django/django/language/" "pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,9 +37,9 @@ msgid "Content type %(ct_id)s object has no associated model" msgstr "Objeto do tipo de conteúdo %(ct_id)s não tem nenhum model associado" #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" -msgstr "Objeto %(obj_id)s do tipo de conteúdo %(ct_id)s não existe" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" +msgstr "O objeto %(obj_id)s do tipo de conteúdo %(ct_id)s não existe." #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" -msgstr "Objetos %(ct_name)s não tem um método get_absolute_url()" +msgid "%(ct_name)s objects don’t have a get_absolute_url() method" +msgstr "Objetos %(ct_name)s não têm o método get_absolute_url()." diff --git a/django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo index c122551e61..3d6b2946b3 100644 Binary files a/django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/az/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/az/LC_MESSAGES/django.po index e2d56f856f..45de566ce2 100644 --- a/django/contrib/flatpages/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/az/LC_MESSAGES/django.po @@ -5,14 +5,15 @@ # Dimitris Glezos , 2012 # Emin Mastizada , 2018,2020 # Emin Mastizada , 2015 +# Nijat Mammadov, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-12 07:27+0000\n" -"Last-Translator: Emin Mastizada \n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"PO-Revision-Date: 2024-08-07 19:03+0000\n" +"Last-Translator: Nijat Mammadov, 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgid "Advanced options" msgstr "Əlavə imkanlar" msgid "Flat Pages" -msgstr "Flat Səhifələr" +msgstr "Düz Səhifələr" msgid "URL" msgstr "URL" @@ -32,29 +33,29 @@ msgstr "URL" msgid "" "Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Məsələn, “/about/contact/”. Əvvəldə və sondakı kəsr xəttinin olmasına diqqət " +"Məsələn, “/about/contact/”. Əvvəldə və sondakı çəpəki xəttin olmasına diqqət " "edin." msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " "slashes or tildes." msgstr "" -"Burada yalnız hərf, rəqəm, nöqtə, altdan xətt, defis, kəsr xətti və ya " +"Burada yalnız hərf, rəqəm, nöqtə, altdan xətt, defis, çəpəki xətt və ya " "tildadan istifadə etmək olar." msgid "Example: “/about/contact”. Make sure to have a leading slash." msgstr "" -"Məsələn, “/about/contact”. Əvvəldəki kəsr xəttinin olmasına diqqət edin." +"Məsələn, “/about/contact”. Əvvəldəki çəpəki xəttin olmasına diqqət edin." msgid "URL is missing a leading slash." -msgstr "Ünvan başlanğıcında çəp xətt əksikdir." +msgstr "URL əvvəlində çəpəki xətt əskikdir." msgid "URL is missing a trailing slash." -msgstr "Ünvan sonunda çəp xətt əksikdir." +msgstr "Ünvan sonunda çəpəki xətt əksikdir." #, python-format msgid "Flatpage with url %(url)s already exists for site %(site)s" -msgstr "%(site)s saytı üçün artıq %(url)s ünvanlı Flatpage mövcuddur" +msgstr "%(site)s saytı üçün artıq %(url)s ünvanlı düz səhifə onsuz da var" msgid "title" msgstr "başlıq" @@ -87,7 +88,7 @@ msgid "sites" msgstr "saytlar" msgid "flat page" -msgstr "adi səhifə" +msgstr "düz səhifə" msgid "flat pages" -msgstr "adi səhifələr" +msgstr "düz səhifələr" diff --git a/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.mo index 8e80c1071e..fdb167784d 100644 Binary files a/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.po index 3f0b097586..5db5dba346 100644 --- a/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/ga/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Michael Thornhill , 2011-2012,2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 17:42+0200\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" +"PO-Revision-Date: 2024-10-07 19:03+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,9 +29,9 @@ msgid "URL" msgstr "URL" msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" -"Sampla '/about/contact/' Déan cinnte go bhfuil príomhslaid agus cúlslais " +"Sampla: “/ faoi/teagmháil/”. Bí cinnte go bhfuil slais tosaigh agus slaise " "agat." msgid "" @@ -40,6 +41,9 @@ msgstr "" "Ní mór an luach a bhfuil ach litreacha, uimhreacha, poncanna, béim, dashes, " "slaiseanna nó thilde." +msgid "Example: “/about/contact”. Make sure to have a leading slash." +msgstr "Sampla: “/ faoi/teagmháil”. Bí cinnte go bhfuil slais tosaigh." + msgid "URL is missing a leading slash." msgstr "Tá slais tosaigh in easnamh ag an URL." @@ -63,11 +67,11 @@ msgid "template name" msgstr "ainm an teimpléid" msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" -"Sampla: 'flatpages/contact_page.html'. Muna bhfuil sé ar soláthair, bainfidh " -"an córás úsáid as 'flatpages/default.html'." +"Sampla: “flatpages/contact_page.html”. Mura gcuirtear é seo ar fáil, " +"úsáidfidh an córas “flatpages/default.html”." msgid "registration required" msgstr "clárúchán riachtanach" @@ -78,7 +82,7 @@ msgstr "" "leathanach seo a fheiceail" msgid "sites" -msgstr "" +msgstr "láithreáin" msgid "flat page" msgstr "leacleathanach" diff --git a/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.mo index 2248000f48..643416e823 100644 Binary files a/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.po index ba5baf3c7b..54dd112998 100644 --- a/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/tk/LC_MESSAGES/django.po @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Resul , 2024 # Welbeck Garli , 2020 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-07-15 16:35+0000\n" -"Last-Translator: Welbeck Garli \n" -"Language-Team: Turkmen (http://www.transifex.com/django/django/language/" +"PO-Revision-Date: 2024-08-07 19:03+0000\n" +"Last-Translator: Resul , 2024\n" +"Language-Team: Turkmen (http://app.transifex.com/django/django/language/" "tk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgid "Advanced options" msgstr "Has çylşyrymly wariantlar" msgid "Flat Pages" -msgstr "Tekiz Sahypalar" +msgstr "Ýönekeý Sahypalar" msgid "URL" msgstr "URL" @@ -51,10 +52,10 @@ msgid "Flatpage with url %(url)s already exists for site %(site)s" msgstr "" msgid "title" -msgstr "" +msgstr "Sözbaşy" msgid "content" -msgstr "" +msgstr "mazmun" msgid "enable comments" msgstr "" diff --git a/django/contrib/flatpages/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/flatpages/locale/zh_Hant/LC_MESSAGES/django.mo index 8a1653ec22..756e0b2ae9 100644 Binary files a/django/contrib/flatpages/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/flatpages/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/flatpages/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/zh_Hant/LC_MESSAGES/django.po index cc555780a8..f64b252140 100644 --- a/django/contrib/flatpages/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/zh_Hant/LC_MESSAGES/django.po @@ -5,14 +5,15 @@ # Jannis Leidel , 2011 # 619e61dbdb61c57213f62815aaf60e01, 2011 # Tzu-ping Chung , 2016,2019 +# YAO WEN LIANG, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-18 09:03+0000\n" -"Last-Translator: Tzu-ping Chung \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"PO-Revision-Date: 2024-08-07 19:03+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgid "Advanced options" msgstr "進階選項" msgid "Flat Pages" -msgstr "簡平頁面" +msgstr "靜態頁面" msgid "URL" msgstr "URL" @@ -50,7 +51,7 @@ msgstr "URL 缺少一個斜線。" #, python-format msgid "Flatpage with url %(url)s already exists for site %(site)s" -msgstr "網站 %(site)s 已經存在一個浮動頁面，其位址為 %(url)s。" +msgstr "網站 %(site)s 已經存在一個靜態頁面，其 url 為 %(url)s。" msgid "title" msgstr "標題" @@ -68,8 +69,8 @@ msgid "" "Example: “flatpages/contact_page.html”. If this isn’t provided, the system " "will use “flatpages/default.html”." msgstr "" -"例如：「flatpages/contact_page.html」。若不提供，系統會使用「flatpages/" -"default.html」。" +"例如：\"flatpages/contact_page.html\"。若未提供，系統會使用 \"flatpages/" +"default.html\"。" msgid "registration required" msgstr "請先註冊" @@ -81,7 +82,7 @@ msgid "sites" msgstr "網站" msgid "flat page" -msgstr "簡平頁面" +msgstr "靜態頁面" msgid "flat pages" -msgstr "簡平頁面" +msgstr "靜態頁面" diff --git a/django/contrib/gis/db/backends/mysql/schema.py b/django/contrib/gis/db/backends/mysql/schema.py index f3ddf14fa7..e485c671e5 100644 --- a/django/contrib/gis/db/backends/mysql/schema.py +++ b/django/contrib/gis/db/backends/mysql/schema.py @@ -10,10 +10,6 @@ logger = logging.getLogger("django.contrib.gis") class MySQLGISSchemaEditor(DatabaseSchemaEditor): sql_add_spatial_index = "CREATE SPATIAL INDEX %(index)s ON %(table)s(%(column)s)" - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.geometry_sql = [] - def skip_default(self, field): # Geometry fields are stored as BLOB/TEXT, for which MySQL < 8.0.13 # doesn't support defaults. @@ -29,34 +25,28 @@ class MySQLGISSchemaEditor(DatabaseSchemaEditor): return super().quote_value(str(value)) return super().quote_value(value) - def column_sql(self, model, field, include_default=False): - column_sql = super().column_sql(model, field, include_default) - # MySQL doesn't support spatial indexes on NULL columns + def _field_indexes_sql(self, model, field): if isinstance(field, GeometryField) and field.spatial_index and not field.null: - qn = self.connection.ops.quote_name - db_table = model._meta.db_table - self.geometry_sql.append( - self.sql_add_spatial_index - % { - "index": qn(self._create_spatial_index_name(model, field)), - "table": qn(db_table), - "column": qn(field.column), - } - ) - return column_sql - - def create_model(self, model): - super().create_model(model) - self.create_spatial_indexes() - - def add_field(self, model, field): - super().add_field(model, field) - self.create_spatial_indexes() + with self.connection.cursor() as cursor: + supports_spatial_index = ( + self.connection.introspection.supports_spatial_index( + cursor, model._meta.db_table + ) + ) + sql = self._create_spatial_index_sql(model, field) + if supports_spatial_index: + return [sql] + else: + logger.error( + f"Cannot create SPATIAL INDEX {sql}. Only MyISAM, Aria, and InnoDB " + f"support them.", + ) + return [] + return super()._field_indexes_sql(model, field) def remove_field(self, model, field): if isinstance(field, GeometryField) and field.spatial_index and not field.null: - index_name = self._create_spatial_index_name(model, field) - sql = self._delete_index_sql(model, index_name) + sql = self._delete_spatial_index_sql(model, field) try: self.execute(sql) except OperationalError: @@ -68,16 +58,55 @@ class MySQLGISSchemaEditor(DatabaseSchemaEditor): super().remove_field(model, field) + def _alter_field( + self, + model, + old_field, + new_field, + old_type, + new_type, + old_db_params, + new_db_params, + strict=False, + ): + super()._alter_field( + model, + old_field, + new_field, + old_type, + new_type, + old_db_params, + new_db_params, + strict=strict, + ) + + old_field_spatial_index = ( + isinstance(old_field, GeometryField) + and old_field.spatial_index + and not old_field.null + ) + new_field_spatial_index = ( + isinstance(new_field, GeometryField) + and new_field.spatial_index + and not new_field.null + ) + if not old_field_spatial_index and new_field_spatial_index: + self.execute(self._create_spatial_index_sql(model, new_field)) + elif old_field_spatial_index and not new_field_spatial_index: + self.execute(self._delete_spatial_index_sql(model, old_field)) + def _create_spatial_index_name(self, model, field): return "%s_%s_id" % (model._meta.db_table, field.column) - def create_spatial_indexes(self): - for sql in self.geometry_sql: - try: - self.execute(sql) - except OperationalError: - logger.error( - f"Cannot create SPATIAL INDEX {sql}. Only MyISAM, Aria, and InnoDB " - f"support them.", - ) - self.geometry_sql = [] + def _create_spatial_index_sql(self, model, field): + index_name = self._create_spatial_index_name(model, field) + qn = self.connection.ops.quote_name + return self.sql_add_spatial_index % { + "index": qn(index_name), + "table": qn(model._meta.db_table), + "column": qn(field.column), + } + + def _delete_spatial_index_sql(self, model, field): + index_name = self._create_spatial_index_name(model, field) + return self._delete_index_sql(model, index_name) diff --git a/django/contrib/gis/db/backends/oracle/schema.py b/django/contrib/gis/db/backends/oracle/schema.py index fd542531eb..ce03ee8892 100644 --- a/django/contrib/gis/db/backends/oracle/schema.py +++ b/django/contrib/gis/db/backends/oracle/schema.py @@ -40,14 +40,18 @@ class OracleGISSchemaEditor(DatabaseSchemaEditor): return super().quote_value(str(value)) return super().quote_value(value) + def _field_indexes_sql(self, model, field): + if isinstance(field, GeometryField) and field.spatial_index: + return [self._create_spatial_index_sql(model, field)] + return super()._field_indexes_sql(model, field) + def column_sql(self, model, field, include_default=False): column_sql = super().column_sql(model, field, include_default) if isinstance(field, GeometryField): - db_table = model._meta.db_table self.geometry_sql.append( self.sql_add_geometry_metadata % { - "table": self.geo_quote_name(db_table), + "table": self.geo_quote_name(model._meta.db_table), "column": self.geo_quote_name(field.column), "dim0": field._extent[0], "dim1": field._extent[1], @@ -57,17 +61,6 @@ class OracleGISSchemaEditor(DatabaseSchemaEditor): "srid": field.srid, } ) - if field.spatial_index: - self.geometry_sql.append( - self.sql_add_spatial_index - % { - "index": self.quote_name( - self._create_spatial_index_name(model, field) - ), - "table": self.quote_name(db_table), - "column": self.quote_name(field.column), - } - ) return column_sql def create_model(self, model): @@ -97,8 +90,7 @@ class OracleGISSchemaEditor(DatabaseSchemaEditor): } ) if field.spatial_index: - index_name = self._create_spatial_index_name(model, field) - self.execute(self._delete_index_sql(model, index_name)) + self.execute(self._delete_spatial_index_sql(model, field)) super().remove_field(model, field) def run_geometry_sql(self): @@ -106,9 +98,54 @@ class OracleGISSchemaEditor(DatabaseSchemaEditor): self.execute(sql) self.geometry_sql = [] + def _alter_field( + self, + model, + old_field, + new_field, + old_type, + new_type, + old_db_params, + new_db_params, + strict=False, + ): + super()._alter_field( + model, + old_field, + new_field, + old_type, + new_type, + old_db_params, + new_db_params, + strict=strict, + ) + + old_field_spatial_index = ( + isinstance(old_field, GeometryField) and old_field.spatial_index + ) + new_field_spatial_index = ( + isinstance(new_field, GeometryField) and new_field.spatial_index + ) + if not old_field_spatial_index and new_field_spatial_index: + self.execute(self._create_spatial_index_sql(model, new_field)) + elif old_field_spatial_index and not new_field_spatial_index: + self.execute(self._delete_spatial_index_sql(model, old_field)) + def _create_spatial_index_name(self, model, field): # Oracle doesn't allow object names > 30 characters. Use this scheme # instead of self._create_index_name() for backwards compatibility. return truncate_name( "%s_%s_id" % (strip_quotes(model._meta.db_table), field.column), 30 ) + + def _create_spatial_index_sql(self, model, field): + index_name = self._create_spatial_index_name(model, field) + return self.sql_add_spatial_index % { + "index": self.quote_name(index_name), + "table": self.quote_name(model._meta.db_table), + "column": self.quote_name(field.column), + } + + def _delete_spatial_index_sql(self, model, field): + index_name = self._create_spatial_index_name(model, field) + return self._delete_index_sql(model, index_name) diff --git a/django/contrib/gis/db/backends/postgis/schema.py b/django/contrib/gis/db/backends/postgis/schema.py index 5464c85cf6..c74b574c4c 100644 --- a/django/contrib/gis/db/backends/postgis/schema.py +++ b/django/contrib/gis/db/backends/postgis/schema.py @@ -1,3 +1,4 @@ +from django.contrib.gis.db.models import GeometryField from django.db.backends.postgresql.schema import DatabaseSchemaEditor from django.db.models.expressions import Col, Func @@ -26,29 +27,7 @@ class PostGISSchemaEditor(DatabaseSchemaEditor): if fields is None or len(fields) != 1 or not hasattr(fields[0], "geodetic"): return super()._create_index_sql(model, fields=fields, **kwargs) - field = fields[0] - expressions = None - opclasses = None - if field.geom_type == "RASTER": - # For raster fields, wrap index creation SQL statement with ST_ConvexHull. - # Indexes on raster columns are based on the convex hull of the raster. - expressions = Func(Col(None, field), template=self.rast_index_template) - fields = None - elif field.dim > 2 and not field.geography: - # Use "nd" ops which are fast on multidimensional cases - opclasses = [self.geom_index_ops_nd] - name = kwargs.get("name") - if not name: - name = self._create_index_name(model._meta.db_table, [field.column], "_id") - - return super()._create_index_sql( - model, - fields=fields, - name=name, - using=" USING %s" % self.geom_index_type, - opclasses=opclasses, - expressions=expressions, - ) + return self._create_spatial_index_sql(model, fields[0], **kwargs) def _alter_column_type_sql( self, table, old_field, new_field, new_type, old_collation, new_collation @@ -79,3 +58,67 @@ class PostGISSchemaEditor(DatabaseSchemaEditor): ), [], ) + + def _alter_field( + self, + model, + old_field, + new_field, + old_type, + new_type, + old_db_params, + new_db_params, + strict=False, + ): + super()._alter_field( + model, + old_field, + new_field, + old_type, + new_type, + old_db_params, + new_db_params, + strict=strict, + ) + + old_field_spatial_index = ( + isinstance(old_field, GeometryField) and old_field.spatial_index + ) + new_field_spatial_index = ( + isinstance(new_field, GeometryField) and new_field.spatial_index + ) + if not old_field_spatial_index and new_field_spatial_index: + self.execute(self._create_spatial_index_sql(model, new_field)) + elif old_field_spatial_index and not new_field_spatial_index: + self.execute(self._delete_spatial_index_sql(model, old_field)) + + def _create_spatial_index_name(self, model, field): + return self._create_index_name(model._meta.db_table, [field.column], "_id") + + def _create_spatial_index_sql(self, model, field, **kwargs): + expressions = None + opclasses = None + fields = [field] + if field.geom_type == "RASTER": + # For raster fields, wrap index creation SQL statement with ST_ConvexHull. + # Indexes on raster columns are based on the convex hull of the raster. + expressions = Func(Col(None, field), template=self.rast_index_template) + fields = None + elif field.dim > 2 and not field.geography: + # Use "nd" ops which are fast on multidimensional cases + opclasses = [self.geom_index_ops_nd] + if not (name := kwargs.get("name")): + name = self._create_spatial_index_name(model, field) + + return super()._create_index_sql( + model, + fields=fields, + name=name, + using=" USING %s" % self.geom_index_type, + opclasses=opclasses, + expressions=expressions, + ) + + def _delete_spatial_index_sql(self, model, field): + index_name = self._create_spatial_index_name(model, field) + return self._delete_index_sql(model, index_name) diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 1aa7eecfdd..9f88bbedc8 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -30,7 +30,6 @@ elif os.name == "nt": "gdal303", "gdal302", "gdal301", - "gdal300", ] elif os.name == "posix": # *NIX library names. @@ -45,7 +44,6 @@ elif os.name == "posix": "gdal3.3.0", "gdal3.2.0", "gdal3.1.0", - "gdal3.0.0", ] else: raise ImproperlyConfigured('GDAL is unsupported on OS "%s".' % os.name) diff --git a/django/contrib/gis/locale/az/LC_MESSAGES/django.mo b/django/contrib/gis/locale/az/LC_MESSAGES/django.mo index 1f2b3a9662..265fec9e94 100644 Binary files a/django/contrib/gis/locale/az/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/az/LC_MESSAGES/django.po b/django/contrib/gis/locale/az/LC_MESSAGES/django.po index 83f1eb20cf..55252964f2 100644 --- a/django/contrib/gis/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/az/LC_MESSAGES/django.po @@ -3,14 +3,15 @@ # Translators: # Ali Ismayilov , 2011 # Emin Mastizada , 2018,2020 +# Nijat Mammadov, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-12 07:23+0000\n" -"Last-Translator: Emin Mastizada \n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"PO-Revision-Date: 2024-08-07 18:45+0000\n" +"Last-Translator: Nijat Mammadov, 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +23,7 @@ msgid "GIS" msgstr "GIS" msgid "The base GIS field." -msgstr "Təməl GIS sahəsi (field)." +msgstr "Təməl GIS xanası." msgid "" "The base Geometry field — maps to the OpenGIS Specification Geometry type." @@ -39,7 +40,7 @@ msgid "Polygon" msgstr "Poliqon" msgid "Multi-point" -msgstr "Nöqtələr" +msgstr "Çox nöqtəli" msgid "Multi-line string" msgstr "Xətlər" @@ -74,9 +75,6 @@ msgstr "" msgid "Delete all Features" msgstr "Bütün Xüsusiyyətləri sil" -msgid "WKT debugging window:" -msgstr "WKT sazlama pəncərəsi:" - msgid "Debugging window (serialized value)" msgstr "Sazlama pəncərəsi (seriallaşdırılmış dəyər)" @@ -85,4 +83,4 @@ msgstr "Qeyd edilmiş axın yoxdur." #, python-format msgid "Slug %r isn’t registered." -msgstr "%r slug-ı qeyd edilməyib." +msgstr "%r qısaltması qeyd edilməyib." diff --git a/django/contrib/gis/locale/ga/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ga/LC_MESSAGES/django.mo index 846f0d559c..ea86255550 100644 Binary files a/django/contrib/gis/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ga/LC_MESSAGES/django.po b/django/contrib/gis/locale/ga/LC_MESSAGES/django.po index e8de66a38b..482e384cff 100644 --- a/django/contrib/gis/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ga/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Michael Thornhill , 2012 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-19 16:49+0100\n" -"PO-Revision-Date: 2017-09-23 18:54+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"PO-Revision-Date: 2024-10-07 18:45+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,14 +20,16 @@ msgstr "" "4);\n" msgid "GIS" -msgstr "" +msgstr "GIS" msgid "The base GIS field." -msgstr "" +msgstr "Réimse bonn GIS." msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" +"An bonnréimse Céimseata — léarscáileanna chuig an gcineál Céimseata " +"Sonraíochta OpenGIS." msgid "Point" msgstr "Pointe" @@ -50,10 +53,10 @@ msgid "Geometry collection" msgstr "Céimseata bhailiú" msgid "Extent Aggregate Field" -msgstr "" +msgstr "Méid Réimse Comhiomlán" msgid "Raster Field" -msgstr "" +msgstr "Réimse Raster" msgid "No geometry value provided." msgstr "Ní soláthair méid geoiméadracht" @@ -72,17 +75,14 @@ msgstr "" "geoiméadracht." msgid "Delete all Features" -msgstr "" - -msgid "WKT debugging window:" -msgstr "" +msgstr "Scrios na Gnéithe go léir" msgid "Debugging window (serialized value)" -msgstr "" +msgstr "Fuinneog dífhabhtaithe (luach sraitheach)" msgid "No feeds are registered." msgstr "Níl fothaí cláraithe." #, python-format -msgid "Slug %r isn't registered." -msgstr "Níl slug %r cláraithe." +msgid "Slug %r isn’t registered." +msgstr "Níl seilide %r cláraithe." diff --git a/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo b/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo index 831f423100..402c100602 100644 Binary files a/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/ja/LC_MESSAGES/django.po b/django/contrib/gis/locale/ja/LC_MESSAGES/django.po index 2a0d6cd50d..232f66ad0e 100644 --- a/django/contrib/gis/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/ja/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Akio Ogasahara , 2024 # Jannis Leidel , 2011 # Shinya Okano , 2012,2014-2015 # Takuya N , 2020 @@ -9,8 +10,8 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 18:45+0000\n" -"Last-Translator: Takuya N , 2020\n" +"PO-Revision-Date: 2024-08-07 18:45+0000\n" +"Last-Translator: Akio Ogasahara , 2024\n" "Language-Team: Japanese (http://app.transifex.com/django/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -48,7 +49,7 @@ msgid "Multi polygon" msgstr "複数のポリゴン" msgid "Geometry collection" -msgstr "地形の集合" +msgstr "ジオメトリのコレクション" msgid "Extent Aggregate Field" msgstr "広さ集計フィールド" diff --git a/django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.mo index d282a94b0a..c667bc5bf7 100644 Binary files a/django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.po index d976cfdecb..828b555a43 100644 --- a/django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/zh_Hant/LC_MESSAGES/django.po @@ -6,13 +6,14 @@ # Jannis Leidel , 2011 # 619e61dbdb61c57213f62815aaf60e01, 2011 # Tzu-ping Chung , 2016,2019 +# YAO WEN LIANG, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 18:45+0000\n" -"Last-Translator: Tzu-ping Chung , 2016,2019\n" +"PO-Revision-Date: 2024-08-07 18:45+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" "Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -22,7 +23,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "GIS" -msgstr "GIS" +msgstr "地理資訊系統(GIS)" msgid "The base GIS field." msgstr "基礎 GIS 欄位。" @@ -32,34 +33,34 @@ msgid "" msgstr "基本的 Geometry 欄位——對應於 OpenGIS 規格的 Geometry 類型。" msgid "Point" -msgstr "Point 類別" +msgstr "點" msgid "Line string" -msgstr "Line string 類別" +msgstr "線串" msgid "Polygon" -msgstr "Polygon 類別" +msgstr "多邊形" msgid "Multi-point" -msgstr "Multi-point 類別" +msgstr "多點" msgid "Multi-line string" -msgstr "Multi-line string 類別" +msgstr "多線串" msgid "Multi polygon" -msgstr "Multi polygon 類別" +msgstr "多個多邊形" msgid "Geometry collection" -msgstr "Geometry collection (幾何型別之叢集) 類別" +msgstr "幾何集合" msgid "Extent Aggregate Field" msgstr "聚集程度欄位" msgid "Raster Field" -msgstr "柵格欄位" +msgstr "光柵欄位" msgid "No geometry value provided." -msgstr "沒有幾何資訊。" +msgstr "未提供幾何資訊。" msgid "Invalid geometry value." msgstr "無效的幾何參數。" @@ -73,7 +74,7 @@ msgid "" msgstr "當把目前地理資訊-GIS，轉成空間參考識別碼-SRID時發生錯誤。" msgid "Delete all Features" -msgstr "刪除所有特徵" +msgstr "清空地圖" msgid "Debugging window (serialized value)" msgstr "除錯視窗 (序列化值)" @@ -83,4 +84,4 @@ msgstr "沒有已註冊的 feed。" #, python-format msgid "Slug %r isn’t registered." -msgstr "嵌入式語法 %r 尚未註冊。" +msgstr "Slug %r 尚未註冊。" diff --git a/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo index 251d93fe6b..57035e03b7 100644 Binary files a/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po index 2729a9bc75..df21af9a3d 100644 --- a/django/contrib/humanize/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/az/LC_MESSAGES/django.po @@ -6,14 +6,15 @@ # Emin Mastizada , 2018,2020 # Emin Mastizada , 2016 # Nicat Məmmədov , 2022 +# Nijat Mammadov, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-07 14:40+0200\n" -"PO-Revision-Date: 2022-07-24 18:40+0000\n" -"Last-Translator: Nicat Məmmədov \n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"PO-Revision-Date: 2024-08-07 18:40+0000\n" +"Last-Translator: Nijat Mammadov, 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,47 +38,47 @@ msgstr "{}." #. Translators: Ordinal format when value ends with 1, e.g. 81st, except 11. msgctxt "ordinal 1" msgid "{}st" -msgstr "{}ci" +msgstr "{}." #. Translators: Ordinal format when value ends with 2, e.g. 82nd, except 12. msgctxt "ordinal 2" msgid "{}nd" -msgstr "{}ci" +msgstr "{}." -#. Translators: Ordinal format when value ends with 3, e.g. 83th, except 13. +#. Translators: Ordinal format when value ends with 3, e.g. 83rd, except 13. msgctxt "ordinal 3" msgid "{}rd" -msgstr "{}cü" +msgstr "{}." #. Translators: Ordinal format when value ends with 4, e.g. 84th. msgctxt "ordinal 4" msgid "{}th" -msgstr "{}cü" +msgstr "{}." #. Translators: Ordinal format when value ends with 5, e.g. 85th. msgctxt "ordinal 5" msgid "{}th" -msgstr "{}ci" +msgstr "{}." #. Translators: Ordinal format when value ends with 6, e.g. 86th. msgctxt "ordinal 6" msgid "{}th" -msgstr "{}cı" +msgstr "{}." #. Translators: Ordinal format when value ends with 7, e.g. 87th. msgctxt "ordinal 7" msgid "{}th" -msgstr "{}ci" +msgstr "{}." #. Translators: Ordinal format when value ends with 8, e.g. 88th. msgctxt "ordinal 8" msgid "{}th" -msgstr "{}ci" +msgstr "{}." #. Translators: Ordinal format when value ends with 9, e.g. 89th. msgctxt "ordinal 9" msgid "{}th" -msgstr "{}cu" +msgstr "{}." #, python-format msgid "%(value)s million" diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo index d167d67e44..7efd0e28f5 100644 Binary files a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po index b8ed0c5f74..648bf694b5 100644 --- a/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/eu/LC_MESSAGES/django.po @@ -3,17 +3,18 @@ # Translators: # Aitzol Naberan , 2011-2012,2016 # Ander Martinez , 2014 -# Eneko Illarramendi , 2017-2018,2022 +# Eneko Illarramendi , 2017-2018,2022,2024 # Jannis Leidel , 2011 # julen, 2014 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-07 14:40+0200\n" -"PO-Revision-Date: 2022-07-24 18:40+0000\n" -"Last-Translator: Eneko Illarramendi \n" -"Language-Team: Basque (http://www.transifex.com/django/django/language/eu/)\n" +"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"PO-Revision-Date: 2024-08-07 18:40+0000\n" +"Last-Translator: Eneko Illarramendi , " +"2017-2018,2022,2024\n" +"Language-Team: Basque (http://app.transifex.com/django/django/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,7 +22,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Humanize" -msgstr "Humanizatu" +msgstr "Gizakitu" #. Translators: Ordinal format for 11 (11th), 12 (12th), and 13 (13th). msgctxt "ordinal 11, 12, 13" @@ -43,7 +44,7 @@ msgctxt "ordinal 2" msgid "{}nd" msgstr "{}." -#. Translators: Ordinal format when value ends with 3, e.g. 83th, except 13. +#. Translators: Ordinal format when value ends with 3, e.g. 83rd, except 13. msgctxt "ordinal 3" msgid "{}rd" msgstr "{}." @@ -208,7 +209,7 @@ msgstr[1] "duela %(count)s minutu" msgid "a second ago" msgid_plural "%(count)s seconds ago" msgstr[0] "duela segundu bat" -msgstr[1] "duela %(count)s segundu" +msgstr[1] "duela %(count)s segundo" msgid "now" msgstr "orain" @@ -219,7 +220,7 @@ msgstr "orain" msgid "a second from now" msgid_plural "%(count)s seconds from now" msgstr[0] "segundu bat barru" -msgstr[1] "%(count)s segundu barru" +msgstr[1] "%(count)s segundo barru" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. diff --git a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo index 1fb51b9f43..abbfd57980 100644 Binary files a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po index 5108ded756..0e99520b73 100644 --- a/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/ga/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Luke Blaney , 2019 # Michael Thornhill , 2011-2012 @@ -8,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-06-22 21:44+0000\n" -"Last-Translator: Luke Blaney \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"PO-Revision-Date: 2024-10-07 18:40+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,7 +21,7 @@ msgstr "" "4);\n" msgid "Humanize" -msgstr "" +msgstr "Déan daonnachadh" #. Translators: Ordinal format for 11 (11th), 12 (12th), and 13 (13th). msgctxt "ordinal 11, 12, 13" @@ -42,7 +43,7 @@ msgctxt "ordinal 2" msgid "{}nd" msgstr "{}ú" -#. Translators: Ordinal format when value ends with 3, e.g. 83th, except 13. +#. Translators: Ordinal format when value ends with 3, e.g. 83rd, except 13. msgctxt "ordinal 3" msgid "{}rd" msgstr "{}ú" @@ -77,15 +78,6 @@ msgctxt "ordinal 9" msgid "{}th" msgstr "{}ú" -#, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "%(value).1f milliún" -msgstr[1] "%(value).1f milliún" -msgstr[2] "%(value).1f milliún" -msgstr[3] "%(value).1f milliún" -msgstr[4] "%(value).1f milliún" - #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" @@ -95,15 +87,6 @@ msgstr[2] " %(value)s milliún" msgstr[3] " %(value)s milliún" msgstr[4] " %(value)s milliún" -#, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f billiún" -msgstr[1] "%(value).1f billiún" -msgstr[2] "%(value).1f billiún" -msgstr[3] "%(value).1f billiún" -msgstr[4] "%(value).1f billiún" - #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" @@ -113,15 +96,6 @@ msgstr[2] " %(value)s billiún" msgstr[3] " %(value)s billiún" msgstr[4] " %(value)s billiún" -#, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f trilliún" -msgstr[1] "%(value).1f trilliún" -msgstr[2] "%(value).1f trilliún" -msgstr[3] "%(value).1f trilliún" -msgstr[4] "%(value).1f trilliún" - #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" @@ -131,15 +105,6 @@ msgstr[2] " %(value)s trilliún" msgstr[3] " %(value)s trilliún" msgstr[4] " %(value)s trilliún" -#, python-format -msgid "%(value).1f quadrillion" -msgid_plural "%(value).1f quadrillion" -msgstr[0] "%(value).1f quadrilliún" -msgstr[1] "%(value).1f quadrilliún" -msgstr[2] "%(value).1f quadrilliún" -msgstr[3] "%(value).1f quadrilliún" -msgstr[4] "%(value).1f quadrilliún" - #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" @@ -149,15 +114,6 @@ msgstr[2] "%(value)s quadrilliún" msgstr[3] "%(value)s quadrilliún" msgstr[4] "%(value)s quadrilliún" -#, python-format -msgid "%(value).1f quintillion" -msgid_plural "%(value).1f quintillion" -msgstr[0] "%(value).1f quintillion" -msgstr[1] "%(value).1f quintillion" -msgstr[2] "%(value).1f quintillion" -msgstr[3] "%(value).1f quintillion" -msgstr[4] "%(value).1f quintillion" - #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" @@ -167,15 +123,6 @@ msgstr[2] "%(value)s quintillion" msgstr[3] "%(value)s quintillion" msgstr[4] "%(value)s quintillion" -#, python-format -msgid "%(value).1f sextillion" -msgid_plural "%(value).1f sextillion" -msgstr[0] "%(value).1f sextillion" -msgstr[1] "%(value).1f sextillion" -msgstr[2] "%(value).1f sextillion" -msgstr[3] "%(value).1f sextillion" -msgstr[4] "%(value).1f sextillion" - #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" @@ -185,15 +132,6 @@ msgstr[2] "%(value)s sextillion" msgstr[3] "%(value)s sextillion" msgstr[4] "%(value)s sextillion" -#, python-format -msgid "%(value).1f septillion" -msgid_plural "%(value).1f septillion" -msgstr[0] "%(value).1f septillion" -msgstr[1] "%(value).1f septillion" -msgstr[2] "%(value).1f septillion" -msgstr[3] "%(value).1f septillion" -msgstr[4] "%(value).1f septillion" - #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" @@ -203,15 +141,6 @@ msgstr[2] "%(value)s septillion" msgstr[3] "%(value)s septillion" msgstr[4] "%(value)s septillion" -#, python-format -msgid "%(value).1f octillion" -msgid_plural "%(value).1f octillion" -msgstr[0] "%(value).1f octillion" -msgstr[1] "%(value).1f octillion" -msgstr[2] "%(value).1f octillion" -msgstr[3] "%(value).1f octillion" -msgstr[4] "%(value).1f octillion" - #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" @@ -221,15 +150,6 @@ msgstr[2] "%(value)s octillion" msgstr[3] "%(value)s octillion" msgstr[4] "%(value)s octillion" -#, python-format -msgid "%(value).1f nonillion" -msgid_plural "%(value).1f nonillion" -msgstr[0] "%(value).1f nonillion" -msgstr[1] "%(value).1f nonillion" -msgstr[2] "%(value).1f nonillion" -msgstr[3] "%(value).1f nonillion" -msgstr[4] "%(value).1f nonillion" - #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" @@ -239,15 +159,6 @@ msgstr[2] "%(value)s nonillion" msgstr[3] "%(value)s nonillion" msgstr[4] "%(value)s nonillion" -#, python-format -msgid "%(value).1f decillion" -msgid_plural "%(value).1f decillion" -msgstr[0] "%(value).1f decillion" -msgstr[1] "%(value).1f decillion" -msgstr[2] "%(value).1f decillion" -msgstr[3] "%(value).1f decillion" -msgstr[4] "%(value).1f decillion" - #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" @@ -257,15 +168,6 @@ msgstr[2] "%(value)s decillion" msgstr[3] "%(value)s decillion" msgstr[4] "%(value)s decillion" -#, python-format -msgid "%(value).1f googol" -msgid_plural "%(value).1f googol" -msgstr[0] "%(value).1f googol" -msgstr[1] "%(value).1f googol" -msgstr[2] "%(value).1f googol" -msgstr[3] "%(value).1f googol" -msgstr[4] "%(value).1f googol" - #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" @@ -315,40 +217,40 @@ msgstr "inné" #. weeks' #, python-format msgid "%(delta)s ago" -msgstr "" +msgstr "%(delta)s ó shin" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "an hour ago" msgid_plural "%(count)s hours ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgstr[0] "uair an chloig ó shin" +msgstr[1] "%(count)s uair an chloig ó shin" +msgstr[2] "%(count)s uair an chloig ó shin" +msgstr[3] "%(count)s uair an chloig ó shin" +msgstr[4] "%(count)s uair an chloig ó shin" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "a minute ago" msgid_plural "%(count)s minutes ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgstr[0] "nóiméad ó shin" +msgstr[1] "%(count)s nóiméad ó shin" +msgstr[2] "%(count)s nóiméad ó shin" +msgstr[3] "%(count)s nóiméad ó shin" +msgstr[4] "%(count)s nóiméad ó shin" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "a second ago" msgid_plural "%(count)s seconds ago" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgstr[0] "soicind ó shin" +msgstr[1] "%(count)s soicindí ó shin" +msgstr[2] "%(count)s soicindí ó shin" +msgstr[3] "%(count)s soicindí ó shin" +msgstr[4] "%(count)s soicindí ó shin" msgid "now" msgstr "anois" @@ -358,159 +260,159 @@ msgstr "anois" #, python-format msgid "a second from now" msgid_plural "%(count)s seconds from now" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgstr[0] "soicind as seo amach" +msgstr[1] "%(count)s soicind as seo amach" +msgstr[2] "%(count)s soicind as seo amach" +msgstr[3] "%(count)s soicind as seo amach" +msgstr[4] "%(count)s soicind as seo amach" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "a minute from now" msgid_plural "%(count)s minutes from now" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgstr[0] "nóiméad ó anois" +msgstr[1] "%(count)s nóiméad as seo" +msgstr[2] "%(count)s nóiméad as seo" +msgstr[3] "%(count)s nóiméad as seo" +msgstr[4] "%(count)s nóiméad as seo" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "an hour from now" msgid_plural "%(count)s hours from now" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgstr[0] "uair an chloig ó anois" +msgstr[1] "%(count)s uair an chloig as seo amach" +msgstr[2] "%(count)s uair an chloig as seo amach" +msgstr[3] "%(count)s uair an chloig as seo amach" +msgstr[4] "%(count)s uair an chloig as seo amach" #. Translators: delta will contain a string like '2 months' or '1 month, 2 #. weeks' #, python-format msgid "%(delta)s from now" -msgstr "" +msgstr "%(delta)s as seo amach" #. Translators: 'naturaltime-past' strings will be included in '%(delta)s ago' #, python-format msgctxt "naturaltime-past" -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d bhliain" +msgstr[1] "%(num)d bliain" +msgstr[2] "%(num)d bliain" +msgstr[3] "%(num)d bliain" +msgstr[4] "%(num)d bliain" #, python-format msgctxt "naturaltime-past" -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d mí" +msgstr[1] "%(num)d mí" +msgstr[2] "%(num)d mí" +msgstr[3] "%(num)d mí" +msgstr[4] "%(num)d mí" #, python-format msgctxt "naturaltime-past" -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d seachtain" +msgstr[1] "%(num)d seachtain" +msgstr[2] "%(num)d seachtain" +msgstr[3] "%(num)d seachtain" +msgstr[4] "%(num)d seachtain" #, python-format msgctxt "naturaltime-past" -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d lá" +msgstr[1] "%(num)d lá" +msgstr[2] "%(num)d lá" +msgstr[3] "%(num)d lá" +msgstr[4] "%(num)d lá" #, python-format msgctxt "naturaltime-past" -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d uair" +msgstr[1] "%(num)d uair an chloig" +msgstr[2] "%(num)d uair an chloig" +msgstr[3] "%(num)d uair an chloig" +msgstr[4] "%(num)d uair an chloig" #, python-format msgctxt "naturaltime-past" -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d nóiméad" +msgstr[1] "%(num)d nóiméad" +msgstr[2] "%(num)d nóiméad" +msgstr[3] "%(num)d nóiméad" +msgstr[4] "%(num)d nóiméad" #. Translators: 'naturaltime-future' strings will be included in '%(delta)s #. from now' #, python-format msgctxt "naturaltime-future" -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d bhliain" +msgstr[1] "%(num)d bliain" +msgstr[2] "%(num)d bliain" +msgstr[3] "%(num)d bliain" +msgstr[4] "%(num)d bliain" #, python-format msgctxt "naturaltime-future" -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d mí" +msgstr[1] "%(num)d mí" +msgstr[2] "%(num)d mí" +msgstr[3] "%(num)d mí" +msgstr[4] "%(num)d mí" #, python-format msgctxt "naturaltime-future" -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d seachtain" +msgstr[1] "%(num)d seachtain" +msgstr[2] "%(num)d seachtain" +msgstr[3] "%(num)d seachtain" +msgstr[4] "%(num)d seachtain" #, python-format msgctxt "naturaltime-future" -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d lá" +msgstr[1] "%(num)d lá" +msgstr[2] "%(num)d lá" +msgstr[3] "%(num)d lá" +msgstr[4] "%(num)d lá" #, python-format msgctxt "naturaltime-future" -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d uair" +msgstr[1] "%(num)d uair an chloig" +msgstr[2] "%(num)d uair an chloig" +msgstr[3] "%(num)d uair an chloig" +msgstr[4] "%(num)d uair an chloig" #, python-format msgctxt "naturaltime-future" -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d nóiméad" +msgstr[1] "%(num)d nóiméad" +msgstr[2] "%(num)d nóiméad" +msgstr[3] "%(num)d nóiméad" +msgstr[4] "%(num)d nóiméad" diff --git a/django/contrib/humanize/locale/hy/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/hy/LC_MESSAGES/django.mo index b41d6f862d..2062d1eca0 100644 Binary files a/django/contrib/humanize/locale/hy/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/hy/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/hy/LC_MESSAGES/django.po b/django/contrib/humanize/locale/hy/LC_MESSAGES/django.po index ebd773e8cb..085e7d790b 100644 --- a/django/contrib/humanize/locale/hy/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/hy/LC_MESSAGES/django.po @@ -2,15 +2,16 @@ # # Translators: # Artur Saroyan <>, 2012 +# EnCo_de, 2024 # Ruben Harutyunov , 2018 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2018-11-11 20:06+0000\n" -"Last-Translator: Ruben Harutyunov \n" -"Language-Team: Armenian (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"PO-Revision-Date: 2024-08-07 18:40+0000\n" +"Last-Translator: EnCo_de, 2024\n" +"Language-Team: Armenian (http://app.transifex.com/django/django/language/" "hy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,14 +35,14 @@ msgstr "{}րդ" #. Translators: Ordinal format when value ends with 1, e.g. 81st, except 11. msgctxt "ordinal 1" msgid "{}st" -msgstr "{}ին" +msgstr "{}րդ" #. Translators: Ordinal format when value ends with 2, e.g. 82nd, except 12. msgctxt "ordinal 2" msgid "{}nd" msgstr "{}րդ" -#. Translators: Ordinal format when value ends with 3, e.g. 83th, except 13. +#. Translators: Ordinal format when value ends with 3, e.g. 83rd, except 13. msgctxt "ordinal 3" msgid "{}rd" msgstr "{}րդ" @@ -76,59 +77,29 @@ msgctxt "ordinal 9" msgid "{}th" msgstr "{}րդ" -#, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "%(value).1fմիլիոն" -msgstr[1] "%(value).1fմիլիոն" - #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" -msgstr[0] "" -msgstr[1] "" - -#, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s միլիոն" +msgstr[1] "%(value)s միլիոն" #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" -msgstr[0] "" -msgstr[1] "" - -#, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s միլիարդ" +msgstr[1] "%(value)s միլիարդ" #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" -msgstr[0] "" -msgstr[1] "" - -#, python-format -msgid "%(value).1f quadrillion" -msgid_plural "%(value).1f quadrillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s տրիլիոն" +msgstr[1] "%(value)s տրիլիոն" #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" -msgstr[0] "" -msgstr[1] "" - -#, python-format -msgid "%(value).1f quintillion" -msgid_plural "%(value).1f quintillion" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(value)s կվադրիլիոն" +msgstr[1] "%(value)s կվադրիլիոն" #, python-format msgid "%(value)s quintillion" @@ -136,72 +107,36 @@ msgid_plural "%(value)s quintillion" msgstr[0] "" msgstr[1] "" -#, python-format -msgid "%(value).1f sextillion" -msgid_plural "%(value).1f sextillion" -msgstr[0] "" -msgstr[1] "" - #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" msgstr[0] "" msgstr[1] "" -#, python-format -msgid "%(value).1f septillion" -msgid_plural "%(value).1f septillion" -msgstr[0] "" -msgstr[1] "" - #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" msgstr[0] "" msgstr[1] "" -#, python-format -msgid "%(value).1f octillion" -msgid_plural "%(value).1f octillion" -msgstr[0] "" -msgstr[1] "" - #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "" msgstr[1] "" -#, python-format -msgid "%(value).1f nonillion" -msgid_plural "%(value).1f nonillion" -msgstr[0] "" -msgstr[1] "" - #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" msgstr[0] "" msgstr[1] "" -#, python-format -msgid "%(value).1f decillion" -msgid_plural "%(value).1f decillion" -msgstr[0] "" -msgstr[1] "" - #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" msgstr[0] "" msgstr[1] "" -#, python-format -msgid "%(value).1f googol" -msgid_plural "%(value).1f googol" -msgstr[0] "" -msgstr[1] "" - #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" @@ -248,31 +183,31 @@ msgstr "երեկ" #. weeks' #, python-format msgid "%(delta)s ago" -msgstr "" +msgstr "%(delta)s առաջ" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "an hour ago" msgid_plural "%(count)s hours ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "մեկ ժամ առաջ" +msgstr[1] "%(count)s ժամ առաջ" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "a minute ago" msgid_plural "%(count)s minutes ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "մեկ րոպե առաջ" +msgstr[1] "%(count)s րոպե առաջ" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "a second ago" msgid_plural "%(count)s seconds ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "մեկ վայրկյան առաջ" +msgstr[1] "%(count)s վայրկյան առաջ" msgid "now" msgstr "հիմա" @@ -282,114 +217,114 @@ msgstr "հիմա" #, python-format msgid "a second from now" msgid_plural "%(count)s seconds from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "մեկ վայրկյանից" +msgstr[1] "%(count)s վայրկյանից" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "a minute from now" msgid_plural "%(count)s minutes from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "մեկ րոպե անց" +msgstr[1] "%(count)s րոպե անց" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. #, python-format msgid "an hour from now" msgid_plural "%(count)s hours from now" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "մեկ ժամ հետո" +msgstr[1] "%(count)s ժամ հետո" #. Translators: delta will contain a string like '2 months' or '1 month, 2 #. weeks' #, python-format msgid "%(delta)s from now" -msgstr "" +msgstr "%(delta)s հետո" #. Translators: 'naturaltime-past' strings will be included in '%(delta)s ago' #, python-format msgctxt "naturaltime-past" -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d տարի" +msgstr[1] "%(num)d տարի" #, python-format msgctxt "naturaltime-past" -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d ամիս" +msgstr[1] "%(num)d ամիս" #, python-format msgctxt "naturaltime-past" -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d շաբաթ" +msgstr[1] "%(num)d շաբաթ" #, python-format msgctxt "naturaltime-past" -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d օր" +msgstr[1] "%(num)d օր" #, python-format msgctxt "naturaltime-past" -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d ժամ" +msgstr[1] "%(num)d ժամ" #, python-format msgctxt "naturaltime-past" -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d րոպե" +msgstr[1] "%(num)d րոպե" #. Translators: 'naturaltime-future' strings will be included in '%(delta)s #. from now' #, python-format msgctxt "naturaltime-future" -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d տարի" +msgstr[1] "%(num)d տարի" #, python-format msgctxt "naturaltime-future" -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d ամիս" +msgstr[1] "%(num)d ամիս" #, python-format msgctxt "naturaltime-future" -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d շաբաթ" +msgstr[1] "%(num)d շաբաթ" #, python-format msgctxt "naturaltime-future" -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d օր" +msgstr[1] "%(num)d օր" #, python-format msgctxt "naturaltime-future" -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d ժամ" +msgstr[1] "%(num)d ժամ" #, python-format msgctxt "naturaltime-future" -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d րոպե" +msgstr[1] "%(num)d րոպե" diff --git a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo index eb35f0e393..fe94773494 100644 Binary files a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po index 53e9b28026..391c4d592b 100644 --- a/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/pt_BR/LC_MESSAGES/django.po @@ -3,9 +3,11 @@ # Translators: # Allisson Azevedo , 2014 # bruno.devpod , 2014 +# Claude Paroz , 2024 # Eduardo Cereto Carvalho, 2012 +# Eduardo Felipe Castegnaro , 2024 # Erick Mesquita, 2023 -# semente, 2012-2013 +# fa9e10542e458baef0599ae856e43651_13d2225, 2012-2013 # Jannis Leidel , 2011 # Rafael Fontenelle , 2022 # Sandro , 2011 @@ -14,10 +16,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-07 14:40+0200\n" -"PO-Revision-Date: 2023-04-24 18:40+0000\n" -"Last-Translator: Erick Mesquita, 2023\n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" +"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"PO-Revision-Date: 2024-08-07 18:40+0000\n" +"Last-Translator: Eduardo Felipe Castegnaro , 2024\n" +"Language-Team: Portuguese (Brazil) (http://app.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -48,7 +50,7 @@ msgctxt "ordinal 2" msgid "{}nd" msgstr "{}º" -#. Translators: Ordinal format when value ends with 3, e.g. 83th, except 13. +#. Translators: Ordinal format when value ends with 3, e.g. 83rd, except 13. msgctxt "ordinal 3" msgid "{}rd" msgstr "{}º" @@ -200,7 +202,7 @@ msgstr "ontem" #. weeks' #, python-format msgid "%(delta)s ago" -msgstr "%(delta)satrás" +msgstr "%(delta)s atrás" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. @@ -208,8 +210,8 @@ msgstr "%(delta)satrás" msgid "an hour ago" msgid_plural "%(count)s hours ago" msgstr[0] "uma hora atrás" -msgstr[1] "%(count)s horas atrás" -msgstr[2] "%(count)s horas atrás" +msgstr[1] "%(count)s horas atrás" +msgstr[2] "%(count)s horas atrás" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. @@ -217,8 +219,8 @@ msgstr[2] "%(count)s horas atrás" msgid "a minute ago" msgid_plural "%(count)s minutes ago" msgstr[0] "um minuto atrás" -msgstr[1] "%(count)s minutos atrás" -msgstr[2] "%(count)s minutos atrás" +msgstr[1] "%(count)s minutos atrás" +msgstr[2] "%(count)s minutos atrás" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. @@ -226,8 +228,8 @@ msgstr[2] "%(count)s minutos atrás" msgid "a second ago" msgid_plural "%(count)s seconds ago" msgstr[0] "um segundo atrás" -msgstr[1] "%(count)s segundos atrás" -msgstr[2] "%(count)s segundos atrás" +msgstr[1] "%(count)s segundos atrás" +msgstr[2] "%(count)s segundos atrás" msgid "now" msgstr "agora" @@ -238,8 +240,8 @@ msgstr "agora" msgid "a second from now" msgid_plural "%(count)s seconds from now" msgstr[0] "um segundo a partir de agora" -msgstr[1] "%(count)s segundos a partir de agora" -msgstr[2] "%(count)s segundos a partir de agora" +msgstr[1] "%(count)s segundos a partir de agora" +msgstr[2] "%(count)s segundos a partir de agora" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. @@ -247,8 +249,8 @@ msgstr[2] "%(count)s segundos a partir de agora" msgid "a minute from now" msgid_plural "%(count)s minutes from now" msgstr[0] "um minuto a partir de agora" -msgstr[1] "%(count)s minutos a partir de agora" -msgstr[2] "%(count)s minutos a partir de agora" +msgstr[1] "%(count)s minutos a partir de agora" +msgstr[2] "%(count)s minutos a partir de agora" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. @@ -256,8 +258,8 @@ msgstr[2] "%(count)s minutos a partir de agora" msgid "an hour from now" msgid_plural "%(count)s hours from now" msgstr[0] "uma hora a partir de agora" -msgstr[1] "%(count)s horas a partir de agora" -msgstr[2] "%(count)s horas a partir de agora" +msgstr[1] "%(count)s horas a partir de agora" +msgstr[2] "%(count)s horas a partir de agora" #. Translators: delta will contain a string like '2 months' or '1 month, 2 #. weeks' @@ -329,7 +331,7 @@ msgctxt "naturaltime-future" msgid "%(num)d month" msgid_plural "%(num)d months" msgstr[0] "%(num)d mês" -msgstr[1] "%(num)d mses" +msgstr[1] "%(num)d meses" msgstr[2] "%(num)d meses" #, python-format diff --git a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo index e40470bafc..adfc7b1ebd 100644 Binary files a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po index 02cf707079..2fe9406fef 100644 --- a/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/sr_Latn/LC_MESSAGES/django.po @@ -1,95 +1,108 @@ # This file is distributed under the same license as the Django package. -# +# # Translators: -# Igor Jerosimić, 2021,2023 +# Igor Jerosimić, 2021,2023-2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-09-18 11:41-0300\n" -"PO-Revision-Date: 2023-12-04 18:40+0000\n" -"Last-Translator: Igor Jerosimić, 2021,2023\n" -"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/" -"language/sr@latin/)\n" +"PO-Revision-Date: 2024-08-07 18:40+0000\n" +"Last-Translator: Igor Jerosimić, 2021,2023-2024\n" +"Language-Team: Serbian (Latin) (http://app.transifex.com/django/django/language/sr@latin/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: sr@latin\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" +"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" +#: contrib/humanize/apps.py:7 msgid "Humanize" msgstr "Humanizovanje" #. Translators: Ordinal format for 11 (11th), 12 (12th), and 13 (13th). +#: contrib/humanize/templatetags/humanize.py:35 msgctxt "ordinal 11, 12, 13" msgid "{}th" msgstr "{}-ti" #. Translators: Ordinal format when value ends with 0, e.g. 80th. +#: contrib/humanize/templatetags/humanize.py:39 msgctxt "ordinal 0" msgid "{}th" msgstr "{}-ti" #. Translators: Ordinal format when value ends with 1, e.g. 81st, except 11. +#: contrib/humanize/templatetags/humanize.py:41 msgctxt "ordinal 1" msgid "{}st" msgstr "" #. Translators: Ordinal format when value ends with 2, e.g. 82nd, except 12. +#: contrib/humanize/templatetags/humanize.py:43 msgctxt "ordinal 2" msgid "{}nd" msgstr "" #. Translators: Ordinal format when value ends with 3, e.g. 83rd, except 13. +#: contrib/humanize/templatetags/humanize.py:45 msgctxt "ordinal 3" msgid "{}rd" msgstr "" #. Translators: Ordinal format when value ends with 4, e.g. 84th. +#: contrib/humanize/templatetags/humanize.py:47 msgctxt "ordinal 4" msgid "{}th" msgstr "" #. Translators: Ordinal format when value ends with 5, e.g. 85th. +#: contrib/humanize/templatetags/humanize.py:49 msgctxt "ordinal 5" msgid "{}th" msgstr "" #. Translators: Ordinal format when value ends with 6, e.g. 86th. +#: contrib/humanize/templatetags/humanize.py:51 msgctxt "ordinal 6" msgid "{}th" msgstr "" #. Translators: Ordinal format when value ends with 7, e.g. 87th. +#: contrib/humanize/templatetags/humanize.py:53 msgctxt "ordinal 7" msgid "{}th" msgstr "" #. Translators: Ordinal format when value ends with 8, e.g. 88th. +#: contrib/humanize/templatetags/humanize.py:55 msgctxt "ordinal 8" msgid "{}th" msgstr "" #. Translators: Ordinal format when value ends with 9, e.g. 89th. +#: contrib/humanize/templatetags/humanize.py:57 msgctxt "ordinal 9" msgid "{}th" msgstr "" +#: contrib/humanize/templatetags/humanize.py:88 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(value)s milion" +msgstr[1] "%(value)s miliona" +msgstr[2] "%(value)s miliona" +#: contrib/humanize/templatetags/humanize.py:89 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(value)s milijarda" +msgstr[1] "%(value)s milijarde" +msgstr[2] "%(value)s milijardi" +#: contrib/humanize/templatetags/humanize.py:90 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" @@ -97,6 +110,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:94 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" @@ -104,6 +118,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:100 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" @@ -111,6 +126,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:105 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" @@ -118,6 +134,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:109 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" @@ -125,6 +142,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:111 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" @@ -132,6 +150,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:112 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" @@ -139,6 +158,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:113 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" @@ -146,6 +166,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:114 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" @@ -153,50 +174,64 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:158 msgid "one" msgstr "jedan" +#: contrib/humanize/templatetags/humanize.py:159 msgid "two" msgstr "dva" +#: contrib/humanize/templatetags/humanize.py:160 msgid "three" msgstr "tri" +#: contrib/humanize/templatetags/humanize.py:161 msgid "four" msgstr "četiri" +#: contrib/humanize/templatetags/humanize.py:162 msgid "five" msgstr "pet" +#: contrib/humanize/templatetags/humanize.py:163 msgid "six" msgstr "šest" +#: contrib/humanize/templatetags/humanize.py:164 msgid "seven" msgstr "sedam" +#: contrib/humanize/templatetags/humanize.py:165 msgid "eight" msgstr "osam" +#: contrib/humanize/templatetags/humanize.py:166 msgid "nine" msgstr "devet" +#: contrib/humanize/templatetags/humanize.py:188 msgid "today" msgstr "danas" +#: contrib/humanize/templatetags/humanize.py:190 msgid "tomorrow" msgstr "sutra" +#: contrib/humanize/templatetags/humanize.py:192 msgid "yesterday" msgstr "juče" #. Translators: delta will contain a string like '2 months' or '1 month, 2 #. weeks' +#: contrib/humanize/templatetags/humanize.py:210 #, python-format msgid "%(delta)s ago" msgstr "" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. +#: contrib/humanize/templatetags/humanize.py:213 #, python-format msgid "an hour ago" msgid_plural "%(count)s hours ago" @@ -206,6 +241,7 @@ msgstr[2] "" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. +#: contrib/humanize/templatetags/humanize.py:216 #, python-format msgid "a minute ago" msgid_plural "%(count)s minutes ago" @@ -215,6 +251,7 @@ msgstr[2] "" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. +#: contrib/humanize/templatetags/humanize.py:219 #, python-format msgid "a second ago" msgid_plural "%(count)s seconds ago" @@ -222,11 +259,13 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: contrib/humanize/templatetags/humanize.py:220 msgid "now" msgstr "sada" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. +#: contrib/humanize/templatetags/humanize.py:224 #, python-format msgid "a second from now" msgid_plural "%(count)s seconds from now" @@ -236,6 +275,7 @@ msgstr[2] "" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. +#: contrib/humanize/templatetags/humanize.py:229 #, python-format msgid "a minute from now" msgid_plural "%(count)s minutes from now" @@ -245,6 +285,7 @@ msgstr[2] "" #. Translators: please keep a non-breaking space (U+00A0) between count #. and time unit. +#: contrib/humanize/templatetags/humanize.py:234 #, python-format msgid "an hour from now" msgid_plural "%(count)s hours from now" @@ -254,105 +295,118 @@ msgstr[2] "" #. Translators: delta will contain a string like '2 months' or '1 month, 2 #. weeks' +#: contrib/humanize/templatetags/humanize.py:237 #, python-format msgid "%(delta)s from now" msgstr "" #. Translators: 'naturaltime-past' strings will be included in '%(delta)s ago' +#: contrib/humanize/templatetags/humanize.py:242 #, python-format msgctxt "naturaltime-past" msgid "%(num)d year" msgid_plural "%(num)d years" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d godina" +msgstr[1] "%(num)d godine" +msgstr[2] "%(num)d godina" +#: contrib/humanize/templatetags/humanize.py:245 #, python-format msgctxt "naturaltime-past" msgid "%(num)d month" msgid_plural "%(num)d months" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d mesec" +msgstr[1] "%(num)d meseca" +msgstr[2] "%(num)d meseci" +#: contrib/humanize/templatetags/humanize.py:248 #, python-format msgctxt "naturaltime-past" msgid "%(num)d week" msgid_plural "%(num)d weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d nedelja" +msgstr[1] "%(num)d nedelje" +msgstr[2] "%(num)d nedelja" +#: contrib/humanize/templatetags/humanize.py:250 #, python-format msgctxt "naturaltime-past" msgid "%(num)d day" msgid_plural "%(num)d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d dan" +msgstr[1] "%(num)d dana" +msgstr[2] "%(num)d dana" +#: contrib/humanize/templatetags/humanize.py:252 #, python-format msgctxt "naturaltime-past" msgid "%(num)d hour" msgid_plural "%(num)d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d sat" +msgstr[1] "%(num)d sata" +msgstr[2] "%(num)d sati" +#: contrib/humanize/templatetags/humanize.py:255 #, python-format msgctxt "naturaltime-past" msgid "%(num)d minute" msgid_plural "%(num)d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d minut" +msgstr[1] "%(num)d minuta" +msgstr[2] "%(num)d minuta" #. Translators: 'naturaltime-future' strings will be included in '%(delta)s #. from now' +#: contrib/humanize/templatetags/humanize.py:262 #, python-format msgctxt "naturaltime-future" msgid "%(num)d year" msgid_plural "%(num)d years" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d godina" +msgstr[1] "%(num)d godine" +msgstr[2] "%(num)d godina" +#: contrib/humanize/templatetags/humanize.py:265 #, python-format msgctxt "naturaltime-future" msgid "%(num)d month" msgid_plural "%(num)d months" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d mesec" +msgstr[1] "%(num)d meseca" +msgstr[2] "%(num)d meseci" +#: contrib/humanize/templatetags/humanize.py:268 #, python-format msgctxt "naturaltime-future" msgid "%(num)d week" msgid_plural "%(num)d weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d nedelja" +msgstr[1] "%(num)d nedelje" +msgstr[2] "%(num)d nedelja" +#: contrib/humanize/templatetags/humanize.py:271 #, python-format msgctxt "naturaltime-future" msgid "%(num)d day" msgid_plural "%(num)d days" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d dan" +msgstr[1] "%(num)d dana" +msgstr[2] "%(num)d dana" +#: contrib/humanize/templatetags/humanize.py:274 #, python-format msgctxt "naturaltime-future" msgid "%(num)d hour" msgid_plural "%(num)d hours" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d sat" +msgstr[1] "%(num)d sata" +msgstr[2] "%(num)d sati" +#: contrib/humanize/templatetags/humanize.py:277 #, python-format msgctxt "naturaltime-future" msgid "%(num)d minute" msgid_plural "%(num)d minutes" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(num)d minut" +msgstr[1] "%(num)d minuta" +msgstr[2] "%(num)d minuta" diff --git a/django/contrib/humanize/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/humanize/locale/zh_Hant/LC_MESSAGES/django.mo index 2be75b5f1a..418fa78053 100644 Binary files a/django/contrib/humanize/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/humanize/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/humanize/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/humanize/locale/zh_Hant/LC_MESSAGES/django.po index 0944649ac9..f6edb946cd 100644 --- a/django/contrib/humanize/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Chen Chun-Chia , 2015 +# yubike, 2024 # Jannis Leidel , 2011 # tcc , 2011 # Tzu-ping Chung , 2016,2019 @@ -10,10 +11,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-16 20:42+0100\n" -"PO-Revision-Date: 2019-09-18 09:08+0000\n" -"Last-Translator: Tzu-ping Chung \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"POT-Creation-Date: 2023-09-18 11:41-0300\n" +"PO-Revision-Date: 2024-08-07 18:40+0000\n" +"Last-Translator: yubike, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +45,7 @@ msgctxt "ordinal 2" msgid "{}nd" msgstr "第{}" -#. Translators: Ordinal format when value ends with 3, e.g. 83th, except 13. +#. Translators: Ordinal format when value ends with 3, e.g. 83rd, except 13. msgctxt "ordinal 3" msgid "{}rd" msgstr "第{}" @@ -79,111 +80,56 @@ msgctxt "ordinal 9" msgid "{}th" msgstr "第{}" -#, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "%(value).1f 百萬" - #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" msgstr[0] "%(value)s 百萬" -#, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f 十億" - #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" msgstr[0] "%(value)s 十億" -#, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f 兆" - #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" msgstr[0] "%(value)s 兆" -#, python-format -msgid "%(value).1f quadrillion" -msgid_plural "%(value).1f quadrillion" -msgstr[0] "%(value).1f 千兆" - #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" msgstr[0] "%(value)s 千兆" -#, python-format -msgid "%(value).1f quintillion" -msgid_plural "%(value).1f quintillion" -msgstr[0] "%(value).1f 百京" - #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" msgstr[0] "%(value)s 百京" -#, python-format -msgid "%(value).1f sextillion" -msgid_plural "%(value).1f sextillion" -msgstr[0] "%(value).1f 十垓" - #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" msgstr[0] "%(value)s 十垓" -#, python-format -msgid "%(value).1f septillion" -msgid_plural "%(value).1f septillion" -msgstr[0] "%(value).1f 秭" - #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" msgstr[0] "%(value)s 秭" -#, python-format -msgid "%(value).1f octillion" -msgid_plural "%(value).1f octillion" -msgstr[0] "%(value).1f 千秭" - #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "%(value)s 千秭" -#, python-format -msgid "%(value).1f nonillion" -msgid_plural "%(value).1f nonillion" -msgstr[0] "%(value).1f 百穰" - #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" msgstr[0] "%(value)s 百穰" -#, python-format -msgid "%(value).1f decillion" -msgid_plural "%(value).1f decillion" -msgstr[0] "%(value).1f 十溝" - #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" msgstr[0] "%(value)s 十溝" -#, python-format -msgid "%(value).1f googol" -msgid_plural "%(value).1f googol" -msgstr[0] "%(value).1f 穰大數" - #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" @@ -285,74 +231,74 @@ msgstr "%(delta)s後" #. Translators: 'naturaltime-past' strings will be included in '%(delta)s ago' #, python-format msgctxt "naturaltime-past" -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "%d 年" +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d 年" #, python-format msgctxt "naturaltime-past" -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "%d 個月" +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d 月" #, python-format msgctxt "naturaltime-past" -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "%d 週" +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d 週" #, python-format msgctxt "naturaltime-past" -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d 天" +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d 日" #, python-format msgctxt "naturaltime-past" -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d 小時" +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d 小時" #, python-format msgctxt "naturaltime-past" -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d 分" +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d 分" #. Translators: 'naturaltime-future' strings will be included in '%(delta)s #. from now' #, python-format msgctxt "naturaltime-future" -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "%d 年" +msgid "%(num)d year" +msgid_plural "%(num)d years" +msgstr[0] "%(num)d 年" #, python-format msgctxt "naturaltime-future" -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "%d 個月" +msgid "%(num)d month" +msgid_plural "%(num)d months" +msgstr[0] "%(num)d 月" #, python-format msgctxt "naturaltime-future" -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "%d 週" +msgid "%(num)d week" +msgid_plural "%(num)d weeks" +msgstr[0] "%(num)d 週" #, python-format msgctxt "naturaltime-future" -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d 天" +msgid "%(num)d day" +msgid_plural "%(num)d days" +msgstr[0] "%(num)d 日" #, python-format msgctxt "naturaltime-future" -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d 小時" +msgid "%(num)d hour" +msgid_plural "%(num)d hours" +msgstr[0] "%(num)d 小時" #, python-format msgctxt "naturaltime-future" -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d 分" +msgid "%(num)d minute" +msgid_plural "%(num)d minutes" +msgstr[0] "%(num)d 分" diff --git a/django/contrib/messages/test.py b/django/contrib/messages/test.py index 3a69f54585..9f3e1bf0bc 100644 --- a/django/contrib/messages/test.py +++ b/django/contrib/messages/test.py @@ -1,5 +1,8 @@ from .api import get_messages +# Make unittest ignore frames in this module when reporting failures. +__unittest = True + class MessagesTestMixin: def assertMessages(self, response, expected_messages, *, ordered=True): diff --git a/django/contrib/postgres/constraints.py b/django/contrib/postgres/constraints.py index a6351dc008..2eae101d5a 100644 --- a/django/contrib/postgres/constraints.py +++ b/django/contrib/postgres/constraints.py @@ -178,22 +178,16 @@ class ExclusionConstraint(BaseConstraint): def validate(self, model, instance, exclude=None, using=DEFAULT_DB_ALIAS): queryset = model._default_manager.using(using) - replacement_map = instance._get_field_value_map( + replacement_map = instance._get_field_expression_map( meta=model._meta, exclude=exclude ) replacements = {F(field): value for field, value in replacement_map.items()} lookups = [] - for idx, (expression, operator) in enumerate(self.expressions): + for expression, operator in self.expressions: if isinstance(expression, str): expression = F(expression) - if exclude: - if isinstance(expression, F): - if expression.name in exclude: - return - else: - for expr in expression.flatten(): - if isinstance(expr, F) and expr.name in exclude: - return + if exclude and self._expression_refs_exclude(model, expression, exclude): + return rhs_expression = expression.replace_expressions(replacements) if hasattr(expression, "get_expression_for_validation"): expression = expression.get_expression_for_validation() @@ -204,7 +198,7 @@ class ExclusionConstraint(BaseConstraint): lookups.append(lookup) queryset = queryset.filter(*lookups) model_class_pk = instance._get_pk_val(model._meta) - if not instance._state.adding and model_class_pk is not None: + if not instance._state.adding and instance._is_pk_set(model._meta): queryset = queryset.exclude(pk=model_class_pk) if not self.condition: if queryset.exists(): diff --git a/django/contrib/postgres/forms/array.py b/django/contrib/postgres/forms/array.py index ddb022afc3..fd5cd219f8 100644 --- a/django/contrib/postgres/forms/array.py +++ b/django/contrib/postgres/forms/array.py @@ -228,7 +228,7 @@ class SplitArrayField(forms.Field): params={"nth": index + 1}, ) ) - cleaned_data.append(None) + cleaned_data.append(item) else: errors.append(None) cleaned_data, null_index = self._remove_trailing_nulls(cleaned_data) diff --git a/django/contrib/postgres/locale/az/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/az/LC_MESSAGES/django.mo index 97350a2054..b6739d9648 100644 Binary files a/django/contrib/postgres/locale/az/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/az/LC_MESSAGES/django.po b/django/contrib/postgres/locale/az/LC_MESSAGES/django.po index 418da3a04e..222c65cc70 100644 --- a/django/contrib/postgres/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/az/LC_MESSAGES/django.po @@ -2,14 +2,15 @@ # # Translators: # Emin Mastizada , 2018,2020 +# Nijat Mammadov, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 20:56+0200\n" -"PO-Revision-Date: 2020-05-12 20:01+0000\n" -"Last-Translator: Transifex Bot <>\n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2023-01-17 02:13-0600\n" +"PO-Revision-Date: 2024-08-07 09:22+0000\n" +"Last-Translator: Nijat Mammadov, 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,13 +23,13 @@ msgstr "PostgreSQL uzantıları" #, python-format msgid "Item %(nth)s in the array did not validate:" -msgstr "Array-dəki %(nth)s element təsdiqlənə bilmir:" +msgstr "Massivdəki %(nth)s. element təsdiqlənə bilmir:" msgid "Nested arrays must have the same length." -msgstr "İç-içə array-lərin uzunluğu eyni olmalıdır." +msgstr "İç-içə massivlərin uzunluğu eyni olmalıdır." msgid "Map of strings to strings/nulls" -msgstr "String-lərin string/null-lara xəritələnmə cədvəli" +msgstr "Sətirlərin string/null dəyərlərə xəritələnmə cədvəli" #, python-format msgid "The value of “%(key)s” is not a string or null." @@ -84,7 +85,7 @@ msgstr[1] "" #, python-format msgid "Some keys were missing: %(keys)s" -msgstr "Bəzi açarlar əksikdir: %(keys)s" +msgstr "Bəzi açarlar əskikdir: %(keys)s" #, python-format msgid "Some unknown keys were provided: %(keys)s" @@ -92,11 +93,12 @@ msgstr "Bəzi bilinməyən açarlar təchiz edilib: %(keys)s" #, python-format msgid "" -"Ensure that this range is completely less than or equal to %(limit_value)s." -msgstr "Bu aralığın %(limit_value)s və ya daha az olduğuna əmin olun." +"Ensure that the upper bound of the range is not greater than %(limit_value)s." +msgstr "" +"Aralığın yuxarı sərhədinin %(limit_value)s-dən/dan çox olmadığına əmin olun" #, python-format msgid "" -"Ensure that this range is completely greater than or equal to " -"%(limit_value)s." -msgstr "Bu aralığın %(limit_value)s və ya daha böyük olduğuna əmin olun." +"Ensure that the lower bound of the range is not less than %(limit_value)s." +msgstr "" +"Aralığın yuxarı sərhədinin %(limit_value)s-dən/dan az olmadığına əmin olun" diff --git a/django/contrib/postgres/locale/cs/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/cs/LC_MESSAGES/django.mo index a56d0b4e29..c8e64ab39f 100644 Binary files a/django/contrib/postgres/locale/cs/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/cs/LC_MESSAGES/django.po b/django/contrib/postgres/locale/cs/LC_MESSAGES/django.po index 6a3c9d1d72..ae65f5fe46 100644 --- a/django/contrib/postgres/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/cs/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Jiří Podhorecký , 2024 # Tomáš Ehrlich , 2015 # Vláďa Macek , 2015-2019 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 20:56+0200\n" -"PO-Revision-Date: 2020-05-12 20:01+0000\n" -"Last-Translator: Transifex Bot <>\n" -"Language-Team: Czech (http://www.transifex.com/django/django/language/cs/)\n" +"POT-Creation-Date: 2023-01-17 02:13-0600\n" +"PO-Revision-Date: 2024-10-07 09:22+0000\n" +"Last-Translator: Jiří Podhorecký , 2024\n" +"Language-Team: Czech (http://app.transifex.com/django/django/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -109,11 +110,10 @@ msgstr "Byly zadány neznámé klíče: %(keys)s" #, python-format msgid "" -"Ensure that this range is completely less than or equal to %(limit_value)s." -msgstr "Nejvyšší hodnota rozsahu musí být menší nebo rovna %(limit_value)s." +"Ensure that the upper bound of the range is not greater than %(limit_value)s." +msgstr "Ujistěte se, že horní hranice rozsahu není větší než %(limit_value)s." #, python-format msgid "" -"Ensure that this range is completely greater than or equal to " -"%(limit_value)s." -msgstr "Nejnižší hodnota rozsahu musí být větší nebo rovna %(limit_value)s." +"Ensure that the lower bound of the range is not less than %(limit_value)s." +msgstr "Ujistěte se, že spodní hranice rozsahu není menší než %(limit_value)s." diff --git a/django/contrib/postgres/locale/ga/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/ga/LC_MESSAGES/django.mo new file mode 100644 index 0000000000..0f8fe8b46f Binary files /dev/null and b/django/contrib/postgres/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/ga/LC_MESSAGES/django.po b/django/contrib/postgres/locale/ga/LC_MESSAGES/django.po new file mode 100644 index 0000000000..45babc89a3 --- /dev/null +++ b/django/contrib/postgres/locale/ga/LC_MESSAGES/django.po @@ -0,0 +1,125 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Aindriú Mac Giolla Eoin, 2024 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-01-17 02:13-0600\n" +"PO-Revision-Date: 2024-10-07 09:22+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ga\n" +"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " +"4);\n" + +msgid "PostgreSQL extensions" +msgstr "Eisínteachtaí PostgreSQL" + +#, python-format +msgid "Item %(nth)s in the array did not validate:" +msgstr "Níor bhailíochtaigh mír %(nth)s san eagar:" + +msgid "Nested arrays must have the same length." +msgstr "Caithfidh an fad céanna a bheith ag eagair neadaithe." + +msgid "Map of strings to strings/nulls" +msgstr "Léarscáil de theaghráin go teaghráin/nulls" + +#, python-format +msgid "The value of “%(key)s” is not a string or null." +msgstr "Ní teaghrán nó null é luach “%(key)s”." + +msgid "Could not load JSON data." +msgstr "Níorbh fhéidir sonraí JSON a lódáil." + +msgid "Input must be a JSON dictionary." +msgstr "Ní mór gur foclóir JSON é an t-ionchur." + +msgid "Enter two valid values." +msgstr "Cuir isteach dhá luach bhailí." + +msgid "The start of the range must not exceed the end of the range." +msgstr "Ní fhéadfaidh tús an raoin a bheith níos mó ná deireadh an raoin." + +msgid "Enter two whole numbers." +msgstr "Cuir isteach dhá slánuimhir." + +msgid "Enter two numbers." +msgstr "Cuir isteach dhá uimhir." + +msgid "Enter two valid date/times." +msgstr "Cuir isteach dhá dháta bhailí." + +msgid "Enter two valid dates." +msgstr "Cuir isteach dhá dháta bhailí." + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no more than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no more than " +"%(limit_value)d." +msgstr[0] "" +"Tá %(show_value)d mír ar an liosta, níor cheart go mbeadh níos mó ná " +"%(limit_value)d ann." +msgstr[1] "" +"Tá %(show_value)d míreanna ar an liosta, níor cheart go mbeadh níos mó ná " +"%(limit_value)d ann." +msgstr[2] "" +"Tá %(show_value)d míreanna ar an liosta, níor cheart go mbeadh níos mó ná " +"%(limit_value)d ann." +msgstr[3] "" +"Tá %(show_value)d míreanna ar an liosta, níor cheart go mbeadh níos mó ná " +"%(limit_value)d ann." +msgstr[4] "" +"Tá %(show_value)d míreanna ar an liosta, níor cheart go mbeadh níos mó ná " +"%(limit_value)d ann." + +#, python-format +msgid "" +"List contains %(show_value)d item, it should contain no fewer than " +"%(limit_value)d." +msgid_plural "" +"List contains %(show_value)d items, it should contain no fewer than " +"%(limit_value)d." +msgstr[0] "" +"Tá %(show_value)d mír ar an liosta, níor cheart go mbeadh níos lú ná " +"%(limit_value)d ann." +msgstr[1] "" +"Tá %(show_value)d míreanna ar an liosta, níor cheart go mbeadh níos lú ná " +"%(limit_value)d ann." +msgstr[2] "" +"Tá %(show_value)d míreanna ar an liosta, níor cheart go mbeadh níos lú ná " +"%(limit_value)d ann." +msgstr[3] "" +"Tá %(show_value)d míreanna ar an liosta, níor cheart go mbeadh níos lú ná " +"%(limit_value)d ann." +msgstr[4] "" +"Tá %(show_value)d míreanna ar an liosta, níor cheart go mbeadh níos lú ná " +"%(limit_value)d ann." + +#, python-format +msgid "Some keys were missing: %(keys)s" +msgstr "Bhí roinnt eochracha ar iarraidh: %(keys)s" + +#, python-format +msgid "Some unknown keys were provided: %(keys)s" +msgstr "Soláthraíodh roinnt eochracha anaithnid: %(keys)s" + +#, python-format +msgid "" +"Ensure that the upper bound of the range is not greater than %(limit_value)s." +msgstr "" +"Cinntigh nach bhfuil teorainn uachtarach an raoin níos mó ná %(limit_value)s." + +#, python-format +msgid "" +"Ensure that the lower bound of the range is not less than %(limit_value)s." +msgstr "" +"Cinntigh nach bhfuil teorainn íochtair an raoin níos lú ná %(limit_value)s." diff --git a/django/contrib/postgres/locale/id/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/id/LC_MESSAGES/django.mo index b8f6c669bf..d0e3ef7231 100644 Binary files a/django/contrib/postgres/locale/id/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/id/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/id/LC_MESSAGES/django.po b/django/contrib/postgres/locale/id/LC_MESSAGES/django.po index a05951076f..f7a7e2d995 100644 --- a/django/contrib/postgres/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/id/LC_MESSAGES/django.po @@ -1,20 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Fery Setiawan , 2015-2018 +# Fery Setiawan , 2015-2018,2024 # M Asep Indrayana , 2015 -# oon arfiandwi , 2016 +# oon arfiandwi (OonID) , 2016 # rodin , 2016 -# sage , 2019 +# sag​e , 2019 # Sutrisno Efendi , 2015 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 20:56+0200\n" -"PO-Revision-Date: 2020-05-12 20:01+0000\n" -"Last-Translator: Transifex Bot <>\n" -"Language-Team: Indonesian (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2023-01-17 02:13-0600\n" +"PO-Revision-Date: 2024-08-07 09:22+0000\n" +"Last-Translator: Fery Setiawan , 2015-2018,2024\n" +"Language-Team: Indonesian (http://app.transifex.com/django/django/language/" "id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -95,15 +95,11 @@ msgstr "Beberapa kunci yang tidak dikenali diberikan: %(keys)s" #, python-format msgid "" -"Ensure that this range is completely less than or equal to %(limit_value)s." +"Ensure that the upper bound of the range is not greater than %(limit_value)s." msgstr "" -"Pastikan bahwa jangkauan ini sepenuhnya kurang dari atau sama dengan " -"%(limit_value)s." +"Pastikan bahwa batas atas jangkauan tidak lebih besar dari %(limit_value)s." #, python-format msgid "" -"Ensure that this range is completely greater than or equal to " -"%(limit_value)s." -msgstr "" -"Pastikan bahwa jangkauan ini sepenuhnya lebih dari atau sama dengan " -"%(limit_value)s." +"Ensure that the lower bound of the range is not less than %(limit_value)s." +msgstr "Pastikan batas bawah jangkauan tidak kurang dari %(limit_value)s." diff --git a/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo index 7e72afdd6a..3a13d4e281 100644 Binary files a/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.po index 5a6f178b8f..e82920a4b7 100644 --- a/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/postgres/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,15 +2,17 @@ # # Translators: # Chen Chun-Chia , 2015 +# yubike, 2024 # Tzu-ping Chung , 2016-2017,2019 +# YAO WEN LIANG, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-11 20:56+0200\n" -"PO-Revision-Date: 2020-05-12 20:01+0000\n" -"Last-Translator: Transifex Bot <>\n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"POT-Creation-Date: 2023-01-17 02:13-0600\n" +"PO-Revision-Date: 2024-08-07 09:22+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +41,7 @@ msgid "Could not load JSON data." msgstr "無法載入 JSON 資料。" msgid "Input must be a JSON dictionary." -msgstr "必須輸入 JSON dictionary。" +msgstr "必須輸入 JSON 字典。" msgid "Enter two valid values." msgstr "請輸入兩個有效的值" @@ -66,7 +68,7 @@ msgid "" msgid_plural "" "List contains %(show_value)d items, it should contain no more than " "%(limit_value)d." -msgstr[0] "串列包含 %(show_value)d 個物件，但不應包含多於 %(limit_value)d 個。" +msgstr[0] "列表包含 %(show_value)d 個物件，但不應包含多於 %(limit_value)d 個。" #, python-format msgid "" @@ -75,7 +77,7 @@ msgid "" msgid_plural "" "List contains %(show_value)d items, it should contain no fewer than " "%(limit_value)d." -msgstr[0] "串列包含 %(show_value)d 個物件，但應至少包含 %(limit_value)d 個。" +msgstr[0] "列表包含 %(show_value)d 個物件，但應至少包含 %(limit_value)d 個。" #, python-format msgid "Some keys were missing: %(keys)s" @@ -87,11 +89,10 @@ msgstr "包含不明鍵值：%(keys)s" #, python-format msgid "" -"Ensure that this range is completely less than or equal to %(limit_value)s." -msgstr "請確認此範圍是否完全小於或等於 %(limit_value)s。" +"Ensure that the upper bound of the range is not greater than %(limit_value)s." +msgstr "請確保範圍的上限不會大於%(limit_value)s。" #, python-format msgid "" -"Ensure that this range is completely greater than or equal to " -"%(limit_value)s." -msgstr "請確認此範圍是否完全大於或等於 %(limit_value)s。" +"Ensure that the lower bound of the range is not less than %(limit_value)s." +msgstr "請確保範圍的下限不會小於%(limit_value)s。" diff --git a/django/contrib/redirects/locale/az/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/az/LC_MESSAGES/django.mo index 8f00ebdb2c..0e1dda24ff 100644 Binary files a/django/contrib/redirects/locale/az/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/az/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/az/LC_MESSAGES/django.po b/django/contrib/redirects/locale/az/LC_MESSAGES/django.po index f1713bb58c..26231d2387 100644 --- a/django/contrib/redirects/locale/az/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/az/LC_MESSAGES/django.po @@ -4,14 +4,15 @@ # Ali Ismayilov , 2011 # Emin Mastizada , 2020 # Emin Mastizada , 2016 +# Nijat Mammadov, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2020-01-12 06:46+0000\n" -"Last-Translator: Emin Mastizada \n" -"Language-Team: Azerbaijani (http://www.transifex.com/django/django/language/" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2024-08-07 18:32+0000\n" +"Last-Translator: Nijat Mammadov, 2024\n" +"Language-Team: Azerbaijani (http://app.transifex.com/django/django/language/" "az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,25 +27,25 @@ msgid "site" msgstr "sayt" msgid "redirect from" -msgstr "buradan yönəlt" +msgstr "burdan yönləndir" msgid "" "This should be an absolute path, excluding the domain name. Example: “/" "events/search/”." -msgstr "Bu, domen adı xaric, mütləq yol olmalıdır. Məsələn: “/events/search/”." +msgstr "Bu, domen adı xaric, tam yol olmalıdır. Məsələn: “/events/search/”." msgid "redirect to" -msgstr "bura yönəlt" +msgstr "bura yönləndir" msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"“http://”." +"This can be either an absolute path (as above) or a full URL starting with a " +"scheme such as “https://”." msgstr "" -"Bu həm mütləq yol (yuxarıdakı kimi), həm də “http://” ilə başlayan tam URL " -"ola bilər." +"Bu ya tam yol (yuxarıdakı kimi), ya da “https://” ilə başyalan full URL " +"olmalıdır." msgid "redirect" -msgstr "yönəlt" +msgstr "yönləndirmə" msgid "redirects" -msgstr "yönəldir" +msgstr "yönləndirmələr" diff --git a/django/contrib/redirects/locale/ga/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ga/LC_MESSAGES/django.mo index 52e3967c42..0ed0c01435 100644 Binary files a/django/contrib/redirects/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/ga/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ga/LC_MESSAGES/django.po index 8ad2ce1ab8..805902afdd 100644 --- a/django/contrib/redirects/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/ga/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Luke Blaney , 2019 # Michael Thornhill , 2015 @@ -8,10 +9,10 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 17:42+0200\n" -"PO-Revision-Date: 2019-06-22 21:46+0000\n" -"Last-Translator: Luke Blaney \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2024-10-07 18:32+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,17 +30,21 @@ msgid "redirect from" msgstr "atreoraigh ó" msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "Teastaíonn dearbhchosán gan ainm fearainn. Sampla '/events/search/'." +"This should be an absolute path, excluding the domain name. Example: “/" +"events/search/”." +msgstr "" +"Ba cheart gur cosán iomlán é seo, gan an t-ainm fearainn a áireamh. Sampla: " +"\\u201c/events/search/\\u201d." msgid "redirect to" msgstr "atreoraigh go dtí" msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "Is féidir dearbhchosán nó URL lán ag tosnú le 'http://'." +"This can be either an absolute path (as above) or a full URL starting with a " +"scheme such as “https://”." +msgstr "" +"Is féidir gur cosán iomlán é seo (mar atá thuas) nó URL iomlán ag tosú le " +"scéim mar \\u201chttps://\\u201d." msgid "redirect" msgstr "athsheol" diff --git a/django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo index d0a6f6da36..82d36159c1 100644 Binary files a/django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/ko/LC_MESSAGES/django.po b/django/contrib/redirects/locale/ko/LC_MESSAGES/django.po index 2f2e380551..4209b98700 100644 --- a/django/contrib/redirects/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/ko/LC_MESSAGES/django.po @@ -2,6 +2,7 @@ # # Translators: # Jiyoon, Ha , 2016 +# Hyeonho Kang, 2024 # Jannis Leidel , 2011 # Jay Oh , 2020 # JunGu Kang , 2015 @@ -13,9 +14,9 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-15 09:00+0100\n" -"PO-Revision-Date: 2021-12-24 18:32+0000\n" -"Last-Translator: 정훈 이\n" -"Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" +"PO-Revision-Date: 2024-10-07 18:32+0000\n" +"Last-Translator: Hyeonho Kang, 2024\n" +"Language-Team: Korean (http://app.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,7 +37,7 @@ msgid "" "events/search/”." msgstr "" "도메인 이름을 제외한 절대 경로여야 합니다.\n" -"예제: \"/events/search/\"." +"예시: \"/events/search/\"." msgid "redirect to" msgstr "(으)로 리다이렉트" @@ -45,8 +46,8 @@ msgid "" "This can be either an absolute path (as above) or a full URL starting with a " "scheme such as “https://”." msgstr "" -"(위와 같은) 절대경로 혹은 \"https://\" 같은 식으로 시작하는 완전한 URL 모두 " -"가능합니다." +"이것은 절대 경로 (위와 같이) 이거나 “https://”와 같은 체계로 시작하는 전체 " +"URL 일 수 있습니다." msgid "redirect" msgstr "리다이렉트" diff --git a/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.mo index 2eecaf9f0b..30c3a67788 100644 Binary files a/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.po index 83f927563b..bdab9b2c1e 100644 --- a/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/pt_BR/LC_MESSAGES/django.po @@ -3,7 +3,8 @@ # Translators: # Allisson Azevedo , 2014 # Amanda Savluchinske , 2019 -# semente, 2013 +# Eduardo Felipe Castegnaro , 2024 +# fa9e10542e458baef0599ae856e43651_13d2225, 2013 # Jannis Leidel , 2011 # Lucas Infante , 2015 # Rafael Fontenelle , 2021 @@ -13,9 +14,9 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-15 09:00+0100\n" -"PO-Revision-Date: 2021-01-17 05:46+0000\n" -"Last-Translator: Rafael Fontenelle \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/django/django/" +"PO-Revision-Date: 2024-08-07 18:32+0000\n" +"Last-Translator: Eduardo Felipe Castegnaro , 2024\n" +"Language-Team: Portuguese (Brazil) (http://app.transifex.com/django/django/" "language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,8 +37,8 @@ msgid "" "This should be an absolute path, excluding the domain name. Example: “/" "events/search/”." msgstr "" -"Este deve ser um caminho absoluto, excluindo o nome do domínio. Exemplo: \"/" -"events/search/\"." +"Este deve ser um caminho absoluto, excluindo o domínio. Exemplo: \"/events/" +"search/\"." msgid "redirect to" msgstr "redirecionar para" diff --git a/django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.mo index 2a650c90cf..dbaf36dfa9 100644 Binary files a/django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.po index cb6c90f0e3..4a1dbf152e 100644 --- a/django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,16 +2,18 @@ # # Translators: # Chen Chun-Chia , 2015 +# yubike, 2024 # Jannis Leidel , 2011 # Tzu-ping Chung , 2016,2019 +# YAO WEN LIANG, 2024 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-09-08 17:27+0200\n" -"PO-Revision-Date: 2019-09-18 09:01+0000\n" -"Last-Translator: Tzu-ping Chung \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"POT-Creation-Date: 2021-01-15 09:00+0100\n" +"PO-Revision-Date: 2024-08-07 18:32+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,29 +22,30 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Redirects" -msgstr "重導向" +msgstr "重新導向" msgid "site" msgstr "網站" msgid "redirect from" -msgstr "重導向自" +msgstr "重新導向自" msgid "" "This should be an absolute path, excluding the domain name. Example: “/" "events/search/”." -msgstr "應該是一個絕對路徑，不包括網域。例如：「/events/search/」。" +msgstr "這應該是一個絕對路徑，不包括網域。例如：「/events/search/」。" msgid "redirect to" -msgstr "重導向到" +msgstr "重新導向到" msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"“http://”." -msgstr "此可為一絕對路徑（如上）或一個以「http://」開頭的完整 URL。" +"This can be either an absolute path (as above) or a full URL starting with a " +"scheme such as “https://”." +msgstr "" +"這可以是絕對路徑（如上）也可以是一個以 \"https://\" 等協議開頭的完整 URL。" msgid "redirect" -msgstr "重導向" +msgstr "重新導向" msgid "redirects" -msgstr "重導向" +msgstr "重新導向" diff --git a/django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo index 144d87c191..02949db3ad 100644 Binary files a/django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sessions/locale/ko/LC_MESSAGES/django.po b/django/contrib/sessions/locale/ko/LC_MESSAGES/django.po index 74c622c3f9..b49ff0e67e 100644 --- a/django/contrib/sessions/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/sessions/locale/ko/LC_MESSAGES/django.po @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Hyeonho Kang, 2024 # Jannis Leidel , 2011 -# Chr0m3 , 2015 +# JunGu Kang , 2015 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: 2017-09-19 16:40+0000\n" -"Last-Translator: Chr0m3 \n" -"Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" +"PO-Revision-Date: 2024-10-07 18:26+0000\n" +"Last-Translator: Hyeonho Kang, 2024\n" +"Language-Team: Korean (http://app.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,10 +28,10 @@ msgid "session data" msgstr "세션 날짜" msgid "expire date" -msgstr "유효날짜" +msgstr "만료 날짜" msgid "session" msgstr "세션" msgid "sessions" -msgstr "세션" +msgstr "세션들" diff --git a/django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.mo index ad83522943..1cf5a54052 100644 Binary files a/django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.po index ef202b9f41..45198f499f 100644 --- a/django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/sessions/locale/zh_Hant/LC_MESSAGES/django.po @@ -3,14 +3,15 @@ # Translators: # Chen Chun-Chia , 2015 # Jannis Leidel , 2011 +# YAO WEN LIANG, 2024 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: 2017-09-19 16:40+0000\n" -"Last-Translator: Chen Chun-Chia \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"PO-Revision-Date: 2024-08-07 18:26+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgid "session data" msgstr "session 資料" msgid "expire date" -msgstr "到期日期" +msgstr "過期時間" msgid "session" msgstr "session" diff --git a/django/contrib/sites/locale/ga/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ga/LC_MESSAGES/django.mo index c15ebefd56..b828e40e41 100644 Binary files a/django/contrib/sites/locale/ga/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/ga/LC_MESSAGES/django.po b/django/contrib/sites/locale/ga/LC_MESSAGES/django.po index 095d08db92..2b1c9bf9ad 100644 --- a/django/contrib/sites/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/ga/LC_MESSAGES/django.po @@ -1,6 +1,7 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aindriú Mac Giolla Eoin, 2024 # Jannis Leidel , 2011 # Luke Blaney , 2019 msgid "" @@ -8,9 +9,9 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-17 11:07+0100\n" -"PO-Revision-Date: 2019-06-22 21:46+0000\n" -"Last-Translator: Luke Blaney \n" -"Language-Team: Irish (http://www.transifex.com/django/django/language/ga/)\n" +"PO-Revision-Date: 2024-10-07 18:05+0000\n" +"Last-Translator: Aindriú Mac Giolla Eoin, 2024\n" +"Language-Team: Irish (http://app.transifex.com/django/django/language/ga/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,7 +23,7 @@ msgid "Sites" msgstr "Suíomhanna" msgid "The domain name cannot contain any spaces or tabs." -msgstr "" +msgstr "Ní féidir spásanna ná cluaisíní ar bith a bheith san ainm fearainn." msgid "domain name" msgstr "ainm fearainn" diff --git a/django/contrib/sites/locale/ko/LC_MESSAGES/django.mo b/django/contrib/sites/locale/ko/LC_MESSAGES/django.mo index e697676e25..6cd41462af 100644 Binary files a/django/contrib/sites/locale/ko/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/ko/LC_MESSAGES/django.po b/django/contrib/sites/locale/ko/LC_MESSAGES/django.po index de726db04c..fcf8adcf5b 100644 --- a/django/contrib/sites/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/ko/LC_MESSAGES/django.po @@ -2,17 +2,18 @@ # # Translators: # Jiyoon, Ha , 2016 +# Hyeonho Kang, 2024 # Jannis Leidel , 2011 # Le Tartuffe , 2014 -# Chr0m3 , 2015 +# JunGu Kang , 2015 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: 2017-09-19 16:40+0000\n" -"Last-Translator: Jiyoon, Ha \n" -"Language-Team: Korean (http://www.transifex.com/django/django/language/ko/)\n" +"PO-Revision-Date: 2024-10-07 18:05+0000\n" +"Last-Translator: Hyeonho Kang, 2024\n" +"Language-Team: Korean (http://app.transifex.com/django/django/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,10 +24,10 @@ msgid "Sites" msgstr "사이트" msgid "The domain name cannot contain any spaces or tabs." -msgstr "도메인 이름은 공백이나 탭을 포함 할 수 없습니다." +msgstr "도메인 이름은 공백이나 탭을 포함할 수 없습니다." msgid "domain name" -msgstr "도메인 명" +msgstr "도메인명" msgid "display name" msgstr "표시명" diff --git a/django/contrib/sites/locale/zh_Hant/LC_MESSAGES/django.mo b/django/contrib/sites/locale/zh_Hant/LC_MESSAGES/django.mo index f1c3d67b36..adf09fb3e6 100644 Binary files a/django/contrib/sites/locale/zh_Hant/LC_MESSAGES/django.mo and b/django/contrib/sites/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/django/contrib/sites/locale/zh_Hant/LC_MESSAGES/django.po b/django/contrib/sites/locale/zh_Hant/LC_MESSAGES/django.po index d1a5583f8c..5b8b24dcdb 100644 --- a/django/contrib/sites/locale/zh_Hant/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/zh_Hant/LC_MESSAGES/django.po @@ -5,14 +5,15 @@ # Jannis Leidel , 2011 # mail6543210 , 2013 # Tzu-ping Chung , 2016 +# YAO WEN LIANG, 2024 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: 2017-09-19 16:40+0000\n" -"Last-Translator: Tzu-ping Chung \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/django/django/" +"PO-Revision-Date: 2024-08-07 18:05+0000\n" +"Last-Translator: YAO WEN LIANG, 2024\n" +"Language-Team: Chinese (Taiwan) (http://app.transifex.com/django/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgid "Sites" msgstr "網站" msgid "The domain name cannot contain any spaces or tabs." -msgstr "網域名稱不能包含空格或定位字元。" +msgstr "網域名稱不能包含空格或製表符(tabs)。" msgid "domain name" msgstr "網域名稱" diff --git a/django/contrib/staticfiles/finders.py b/django/contrib/staticfiles/finders.py index 8051650daf..c2087569db 100644 --- a/django/contrib/staticfiles/finders.py +++ b/django/contrib/staticfiles/finders.py @@ -18,7 +18,7 @@ searched_locations = [] # RemovedInDjango61Warning: When the deprecation ends, remove completely. -def _check_deprecated_find_param(class_name="", find_all=False, **kwargs): +def _check_deprecated_find_param(class_name="", find_all=False, stacklevel=3, **kwargs): method_name = "find" if not class_name else f"{class_name}.find" if "all" in kwargs: legacy_all = kwargs.pop("all") @@ -26,7 +26,7 @@ def _check_deprecated_find_param(class_name="", find_all=False, **kwargs): "Passing the `all` argument to find() is deprecated. Use `find_all` " "instead." ) - warnings.warn(msg, RemovedInDjango61Warning, stacklevel=2) + warnings.warn(msg, RemovedInDjango61Warning, stacklevel=stacklevel) # If both `find_all` and `all` were given, raise TypeError. if find_all is not False: @@ -57,7 +57,7 @@ class BaseFinder: # RemovedInDjango61Warning: When the deprecation ends, remove completely. def _check_deprecated_find_param(self, **kwargs): return _check_deprecated_find_param( - class_name=self.__class__.__qualname__, **kwargs + class_name=self.__class__.__qualname__, stacklevel=4, **kwargs ) # RemovedInDjango61Warning: When the deprecation ends, replace with: diff --git a/django/contrib/staticfiles/storage.py b/django/contrib/staticfiles/storage.py index 191fe3cbb5..dfc3137f76 100644 --- a/django/contrib/staticfiles/storage.py +++ b/django/contrib/staticfiles/storage.py @@ -53,7 +53,8 @@ class HashedFilesMixin: ( ( ( - r"""(?Pimport(?s:(?P[\s\{].*?))""" + r"""(?Pimport""" + r"""(?s:(?P[\s\{].*?|\*\s*as\s*\w+))""" r"""\s*from\s*['"](?P[./].*?)["']\s*;)""" ), """import%(import)s from "%(url)s";""", @@ -307,22 +308,23 @@ class HashedFilesMixin: processed_adjustable_paths[name] = (name, hashed_name, processed) paths = {path: paths[path] for path in adjustable_paths} - substitutions = False - + unresolved_paths = [] for i in range(self.max_post_process_passes): - substitutions = False + unresolved_paths = [] for name, hashed_name, processed, subst in self._post_process( paths, adjustable_paths, hashed_files ): # Overwrite since hashed_name may be newer. processed_adjustable_paths[name] = (name, hashed_name, processed) - substitutions = substitutions or subst + if subst: + unresolved_paths.append(name) - if not substitutions: + if not unresolved_paths: break - if substitutions: - yield "All", None, RuntimeError("Max post-process passes exceeded.") + if unresolved_paths: + problem_paths = ", ".join(sorted(unresolved_paths)) + yield problem_paths, None, RuntimeError("Max post-process passes exceeded.") # Store the processed paths self.hashed_files.update(hashed_files) diff --git a/django/core/files/storage/base.py b/django/core/files/storage/base.py index 55285bc23a..31ecbd209a 100644 --- a/django/core/files/storage/base.py +++ b/django/core/files/storage/base.py @@ -51,6 +51,10 @@ class Storage: validate_file_name(name, allow_relative_path=True) return name + def is_name_available(self, name, max_length=None): + exceeds_max_length = max_length and len(name) > max_length + return not self.exists(name) and not exceeds_max_length + # These methods are part of the public API, with default implementations. def get_valid_name(self, name): @@ -82,11 +86,11 @@ class Storage: validate_file_name(file_name) file_ext = "".join(pathlib.PurePath(file_name).suffixes) file_root = file_name.removesuffix(file_ext) - # If the filename already exists, generate an alternative filename - # until it doesn't exist. + # If the filename is not available, generate an alternative + # filename until one is available. # Truncate original name if required, so the new filename does not # exceed the max_length. - while self.exists(name) or (max_length and len(name) > max_length): + while not self.is_name_available(name, max_length=max_length): # file_ext includes the dot. name = os.path.join( dir_name, self.get_alternative_name(file_root, file_ext) diff --git a/django/core/files/storage/filesystem.py b/django/core/files/storage/filesystem.py index ed752cc062..bf2b9caad4 100644 --- a/django/core/files/storage/filesystem.py +++ b/django/core/files/storage/filesystem.py @@ -4,7 +4,6 @@ from datetime import datetime, timezone from urllib.parse import urljoin from django.conf import settings -from django.core.exceptions import SuspiciousFileOperation from django.core.files import File, locks from django.core.files.move import file_move_safe from django.core.signals import setting_changed @@ -49,6 +48,7 @@ class FileSystemStorage(Storage, StorageSettingsMixin): "Overriding OS_OPEN_FLAGS is deprecated. Use " "the allow_overwrite parameter instead.", RemovedInDjango60Warning, + stacklevel=2, ) @cached_property @@ -192,14 +192,18 @@ class FileSystemStorage(Storage, StorageSettingsMixin): # concurrently. pass - def exists(self, name): - try: - exists = os.path.lexists(self.path(name)) - except SuspiciousFileOperation: - raise + def is_name_available(self, name, max_length=None): if self._allow_overwrite: - return False - return exists + return not (max_length and len(name) > max_length) + return super().is_name_available(name, max_length=max_length) + + def get_alternative_name(self, file_root, file_ext): + if self._allow_overwrite: + return f"{file_root}{file_ext}" + return super().get_alternative_name(file_root, file_ext) + + def exists(self, name): + return os.path.lexists(self.path(name)) def listdir(self, path): path = self.path(path) diff --git a/django/core/files/storage/memory.py b/django/core/files/storage/memory.py index 39a8aef3ae..22b8c62bd1 100644 --- a/django/core/files/storage/memory.py +++ b/django/core/files/storage/memory.py @@ -45,10 +45,9 @@ class InMemoryFileNode(ContentFile, TimingMixin): modification, and access times. """ - def __init__(self, content="", name=""): - self.file = None + def __init__(self, content="", name=None): + super().__init__(content, name) self._content_type = type(content) - self._initialize_stream() self._initialize_times() def open(self, mode): @@ -142,7 +141,11 @@ class InMemoryDirNode(TimingMixin): if create_if_missing: self._update_accessed_time() self._update_modified_time() - return self._children.setdefault(path_segment, child_cls()) + if child_cls is InMemoryFileNode: + child = child_cls(name=path_segment) + else: + child = child_cls() + return self._children.setdefault(path_segment, child) return self._children.get(path_segment) def listdir(self): diff --git a/django/core/mail/__init__.py b/django/core/mail/__init__.py index 676326697b..b179736b15 100644 --- a/django/core/mail/__init__.py +++ b/django/core/mail/__init__.py @@ -11,6 +11,8 @@ from django.conf import settings from django.core.mail.message import ( DEFAULT_ATTACHMENT_MIME_TYPE, BadHeaderError, + EmailAlternative, + EmailAttachment, EmailMessage, EmailMultiAlternatives, SafeMIMEMultipart, @@ -37,6 +39,8 @@ __all__ = [ "send_mass_mail", "mail_admins", "mail_managers", + "EmailAlternative", + "EmailAttachment", ] diff --git a/django/core/mail/message.py b/django/core/mail/message.py index eb467de429..e6d0ec2dc8 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -191,7 +191,7 @@ class SafeMIMEMultipart(MIMEMixin, MIMEMultipart): MIMEMultipart.__setitem__(self, name, val) -Alternative = namedtuple("Alternative", ["content", "mimetype"]) +EmailAlternative = namedtuple("Alternative", ["content", "mimetype"]) EmailAttachment = namedtuple("Attachment", ["filename", "content", "mimetype"]) @@ -477,14 +477,14 @@ class EmailMultiAlternatives(EmailMessage): reply_to, ) self.alternatives = [ - Alternative(*alternative) for alternative in (alternatives or []) + EmailAlternative(*alternative) for alternative in (alternatives or []) ] def attach_alternative(self, content, mimetype): """Attach an alternative content representation.""" if content is None or mimetype is None: raise ValueError("Both content and mimetype must be provided.") - self.alternatives.append(Alternative(content, mimetype)) + self.alternatives.append(EmailAlternative(content, mimetype)) def _create_message(self, msg): return self._create_attachments(self._create_alternatives(msg)) diff --git a/django/core/management/base.py b/django/core/management/base.py index 41b17a24c8..6232b42bd4 100644 --- a/django/core/management/base.py +++ b/django/core/management/base.py @@ -672,7 +672,13 @@ class LabelCommand(BaseCommand): """ label = "label" - missing_args_message = "Enter at least one %s." % label + missing_args_message = "Enter at least one %s." + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + if self.missing_args_message == LabelCommand.missing_args_message: + self.missing_args_message = self.missing_args_message % self.label def add_arguments(self, parser): parser.add_argument("args", metavar=self.label, nargs="+") diff --git a/django/core/management/commands/compilemessages.py b/django/core/management/commands/compilemessages.py index eddf31b794..c56e2a237c 100644 --- a/django/core/management/commands/compilemessages.py +++ b/django/core/management/commands/compilemessages.py @@ -79,8 +79,8 @@ class Command(BaseCommand): if find_command(self.program) is None: raise CommandError( - "Can't find %s. Make sure you have GNU gettext " - "tools 0.15 or newer installed." % self.program + f"Can't find {self.program}. Make sure you have GNU gettext " + "tools 0.19 or newer installed." ) basedirs = [os.path.join("conf", "locale"), "locale"] diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py index dc3d4026e2..076667d41a 100644 --- a/django/core/management/commands/makemessages.py +++ b/django/core/management/commands/makemessages.py @@ -19,7 +19,6 @@ from django.core.management.utils import ( ) from django.utils.encoding import DEFAULT_LOCALE_ENCODING from django.utils.functional import cached_property -from django.utils.jslex import prepare_js_for_gettext from django.utils.regex_helper import _lazy_re_compile from django.utils.text import get_text_list from django.utils.translation import templatize @@ -35,8 +34,8 @@ def check_programs(*programs): for program in programs: if find_command(program) is None: raise CommandError( - "Can't find %s. Make sure you have GNU gettext tools 0.15 or " - "newer installed." % program + f"Can't find {program}. Make sure you have GNU gettext tools " + "0.19 or newer installed." ) @@ -80,9 +79,7 @@ class BuildFile: @cached_property def is_templatized(self): - if self.domain == "djangojs": - return self.command.gettext_version < (0, 18, 3) - elif self.domain == "django": + if self.domain == "django": file_ext = os.path.splitext(self.translatable.file)[1] return file_ext != ".py" return False @@ -99,11 +96,7 @@ class BuildFile: """ if not self.is_templatized: return self.path - extension = { - "djangojs": "c", - "django": "py", - }.get(self.domain) - filename = "%s.%s" % (self.translatable.file, extension) + filename = f"{self.translatable.file}.py" return os.path.join(self.translatable.dirpath, filename) def preprocess(self): @@ -117,9 +110,7 @@ class BuildFile: with open(self.path, encoding="utf-8") as fp: src_data = fp.read() - if self.domain == "djangojs": - content = prepare_js_for_gettext(src_data) - elif self.domain == "django": + if self.domain == "django": content = templatize(src_data, origin=self.path[2:]) with open(self.work_path, "w", encoding="utf-8") as fp: @@ -349,11 +340,6 @@ class Command(BaseCommand): self.msgattrib_options = self.msgattrib_options[:] + ["--no-location"] self.xgettext_options = self.xgettext_options[:] + ["--no-location"] if options["add_location"]: - if self.gettext_version < (0, 19): - raise CommandError( - "The --add-location option requires gettext 0.19 or later. " - "You have %s." % ".".join(str(x) for x in self.gettext_version) - ) arg_add_location = "--add-location=%s" % options["add_location"] self.msgmerge_options = self.msgmerge_options[:] + [arg_add_location] self.msguniq_options = self.msguniq_options[:] + [arg_add_location] @@ -636,12 +622,11 @@ class Command(BaseCommand): build_files.append(build_file) if self.domain == "djangojs": - is_templatized = build_file.is_templatized args = [ "xgettext", "-d", self.domain, - "--language=%s" % ("C" if is_templatized else "JavaScript",), + "--language=JavaScript", "--keyword=gettext_noop", "--keyword=gettext_lazy", "--keyword=ngettext_lazy:1,2", diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py index 132ee4c079..2c8e445de8 100644 --- a/django/core/management/commands/runserver.py +++ b/django/core/management/commands/runserver.py @@ -11,6 +11,7 @@ from django.core.servers.basehttp import WSGIServer, get_internal_wsgi_applicati from django.db import connections from django.utils import autoreload from django.utils.regex_helper import _lazy_re_compile +from django.utils.version import get_docs_version naiveip_re = _lazy_re_compile( r"""^(?: @@ -188,3 +189,14 @@ class Command(BaseCommand): f"Quit the server with {quit_command}.", file=self.stdout, ) + docs_version = get_docs_version() + if os.environ.get("HIDE_PRODUCTION_WARNING") != "true": + self.stdout.write( + self.style.WARNING( + "WARNING: This is a development server. Do not use it in a " + "production setting. Use a production WSGI or ASGI server " + "instead.\nFor more information on production servers see: " + f"https://docs.djangoproject.com/en/{docs_version}/howto/" + "deployment/" + ) + ) diff --git a/django/core/serializers/json.py b/django/core/serializers/json.py index afac821465..7683368e62 100644 --- a/django/core/serializers/json.py +++ b/django/core/serializers/json.py @@ -59,19 +59,27 @@ class Serializer(PythonSerializer): return super(PythonSerializer, self).getvalue() -def Deserializer(stream_or_string, **options): +class Deserializer(PythonDeserializer): """Deserialize a stream or string of JSON data.""" - if not isinstance(stream_or_string, (bytes, str)): - stream_or_string = stream_or_string.read() - if isinstance(stream_or_string, bytes): - stream_or_string = stream_or_string.decode() - try: - objects = json.loads(stream_or_string) - yield from PythonDeserializer(objects, **options) - except (GeneratorExit, DeserializationError): - raise - except Exception as exc: - raise DeserializationError() from exc + + def __init__(self, stream_or_string, **options): + if not isinstance(stream_or_string, (bytes, str)): + stream_or_string = stream_or_string.read() + if isinstance(stream_or_string, bytes): + stream_or_string = stream_or_string.decode() + try: + objects = json.loads(stream_or_string) + except Exception as exc: + raise DeserializationError() from exc + super().__init__(objects, **options) + + def _handle_object(self, obj): + try: + yield from super()._handle_object(obj) + except (GeneratorExit, DeserializationError): + raise + except Exception as exc: + raise DeserializationError(f"Error deserializing object: {exc}") from exc class DjangoJSONEncoder(json.JSONEncoder): diff --git a/django/core/serializers/jsonl.py b/django/core/serializers/jsonl.py index c264c2ccaf..7bc9bed79f 100644 --- a/django/core/serializers/jsonl.py +++ b/django/core/serializers/jsonl.py @@ -39,19 +39,30 @@ class Serializer(PythonSerializer): return super(PythonSerializer, self).getvalue() -def Deserializer(stream_or_string, **options): +class Deserializer(PythonDeserializer): """Deserialize a stream or string of JSON data.""" - if isinstance(stream_or_string, bytes): - stream_or_string = stream_or_string.decode() - if isinstance(stream_or_string, (bytes, str)): - stream_or_string = stream_or_string.split("\n") - for line in stream_or_string: - if not line.strip(): - continue + def __init__(self, stream_or_string, **options): + if isinstance(stream_or_string, bytes): + stream_or_string = stream_or_string.decode() + if isinstance(stream_or_string, str): + stream_or_string = stream_or_string.splitlines() + super().__init__(Deserializer._get_lines(stream_or_string), **options) + + def _handle_object(self, obj): try: - yield from PythonDeserializer([json.loads(line)], **options) + yield from super()._handle_object(obj) except (GeneratorExit, DeserializationError): raise except Exception as exc: - raise DeserializationError() from exc + raise DeserializationError(f"Error deserializing object: {exc}") from exc + + @staticmethod + def _get_lines(stream): + for line in stream: + if not line.strip(): + continue + try: + yield json.loads(line) + except Exception as exc: + raise DeserializationError() from exc diff --git a/django/core/serializers/python.py b/django/core/serializers/python.py index 7ec894aa00..46ef9f0771 100644 --- a/django/core/serializers/python.py +++ b/django/core/serializers/python.py @@ -96,45 +96,60 @@ class Serializer(base.Serializer): return self.objects -def Deserializer( - object_list, *, using=DEFAULT_DB_ALIAS, ignorenonexistent=False, **options -): +class Deserializer(base.Deserializer): """ Deserialize simple Python objects back into Django ORM instances. It's expected that you pass the Python objects themselves (instead of a stream or a string) to the constructor """ - handle_forward_references = options.pop("handle_forward_references", False) - field_names_cache = {} # Model: - for d in object_list: - # Look up the model and starting build a dict of data for it. - try: - Model = _get_model(d["model"]) - except base.DeserializationError: - if ignorenonexistent: - continue - else: - raise + def __init__( + self, object_list, *, using=DEFAULT_DB_ALIAS, ignorenonexistent=False, **options + ): + super().__init__(object_list, **options) + self.handle_forward_references = options.pop("handle_forward_references", False) + self.using = using + self.ignorenonexistent = ignorenonexistent + self.field_names_cache = {} # Model: + self._iterator = None + + def __iter__(self): + for obj in self.stream: + yield from self._handle_object(obj) + + def __next__(self): + if self._iterator is None: + self._iterator = iter(self) + return next(self._iterator) + + def _handle_object(self, obj): data = {} - if "pk" in d: - try: - data[Model._meta.pk.attname] = Model._meta.pk.to_python(d.get("pk")) - except Exception as e: - raise base.DeserializationError.WithData( - e, d["model"], d.get("pk"), None - ) m2m_data = {} deferred_fields = {} - if Model not in field_names_cache: - field_names_cache[Model] = {f.name for f in Model._meta.get_fields()} - field_names = field_names_cache[Model] + # Look up the model and starting build a dict of data for it. + try: + Model = self._get_model_from_node(obj["model"]) + except base.DeserializationError: + if self.ignorenonexistent: + return + raise + if "pk" in obj: + try: + data[Model._meta.pk.attname] = Model._meta.pk.to_python(obj.get("pk")) + except Exception as e: + raise base.DeserializationError.WithData( + e, obj["model"], obj.get("pk"), None + ) + + if Model not in self.field_names_cache: + self.field_names_cache[Model] = {f.name for f in Model._meta.get_fields()} + field_names = self.field_names_cache[Model] # Handle each field - for field_name, field_value in d["fields"].items(): - if ignorenonexistent and field_name not in field_names: + for field_name, field_value in obj["fields"].items(): + if self.ignorenonexistent and field_name not in field_names: # skip fields no longer on model continue @@ -145,51 +160,59 @@ def Deserializer( field.remote_field, models.ManyToManyRel ): try: - values = base.deserialize_m2m_values( - field, field_value, using, handle_forward_references - ) + values = self._handle_m2m_field_node(field, field_value) + if values == base.DEFER_FIELD: + deferred_fields[field] = field_value + else: + m2m_data[field.name] = values except base.M2MDeserializationError as e: raise base.DeserializationError.WithData( - e.original_exc, d["model"], d.get("pk"), e.pk + e.original_exc, obj["model"], obj.get("pk"), e.pk ) - if values == base.DEFER_FIELD: - deferred_fields[field] = field_value - else: - m2m_data[field.name] = values + # Handle FK fields elif field.remote_field and isinstance( field.remote_field, models.ManyToOneRel ): try: - value = base.deserialize_fk_value( - field, field_value, using, handle_forward_references - ) + value = self._handle_fk_field_node(field, field_value) + if value == base.DEFER_FIELD: + deferred_fields[field] = field_value + else: + data[field.attname] = value except Exception as e: raise base.DeserializationError.WithData( - e, d["model"], d.get("pk"), field_value + e, obj["model"], obj.get("pk"), field_value ) - if value == base.DEFER_FIELD: - deferred_fields[field] = field_value - else: - data[field.attname] = value + # Handle all other fields else: try: data[field.name] = field.to_python(field_value) except Exception as e: raise base.DeserializationError.WithData( - e, d["model"], d.get("pk"), field_value + e, obj["model"], obj.get("pk"), field_value ) - obj = base.build_instance(Model, data, using) - yield base.DeserializedObject(obj, m2m_data, deferred_fields) + model_instance = base.build_instance(Model, data, self.using) + yield base.DeserializedObject(model_instance, m2m_data, deferred_fields) - -def _get_model(model_identifier): - """Look up a model from an "app_label.model_name" string.""" - try: - return apps.get_model(model_identifier) - except (LookupError, TypeError): - raise base.DeserializationError( - "Invalid model identifier: '%s'" % model_identifier + def _handle_m2m_field_node(self, field, field_value): + return base.deserialize_m2m_values( + field, field_value, self.using, self.handle_forward_references ) + + def _handle_fk_field_node(self, field, field_value): + return base.deserialize_fk_value( + field, field_value, self.using, self.handle_forward_references + ) + + @staticmethod + def _get_model_from_node(model_identifier): + """Look up a model from an "app_label.model_name" string.""" + try: + return apps.get_model(model_identifier) + except (LookupError, TypeError): + raise base.DeserializationError( + f"Invalid model identifier: {model_identifier}" + ) diff --git a/django/core/serializers/pyyaml.py b/django/core/serializers/pyyaml.py index 9a20b6658f..ed6e4b3895 100644 --- a/django/core/serializers/pyyaml.py +++ b/django/core/serializers/pyyaml.py @@ -6,7 +6,6 @@ Requires PyYaml (https://pyyaml.org/), but that's checked for in __init__. import collections import decimal -from io import StringIO import yaml @@ -66,17 +65,23 @@ class Serializer(PythonSerializer): return super(PythonSerializer, self).getvalue() -def Deserializer(stream_or_string, **options): +class Deserializer(PythonDeserializer): """Deserialize a stream or string of YAML data.""" - if isinstance(stream_or_string, bytes): - stream_or_string = stream_or_string.decode() - if isinstance(stream_or_string, str): - stream = StringIO(stream_or_string) - else: + + def __init__(self, stream_or_string, **options): stream = stream_or_string - try: - yield from PythonDeserializer(yaml.load(stream, Loader=SafeLoader), **options) - except (GeneratorExit, DeserializationError): - raise - except Exception as exc: - raise DeserializationError() from exc + if isinstance(stream_or_string, bytes): + stream = stream_or_string.decode() + try: + objects = yaml.load(stream, Loader=SafeLoader) + except Exception as exc: + raise DeserializationError() from exc + super().__init__(objects, **options) + + def _handle_object(self, obj): + try: + yield from super()._handle_object(obj) + except (GeneratorExit, DeserializationError): + raise + except Exception as exc: + raise DeserializationError(f"Error deserializing object: {exc}") from exc diff --git a/django/db/backends/base/base.py b/django/db/backends/base/base.py index 7a1dfd30d1..e6e0325d07 100644 --- a/django/db/backends/base/base.py +++ b/django/db/backends/base/base.py @@ -175,7 +175,8 @@ class BaseDatabaseWrapper: if len(self.queries_log) == self.queries_log.maxlen: warnings.warn( "Limit for query logging exceeded, only the last {} queries " - "will be returned.".format(self.queries_log.maxlen) + "will be returned.".format(self.queries_log.maxlen), + stacklevel=2, ) return list(self.queries_log) diff --git a/django/db/backends/base/operations.py b/django/db/backends/base/operations.py index 889e4d87b4..dba9fcbba8 100644 --- a/django/db/backends/base/operations.py +++ b/django/db/backends/base/operations.py @@ -228,6 +228,7 @@ class BaseDatabaseOperations: "DatabaseOperations.lookup_cast() instead." ), RemovedInDjango60Warning, + stacklevel=2, ) return "%s" diff --git a/django/db/backends/base/schema.py b/django/db/backends/base/schema.py index e5f28d9c6a..3e38c56d50 100644 --- a/django/db/backends/base/schema.py +++ b/django/db/backends/base/schema.py @@ -164,7 +164,7 @@ class BaseDatabaseSchemaEditor: def __exit__(self, exc_type, exc_value, traceback): if exc_type is None: for sql in self.deferred_sql: - self.execute(sql) + self.execute(sql, None) if self.atomic_migration: self.atomic.__exit__(exc_type, exc_value, traceback) @@ -265,16 +265,29 @@ class BaseDatabaseSchemaEditor: ) if autoinc_sql: self.deferred_sql.extend(autoinc_sql) - constraints = [ - constraint.constraint_sql(model, self) - for constraint in model._meta.constraints - ] + # The BaseConstraint DDL creation methods such as constraint_sql(), + # create_sql(), and delete_sql(), were not designed in a way that + # separate SQL from parameters which make their generated SQL unfit to + # be used in a context where parametrization is delegated to the + # backend. + constraint_sqls = [] + if params: + # If parameters are present (e.g. a DEFAULT clause on backends that + # allow parametrization) defer constraint creation so they are not + # mixed with SQL meant to be parametrized. + for constraint in model._meta.constraints: + self.deferred_sql.append(constraint.create_sql(model, self)) + else: + constraint_sqls.extend( + constraint.constraint_sql(model, self) + for constraint in model._meta.constraints + ) sql = self.sql_create_table % { "table": self.quote_name(model._meta.db_table), "definition": ", ".join( - str(constraint) - for constraint in (*column_sqls, *constraints) - if constraint + str(statement) + for statement in (*column_sqls, *constraint_sqls) + if statement ), } if model._meta.db_tablespace: diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 5606f90653..df78d9ba27 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -14,13 +14,17 @@ from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.db import IntegrityError from django.db.backends.base.base import BaseDatabaseWrapper -from django.db.backends.oracle.oracledb_any import oracledb as Database from django.db.backends.utils import debug_transaction from django.utils.asyncio import async_unsafe from django.utils.encoding import force_bytes, force_str from django.utils.functional import cached_property from django.utils.version import get_version_tuple +try: + from django.db.backends.oracle.oracledb_any import oracledb as Database +except ImportError as e: + raise ImproperlyConfigured(f"Error loading oracledb module: {e}") + def _setup_environment(environ): # Cygwin requires some special voodoo to set the environment variables diff --git a/django/db/backends/oracle/features.py b/django/db/backends/oracle/features.py index aa657b3ba4..72c6180f50 100644 --- a/django/db/backends/oracle/features.py +++ b/django/db/backends/oracle/features.py @@ -116,6 +116,7 @@ class DatabaseFeatures(BaseDatabaseFeatures): "Oracle requires ORDER BY in row_number, ANSI:SQL doesn't.": { "expressions_window.tests.WindowFunctionTests." "test_row_number_no_ordering", + "prefetch_related.tests.PrefetchLimitTests.test_empty_order", }, "Oracle doesn't support changing collations on indexed columns (#33671).": { "migrations.test_operations.OperationTests." @@ -204,10 +205,6 @@ class DatabaseFeatures(BaseDatabaseFeatures): def supports_aggregation_over_interval_types(self): return self.connection.oracle_version >= (23,) - @cached_property - def supports_bulk_insert_with_multiple_rows(self): - return self.connection.oracle_version >= (23,) - @cached_property def bare_select_suffix(self): return "" if self.connection.oracle_version >= (23,) else " FROM DUAL" diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py index 507c5fb369..86340bbf4a 100644 --- a/django/db/backends/oracle/operations.py +++ b/django/db/backends/oracle/operations.py @@ -678,24 +678,6 @@ END; for field in fields if field ] - if ( - self.connection.features.supports_bulk_insert_with_multiple_rows - # A workaround with UNION of SELECTs is required for models without - # any fields. - and field_placeholders - ): - placeholder_rows_sql = [] - for row in placeholder_rows: - placeholders_row = ( - field_placeholder % placeholder - for field_placeholder, placeholder in zip( - field_placeholders, row, strict=True - ) - ) - placeholder_rows_sql.append(placeholders_row) - return super().bulk_insert_sql(fields, placeholder_rows_sql) - # Oracle < 23c doesn't support inserting multiple rows in a single - # statement, use UNION of SELECTs as a workaround. query = [] for row in placeholder_rows: select = [] diff --git a/django/db/backends/oracle/oracledb_any.py b/django/db/backends/oracle/oracledb_any.py index 65d9f1d67d..22a9b78be8 100644 --- a/django/db/backends/oracle/oracledb_any.py +++ b/django/db/backends/oracle/oracledb_any.py @@ -1,6 +1,5 @@ import warnings -from django.core.exceptions import ImproperlyConfigured from django.utils.deprecation import RemovedInDjango60Warning try: @@ -18,4 +17,4 @@ except ImportError as e: ) is_oracledb = False except ImportError: - raise ImproperlyConfigured(f"Error loading oracledb module: {e}") + raise e from None diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index e97ab6aa89..c864cab57a 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -86,24 +86,6 @@ def _get_varchar_column(data): return "varchar(%(max_length)s)" % data -def ensure_timezone(connection, ops, timezone_name): - conn_timezone_name = connection.info.parameter_status("TimeZone") - if timezone_name and conn_timezone_name != timezone_name: - with connection.cursor() as cursor: - cursor.execute(ops.set_time_zone_sql(), [timezone_name]) - return True - return False - - -def ensure_role(connection, ops, role_name): - if role_name: - with connection.cursor() as cursor: - sql = ops.compose_sql("SET ROLE %s", [role_name]) - cursor.execute(sql) - return True - return False - - class DatabaseWrapper(BaseDatabaseWrapper): vendor = "postgresql" display_name = "PostgreSQL" @@ -364,21 +346,35 @@ class DatabaseWrapper(BaseDatabaseWrapper): self.close_pool() if self.connection is None: return False - return ensure_timezone(self.connection, self.ops, self.timezone_name) + return self._configure_timezone(self.connection) + + def _configure_timezone(self, connection): + conn_timezone_name = connection.info.parameter_status("TimeZone") + timezone_name = self.timezone_name + if timezone_name and conn_timezone_name != timezone_name: + with connection.cursor() as cursor: + cursor.execute(self.ops.set_time_zone_sql(), [timezone_name]) + return True + return False + + def _configure_role(self, connection): + if new_role := self.settings_dict["OPTIONS"].get("assume_role"): + with connection.cursor() as cursor: + sql = self.ops.compose_sql("SET ROLE %s", [new_role]) + cursor.execute(sql) + return True + return False def _configure_connection(self, connection): # This function is called from init_connection_state and from the - # psycopg pool itself after a connection is opened. Make sure that - # whatever is done here does not access anything on self aside from - # variables. + # psycopg pool itself after a connection is opened. # Commit after setting the time zone. - commit_tz = ensure_timezone(connection, self.ops, self.timezone_name) + commit_tz = self._configure_timezone(connection) # Set the role on the connection. This is useful if the credential used # to login is not the same as the role that owns database resources. As # can be the case when using temporary or ephemeral credentials. - role_name = self.settings_dict["OPTIONS"].get("assume_role") - commit_role = ensure_role(connection, self.ops, role_name) + commit_role = self._configure_role(connection) return commit_role or commit_tz diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index c7cf947800..f7b65651b3 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -40,6 +40,12 @@ def adapt_datetime(val): return val.isoformat(" ") +def _get_varchar_column(data): + if data["max_length"] is None: + return "varchar" + return "varchar(%(max_length)s)" % data + + Database.register_converter("bool", b"1".__eq__) Database.register_converter("date", decoder(parse_date)) Database.register_converter("time", decoder(parse_time)) @@ -62,7 +68,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): "BigAutoField": "integer", "BinaryField": "BLOB", "BooleanField": "bool", - "CharField": "varchar(%(max_length)s)", + "CharField": _get_varchar_column, "DateField": "date", "DateTimeField": "datetime", "DecimalField": "decimal", diff --git a/django/db/backends/sqlite3/features.py b/django/db/backends/sqlite3/features.py index 502d8546e3..669e875b59 100644 --- a/django/db/backends/sqlite3/features.py +++ b/django/db/backends/sqlite3/features.py @@ -60,6 +60,7 @@ class DatabaseFeatures(BaseDatabaseFeatures): """ insert_test_table_with_defaults = 'INSERT INTO {} ("null") VALUES (1)' supports_default_keyword_in_insert = False + supports_unlimited_charfield = True @cached_property def django_test_skips(self): diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py index 79aa1934c0..a21bc22413 100644 --- a/django/db/backends/sqlite3/introspection.py +++ b/django/db/backends/sqlite3/introspection.py @@ -316,8 +316,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): # Find inline check constraints. try: table_schema = cursor.execute( - "SELECT sql FROM sqlite_master WHERE type='table' and name=%s" - % (self.connection.ops.quote_name(table_name),) + "SELECT sql FROM sqlite_master WHERE type='table' and name=%s", + [table_name], ).fetchone()[0] except TypeError: # table_name is a view. @@ -337,8 +337,8 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): # columns. Discard last 2 columns if there. number, index, unique = row[:3] cursor.execute( - "SELECT sql FROM sqlite_master " - "WHERE type='index' AND name=%s" % self.connection.ops.quote_name(index) + "SELECT sql FROM sqlite_master WHERE type='index' AND name=%s", + [index], ) # There's at most one row. (sql,) = cursor.fetchone() or (None,) diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py index 9aad9c809e..2469d01efb 100644 --- a/django/db/migrations/operations/models.py +++ b/django/db/migrations/operations/models.py @@ -184,6 +184,38 @@ class CreateModel(ModelOperation): managers=operation.managers, ), ] + elif ( + isinstance(operation, AlterModelTable) + and self.name_lower == operation.name_lower + ): + return [ + CreateModel( + self.name, + fields=self.fields, + options={ + **self.options, + "db_table": operation.table, + }, + bases=self.bases, + managers=self.managers, + ), + ] + elif ( + isinstance(operation, AlterModelTableComment) + and self.name_lower == operation.name_lower + ): + return [ + CreateModel( + self.name, + fields=self.fields, + options={ + **self.options, + "db_table_comment": operation.table_comment, + }, + bases=self.bases, + managers=self.managers, + ), + ] elif ( isinstance(operation, AlterTogetherOptionOperation) and self.name_lower == operation.name_lower @@ -947,7 +979,7 @@ class AddIndex(IndexOperation): return [] if isinstance(operation, RenameIndex) and self.index.name == operation.old_name: self.index.name = operation.new_name - return [AddIndex(model_name=self.model_name, index=self.index)] + return [self.__class__(model_name=self.model_name, index=self.index)] return super().reduce(operation, app_label) diff --git a/django/db/models/base.py b/django/db/models/base.py index 9f8c1c0cc0..5b819b1406 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -601,7 +601,7 @@ class Model(AltersData, metaclass=ModelBase): return my_pk == other.pk def __hash__(self): - if self.pk is None: + if not self._is_pk_set(): raise TypeError("Model instances without primary key value are unhashable") return hash(self.pk) @@ -662,6 +662,9 @@ class Model(AltersData, metaclass=ModelBase): pk = property(_get_pk_val, _set_pk_val) + def _is_pk_set(self, meta=None): + return self._get_pk_val(meta) is not None + def get_deferred_fields(self): """ Return a set containing names of deferred fields for this instance. @@ -788,7 +791,7 @@ class Model(AltersData, metaclass=ModelBase): warnings.warn( f"Passing positional arguments to {method_name}() is deprecated", RemovedInDjango60Warning, - stacklevel=2, + stacklevel=3, ) total_len_args = len(args) + 1 # include self max_len_args = len(defaults) + 1 @@ -1094,11 +1097,10 @@ class Model(AltersData, metaclass=ModelBase): if f.name in update_fields or f.attname in update_fields ] - pk_val = self._get_pk_val(meta) - if pk_val is None: + if not self._is_pk_set(meta): pk_val = meta.pk.get_pk_value_on_save(self) setattr(self, meta.pk.attname, pk_val) - pk_set = pk_val is not None + pk_set = self._is_pk_set(meta) if not pk_set and (force_update or update_fields): raise ValueError("Cannot force an update in save() with no primary key.") updated = False @@ -1126,6 +1128,7 @@ class Model(AltersData, metaclass=ModelBase): for f in non_pks_non_generated ] forced_update = update_fields or force_update + pk_val = self._get_pk_val(meta) updated = self._do_update( base_qs, using, pk_val, values, update_fields, forced_update ) @@ -1226,7 +1229,7 @@ class Model(AltersData, metaclass=ModelBase): # database to raise an IntegrityError if applicable. If # constraints aren't supported by the database, there's the # unavoidable risk of data corruption. - if obj.pk is None: + if not obj._is_pk_set(): # Remove the object from a related instance cache. if not field.remote_field.multiple: field.remote_field.delete_cached_value(obj) @@ -1254,14 +1257,14 @@ class Model(AltersData, metaclass=ModelBase): and hasattr(field, "fk_field") ): obj = field.get_cached_value(self, default=None) - if obj and obj.pk is None: + if obj and not obj._is_pk_set(): raise ValueError( f"{operation_name}() prohibited to prevent data loss due to " f"unsaved related object '{field.name}'." ) def delete(self, using=None, keep_parents=False): - if self.pk is None: + if not self._is_pk_set(): raise ValueError( "%s object can't be deleted because its %s attribute is set " "to None." % (self._meta.object_name, self._meta.pk.attname) @@ -1333,21 +1336,41 @@ class Model(AltersData, metaclass=ModelBase): setattr(self, cachename, obj) return getattr(self, cachename) - def _get_field_value_map(self, meta, exclude=None): + def _get_field_expression_map(self, meta, exclude=None): if exclude is None: exclude = set() meta = meta or self._meta - field_map = { - field.name: Value(getattr(self, field.attname), field) - for field in meta.local_concrete_fields - if field.name not in exclude and not field.generated - } + field_map = {} + generated_fields = [] + for field in meta.local_concrete_fields: + if field.name in exclude: + continue + if field.generated: + if any( + ref[0] in exclude + for ref in self._get_expr_references(field.expression) + ): + continue + generated_fields.append(field) + continue + value = getattr(self, field.attname) + if not value or not hasattr(value, "resolve_expression"): + value = Value(value, field) + field_map[field.name] = value if "pk" not in exclude: field_map["pk"] = Value(self.pk, meta.pk) + if generated_fields: + replacements = {F(name): value for name, value in field_map.items()} + for generated_field in generated_fields: + field_map[generated_field.name] = ExpressionWrapper( + generated_field.expression.replace_expressions(replacements), + generated_field.output_field, + ) + return field_map def prepare_database_save(self, field): - if self.pk is None: + if not self._is_pk_set(): raise ValueError( "Unsaved model instance %r cannot be used in an ORM query." % self ) @@ -1477,7 +1500,7 @@ class Model(AltersData, metaclass=ModelBase): # allows single model to have effectively multiple primary keys. # Refs #17615. model_class_pk = self._get_pk_val(model_class._meta) - if not self._state.adding and model_class_pk is not None: + if not self._state.adding and self._is_pk_set(model_class._meta): qs = qs.exclude(pk=model_class_pk) if qs.exists(): if len(unique_check) == 1: @@ -1512,7 +1535,7 @@ class Model(AltersData, metaclass=ModelBase): qs = model_class._default_manager.filter(**lookup_kwargs) # Exclude the current object from the query if we are editing an # instance (as opposed to creating a new one) - if not self._state.adding and self.pk is not None: + if not self._state.adding and self._is_pk_set(): qs = qs.exclude(pk=self.pk) if qs.exists(): diff --git a/django/db/models/constraints.py b/django/db/models/constraints.py index 0a63e38d83..3859a60e2f 100644 --- a/django/db/models/constraints.py +++ b/django/db/models/constraints.py @@ -68,6 +68,19 @@ class BaseConstraint: def remove_sql(self, model, schema_editor): raise NotImplementedError("This method must be implemented by a subclass.") + @classmethod + def _expression_refs_exclude(cls, model, expression, exclude): + get_field = model._meta.get_field + for field_name, *__ in model._get_expr_references(expression): + if field_name in exclude: + return True + field = get_field(field_name) + if field.generated and cls._expression_refs_exclude( + model, field.expression, exclude + ): + return True + return False + def validate(self, model, instance, exclude=None, using=DEFAULT_DB_ALIAS): raise NotImplementedError("This method must be implemented by a subclass.") @@ -241,7 +254,7 @@ class CheckConstraint(BaseConstraint): return schema_editor._delete_check_sql(model, self.name) def validate(self, model, instance, exclude=None, using=DEFAULT_DB_ALIAS): - against = instance._get_field_value_map(meta=model._meta, exclude=exclude) + against = instance._get_field_expression_map(meta=model._meta, exclude=exclude) try: if not Q(self.condition).check(against, using=using): raise ValidationError( @@ -606,39 +619,59 @@ class UniqueConstraint(BaseConstraint): queryset = model._default_manager.using(using) if self.fields: lookup_kwargs = {} + generated_field_names = [] for field_name in self.fields: if exclude and field_name in exclude: return field = model._meta.get_field(field_name) - lookup_value = getattr(instance, field.attname) - if ( - self.nulls_distinct is not False - and lookup_value is None - or ( - lookup_value == "" - and connections[ - using - ].features.interprets_empty_strings_as_nulls - ) - ): - # A composite constraint containing NULL value cannot cause - # a violation since NULL != NULL in SQL. - return - lookup_kwargs[field.name] = lookup_value - queryset = queryset.filter(**lookup_kwargs) + if field.generated: + if exclude and self._expression_refs_exclude( + model, field.expression, exclude + ): + return + generated_field_names.append(field.name) + else: + lookup_value = getattr(instance, field.attname) + if ( + self.nulls_distinct is not False + and lookup_value is None + or ( + lookup_value == "" + and connections[ + using + ].features.interprets_empty_strings_as_nulls + ) + ): + # A composite constraint containing NULL value cannot cause + # a violation since NULL != NULL in SQL. + return + lookup_kwargs[field.name] = lookup_value + lookup_args = [] + if generated_field_names: + field_expression_map = instance._get_field_expression_map( + meta=model._meta, exclude=exclude + ) + for field_name in generated_field_names: + expression = field_expression_map[field_name] + if self.nulls_distinct is False: + lhs = F(field_name) + condition = Q(Exact(lhs, expression)) | Q( + IsNull(lhs, True), IsNull(expression, True) + ) + lookup_args.append(condition) + else: + lookup_kwargs[field_name] = expression + queryset = queryset.filter(*lookup_args, **lookup_kwargs) else: # Ignore constraints with excluded fields. - if exclude: - for expression in self.expressions: - if hasattr(expression, "flatten"): - for expr in expression.flatten(): - if isinstance(expr, F) and expr.name in exclude: - return - elif isinstance(expression, F) and expression.name in exclude: - return + if exclude and any( + self._expression_refs_exclude(model, expression, exclude) + for expression in self.expressions + ): + return replacements = { F(field): value - for field, value in instance._get_field_value_map( + for field, value in instance._get_field_expression_map( meta=model._meta, exclude=exclude ).items() } @@ -653,7 +686,7 @@ class UniqueConstraint(BaseConstraint): filters.append(condition) queryset = queryset.filter(*filters) model_class_pk = instance._get_pk_val(model._meta) - if not instance._state.adding and model_class_pk is not None: + if not instance._state.adding and instance._is_pk_set(model._meta): queryset = queryset.exclude(pk=model_class_pk) if not self.condition: if queryset.exists(): @@ -668,7 +701,9 @@ class UniqueConstraint(BaseConstraint): code=self.violation_error_code, ) else: - against = instance._get_field_value_map(meta=model._meta, exclude=exclude) + against = instance._get_field_expression_map( + meta=model._meta, exclude=exclude + ) try: if (self.condition & Exists(queryset.filter(self.condition))).check( against, using=using diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index ffb9f3c816..667e9f93c6 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -182,6 +182,8 @@ class BaseExpression: allowed_default = False # Can the expression be used during a constraint validation? constraint_validation_compatible = True + # Does the expression possibly return more than one row? + set_returning = False def __init__(self, output_field=None): if output_field is not None: @@ -1250,9 +1252,41 @@ class Star(Expression): class DatabaseDefault(Expression): - """Placeholder expression for the database default in an insert query.""" + """ + Expression to use DEFAULT keyword during insert otherwise the underlying expression. + """ + + def __init__(self, expression, output_field=None): + super().__init__(output_field) + self.expression = expression + + def get_source_expressions(self): + return [self.expression] + + def set_source_expressions(self, exprs): + (self.expression,) = exprs + + def resolve_expression( + self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False + ): + resolved_expression = self.expression.resolve_expression( + query=query, + allow_joins=allow_joins, + reuse=reuse, + summarize=summarize, + for_save=for_save, + ) + # Defaults used outside an INSERT context should resolve to their + # underlying expression. + if not for_save: + return resolved_expression + return DatabaseDefault( + resolved_expression, output_field=self._output_field_or_none + ) def as_sql(self, compiler, connection): + if not connection.features.supports_default_keyword_in_insert: + return compiler.compile(self.expression) return "DEFAULT", [] @@ -1295,6 +1329,60 @@ class Col(Expression): ) + self.target.get_db_converters(connection) +class ColPairs(Expression): + def __init__(self, alias, targets, sources, output_field): + super().__init__(output_field=output_field) + self.alias = alias + self.targets = targets + self.sources = sources + + def __len__(self): + return len(self.targets) + + def __iter__(self): + return iter(self.get_cols()) + + def __repr__(self): + return ( + f"{self.__class__.__name__}({self.alias!r}, {self.targets!r}, " + f"{self.sources!r}, {self.output_field!r})" + ) + + def get_cols(self): + return [ + Col(self.alias, target, source) + for target, source in zip(self.targets, self.sources) + ] + + def get_source_expressions(self): + return self.get_cols() + + def set_source_expressions(self, exprs): + assert all(isinstance(expr, Col) and expr.alias == self.alias for expr in exprs) + self.targets = [col.target for col in exprs] + self.sources = [col.field for col in exprs] + + def as_sql(self, compiler, connection): + cols_sql = [] + cols_params = [] + cols = self.get_cols() + + for col in cols: + sql, params = col.as_sql(compiler, connection) + cols_sql.append(sql) + cols_params.extend(params) + + return ", ".join(cols_sql), cols_params + + def relabeled_clone(self, relabels): + return self.__class__( + relabels.get(self.alias, self.alias), self.targets, self.sources, self.field + ) + + def resolve_expression(self, *args, **kwargs): + return self + + class Ref(Expression): """ Reference to column alias of the query. For example, Ref('sum_cost') in @@ -1345,16 +1433,14 @@ class ExpressionList(Func): template = "%(expressions)s" - def __init__(self, *expressions, **extra): - if not expressions: - raise ValueError( - "%s requires at least one expression." % self.__class__.__name__ - ) - super().__init__(*expressions, **extra) - def __str__(self): return self.arg_joiner.join(str(arg) for arg in self.source_expressions) + def as_sql(self, *args, **kwargs): + if not self.source_expressions: + return "", () + return super().as_sql(*args, **kwargs) + def as_sqlite(self, compiler, connection, **extra_context): # Casting to numeric is unnecessary. return self.as_sql(compiler, connection, **extra_context) diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index 796c4d23c4..d1f31f0211 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -983,13 +983,7 @@ class Field(RegisterLookupMixin): def pre_save(self, model_instance, add): """Return field's value just before saving.""" - value = getattr(model_instance, self.attname) - if not connection.features.supports_default_keyword_in_insert: - from django.db.models.expressions import DatabaseDefault - - if isinstance(value, DatabaseDefault): - return self._db_default_expression - return value + return getattr(model_instance, self.attname) def get_prep_value(self, value): """Perform preliminary non-db specific value checks and conversions.""" @@ -1031,7 +1025,9 @@ class Field(RegisterLookupMixin): if self.db_default is not NOT_PROVIDED: from django.db.models.expressions import DatabaseDefault - return DatabaseDefault + return lambda: DatabaseDefault( + self._db_default_expression, output_field=self + ) if ( not self.empty_strings_allowed diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py index 7c911f4b23..0716d3599e 100644 --- a/django/db/models/fields/files.py +++ b/django/db/models/fields/files.py @@ -9,6 +9,7 @@ from django.core.files.images import ImageFile from django.core.files.storage import Storage, default_storage from django.core.files.utils import validate_file_name from django.db.models import signals +from django.db.models.expressions import DatabaseDefault from django.db.models.fields import Field from django.db.models.query_utils import DeferredAttribute from django.db.models.utils import AltersData @@ -197,6 +198,12 @@ class FileDescriptor(DeferredAttribute): attr = self.field.attr_class(instance, self.field, file) instance.__dict__[self.field.attname] = attr + # If this value is a DatabaseDefault, initialize the attribute class + # for this field with its db_default value. + elif isinstance(file, DatabaseDefault): + attr = self.field.attr_class(instance, self.field, self.field.db_default) + instance.__dict__[self.field.attname] = attr + # Other types of files may be assigned as well, but they need to have # the FieldFile interface added to them. Thus, we wrap any other type of # File inside a FieldFile (well, the field's attr_class, which is diff --git a/django/db/models/fields/mixins.py b/django/db/models/fields/mixins.py index 9f2809dfc8..6774303773 100644 --- a/django/db/models/fields/mixins.py +++ b/django/db/models/fields/mixins.py @@ -28,6 +28,7 @@ class FieldCacheMixin: f"Override {self.__class__.__qualname__}.cache_name instead of " "get_cache_name().", RemovedInDjango60Warning, + stacklevel=3, ) return cache_name diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 6737570074..b672a4b488 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -781,6 +781,7 @@ class ForeignObject(RelatedField): "ForeignObject.get_joining_columns() is deprecated. Use " "get_joining_fields() instead.", RemovedInDjango60Warning, + stacklevel=2, ) source = self.reverse_related_fields if reverse_join else self.related_fields return tuple( @@ -792,6 +793,7 @@ class ForeignObject(RelatedField): "ForeignObject.get_reverse_joining_columns() is deprecated. Use " "get_reverse_joining_fields() instead.", RemovedInDjango60Warning, + stacklevel=2, ) return self.get_joining_columns(reverse_join=True) @@ -1967,7 +1969,7 @@ class ManyToManyField(RelatedField): pass def value_from_object(self, obj): - return [] if obj.pk is None else list(getattr(obj, self.attname).all()) + return list(getattr(obj, self.attname).all()) if obj._is_pk_set() else [] def save_form_data(self, instance, data): getattr(instance, self.attname).set(data) diff --git a/django/db/models/fields/related_descriptors.py b/django/db/models/fields/related_descriptors.py index bc288c47ec..2b23085fa8 100644 --- a/django/db/models/fields/related_descriptors.py +++ b/django/db/models/fields/related_descriptors.py @@ -511,8 +511,7 @@ class ReverseOneToOneDescriptor: try: rel_obj = self.related.get_cached_value(instance) except KeyError: - related_pk = instance.pk - if related_pk is None: + if not instance._is_pk_set(): rel_obj = None else: filter_args = self.related.field.get_forward_related_filter(instance) @@ -753,7 +752,7 @@ def create_reverse_many_to_one_manager(superclass, rel): # Even if this relation is not to pk, we require still pk value. # The wish is that the instance has been already saved to DB, # although having a pk value isn't a guarantee of that. - if self.instance.pk is None: + if not self.instance._is_pk_set(): raise ValueError( f"{self.instance.__class__.__name__!r} instance needs to have a " f"primary key value before this relationship can be used." @@ -1081,7 +1080,7 @@ def create_forward_many_to_many_manager(superclass, rel, reverse): # Even if this relation is not to pk, we require still pk value. # The wish is that the instance has been already saved to DB, # although having a pk value isn't a guarantee of that. - if instance.pk is None: + if not instance._is_pk_set(): raise ValueError( "%r instance needs to have a primary key value before " "a many-to-many relationship can be used." diff --git a/django/db/models/fields/related_lookups.py b/django/db/models/fields/related_lookups.py index 07a06e1686..8b5663dfea 100644 --- a/django/db/models/fields/related_lookups.py +++ b/django/db/models/fields/related_lookups.py @@ -1,3 +1,6 @@ +from django.db import NotSupportedError +from django.db.models.expressions import ColPairs +from django.db.models.fields.tuple_lookups import TupleIn, tuple_lookups from django.db.models.lookups import ( Exact, GreaterThan, @@ -9,39 +12,11 @@ from django.db.models.lookups import ( ) -class MultiColSource: - contains_aggregate = False - contains_over_clause = False - - def __init__(self, alias, targets, sources, field): - self.targets, self.sources, self.field, self.alias = ( - targets, - sources, - field, - alias, - ) - self.output_field = self.field - - def __repr__(self): - return "{}({}, {})".format(self.__class__.__name__, self.alias, self.field) - - def relabeled_clone(self, relabels): - return self.__class__( - relabels.get(self.alias, self.alias), self.targets, self.sources, self.field - ) - - def get_lookup(self, lookup): - return self.output_field.get_lookup(lookup) - - def resolve_expression(self, *args, **kwargs): - return self - - def get_normalized_value(value, lhs): from django.db.models import Model if isinstance(value, Model): - if value.pk is None: + if not value._is_pk_set(): raise ValueError("Model instances passed to related filters must be saved.") value_list = [] sources = lhs.output_field.path_infos[-1].target_fields @@ -64,7 +39,7 @@ def get_normalized_value(value, lhs): class RelatedIn(In): def get_prep_lookup(self): - if not isinstance(self.lhs, MultiColSource): + if not isinstance(self.lhs, ColPairs): if self.rhs_is_direct_value(): # If we get here, we are dealing with single-column relations. self.rhs = [get_normalized_value(val, self.lhs)[0] for val in self.rhs] @@ -98,49 +73,29 @@ class RelatedIn(In): return super().get_prep_lookup() def as_sql(self, compiler, connection): - if isinstance(self.lhs, MultiColSource): - # For multicolumn lookups we need to build a multicolumn where clause. - # This clause is either a SubqueryConstraint (for values that need - # to be compiled to SQL) or an OR-combined list of - # (col1 = val1 AND col2 = val2 AND ...) clauses. - from django.db.models.sql.where import ( - AND, - OR, - SubqueryConstraint, - WhereNode, - ) + if isinstance(self.lhs, ColPairs): + from django.db.models.sql.where import SubqueryConstraint - root_constraint = WhereNode(connector=OR) if self.rhs_is_direct_value(): values = [get_normalized_value(value, self.lhs) for value in self.rhs] - for value in values: - value_constraint = WhereNode() - for source, target, val in zip( - self.lhs.sources, self.lhs.targets, value - ): - lookup_class = target.get_lookup("exact") - lookup = lookup_class( - target.get_col(self.lhs.alias, source), val - ) - value_constraint.add(lookup, AND) - root_constraint.add(value_constraint, OR) + lookup = TupleIn(self.lhs, values) + return compiler.compile(lookup) else: - root_constraint.add( + return compiler.compile( SubqueryConstraint( self.lhs.alias, [target.column for target in self.lhs.targets], [source.name for source in self.lhs.sources], self.rhs, ), - AND, ) - return root_constraint.as_sql(compiler, connection) + return super().as_sql(compiler, connection) class RelatedLookupMixin: def get_prep_lookup(self): - if not isinstance(self.lhs, MultiColSource) and not hasattr( + if not isinstance(self.lhs, ColPairs) and not hasattr( self.rhs, "resolve_expression" ): # If we get here, we are dealing with single-column relations. @@ -158,20 +113,16 @@ class RelatedLookupMixin: return super().get_prep_lookup() def as_sql(self, compiler, connection): - if isinstance(self.lhs, MultiColSource): - assert self.rhs_is_direct_value() - self.rhs = get_normalized_value(self.rhs, self.lhs) - from django.db.models.sql.where import AND, WhereNode - - root_constraint = WhereNode() - for target, source, val in zip( - self.lhs.targets, self.lhs.sources, self.rhs - ): - lookup_class = target.get_lookup(self.lookup_name) - root_constraint.add( - lookup_class(target.get_col(self.lhs.alias, source), val), AND + if isinstance(self.lhs, ColPairs): + if not self.rhs_is_direct_value(): + raise NotSupportedError( + f"'{self.lookup_name}' doesn't support multi-column subqueries." ) - return root_constraint.as_sql(compiler, connection) + self.rhs = get_normalized_value(self.rhs, self.lhs) + lookup_class = tuple_lookups[self.lookup_name] + lookup = lookup_class(self.lhs, self.rhs) + return compiler.compile(lookup) + return super().as_sql(compiler, connection) diff --git a/django/db/models/fields/reverse_related.py b/django/db/models/fields/reverse_related.py index a39bfd07da..85378431a7 100644 --- a/django/db/models/fields/reverse_related.py +++ b/django/db/models/fields/reverse_related.py @@ -197,6 +197,7 @@ class ForeignObjectRel(FieldCacheMixin): "ForeignObjectRel.get_joining_columns() is deprecated. Use " "get_joining_fields() instead.", RemovedInDjango60Warning, + stacklevel=2, ) return self.field.get_reverse_joining_columns() diff --git a/django/db/models/fields/tuple_lookups.py b/django/db/models/fields/tuple_lookups.py new file mode 100644 index 0000000000..eb2d80b20f --- /dev/null +++ b/django/db/models/fields/tuple_lookups.py @@ -0,0 +1,257 @@ +import itertools + +from django.core.exceptions import EmptyResultSet +from django.db.models import Field +from django.db.models.expressions import Func, Value +from django.db.models.lookups import ( + Exact, + GreaterThan, + GreaterThanOrEqual, + In, + IsNull, + LessThan, + LessThanOrEqual, +) +from django.db.models.sql.where import AND, OR, WhereNode + + +class Tuple(Func): + function = "" + output_field = Field() + + def __len__(self): + return len(self.source_expressions) + + def __iter__(self): + return iter(self.source_expressions) + + +class TupleLookupMixin: + def get_prep_lookup(self): + self.check_rhs_length_equals_lhs_length() + return self.rhs + + def check_rhs_length_equals_lhs_length(self): + len_lhs = len(self.lhs) + if len_lhs != len(self.rhs): + raise ValueError( + f"'{self.lookup_name}' lookup of '{self.lhs.field.name}' field " + f"must have {len_lhs} elements" + ) + + def get_prep_lhs(self): + if isinstance(self.lhs, (tuple, list)): + return Tuple(*self.lhs) + return super().get_prep_lhs() + + def process_lhs(self, compiler, connection, lhs=None): + sql, params = super().process_lhs(compiler, connection, lhs) + if not isinstance(self.lhs, Tuple): + sql = f"({sql})" + return sql, params + + def process_rhs(self, compiler, connection): + values = [ + Value(val, output_field=col.output_field) + for col, val in zip(self.lhs, self.rhs) + ] + return Tuple(*values).as_sql(compiler, connection) + + +class TupleExact(TupleLookupMixin, Exact): + def as_oracle(self, compiler, connection): + # e.g.: (a, b, c) == (x, y, z) as SQL: + # WHERE a = x AND b = y AND c = z + lookups = [Exact(col, val) for col, val in zip(self.lhs, self.rhs)] + root = WhereNode(lookups, connector=AND) + + return root.as_sql(compiler, connection) + + +class TupleIsNull(TupleLookupMixin, IsNull): + def get_prep_lookup(self): + rhs = self.rhs + if isinstance(rhs, (tuple, list)) and len(rhs) == 1: + rhs = rhs[0] + if isinstance(rhs, bool): + return rhs + raise ValueError( + "The QuerySet value for an isnull lookup must be True or False." + ) + + def as_sql(self, compiler, connection): + # e.g.: (a, b, c) is None as SQL: + # WHERE a IS NULL OR b IS NULL OR c IS NULL + # e.g.: (a, b, c) is not None as SQL: + # WHERE a IS NOT NULL AND b IS NOT NULL AND c IS NOT NULL + rhs = self.rhs + lookups = [IsNull(col, rhs) for col in self.lhs] + root = WhereNode(lookups, connector=OR if rhs else AND) + return root.as_sql(compiler, connection) + + +class TupleGreaterThan(TupleLookupMixin, GreaterThan): + def as_oracle(self, compiler, connection): + # e.g.: (a, b, c) > (x, y, z) as SQL: + # WHERE a > x OR (a = x AND (b > y OR (b = y AND c > z))) + lookups = itertools.cycle([GreaterThan, Exact]) + connectors = itertools.cycle([OR, AND]) + cols_list = [col for col in self.lhs for _ in range(2)] + vals_list = [val for val in self.rhs for _ in range(2)] + cols_iter = iter(cols_list[:-1]) + vals_iter = iter(vals_list[:-1]) + col = next(cols_iter) + val = next(vals_iter) + lookup = next(lookups) + connector = next(connectors) + root = node = WhereNode([lookup(col, val)], connector=connector) + + for col, val in zip(cols_iter, vals_iter): + lookup = next(lookups) + connector = next(connectors) + child = WhereNode([lookup(col, val)], connector=connector) + node.children.append(child) + node = child + + return root.as_sql(compiler, connection) + + +class TupleGreaterThanOrEqual(TupleLookupMixin, GreaterThanOrEqual): + def as_oracle(self, compiler, connection): + # e.g.: (a, b, c) >= (x, y, z) as SQL: + # WHERE a > x OR (a = x AND (b > y OR (b = y AND (c > z OR c = z)))) + lookups = itertools.cycle([GreaterThan, Exact]) + connectors = itertools.cycle([OR, AND]) + cols_list = [col for col in self.lhs for _ in range(2)] + vals_list = [val for val in self.rhs for _ in range(2)] + cols_iter = iter(cols_list) + vals_iter = iter(vals_list) + col = next(cols_iter) + val = next(vals_iter) + lookup = next(lookups) + connector = next(connectors) + root = node = WhereNode([lookup(col, val)], connector=connector) + + for col, val in zip(cols_iter, vals_iter): + lookup = next(lookups) + connector = next(connectors) + child = WhereNode([lookup(col, val)], connector=connector) + node.children.append(child) + node = child + + return root.as_sql(compiler, connection) + + +class TupleLessThan(TupleLookupMixin, LessThan): + def as_oracle(self, compiler, connection): + # e.g.: (a, b, c) < (x, y, z) as SQL: + # WHERE a < x OR (a = x AND (b < y OR (b = y AND c < z))) + lookups = itertools.cycle([LessThan, Exact]) + connectors = itertools.cycle([OR, AND]) + cols_list = [col for col in self.lhs for _ in range(2)] + vals_list = [val for val in self.rhs for _ in range(2)] + cols_iter = iter(cols_list[:-1]) + vals_iter = iter(vals_list[:-1]) + col = next(cols_iter) + val = next(vals_iter) + lookup = next(lookups) + connector = next(connectors) + root = node = WhereNode([lookup(col, val)], connector=connector) + + for col, val in zip(cols_iter, vals_iter): + lookup = next(lookups) + connector = next(connectors) + child = WhereNode([lookup(col, val)], connector=connector) + node.children.append(child) + node = child + + return root.as_sql(compiler, connection) + + +class TupleLessThanOrEqual(TupleLookupMixin, LessThanOrEqual): + def as_oracle(self, compiler, connection): + # e.g.: (a, b, c) <= (x, y, z) as SQL: + # WHERE a < x OR (a = x AND (b < y OR (b = y AND (c < z OR c = z)))) + lookups = itertools.cycle([LessThan, Exact]) + connectors = itertools.cycle([OR, AND]) + cols_list = [col for col in self.lhs for _ in range(2)] + vals_list = [val for val in self.rhs for _ in range(2)] + cols_iter = iter(cols_list) + vals_iter = iter(vals_list) + col = next(cols_iter) + val = next(vals_iter) + lookup = next(lookups) + connector = next(connectors) + root = node = WhereNode([lookup(col, val)], connector=connector) + + for col, val in zip(cols_iter, vals_iter): + lookup = next(lookups) + connector = next(connectors) + child = WhereNode([lookup(col, val)], connector=connector) + node.children.append(child) + node = child + + return root.as_sql(compiler, connection) + + +class TupleIn(TupleLookupMixin, In): + def get_prep_lookup(self): + self.check_rhs_elements_length_equals_lhs_length() + return super(TupleLookupMixin, self).get_prep_lookup() + + def check_rhs_elements_length_equals_lhs_length(self): + len_lhs = len(self.lhs) + if not all(len_lhs == len(vals) for vals in self.rhs): + raise ValueError( + f"'{self.lookup_name}' lookup of '{self.lhs.field.name}' field " + f"must have {len_lhs} elements each" + ) + + def process_rhs(self, compiler, connection): + rhs = self.rhs + if not rhs: + raise EmptyResultSet + + # e.g.: (a, b, c) in [(x1, y1, z1), (x2, y2, z2)] as SQL: + # WHERE (a, b, c) IN ((x1, y1, z1), (x2, y2, z2)) + result = [] + lhs = self.lhs + + for vals in rhs: + result.append( + Tuple( + *[ + Value(val, output_field=col.output_field) + for col, val in zip(lhs, vals) + ] + ) + ) + + return Tuple(*result).as_sql(compiler, connection) + + def as_sqlite(self, compiler, connection): + rhs = self.rhs + if not rhs: + raise EmptyResultSet + + # e.g.: (a, b, c) in [(x1, y1, z1), (x2, y2, z2)] as SQL: + # WHERE (a = x1 AND b = y1 AND c = z1) OR (a = x2 AND b = y2 AND c = z2) + root = WhereNode([], connector=OR) + lhs = self.lhs + + for vals in rhs: + lookups = [Exact(col, val) for col, val in zip(lhs, vals)] + root.children.append(WhereNode(lookups, connector=AND)) + + return root.as_sql(compiler, connection) + + +tuple_lookups = { + "exact": TupleExact, + "gt": TupleGreaterThan, + "gte": TupleGreaterThanOrEqual, + "lt": TupleLessThan, + "lte": TupleLessThanOrEqual, + "in": TupleIn, + "isnull": TupleIsNull, +} diff --git a/django/db/models/functions/comparison.py b/django/db/models/functions/comparison.py index 6db81d6f46..d06f0a25a4 100644 --- a/django/db/models/functions/comparison.py +++ b/django/db/models/functions/comparison.py @@ -175,7 +175,10 @@ class JSONObject(Func): ) def as_postgresql(self, compiler, connection, **extra_context): - if not connection.features.is_postgresql_16: + if ( + not connection.features.is_postgresql_16 + or connection.features.uses_server_side_binding + ): copy = self.copy() copy.set_source_expressions( [ diff --git a/django/db/models/functions/text.py b/django/db/models/functions/text.py index df826ffdb5..9c48659bf9 100644 --- a/django/db/models/functions/text.py +++ b/django/db/models/functions/text.py @@ -78,7 +78,7 @@ class ConcatPair(Func): return super(ConcatPair, coalesced).as_sql( compiler, connection, - template="%(expressions)s", + template="(%(expressions)s)", arg_joiner=" || ", **extra_context, ) diff --git a/django/db/models/lookups.py b/django/db/models/lookups.py index 18c4f2ca08..734f911f83 100644 --- a/django/db/models/lookups.py +++ b/django/db/models/lookups.py @@ -300,7 +300,11 @@ class FieldGetDbPrepValueIterableMixin(FieldGetDbPrepValueMixin): # An expression will be handled by the database but can coexist # alongside real values. pass - elif self.prepare_rhs and hasattr(self.lhs.output_field, "get_prep_value"): + elif ( + self.prepare_rhs + and hasattr(self.lhs, "output_field") + and hasattr(self.lhs.output_field, "get_prep_value") + ): rhs_value = self.lhs.output_field.get_prep_value(rhs_value) prepared_values.append(rhs_value) return prepared_values diff --git a/django/db/models/query.py b/django/db/models/query.py index 3f9d4768f7..a4277d05fc 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -668,7 +668,7 @@ class QuerySet(AltersData): connection = connections[self.db] for obj in objs: - if obj.pk is None: + if not obj._is_pk_set(): # Populate new PK values. obj.pk = obj._meta.pk.get_pk_value_on_save(obj) if not connection.features.supports_default_keyword_in_bulk_insert: @@ -794,7 +794,7 @@ class QuerySet(AltersData): objs = list(objs) self._prepare_for_bulk_create(objs) with transaction.atomic(using=self.db, savepoint=False): - objs_with_pk, objs_without_pk = partition(lambda o: o.pk is None, objs) + objs_without_pk, objs_with_pk = partition(lambda o: o._is_pk_set(), objs) if objs_with_pk: returned_columns = self._batched_insert( objs_with_pk, @@ -862,7 +862,7 @@ class QuerySet(AltersData): if not fields: raise ValueError("Field names must be given to bulk_update().") objs = tuple(objs) - if any(obj.pk is None for obj in objs): + if not all(obj._is_pk_set() for obj in objs): raise ValueError("All bulk_update() objects must have a primary key set.") fields = [self.model._meta.get_field(name) for name in fields] if any(not f.concrete or f.many_to_many for f in fields): @@ -1101,6 +1101,8 @@ class QuerySet(AltersData): """ if self.query.is_sliced: raise TypeError("Cannot use 'limit' or 'offset' with in_bulk().") + if not issubclass(self._iterable_class, ModelIterable): + raise TypeError("in_bulk() cannot be used with values() or values_list().") opts = self.model._meta unique_fields = [ constraint.fields[0] @@ -1287,7 +1289,7 @@ class QuerySet(AltersData): return False except AttributeError: raise TypeError("'obj' must be a model instance.") - if obj.pk is None: + if not obj._is_pk_set(): raise ValueError("QuerySet.contains() cannot be used on unsaved objects.") if self._result_cache is not None: return obj in self._result_cache diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py index 1bf396723e..f0ae810f47 100644 --- a/django/db/models/query_utils.py +++ b/django/db/models/query_utils.py @@ -10,9 +10,10 @@ import functools import inspect import logging from collections import namedtuple +from contextlib import nullcontext from django.core.exceptions import FieldError -from django.db import DEFAULT_DB_ALIAS, DatabaseError, connections +from django.db import DEFAULT_DB_ALIAS, DatabaseError, connections, transaction from django.db.models.constants import LOOKUP_SEP from django.utils import tree from django.utils.functional import cached_property @@ -130,14 +131,21 @@ class Q(tree.Node): value = Value(value) query.add_annotation(value, name, select=False) query.add_annotation(Value(1), "_check") + connection = connections[using] # This will raise a FieldError if a field is missing in "against". - if connections[using].features.supports_comparing_boolean_expr: + if connection.features.supports_comparing_boolean_expr: query.add_q(Q(Coalesce(self, True, output_field=BooleanField()))) else: query.add_q(self) compiler = query.get_compiler(using=using) + context_manager = ( + transaction.atomic(using=using) + if connection.in_atomic_block + else nullcontext() + ) try: - return compiler.execute_sql(SINGLE) is not None + with context_manager: + return compiler.execute_sql(SINGLE) is not None except DatabaseError as e: logger.warning("Got a database error calling check() on %r: %s", self, e) return True @@ -212,7 +220,7 @@ class DeferredAttribute: # might be able to reuse the already loaded value. Refs #18343. val = self._check_parent_chain(instance) if val is None: - if instance.pk is None and self.field.generated: + if not instance._is_pk_set() and self.field.generated: raise AttributeError( "Cannot read a generated field from an unsaved model." ) diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 1d426f49b6..49263d5944 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -403,8 +403,13 @@ class SQLCompiler: ) continue - ref, *transforms = col.split(LOOKUP_SEP) - if expr := self.query.annotations.get(ref): + if expr := self.query.annotations.get(col): + ref = col + transforms = [] + else: + ref, *transforms = col.split(LOOKUP_SEP) + expr = self.query.annotations.get(ref) + if expr: if self.query.combinator and self.select: if transforms: raise NotImplementedError( diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index f00eb1e5a5..aef3f48f10 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -23,6 +23,7 @@ from django.db.models.constants import LOOKUP_SEP from django.db.models.expressions import ( BaseExpression, Col, + ColPairs, Exists, F, OuterRef, @@ -32,7 +33,6 @@ from django.db.models.expressions import ( Value, ) from django.db.models.fields import Field -from django.db.models.fields.related_lookups import MultiColSource from django.db.models.lookups import Lookup from django.db.models.query_utils import ( Q, @@ -491,6 +491,11 @@ class Query(BaseExpression): ) or having ) + set_returning_annotations = { + alias + for alias, annotation in self.annotation_select.items() + if getattr(annotation, "set_returning", False) + } # Decide if we need to use a subquery. # # Existing aggregations would cause incorrect results as @@ -510,6 +515,7 @@ class Query(BaseExpression): or qualify or self.distinct or self.combinator + or set_returning_annotations ): from django.db.models.sql.subqueries import AggregateQuery @@ -551,6 +557,9 @@ class Query(BaseExpression): if annotation.get_group_by_cols(): annotation_mask.add(annotation_alias) inner_query.set_annotation_mask(annotation_mask) + # Annotations that possibly return multiple rows cannot + # be masked as they might have an incidence on the query. + annotation_mask |= set_returning_annotations # Add aggregates to the outer AggregateQuery. This requires making # sure all columns referenced by the aggregates are selected in the @@ -650,13 +659,13 @@ class Query(BaseExpression): for combined_query in q.combined_queries ) q.clear_ordering(force=True) - if limit: + if limit is True: q.set_limits(high=1) q.add_annotation(Value(1), "a") return q def has_results(self, using): - q = self.exists(using) + q = self.exists() compiler = q.get_compiler(using=using) return compiler.has_results() @@ -1549,9 +1558,7 @@ class Query(BaseExpression): if len(targets) == 1: col = self._get_col(targets[0], join_info.final_field, alias) else: - col = MultiColSource( - alias, targets, join_info.targets, join_info.final_field - ) + col = ColPairs(alias, targets, join_info.targets, join_info.final_field) else: col = self._get_col(targets[0], join_info.final_field, alias) @@ -2463,6 +2470,8 @@ class Query(BaseExpression): selected = {} if fields: + for field in fields: + self.check_alias(field) field_names = [] extra_names = [] annotation_names = [] diff --git a/django/forms/jinja2/django/forms/widgets/color.html b/django/forms/jinja2/django/forms/widgets/color.html new file mode 100644 index 0000000000..08b1e61c0b --- /dev/null +++ b/django/forms/jinja2/django/forms/widgets/color.html @@ -0,0 +1 @@ +{% include "django/forms/widgets/input.html" %} diff --git a/django/forms/jinja2/django/forms/widgets/search.html b/django/forms/jinja2/django/forms/widgets/search.html new file mode 100644 index 0000000000..08b1e61c0b --- /dev/null +++ b/django/forms/jinja2/django/forms/widgets/search.html @@ -0,0 +1 @@ +{% include "django/forms/widgets/input.html" %} diff --git a/django/forms/jinja2/django/forms/widgets/tel.html b/django/forms/jinja2/django/forms/widgets/tel.html new file mode 100644 index 0000000000..08b1e61c0b --- /dev/null +++ b/django/forms/jinja2/django/forms/widgets/tel.html @@ -0,0 +1 @@ +{% include "django/forms/widgets/input.html" %} diff --git a/django/forms/models.py b/django/forms/models.py index 8084e16c8d..be59dbe4a0 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -935,7 +935,7 @@ class BaseModelFormSet(BaseFormSet, AltersData): # 1. The object is an unexpected empty model, created by invalid # POST data such as an object outside the formset's queryset. # 2. The object was already deleted from the database. - if obj.pk is None: + if not obj._is_pk_set(): continue if form in forms_to_delete: self.deleted_objects.append(obj) @@ -1103,7 +1103,7 @@ class BaseInlineFormSet(BaseModelFormSet): self.save_as_new = save_as_new if queryset is None: queryset = self.model._default_manager - if self.instance.pk is not None: + if self.instance._is_pk_set(): qs = queryset.filter(**{self.fk.name: self.instance}) else: qs = queryset.none() diff --git a/django/forms/renderers.py b/django/forms/renderers.py index 970d05804c..baf8f74507 100644 --- a/django/forms/renderers.py +++ b/django/forms/renderers.py @@ -80,6 +80,7 @@ class DjangoDivFormRenderer(DjangoTemplates): "The DjangoDivFormRenderer transitional form renderer is deprecated. Use " "DjangoTemplates instead.", RemovedInDjango60Warning, + stacklevel=2, ) super().__init__(*args, **kwargs) @@ -96,6 +97,7 @@ class Jinja2DivFormRenderer(Jinja2): "The Jinja2DivFormRenderer transitional form renderer is deprecated. Use " "Jinja2 instead.", RemovedInDjango60Warning, + stacklevel=2, ) super().__init__(*args, **kwargs) diff --git a/django/forms/templates/django/forms/widgets/color.html b/django/forms/templates/django/forms/widgets/color.html new file mode 100644 index 0000000000..08b1e61c0b --- /dev/null +++ b/django/forms/templates/django/forms/widgets/color.html @@ -0,0 +1 @@ +{% include "django/forms/widgets/input.html" %} diff --git a/django/forms/templates/django/forms/widgets/search.html b/django/forms/templates/django/forms/widgets/search.html new file mode 100644 index 0000000000..08b1e61c0b --- /dev/null +++ b/django/forms/templates/django/forms/widgets/search.html @@ -0,0 +1 @@ +{% include "django/forms/widgets/input.html" %} diff --git a/django/forms/templates/django/forms/widgets/tel.html b/django/forms/templates/django/forms/widgets/tel.html new file mode 100644 index 0000000000..08b1e61c0b --- /dev/null +++ b/django/forms/templates/django/forms/widgets/tel.html @@ -0,0 +1 @@ +{% include "django/forms/widgets/input.html" %} diff --git a/django/forms/widgets.py b/django/forms/widgets.py index 623801eb66..e3a2085843 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -30,6 +30,9 @@ __all__ = ( "NumberInput", "EmailInput", "URLInput", + "ColorInput", + "SearchInput", + "TelInput", "PasswordInput", "HiddenInput", "MultipleHiddenInput", @@ -353,6 +356,21 @@ class URLInput(Input): template_name = "django/forms/widgets/url.html" +class ColorInput(Input): + input_type = "color" + template_name = "django/forms/widgets/color.html" + + +class SearchInput(Input): + input_type = "search" + template_name = "django/forms/widgets/search.html" + + +class TelInput(Input): + input_type = "tel" + template_name = "django/forms/widgets/tel.html" + + class PasswordInput(Input): input_type = "password" template_name = "django/forms/widgets/password.html" diff --git a/django/http/request.py b/django/http/request.py index 4c27d576ba..986d4eee89 100644 --- a/django/http/request.py +++ b/django/http/request.py @@ -1,5 +1,6 @@ import codecs import copy +import operator from io import BytesIO from itertools import chain from urllib.parse import parse_qsl, quote, urlencode, urljoin, urlsplit @@ -89,13 +90,47 @@ class HttpRequest: @cached_property def accepted_types(self): - """Return a list of MediaType instances.""" - return parse_accept_header(self.headers.get("Accept", "*/*")) + """Return a list of MediaType instances, in order of preference.""" + header_value = self.headers.get("Accept", "*/*") + return sorted( + (MediaType(token) for token in header_value.split(",") if token.strip()), + key=operator.attrgetter("quality", "specificity"), + reverse=True, + ) + + def accepted_type(self, media_type): + """ + Return the preferred MediaType instance which matches the given media type. + """ + return next( + ( + accepted_type + for accepted_type in self.accepted_types + if accepted_type.match(media_type) + ), + None, + ) + + def get_preferred_type(self, media_types): + """Select the preferred media type from the provided options.""" + if not media_types or not self.accepted_types: + return None + + desired_types = [ + (accepted_type, media_type) + for media_type in media_types + if (accepted_type := self.accepted_type(media_type)) is not None + ] + + if not desired_types: + return None + + # Of the desired media types, select the one which is most desirable. + return min(desired_types, key=lambda t: self.accepted_types.index(t[0]))[1] def accepts(self, media_type): - return any( - accepted_type.match(media_type) for accepted_type in self.accepted_types - ) + """Does the client accept a response in the given media type?""" + return self.accepted_type(media_type) is not None def _set_content_type_params(self, meta): """Set content_type, content_params, and encoding.""" @@ -678,9 +713,37 @@ class MediaType: if self.is_all_types: return True other = MediaType(other) - if self.main_type == other.main_type and self.sub_type in {"*", other.sub_type}: - return True - return False + return self.main_type == other.main_type and self.sub_type in { + "*", + other.sub_type, + } + + @cached_property + def quality(self): + try: + quality = float(self.params.get("q", 1)) + except ValueError: + # Discard invalid values. + return 1 + + # Valid quality values must be between 0 and 1. + if quality < 0 or quality > 1: + return 1 + + return round(quality, 3) + + @property + def specificity(self): + """ + Return a value from 0-3 for how specific the media type is. + """ + if self.main_type == "*": + return 0 + elif self.sub_type == "*": + return 1 + elif self.quality == 1: + return 2 + return 3 # It's neither necessary nor appropriate to use @@ -732,7 +795,3 @@ def validate_host(host, allowed_hosts): return any( pattern == "*" or is_same_domain(host, pattern) for pattern in allowed_hosts ) - - -def parse_accept_header(header): - return [MediaType(token) for token in header.split(",") if token.strip()] diff --git a/django/http/response.py b/django/http/response.py index 0d756403db..abe71718f2 100644 --- a/django/http/response.py +++ b/django/http/response.py @@ -498,6 +498,7 @@ class StreamingHttpResponse(HttpResponseBase): "StreamingHttpResponse must consume asynchronous iterators in order to " "serve them synchronously. Use a synchronous iterator instead.", Warning, + stacklevel=2, ) # async iterator. Consume in async_to_sync and map back. @@ -518,6 +519,7 @@ class StreamingHttpResponse(HttpResponseBase): "StreamingHttpResponse must consume synchronous iterators in order to " "serve them asynchronously. Use an asynchronous iterator instead.", Warning, + stacklevel=2, ) # sync iterator. Consume via sync_to_async and yield via async # generator. diff --git a/django/template/base.py b/django/template/base.py index 0f1eca58db..ee2e145c04 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -880,6 +880,10 @@ class Variable: try: # catch-all for silent variable failures for bit in self.lookups: try: # dictionary lookup + # Only allow if the metaclass implements __getitem__. See + # https://docs.python.org/3/reference/datamodel.html#classgetitem-versus-getitem + if not hasattr(type(current), "__getitem__"): + raise TypeError current = current[bit] # ValueError/IndexError are for numpy.array lookup on # numpy < 1.9 and 1.9+ respectively diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index 02cac06bcf..66c6e76d20 100644 --- a/django/template/defaultfilters.py +++ b/django/template/defaultfilters.py @@ -162,6 +162,19 @@ def floatformat(text, arg=-1): except ValueError: return input_val + _, digits, exponent = d.as_tuple() + try: + number_of_digits_and_exponent_sum = len(digits) + abs(exponent) + except TypeError: + # Exponent values can be "F", "n", "N". + number_of_digits_and_exponent_sum = 0 + + # Values with more than 200 digits, or with a large exponent, are returned "as is" + # to avoid high memory consumption and potential denial-of-service attacks. + # The cut-off of 200 is consistent with django.utils.numberformat.floatformat(). + if number_of_digits_and_exponent_sum > 200: + return input_val + try: m = int(d) - d except (ValueError, OverflowError, InvalidOperation): diff --git a/django/test/testcases.py b/django/test/testcases.py index 6027332cd5..36366bd777 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -67,6 +67,9 @@ __all__ = ( "skipUnlessDBFeature", ) +# Make unittest ignore frames in this module when reporting failures. +__unittest = True + if not PY311: # Backport of unittest.case._enter_context() from Python 3.11. @@ -205,6 +208,7 @@ class SimpleTestCase(unittest.TestCase): async_client_class = AsyncClient _overridden_settings = None _modified_settings = None + _pre_setup_ran_eagerly = False databases = set() _disallowed_database_msg = ( @@ -357,7 +361,10 @@ class SimpleTestCase(unittest.TestCase): if not skipped: try: - self._pre_setup() + if self.__class__._pre_setup_ran_eagerly: + self.__class__._pre_setup_ran_eagerly = False + else: + self._pre_setup() except Exception: if debug: raise @@ -376,14 +383,15 @@ class SimpleTestCase(unittest.TestCase): result.addError(self, sys.exc_info()) return - def _pre_setup(self): + @classmethod + def _pre_setup(cls): """ Perform pre-test setup: * Create a test client. * Clear the mail test outbox. """ - self.client = self.client_class() - self.async_client = self.async_client_class() + cls.client = cls.client_class() + cls.async_client = cls.async_client_class() mail.outbox = [] def _post_teardown(self): @@ -1086,6 +1094,7 @@ class TransactionTestCase(SimpleTestCase): # Subclasses can enable only a subset of apps for faster tests available_apps = None + _available_apps_calls_balanced = 0 # Subclasses can define fixtures which will be automatically installed. fixtures = None @@ -1103,7 +1112,22 @@ class TransactionTestCase(SimpleTestCase): # This can be slow; this flag allows enabling on a per-case basis. serialized_rollback = False - def _pre_setup(self): + @classmethod + def setUpClass(cls): + super().setUpClass() + if not issubclass(cls, TestCase): + cls._pre_setup() + cls._pre_setup_ran_eagerly = True + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + if not issubclass(cls, TestCase) and cls._available_apps_calls_balanced > 0: + apps.unset_available_apps() + cls._available_apps_calls_balanced -= 1 + + @classmethod + def _pre_setup(cls): """ Perform pre-test setup: * If the class has an 'available_apps' attribute, restrict the app @@ -1112,20 +1136,21 @@ class TransactionTestCase(SimpleTestCase): * If the class has a 'fixtures' attribute, install those fixtures. """ super()._pre_setup() - if self.available_apps is not None: - apps.set_available_apps(self.available_apps) + if cls.available_apps is not None: + apps.set_available_apps(cls.available_apps) + cls._available_apps_calls_balanced += 1 setting_changed.send( sender=settings._wrapped.__class__, setting="INSTALLED_APPS", - value=self.available_apps, + value=cls.available_apps, enter=True, ) - for db_name in self._databases_names(include_mirrors=False): + for db_name in cls._databases_names(include_mirrors=False): emit_post_migrate_signal(verbosity=0, interactive=False, db=db_name) try: - self._fixture_setup() + cls._fixture_setup() except Exception: - if self.available_apps is not None: + if cls.available_apps is not None: apps.unset_available_apps() setting_changed.send( sender=settings._wrapped.__class__, @@ -1137,7 +1162,7 @@ class TransactionTestCase(SimpleTestCase): # Clear the queries_log so that it's less likely to overflow (a single # test probably won't execute 9K queries). If queries_log overflows, # then assertNumQueries() doesn't work. - for db_name in self._databases_names(include_mirrors=False): + for db_name in cls._databases_names(include_mirrors=False): connections[db_name].queries_log.clear() @classmethod @@ -1153,7 +1178,8 @@ class TransactionTestCase(SimpleTestCase): ) ] - def _reset_sequences(self, db_name): + @staticmethod + def _reset_sequences(db_name): conn = connections[db_name] if conn.features.supports_sequence_reset: sql_list = conn.ops.sequence_reset_by_name_sql( @@ -1165,26 +1191,27 @@ class TransactionTestCase(SimpleTestCase): for sql in sql_list: cursor.execute(sql) - def _fixture_setup(self): - for db_name in self._databases_names(include_mirrors=False): + @classmethod + def _fixture_setup(cls): + for db_name in cls._databases_names(include_mirrors=False): # Reset sequences - if self.reset_sequences: - self._reset_sequences(db_name) + if cls.reset_sequences: + cls._reset_sequences(db_name) # Provide replica initial data from migrated apps, if needed. - if self.serialized_rollback and hasattr( + if cls.serialized_rollback and hasattr( connections[db_name], "_test_serialized_contents" ): - if self.available_apps is not None: + if cls.available_apps is not None: apps.unset_available_apps() connections[db_name].creation.deserialize_db_from_string( connections[db_name]._test_serialized_contents ) - if self.available_apps is not None: - apps.set_available_apps(self.available_apps) + if cls.available_apps is not None: + apps.set_available_apps(cls.available_apps) - if self.fixtures: - call_command("loaddata", *self.fixtures, verbosity=0, database=db_name) + if cls.fixtures: + call_command("loaddata", *cls.fixtures, verbosity=0, database=db_name) def _should_reload_connections(self): return True @@ -1209,8 +1236,9 @@ class TransactionTestCase(SimpleTestCase): for conn in connections.all(initialized_only=True): conn.close() finally: - if self.available_apps is not None: + if self.__class__.available_apps is not None: apps.unset_available_apps() + self.__class__._available_apps_calls_balanced -= 1 setting_changed.send( sender=settings._wrapped.__class__, setting="INSTALLED_APPS", @@ -1424,25 +1452,26 @@ class TestCase(TransactionTestCase): return False return super()._should_reload_connections() - def _fixture_setup(self): - if not self._databases_support_transactions(): + @classmethod + def _fixture_setup(cls): + if not cls._databases_support_transactions(): # If the backend does not support transactions, we should reload # class data before each test - self.setUpTestData() + cls.setUpTestData() return super()._fixture_setup() - if self.reset_sequences: + if cls.reset_sequences: raise TypeError("reset_sequences cannot be used on TestCase instances") - self.atomics = self._enter_atomics() - if not self._databases_support_savepoints(): - if self.fixtures: - for db_name in self._databases_names(include_mirrors=False): + cls.atomics = cls._enter_atomics() + if not cls._databases_support_savepoints(): + if cls.fixtures: + for db_name in cls._databases_names(include_mirrors=False): call_command( "loaddata", - *self.fixtures, + *cls.fixtures, **{"verbosity": 0, "database": db_name}, ) - self.setUpTestData() + cls.setUpTestData() def _fixture_teardown(self): if not self._databases_support_transactions(): diff --git a/django/urls/base.py b/django/urls/base.py index 753779c75b..bb40ba2224 100644 --- a/django/urls/base.py +++ b/django/urls/base.py @@ -127,8 +127,9 @@ def clear_script_prefix(): def set_urlconf(urlconf_name): """ - Set the URLconf for the current thread (overriding the default one in - settings). If urlconf_name is None, revert back to the default. + Set the URLconf for the current thread or asyncio task (overriding the + default one in settings). If urlconf_name is None, revert back to the + default. """ if urlconf_name: _urlconfs.value = urlconf_name @@ -139,8 +140,8 @@ def set_urlconf(urlconf_name): def get_urlconf(default=None): """ - Return the root URLconf to use for the current thread if it has been - changed from the default one. + Return the root URLconf to use for the current thread or asyncio task if it + has been changed from the default one. """ return getattr(_urlconfs, "value", default) diff --git a/django/utils/choices.py b/django/utils/choices.py index 7f40bce510..6b355d2324 100644 --- a/django/utils/choices.py +++ b/django/utils/choices.py @@ -21,8 +21,9 @@ class BaseChoiceIterator: return super().__eq__(other) def __getitem__(self, index): - if index < 0: - # Suboptimally consume whole iterator to handle negative index. + if isinstance(index, slice) or index < 0: + # Suboptimally consume whole iterator to handle slices and negative + # indexes. return list(self)[index] try: return next(islice(self, index, index + 1)) diff --git a/django/utils/decorators.py b/django/utils/decorators.py index d8814b0d4c..fb12c7fbcd 100644 --- a/django/utils/decorators.py +++ b/django/utils/decorators.py @@ -2,7 +2,7 @@ from functools import partial, update_wrapper, wraps -from asgiref.sync import iscoroutinefunction +from asgiref.sync import iscoroutinefunction, markcoroutinefunction class classonlymethod(classmethod): @@ -52,6 +52,10 @@ def _multi_decorate(decorators, method): _update_method_wrapper(_wrapper, dec) # Preserve any existing attributes of 'method', including the name. update_wrapper(_wrapper, method) + + if iscoroutinefunction(method): + markcoroutinefunction(_wrapper) + return _wrapper diff --git a/django/utils/html.py b/django/utils/html.py index 1d96cfe6db..b34af183d0 100644 --- a/django/utils/html.py +++ b/django/utils/html.py @@ -4,6 +4,7 @@ import html import json import re import warnings +from collections.abc import Mapping from html.parser import HTMLParser from urllib.parse import parse_qsl, quote, unquote, urlencode, urlsplit, urlunsplit @@ -38,6 +39,8 @@ VOID_ELEMENTS = frozenset( ) ) +MAX_URL_LENGTH = 2048 + @keep_lazy(SafeString) def escape(text): @@ -127,10 +130,11 @@ def format_html(format_string, *args, **kwargs): """ if not (args or kwargs): # RemovedInDjango60Warning: when the deprecation ends, replace with: - # raise ValueError("args or kwargs must be provided.") + # raise TypeError("args or kwargs must be provided.") warnings.warn( "Calling format_html() without passing args or kwargs is deprecated.", RemovedInDjango60Warning, + stacklevel=2, ) args_safe = map(conditional_escape, args) kwargs_safe = {k: conditional_escape(v) for (k, v) in kwargs.items()} @@ -153,7 +157,12 @@ def format_html_join(sep, format_string, args_generator): """ return mark_safe( conditional_escape(sep).join( - format_html(format_string, *args) for args in args_generator + ( + format_html(format_string, **args) + if isinstance(args, Mapping) + else format_html(format_string, *args) + ) + for args in args_generator ) ) @@ -332,9 +341,9 @@ class Urlizer: # Make URL we want to point to. url = None nofollow_attr = ' rel="nofollow"' if nofollow else "" - if self.simple_url_re.match(middle): + if len(middle) <= MAX_URL_LENGTH and self.simple_url_re.match(middle): url = smart_urlquote(html.unescape(middle)) - elif self.simple_url_2_re.match(middle): + elif len(middle) <= MAX_URL_LENGTH and self.simple_url_2_re.match(middle): url = smart_urlquote("http://%s" % html.unescape(middle)) elif ":" not in middle and self.is_email_simple(middle): local, domain = middle.rsplit("@", 1) @@ -410,7 +419,11 @@ class Urlizer: trimmed_something = True counts[closing] -= strip - rstripped = middle.rstrip(self.trailing_punctuation_chars_no_semicolon) + amp = middle.rfind("&") + if amp == -1: + rstripped = middle.rstrip(self.trailing_punctuation_chars) + else: + rstripped = middle.rstrip(self.trailing_punctuation_chars_no_semicolon) if rstripped != middle: trail = middle[len(rstripped) :] + trail middle = rstripped @@ -418,23 +431,20 @@ class Urlizer: if self.trailing_punctuation_chars_has_semicolon and middle.endswith(";"): # Only strip if not part of an HTML entity. - amp = middle.rfind("&") - if amp == -1: - can_strip = True - else: - potential_entity = middle[amp:] - escaped = html.unescape(potential_entity) - can_strip = (escaped == potential_entity) or escaped.endswith(";") - - if can_strip: - rstripped = middle.rstrip(";") - amount_stripped = len(middle) - len(rstripped) - if amp > -1 and amount_stripped > 1: - # Leave a trailing semicolon as might be an entity. - trail = middle[len(rstripped) + 1 :] + trail - middle = rstripped + ";" + potential_entity = middle[amp:] + escaped = html.unescape(potential_entity) + if escaped == potential_entity or escaped.endswith(";"): + rstripped = middle.rstrip(self.trailing_punctuation_chars) + trail_start = len(rstripped) + amount_trailing_semicolons = len(middle) - len(middle.rstrip(";")) + if amp > -1 and amount_trailing_semicolons > 1: + # Leave up to most recent semicolon as might be an entity. + recent_semicolon = middle[trail_start:].index(";") + middle_semicolon_index = recent_semicolon + trail_start + 1 + trail = middle[middle_semicolon_index:] + trail + middle = rstripped + middle[trail_start:middle_semicolon_index] else: - trail = middle[len(rstripped) :] + trail + trail = middle[trail_start:] + trail middle = rstripped trimmed_something = True @@ -451,6 +461,10 @@ class Urlizer: except ValueError: # value contains more than one @. return False + # Max length for domain name labels is 63 characters per RFC 1034. + # Helps to avoid ReDoS vectors in the domain part. + if len(p2) > 63: + return False # Dot must be in p2 (e.g. example.com) if "." not in p2 or p2.startswith("."): return False diff --git a/django/utils/jslex.py b/django/utils/jslex.py deleted file mode 100644 index fc46a686c7..0000000000 --- a/django/utils/jslex.py +++ /dev/null @@ -1,250 +0,0 @@ -"""JsLex: a lexer for JavaScript""" - -# Originally from https://bitbucket.org/ned/jslex -import re - - -class Tok: - """ - A specification for a token class. - """ - - num = 0 - - def __init__(self, name, regex, next=None): - self.id = Tok.num - Tok.num += 1 - self.name = name - self.regex = regex - self.next = next - - -def literals(choices, prefix="", suffix=""): - """ - Create a regex from a space-separated list of literal `choices`. - - If provided, `prefix` and `suffix` will be attached to each choice - individually. - """ - return "|".join(prefix + re.escape(c) + suffix for c in choices.split()) - - -class Lexer: - """ - A generic multi-state regex-based lexer. - """ - - def __init__(self, states, first): - self.regexes = {} - self.toks = {} - - for state, rules in states.items(): - parts = [] - for tok in rules: - groupid = "t%d" % tok.id - self.toks[groupid] = tok - parts.append("(?P<%s>%s)" % (groupid, tok.regex)) - self.regexes[state] = re.compile("|".join(parts), re.MULTILINE | re.VERBOSE) - - self.state = first - - def lex(self, text): - """ - Lexically analyze `text`. - - Yield pairs (`name`, `tokentext`). - """ - end = len(text) - state = self.state - regexes = self.regexes - toks = self.toks - start = 0 - - while start < end: - for match in regexes[state].finditer(text, start): - name = match.lastgroup - tok = toks[name] - toktext = match[name] - start += len(toktext) - yield (tok.name, toktext) - - if tok.next: - state = tok.next - break - - self.state = state - - -class JsLexer(Lexer): - """ - A JavaScript lexer - - >>> lexer = JsLexer() - >>> list(lexer.lex("a = 1")) - [('id', 'a'), ('ws', ' '), ('punct', '='), ('ws', ' '), ('dnum', '1')] - - This doesn't properly handle non-ASCII characters in the JavaScript source. - """ - - # Because these tokens are matched as alternatives in a regex, longer - # possibilities must appear in the list before shorter ones, for example, - # '>>' before '>'. - # - # Note that we don't have to detect malformed JavaScript, only properly - # lex correct JavaScript, so much of this is simplified. - - # Details of JavaScript lexical structure are taken from - # https://www.ecma-international.org/publications-and-standards/standards/ecma-262/ - - # A useful explanation of automatic semicolon insertion is at - # http://inimino.org/~inimino/blog/javascript_semicolons - - both_before = [ - Tok("comment", r"/\*(.|\n)*?\*/"), - Tok("linecomment", r"//.*?$"), - Tok("ws", r"\s+"), - Tok( - "keyword", - literals( - """ - break case catch class const continue debugger - default delete do else enum export extends - finally for function if import in instanceof - new return super switch this throw try typeof - var void while with - """, - suffix=r"\b", - ), - next="reg", - ), - Tok("reserved", literals("null true false", suffix=r"\b"), next="div"), - Tok( - "id", - r""" - ([a-zA-Z_$ ]|\\u[0-9a-fA-Z]{4}) # first char - ([a-zA-Z_$0-9]|\\u[0-9a-fA-F]{4})* # rest chars - """, - next="div", - ), - Tok("hnum", r"0[xX][0-9a-fA-F]+", next="div"), - Tok("onum", r"0[0-7]+"), - Tok( - "dnum", - r""" - ( (0|[1-9][0-9]*) # DecimalIntegerLiteral - \. # dot - [0-9]* # DecimalDigits-opt - ([eE][-+]?[0-9]+)? # ExponentPart-opt - | - \. # dot - [0-9]+ # DecimalDigits - ([eE][-+]?[0-9]+)? # ExponentPart-opt - | - (0|[1-9][0-9]*) # DecimalIntegerLiteral - ([eE][-+]?[0-9]+)? # ExponentPart-opt - ) - """, - next="div", - ), - Tok( - "punct", - literals( - """ - >>>= === !== >>> <<= >>= <= >= == != << >> && - || += -= *= %= &= |= ^= - """ - ), - next="reg", - ), - Tok("punct", literals("++ -- ) ]"), next="div"), - Tok("punct", literals("{ } ( [ . ; , < > + - * % & | ^ ! ~ ? : ="), next="reg"), - Tok("string", r'"([^"\\]|(\\(.|\n)))*?"', next="div"), - Tok("string", r"'([^'\\]|(\\(.|\n)))*?'", next="div"), - ] - - both_after = [ - Tok("other", r"."), - ] - - states = { - # slash will mean division - "div": both_before - + [ - Tok("punct", literals("/= /"), next="reg"), - ] - + both_after, - # slash will mean regex - "reg": both_before - + [ - Tok( - "regex", - r""" - / # opening slash - # First character is.. - ( [^*\\/[] # anything but * \ / or [ - | \\. # or an escape sequence - | \[ # or a class, which has - ( [^\]\\] # anything but \ or ] - | \\. # or an escape sequence - )* # many times - \] - ) - # Following characters are same, except for excluding a star - ( [^\\/[] # anything but \ / or [ - | \\. # or an escape sequence - | \[ # or a class, which has - ( [^\]\\] # anything but \ or ] - | \\. # or an escape sequence - )* # many times - \] - )* # many times - / # closing slash - [a-zA-Z0-9]* # trailing flags - """, - next="div", - ), - ] - + both_after, - } - - def __init__(self): - super().__init__(self.states, "reg") - - -def prepare_js_for_gettext(js): - """ - Convert the JavaScript source `js` into something resembling C for - xgettext. - - What actually happens is that all the regex literals are replaced with - "REGEX". - """ - - def escape_quotes(m): - """Used in a regex to properly escape double quotes.""" - s = m[0] - if s == '"': - return r"\"" - else: - return s - - lexer = JsLexer() - c = [] - for name, tok in lexer.lex(js): - if name == "regex": - # C doesn't grok regexes, and they aren't needed for gettext, - # so just output a string instead. - tok = '"REGEX"' - elif name == "string": - # C doesn't have single-quoted strings, so make all strings - # double-quoted. - if tok.startswith("'"): - guts = re.sub(r"\\.|.", escape_quotes, tok[1:-1]) - tok = '"' + guts + '"' - elif name == "id": - # C can't deal with Unicode escapes in identifiers. We don't - # need them for gettext anyway, so replace them with something - # innocuous - tok = tok.replace("\\", "U") - c.append(tok) - return "".join(c) diff --git a/django/utils/safestring.py b/django/utils/safestring.py index 4eb0207a66..1ac9b877e9 100644 --- a/django/utils/safestring.py +++ b/django/utils/safestring.py @@ -35,10 +35,16 @@ class SafeString(str, SafeData): Concatenating a safe string with another safe bytestring or safe string is safe. Otherwise, the result is no longer safe. """ - t = super().__add__(rhs) - if isinstance(rhs, SafeData): - return SafeString(t) - return t + if isinstance(rhs, str): + t = super().__add__(rhs) + if isinstance(rhs, SafeData): + t = SafeString(t) + return t + + # Give the rhs object a chance to handle the addition, for example if + # the rhs object's class implements `__radd__`. More details: + # https://docs.python.org/3/reference/datamodel.html#object.__radd__ + return NotImplemented def __str__(self): return self diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 4439fdad3f..1b163aab81 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -103,11 +103,9 @@ class TranslationCatalog: yield from cat.keys() def update(self, trans): - # Merge if plural function is the same, else prepend. - for cat, plural in zip(self._catalogs, self._plurals): - if trans.plural.__code__ == plural.__code__: - cat.update(trans._catalog) - break + # Merge if plural function is the same as the top catalog, else prepend. + if trans.plural.__code__ == self._plurals[0]: + self._catalogs[0].update(trans._catalog) else: self._catalogs.insert(0, trans._catalog.copy()) self._plurals.insert(0, trans.plural) @@ -517,7 +515,7 @@ def get_supported_language_variant(lang_code, strict=False): # There is a generic variant under the maximum length accepted length. lang_code = lang_code[:index] else: - raise ValueError("'lang_code' exceeds the maximum accepted length") + raise LookupError(lang_code) # If 'zh-hant-tw' is not supported, try special fallback or subsequent # language codes i.e. 'zh-hant' and 'zh'. possible_lang_codes = [lang_code] diff --git a/django/views/debug.py b/django/views/debug.py index c1265bfe6b..10b4d22030 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -113,7 +113,7 @@ class SafeExceptionReporterFilter: cleansed_substitute = "********************" hidden_settings = _lazy_re_compile( - "API|TOKEN|KEY|SECRET|PASS|SIGNATURE|HTTP_COOKIE", flags=re.I + "API|AUTH|TOKEN|KEY|SECRET|PASS|SIGNATURE|HTTP_COOKIE", flags=re.I ) def cleanse_setting(self, key, value): @@ -620,7 +620,7 @@ def technical_404_response(request, exception): else: resolved = False if not tried or ( # empty URLconf - request.path == "/" + request.path_info == "/" and len(tried) == 1 and len(tried[0]) == 1 # default URLconf and getattr(tried[0][0], "app_name", "") diff --git a/docs/conf.py b/docs/conf.py index c36a9a2022..b72b1afcf5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -94,7 +94,7 @@ spelling_warning = True # templates_path = [] # The suffix of source filenames. -source_suffix = ".txt" +source_suffix = {".txt": "restructuredtext"} # The encoding of source files. # source_encoding = 'utf-8-sig' @@ -182,9 +182,9 @@ pygments_style = "trac" # Links to Python's docs should reference the most recent version of the 3.x # branch, which is located at this URL. intersphinx_mapping = { - "python": ("https://docs.python.org/3/", None), - "sphinx": ("https://www.sphinx-doc.org/en/master/", None), - "psycopg": ("https://www.psycopg.org/psycopg3/docs/", None), + "python": ("https://docs.python.org/3", None), + "sphinx": ("https://www.sphinx-doc.org/en/master", None), + "psycopg": ("https://www.psycopg.org/psycopg3/docs", None), } # Python's docs don't change every week. @@ -292,8 +292,12 @@ latex_elements = { \setmainfont{Symbola} """, "preamble": r""" - \usepackage{newunicodechar} \usepackage[UTF8]{ctex} + \xeCJKDeclareCharClass{HalfLeft}{"2018, "201C} + \xeCJKDeclareCharClass{HalfRight}{ + "00B7, "2019, "201D, "2013, "2014, "2025, "2026, "2E3A + } + \usepackage{newunicodechar} \newunicodechar{π}{\ensuremath{\pi}} \newunicodechar{≤}{\ensuremath{\le}} \newunicodechar{≥}{\ensuremath{\ge}} diff --git a/docs/faq/install.txt b/docs/faq/install.txt index ddb84d6d9c..4623e288fb 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -52,7 +52,7 @@ Django version Python versions ============== =============== 4.2 3.8, 3.9, 3.10, 3.11, 3.12 (added in 4.2.8) 5.0 3.10, 3.11, 3.12 -5.1 3.10, 3.11, 3.12 +5.1 3.10, 3.11, 3.12, 3.13 (added in 5.1.3) 5.2 3.10, 3.11, 3.12, 3.13 ============== =============== diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt index b4a1537896..fefd8740e7 100644 --- a/docs/howto/custom-model-fields.txt +++ b/docs/howto/custom-model-fields.txt @@ -645,6 +645,9 @@ delegate further handling to the parent class. This might require you to write a custom form field (and even a form widget). See the :doc:`forms documentation ` for information about this. +If you wish to exclude the field from the :class:`~django.forms.ModelForm`, you +can override the :meth:`~Field.formfield` method to return ``None``. + Continuing our ongoing example, we can write the :meth:`~Field.formfield` method as:: @@ -652,8 +655,12 @@ as:: # ... def formfield(self, **kwargs): - # This is a fairly standard way to set up some defaults - # while letting the caller override them. + # Exclude the field from the ModelForm when some condition is met. + some_condition = kwargs.get("some_condition", False) + if some_condition: + return None + + # Set up some defaults while letting the caller override them. defaults = {"form_class": MyFormField} defaults.update(kwargs) return super().formfield(**defaults) diff --git a/docs/howto/custom-template-backend.txt b/docs/howto/custom-template-backend.txt index 85e8591cbd..640f6918f7 100644 --- a/docs/howto/custom-template-backend.txt +++ b/docs/howto/custom-template-backend.txt @@ -154,7 +154,8 @@ Origin API and 3rd-party integration Django templates have an :class:`~django.template.base.Origin` object available through the ``template.origin`` attribute. This enables debug information to be displayed in the :ref:`template postmortem `, as well as -in 3rd-party libraries, like the `Django Debug Toolbar`_. +in 3rd-party libraries, like the :pypi:`Django Debug Toolbar +`. Custom engines can provide their own ``template.origin`` information by creating an object that specifies the following attributes: @@ -168,4 +169,3 @@ creating an object that specifies the following attributes: to load the template, e.g. ``django.template.loaders.filesystem.Loader``. .. _DEP 182: https://github.com/django/deps/blob/main/final/0182-multiple-template-engines.rst -.. _Django Debug Toolbar: https://github.com/jazzband/django-debug-toolbar/ diff --git a/docs/howto/deployment/asgi/uvicorn.txt b/docs/howto/deployment/asgi/uvicorn.txt index cfce90fec1..cd7cacd72f 100644 --- a/docs/howto/deployment/asgi/uvicorn.txt +++ b/docs/howto/deployment/asgi/uvicorn.txt @@ -47,13 +47,13 @@ To install Uvicorn and Gunicorn, use the following: .. code-block:: shell - python -m pip install uvicorn gunicorn + python -m pip install uvicorn uvicorn-worker gunicorn Then start Gunicorn using the Uvicorn worker class like this: .. code-block:: shell - python -m gunicorn myproject.asgi:application -k uvicorn.workers.UvicornWorker + python -m gunicorn myproject.asgi:application -k uvicorn_worker.UvicornWorker .. _Uvicorn: https://www.uvicorn.org/ .. _Gunicorn: https://gunicorn.org/ diff --git a/docs/howto/deployment/checklist.txt b/docs/howto/deployment/checklist.txt index 75c9735e86..0f4bd158f8 100644 --- a/docs/howto/deployment/checklist.txt +++ b/docs/howto/deployment/checklist.txt @@ -36,6 +36,14 @@ Some of the checks described below can be automated using the :option:`check --deploy` option. Be sure to run it against your production settings file as described in the option's documentation. +Switch away from ``manage.py runserver`` +======================================== + +The :djadmin:`runserver` command is not designed for a production setting. Be +sure to switch to a production-ready WSGI or ASGI server. For a few common +options, see :doc:`WSGI servers ` or +:doc:`ASGI servers `. + Critical settings ================= diff --git a/docs/howto/deployment/index.txt b/docs/howto/deployment/index.txt index e2fadba5b9..2f53a97bef 100644 --- a/docs/howto/deployment/index.txt +++ b/docs/howto/deployment/index.txt @@ -12,7 +12,8 @@ the scope of what Django can give you as guidance. Django, being a web framework, needs a web server in order to operate. And since most web servers don't natively speak Python, we need an interface to -make that communication happen. +make that communication happen. The :djadmin:`runserver` command starts a +lightweight development server, which is not suitable for production. Django currently supports two interfaces: WSGI and ASGI. diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt index 61450dfe7a..17ba14c35c 100644 --- a/docs/howto/error-reporting.txt +++ b/docs/howto/error-reporting.txt @@ -282,7 +282,11 @@ following attributes and methods: import re - re.compile(r"API|TOKEN|KEY|SECRET|PASS|SIGNATURE|HTTP_COOKIE", flags=re.IGNORECASE) + re.compile(r"API|AUTH|TOKEN|KEY|SECRET|PASS|SIGNATURE|HTTP_COOKIE", flags=re.IGNORECASE) + + .. versionchanged:: 5.2 + + The term ``AUTH`` was added. .. method:: is_active(request) diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt index af2852cc7b..a8c5a57726 100644 --- a/docs/howto/initial-data.txt +++ b/docs/howto/initial-data.txt @@ -85,7 +85,7 @@ Tell Django where to look for fixture files ------------------------------------------- By default, Django looks for fixtures in the ``fixtures`` directory inside each -app for, so the command ``loaddata sample`` will find the file +app, so the command ``loaddata sample`` will find the file ``my_app/fixtures/sample.json``. This works with relative paths as well, so ``loaddata my_app/sample`` will find the file ``my_app/fixtures/my_app/sample.json``. @@ -93,7 +93,7 @@ app for, so the command ``loaddata sample`` will find the file Django also looks for fixtures in the list of directories provided in the :setting:`FIXTURE_DIRS` setting. -To completely prevent default search form happening, use an absolute path to +To completely prevent default search from happening, use an absolute path to specify the location of your fixture file, e.g. ``loaddata /path/to/sample``. .. admonition:: Namespace your fixture files diff --git a/docs/howto/windows.txt b/docs/howto/windows.txt index 83aa8d0655..235b18a24f 100644 --- a/docs/howto/windows.txt +++ b/docs/howto/windows.txt @@ -2,7 +2,7 @@ How to install Django on Windows ================================ -This document will guide you through installing Python 3.12 and Django on +This document will guide you through installing Python 3.13 and Django on Windows. It also provides instructions for setting up a virtual environment, which makes it easier to work on Python projects. This is meant as a beginner's guide for users working on Django projects and does not reflect how Django @@ -18,7 +18,7 @@ Install Python ============== Django is a Python web framework, thus requiring Python to be installed on your -machine. At the time of writing, Python 3.12 is the latest version. +machine. At the time of writing, Python 3.13 is the latest version. To install Python on your machine go to https://www.python.org/downloads/. The website should offer you a download button for the latest Python version. diff --git a/docs/internals/contributing/bugs-and-features.txt b/docs/internals/contributing/bugs-and-features.txt index b6b3265ba6..c59f79e6b8 100644 --- a/docs/internals/contributing/bugs-and-features.txt +++ b/docs/internals/contributing/bugs-and-features.txt @@ -110,13 +110,17 @@ part of that. Here are some tips on how to make a request most effectively: If there's a consensus agreement on the feature, then it's appropriate to create a ticket. Include a link to the discussion in the ticket description. -As with most open-source projects, code talks. If you are willing to write the -code for the feature yourself or, even better, if you've already written it, -it's much more likely to be accepted. Fork Django on GitHub, create a feature -branch, and show us your work! - See also: :ref:`documenting-new-features`. +Requesting performance optimizations +==================================== + +Reports of a performance regression, or suggested performance optimizations, +should provide benchmarks and commands for the ticket triager to reproduce. + +See the :ref:`django-asv-benchmarks` for more details of Django's existing +benchmarks. + .. _how-we-make-decisions: How we make decisions diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt index 73c120f71e..c1838b77a3 100644 --- a/docs/internals/contributing/writing-code/coding-style.txt +++ b/docs/internals/contributing/writing-code/coding-style.txt @@ -35,8 +35,8 @@ with them. Python style ============ -* All files should be formatted using the `black`_ auto-formatter. This will be - run by ``pre-commit`` if that is configured. +* All files should be formatted using the :pypi:`black` auto-formatter. This + will be run by ``pre-commit`` if that is configured. * The project repository includes an ``.editorconfig`` file. We recommend using a text editor with `EditorConfig`_ support to avoid indentation and @@ -506,5 +506,4 @@ JavaScript style For details about the JavaScript code style used by Django, see :doc:`javascript`. -.. _black: https://black.readthedocs.io/en/stable/ .. _editorconfig: https://editorconfig.org/ diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt index 11a96eb911..cac6848d04 100644 --- a/docs/internals/contributing/writing-code/submitting-patches.txt +++ b/docs/internals/contributing/writing-code/submitting-patches.txt @@ -6,6 +6,8 @@ We're always grateful for contributions to Django's code. Indeed, bug reports with associated contributions will get fixed *far* more quickly than those without a solution. +.. _trivial-change: + Typo fixes and trivial documentation changes ============================================ @@ -52,9 +54,10 @@ and time availability), claim it by following these steps: .. note:: The Django software foundation requests that anyone contributing more than - a trivial change to Django sign and submit a `Contributor License - Agreement`_, this ensures that the Django Software Foundation has clear - license to all contributions allowing for a clear license for all users. + a :ref:`trivial change `, to Django sign and submit a + `Contributor License Agreement`_, this ensures that the Django Software + Foundation has clear license to all contributions allowing for a clear + license for all users. .. _Login using your GitHub account: https://code.djangoproject.com/github/login .. _Create an account: https://www.djangoproject.com/accounts/register/ @@ -206,9 +209,10 @@ You should also add a test for the deprecation warning:: def test_foo_deprecation_warning(self): msg = "Expected deprecation message" - with self.assertWarnsMessage(RemovedInDjangoXXWarning, msg): + with self.assertWarnsMessage(RemovedInDjangoXXWarning, msg) as ctx: # invoke deprecated behavior ... + self.assertEqual(ctx.filename, __file__) It's important to include a ``RemovedInDjangoXXWarning`` comment above code which has no warning reference, but will need to be changed or removed when the @@ -230,6 +234,7 @@ deprecation ends. For example:: warnings.warn( "foo() is deprecated.", category=RemovedInDjangoXXWarning, + stacklevel=2, ) old_private_helper() ... @@ -257,21 +262,45 @@ JavaScript contributions For information on JavaScript contributions, see the :ref:`javascript-patches` documentation. +Optimization patches +==================== + +Patches aiming to deliver a performance improvement should provide benchmarks +showing the before and after impact of the patch and sharing the commands for +reviewers to reproduce. + +.. _django-asv-benchmarks: + +``django-asv`` benchmarks +------------------------- + +`django-asv`_ monitors the performance of Django code over time. These +benchmarks can be run on a pull request by labeling the pull request with +``benchmark``. Adding to these benchmarks is highly encouraged. + +.. _django-asv: https://github.com/django/django-asv/ + .. _patch-review-checklist: Contribution checklist ====================== -Use this checklist to review a pull request. If you are reviewing a pull -request that is not your own and it passes all the criteria below, please set -the "Triage Stage" on the corresponding Trac ticket to "Ready for checkin". +Use this checklist to review a pull request. If this contribution would not be +:ref:`considered trivial `, first ensure it has an accepted +ticket before proceeding with the review. + +If the pull request passes all the criteria below and is not your own, please +set the "Triage Stage" on the corresponding Trac ticket to "Ready for checkin". If you've left comments for improvement on the pull request, please tick the appropriate flags on the Trac ticket based on the results of your review: "Patch needs improvement", "Needs documentation", and/or "Needs tests". As time and interest permits, mergers do final reviews of "Ready for checkin" tickets and will either commit the changes or bump it back to "Accepted" if further -work needs to be done. If you're looking to become a merger, doing thorough -reviews of contributions is a great way to earn trust. +work needs to be done. + +If you're looking to become a member of the `triage & review team +`_, doing +thorough reviews of contributions is a great way to earn trust. Looking for a patch to review? Check out the "Patches needing review" section of the `Django Development Dashboard `_. @@ -331,5 +360,7 @@ All tickets :ref:`commit message format `? * Are you the patch author and a new contributor? Please add yourself to the :source:`AUTHORS` file and submit a `Contributor License Agreement`_. +* Does this have an accepted ticket on Trac? All contributions require a ticket + unless the :ref:`change is considered trivial `. .. _Contributor License Agreement: https://www.djangoproject.com/foundation/cla/ diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt index ca4029dbfa..3641bfb8cc 100644 --- a/docs/internals/contributing/writing-code/unit-tests.txt +++ b/docs/internals/contributing/writing-code/unit-tests.txt @@ -313,7 +313,7 @@ dependencies: * :pypi:`aiosmtpd` * :pypi:`argon2-cffi` 19.2.0+ -* :pypi:`asgiref` 3.7.0+ (required) +* :pypi:`asgiref` 3.8.1+ (required) * :pypi:`bcrypt` * :pypi:`colorama` 0.4.6+ * :pypi:`docutils` 0.19+ diff --git a/docs/internals/organization.txt b/docs/internals/organization.txt index 53bac152d5..64349d76ab 100644 --- a/docs/internals/organization.txt +++ b/docs/internals/organization.txt @@ -169,7 +169,7 @@ The steering council is a group of experienced contributors who: - provide oversight of Django's development and release process, - assist in setting the direction of feature development and releases, -- take part in filling certain roles, and +- select Mergers and Releasers, and - have a tie-breaking vote when other decision-making processes fail. Their main concern is to maintain the quality and stability of the Django Web @@ -186,7 +186,6 @@ The steering council holds the following prerogatives: the reversion of any particular merge or commit. - Announcing calls for proposals and ideas for the future technical direction of Django. -- Setting and adjusting the schedule of releases of Django. - Selecting and removing mergers and releasers. - Participating in the removal of members of the steering council, when deemed appropriate. @@ -211,10 +210,13 @@ who demonstrate: This history must begin at least 18 months prior to the individual's candidacy for the Steering Council, and include substantive contributions in at least two of these bullet points: - - Code contributions on Django projects or major third-party packages in the Django ecosystem + + - Code contributions to Django projects or major third-party packages in the + Django ecosystem - Reviewing pull requests and/or triaging Django project tickets - Documentation, tutorials or blog posts - - Discussions about Django on the django-developers mailing list or the Django Forum + - Discussions about Django on the django-developers mailing list or the Django + Forum - Running Django-related events or user groups - A history of engagement with the direction and future of Django. This does diff --git a/docs/intro/_images/admin01.png b/docs/intro/_images/admin01.png index 8b76258676..61fe8ba199 100644 Binary files a/docs/intro/_images/admin01.png and b/docs/intro/_images/admin01.png differ diff --git a/docs/intro/_images/admin02.png b/docs/intro/_images/admin02.png index 63f7b2933a..24f428dcd6 100644 Binary files a/docs/intro/_images/admin02.png and b/docs/intro/_images/admin02.png differ diff --git a/docs/intro/_images/admin03t.png b/docs/intro/_images/admin03t.png index d549c9b5b5..3245bd654b 100644 Binary files a/docs/intro/_images/admin03t.png and b/docs/intro/_images/admin03t.png differ diff --git a/docs/intro/_images/admin04t.png b/docs/intro/_images/admin04t.png index df8b9645f6..517b2296b3 100644 Binary files a/docs/intro/_images/admin04t.png and b/docs/intro/_images/admin04t.png differ diff --git a/docs/intro/_images/admin05t.png b/docs/intro/_images/admin05t.png index d23553b31d..427a26ba18 100644 Binary files a/docs/intro/_images/admin05t.png and b/docs/intro/_images/admin05t.png differ diff --git a/docs/intro/_images/admin06t.png b/docs/intro/_images/admin06t.png index 1398dc9470..b3b90ea15d 100644 Binary files a/docs/intro/_images/admin06t.png and b/docs/intro/_images/admin06t.png differ diff --git a/docs/intro/_images/admin07.png b/docs/intro/_images/admin07.png index 38c276049b..d13b0e9ef8 100644 Binary files a/docs/intro/_images/admin07.png and b/docs/intro/_images/admin07.png differ diff --git a/docs/intro/_images/admin08t.png b/docs/intro/_images/admin08t.png index 9094538057..824bf562e2 100644 Binary files a/docs/intro/_images/admin08t.png and b/docs/intro/_images/admin08t.png differ diff --git a/docs/intro/_images/admin09.png b/docs/intro/_images/admin09.png index f90810dfe1..16ccff4b41 100644 Binary files a/docs/intro/_images/admin09.png and b/docs/intro/_images/admin09.png differ diff --git a/docs/intro/_images/admin10t.png b/docs/intro/_images/admin10t.png index b74f9bb05b..e0376ec700 100644 Binary files a/docs/intro/_images/admin10t.png and b/docs/intro/_images/admin10t.png differ diff --git a/docs/intro/_images/admin11t.png b/docs/intro/_images/admin11t.png index 256fd3f431..2dda5c0d05 100644 Binary files a/docs/intro/_images/admin11t.png and b/docs/intro/_images/admin11t.png differ diff --git a/docs/intro/_images/admin12t.png b/docs/intro/_images/admin12t.png index 5550595527..6b43c7ae6d 100644 Binary files a/docs/intro/_images/admin12t.png and b/docs/intro/_images/admin12t.png differ diff --git a/docs/intro/_images/admin13t.png b/docs/intro/_images/admin13t.png index 892aff32ae..0d79edefd4 100644 Binary files a/docs/intro/_images/admin13t.png and b/docs/intro/_images/admin13t.png differ diff --git a/docs/intro/_images/admin14t.png b/docs/intro/_images/admin14t.png index 5802c8f6f4..44ae24fe40 100644 Binary files a/docs/intro/_images/admin14t.png and b/docs/intro/_images/admin14t.png differ diff --git a/docs/intro/overview.txt b/docs/intro/overview.txt index 8314b3d351..0c41446d01 100644 --- a/docs/intro/overview.txt +++ b/docs/intro/overview.txt @@ -26,7 +26,7 @@ representing your models -- so far, it's been solving many years' worth of database-schema problems. Here's a quick example: .. code-block:: python - :caption: ``mysite/news/models.py`` + :caption: ``news/models.py`` from django.db import models @@ -151,7 +151,7 @@ a website that lets authenticated users add, change and delete objects. The only step required is to register your model in the admin site: .. code-block:: python - :caption: ``mysite/news/models.py`` + :caption: ``news/models.py`` from django.db import models @@ -163,7 +163,7 @@ only step required is to register your model in the admin site: reporter = models.ForeignKey(Reporter, on_delete=models.CASCADE) .. code-block:: python - :caption: ``mysite/news/admin.py`` + :caption: ``news/admin.py`` from django.contrib import admin @@ -195,7 +195,7 @@ Here's what a URLconf might look like for the ``Reporter``/``Article`` example above: .. code-block:: python - :caption: ``mysite/news/urls.py`` + :caption: ``news/urls.py`` from django.urls import path @@ -235,7 +235,7 @@ and renders the template with the retrieved data. Here's an example view for ``year_archive`` from above: .. code-block:: python - :caption: ``mysite/news/views.py`` + :caption: ``news/views.py`` from django.shortcuts import render @@ -265,7 +265,7 @@ Let's say the ``news/year_archive.html`` template was found. Here's what that might look like: .. code-block:: html+django - :caption: ``mysite/news/templates/news/year_archive.html`` + :caption: ``news/templates/news/year_archive.html`` {% extends "base.html" %} @@ -306,7 +306,7 @@ Here's what the "base.html" template, including the use of :doc:`static files `, might look like: .. code-block:: html+django - :caption: ``mysite/templates/base.html`` + :caption: ``templates/base.html`` {% load static %} diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt index 98f21c9d91..a9c0768e3b 100644 --- a/docs/intro/reusable-apps.txt +++ b/docs/intro/reusable-apps.txt @@ -57,7 +57,7 @@ After the previous tutorials, our project should look like this: .. code-block:: text - mysite/ + djangotutorial/ manage.py mysite/ __init__.py @@ -90,12 +90,12 @@ After the previous tutorials, our project should look like this: admin/ base_site.html -You created ``mysite/templates`` in :doc:`Tutorial 7 `, -and ``polls/templates`` in :doc:`Tutorial 3 `. Now perhaps -it is clearer why we chose to have separate template directories for the -project and application: everything that is part of the polls application is in -``polls``. It makes the application self-contained and easier to drop into a -new project. +You created ``djangotutorial/templates`` in :doc:`Tutorial 7 +`, and ``polls/templates`` in +:doc:`Tutorial 3 `. Now perhaps it is clearer why we chose +to have separate template directories for the project and application: +everything that is part of the polls application is in ``polls``. It makes the +application self-contained and easier to drop into a new project. The ``polls`` directory could now be copied into a new Django project and immediately reused. It's not quite ready to be published though. For that, we @@ -237,6 +237,7 @@ this. For a small app like polls, this process isn't too difficult. "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", ] diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt index db59ca49df..041da0a404 100644 --- a/docs/intro/tutorial01.txt +++ b/docs/intro/tutorial01.txt @@ -48,14 +48,21 @@ including database configuration, Django-specific options and application-specific settings. From the command line, ``cd`` into a directory where you'd like to store your -code, then run the following command: +code and create a new directory named ``djangotutorial``. (This directory name +doesn't matter to Django; you can rename it to anything you like.) .. console:: - $ django-admin startproject mysite + $ mkdir djangotutorial -This will create a ``mysite`` directory in your current directory. If it didn't -work, see :ref:`troubleshooting-django-admin`. +Then, run the following command to bootstrap a new Django project: + +.. console:: + + $ django-admin startproject mysite djangotutorial + +This will create a project called ``mysite`` inside the ``djangotutorial`` +directory. If it didn't work, see :ref:`troubleshooting-django-admin`. .. note:: @@ -68,7 +75,7 @@ Let's look at what :djadmin:`startproject` created: .. code-block:: text - mysite/ + djangotutorial/ manage.py mysite/ __init__.py @@ -79,14 +86,11 @@ Let's look at what :djadmin:`startproject` created: These files are: -* The outer :file:`mysite/` root directory is a container for your project. Its - name doesn't matter to Django; you can rename it to anything you like. - * :file:`manage.py`: A command-line utility that lets you interact with this Django project in various ways. You can read all the details about :file:`manage.py` in :doc:`/ref/django-admin`. -* The inner :file:`mysite/` directory is the actual Python package for your +* :file:`mysite/`: A directory that is the actual Python package for your project. Its name is the Python package name you'll need to use to import anything inside it (e.g. ``mysite.urls``). @@ -111,8 +115,8 @@ These files are: The development server ====================== -Let's verify your Django project works. Change into the outer :file:`mysite` directory, if -you haven't already, and run the following commands: +Let's verify your Django project works. Change into the :file:`djangotutorial` +directory, if you haven't already, and run the following commands: .. console:: @@ -134,6 +138,9 @@ You'll see the following output on the command line: Starting development server at http://127.0.0.1:8000/ Quit the server with CONTROL-C. + WARNING: This is a development server. Do not use it in a production setting. Use a production WSGI or ASGI server instead. + For more information on production servers see: https://docs.djangoproject.com/en/|version|/howto/deployment/ + .. note:: Ignore the warning about unapplied database migrations for now; we'll deal with the database shortly. @@ -179,10 +186,8 @@ rather than creating directories. configuration and apps for a particular website. A project can contain multiple apps. An app can be in multiple projects. -Your apps can live anywhere on your :ref:`Python path `. In -this tutorial, we'll create our poll app in the same directory as your -:file:`manage.py` file so that it can be imported as its own top-level module, -rather than a submodule of ``mysite``. +Your apps can live anywhere in your :ref:`Python path `. In +this tutorial, we'll create our poll app inside the ``djangotutorial`` folder. To create your app, make sure you're in the same directory as :file:`manage.py` and type this command: @@ -272,6 +277,8 @@ include the URLconf defined in ``polls.urls``. To do this, add an import for path("admin/", admin.site.urls), ] +The :func:`~django.urls.path` function expects at least two arguments: +``route`` and ``view``. The :func:`~django.urls.include` function allows referencing other URLconfs. Whenever Django encounters :func:`~django.urls.include`, it chops off whatever part of the URL matched up to that point and sends the remaining string to the @@ -304,45 +311,6 @@ text "*Hello, world. You're at the polls index.*", which you defined in the If you get an error page here, check that you're going to http://localhost:8000/polls/ and not http://localhost:8000/. -The :func:`~django.urls.path` function is passed four arguments, two required: -``route`` and ``view``, and two optional: ``kwargs``, and ``name``. -At this point, it's worth reviewing what these arguments are for. - -:func:`~django.urls.path` argument: ``route`` ---------------------------------------------- - -``route`` is a string that contains a URL pattern. When processing a request, -Django starts at the first pattern in ``urlpatterns`` and makes its way down -the list, comparing the requested URL against each pattern until it finds one -that matches. - -Patterns don't search GET and POST parameters, or the domain name. For example, -in a request to ``https://www.example.com/myapp/``, the URLconf will look for -``myapp/``. In a request to ``https://www.example.com/myapp/?page=3``, the -URLconf will also look for ``myapp/``. - -:func:`~django.urls.path` argument: ``view`` --------------------------------------------- - -When Django finds a matching pattern, it calls the specified view function with -an :class:`~django.http.HttpRequest` object as the first argument and any -"captured" values from the route as keyword arguments. We'll give an example -of this in a bit. - -:func:`~django.urls.path` argument: ``kwargs`` ----------------------------------------------- - -Arbitrary keyword arguments can be passed in a dictionary to the target view. We -aren't going to use this feature of Django in the tutorial. - -:func:`~django.urls.path` argument: ``name`` --------------------------------------------- - -Naming your URL lets you refer to it unambiguously from elsewhere in Django, -especially from within templates. This powerful feature allows you to make -global changes to the URL patterns of your project while only touching a single -file. - When you're comfortable with the basic request and response flow, read :doc:`part 2 of this tutorial ` to start working with the database. diff --git a/docs/intro/tutorial05.txt b/docs/intro/tutorial05.txt index 5f501ce92f..28a634b8c3 100644 --- a/docs/intro/tutorial05.txt +++ b/docs/intro/tutorial05.txt @@ -216,7 +216,7 @@ and you'll see something like: FAIL: test_was_published_recently_with_future_question (polls.tests.QuestionModelTests) ---------------------------------------------------------------------- Traceback (most recent call last): - File "/path/to/mysite/polls/tests.py", line 16, in test_was_published_recently_with_future_question + File "/path/to/djangotutorial/polls/tests.py", line 16, in test_was_published_recently_with_future_question self.assertIs(future_question.was_published_recently(), False) AssertionError: True is not False diff --git a/docs/intro/tutorial07.txt b/docs/intro/tutorial07.txt index b47ae14bc2..a8d5e61b81 100644 --- a/docs/intro/tutorial07.txt +++ b/docs/intro/tutorial07.txt @@ -232,7 +232,8 @@ underscores replaced with spaces), and that each line contains the string representation of the output. You can improve that by using the :func:`~django.contrib.admin.display` -decorator on that method (in :file:`polls/models.py`), as follows: +decorator on that method (extending the :file:`polls/models.py` file that was +created in :doc:`Tutorial 2 `), as follows: .. code-block:: python :caption: ``polls/models.py`` @@ -305,10 +306,10 @@ powered by Django itself, and its interfaces use Django's own template system. Customizing your *project's* templates -------------------------------------- -Create a ``templates`` directory in your project directory (the one that -contains ``manage.py``). Templates can live anywhere on your filesystem that -Django can access. (Django runs as whatever user your server runs.) However, -keeping your templates within the project is a good convention to follow. +Create a ``templates`` directory in your ``djangotutorial`` directory. +Templates can live anywhere on your filesystem that Django can access. (Django +runs as whatever user your server runs.) However, keeping your templates within +the project is a good convention to follow. Open your settings file (:file:`mysite/settings.py`, remember) and add a :setting:`DIRS ` option in the :setting:`TEMPLATES` setting: @@ -323,7 +324,6 @@ Open your settings file (:file:`mysite/settings.py`, remember) and add a "APP_DIRS": True, "OPTIONS": { "context_processors": [ - "django.template.context_processors.debug", "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", diff --git a/docs/intro/tutorial08.txt b/docs/intro/tutorial08.txt index c184eec47a..463db3221e 100644 --- a/docs/intro/tutorial08.txt +++ b/docs/intro/tutorial08.txt @@ -8,10 +8,10 @@ Django's strengths is the rich ecosystem of third-party packages. They're community developed packages that can be used to quickly improve the feature set of an application. -This tutorial will show how to add `Django Debug Toolbar -`_, a commonly used third-party -package. The Django Debug Toolbar has ranked in the top three most used -third-party packages in the Django Developers Survey in recent years. +This tutorial will show how to add :pypi:`Django Debug Toolbar +`, a commonly used third-party package. The Django Debug +Toolbar has ranked in the top three most used third-party packages in the +Django Developers Survey in recent years. .. admonition:: Where to get help: diff --git a/docs/ref/contrib/admin/_images/actions-as-modeladmin-methods.png b/docs/ref/contrib/admin/_images/actions-as-modeladmin-methods.png index ceb6f20e9e..6ae454e0de 100644 Binary files a/docs/ref/contrib/admin/_images/actions-as-modeladmin-methods.png and b/docs/ref/contrib/admin/_images/actions-as-modeladmin-methods.png differ diff --git a/docs/ref/contrib/admin/_images/adding-actions-to-the-modeladmin.png b/docs/ref/contrib/admin/_images/adding-actions-to-the-modeladmin.png index afdf4c3032..9510706dad 100644 Binary files a/docs/ref/contrib/admin/_images/adding-actions-to-the-modeladmin.png and b/docs/ref/contrib/admin/_images/adding-actions-to-the-modeladmin.png differ diff --git a/docs/ref/contrib/admin/_images/admin-actions.png b/docs/ref/contrib/admin/_images/admin-actions.png index 763b23a149..7c3a6ccc2e 100644 Binary files a/docs/ref/contrib/admin/_images/admin-actions.png and b/docs/ref/contrib/admin/_images/admin-actions.png differ diff --git a/docs/ref/contrib/admin/_images/fieldsets.png b/docs/ref/contrib/admin/_images/fieldsets.png index f785cb9f75..e5bc614f25 100644 Binary files a/docs/ref/contrib/admin/_images/fieldsets.png and b/docs/ref/contrib/admin/_images/fieldsets.png differ diff --git a/docs/ref/contrib/admin/_images/list_filter.png b/docs/ref/contrib/admin/_images/list_filter.png index 61b1c2b596..02c4879d18 100644 Binary files a/docs/ref/contrib/admin/_images/list_filter.png and b/docs/ref/contrib/admin/_images/list_filter.png differ diff --git a/docs/ref/contrib/admin/_images/raw_id_fields.png b/docs/ref/contrib/admin/_images/raw_id_fields.png index 6886b8facc..7f16b11032 100644 Binary files a/docs/ref/contrib/admin/_images/raw_id_fields.png and b/docs/ref/contrib/admin/_images/raw_id_fields.png differ diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt index 6af2140717..407dd88e71 100644 --- a/docs/ref/contrib/admin/index.txt +++ b/docs/ref/contrib/admin/index.txt @@ -41,7 +41,8 @@ If you're not using the default project template, here are the requirements: `. #. If you've customized the :setting:`MIDDLEWARE` setting, - :class:`django.contrib.auth.middleware.AuthenticationMiddleware` and + :class:`django.contrib.sessions.middleware.SessionMiddleware`, + :class:`django.contrib.auth.middleware.AuthenticationMiddleware`, and :class:`django.contrib.messages.middleware.MessageMiddleware` must be included. diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt index d5fc724b54..c8699a2913 100644 --- a/docs/ref/contrib/auth.txt +++ b/docs/ref/contrib/auth.txt @@ -197,13 +197,23 @@ Methods been called for this user. .. method:: get_user_permissions(obj=None) + .. method:: aget_user_permissions(obj=None) + + *Asynchronous version*: ``aget_user_permissions()`` Returns a set of permission strings that the user has directly. If ``obj`` is passed in, only returns the user permissions for this specific object. + .. versionchanged:: 5.2 + + ``aget_user_permissions()`` method was added. + .. method:: get_group_permissions(obj=None) + .. method:: aget_group_permissions(obj=None) + + *Asynchronous version*: ``aget_group_permissions()`` Returns a set of permission strings that the user has, through their groups. @@ -211,7 +221,14 @@ Methods If ``obj`` is passed in, only returns the group permissions for this specific object. + .. versionchanged:: 5.2 + + ``aget_group_permissions()`` method was added. + .. method:: get_all_permissions(obj=None) + .. method:: aget_all_permissions(obj=None) + + *Asynchronous version*: ``aget_all_permissions()`` Returns a set of permission strings that the user has, both through group and user permissions. @@ -219,7 +236,14 @@ Methods If ``obj`` is passed in, only returns the permissions for this specific object. + .. versionchanged:: 5.2 + + ``aget_all_permissions()`` method was added. + .. method:: has_perm(perm, obj=None) + .. method:: ahas_perm(perm, obj=None) + + *Asynchronous version*: ``ahas_perm()`` Returns ``True`` if the user has the specified permission, where perm is in the format ``"."``. (see @@ -230,7 +254,14 @@ Methods If ``obj`` is passed in, this method won't check for a permission for the model, but for this specific object. + .. versionchanged:: 5.2 + + ``ahas_perm()`` method was added. + .. method:: has_perms(perm_list, obj=None) + .. method:: ahas_perms(perm_list, obj=None) + + *Asynchronous version*: ``ahas_perms()`` Returns ``True`` if the user has each of the specified permissions, where each perm is in the format @@ -241,13 +272,24 @@ Methods If ``obj`` is passed in, this method won't check for permissions for the model, but for the specific object. + .. versionchanged:: 5.2 + + ``ahas_perms()`` method was added. + .. method:: has_module_perms(package_name) + .. method:: ahas_module_perms(package_name) + + *Asynchronous version*: ``ahas_module_perms()`` Returns ``True`` if the user has any permissions in the given package (the Django app label). If the user is inactive, this method will always return ``False``. For an active superuser, this method will always return ``True``. + .. versionchanged:: 5.2 + + ``ahas_module_perms()`` method was added. + .. method:: email_user(subject, message, from_email=None, **kwargs) Sends an email to the user. If ``from_email`` is ``None``, Django uses @@ -264,6 +306,9 @@ Manager methods by :class:`~django.contrib.auth.models.BaseUserManager`): .. method:: create_user(username, email=None, password=None, **extra_fields) + .. method:: acreate_user(username, email=None, password=None, **extra_fields) + + *Asynchronous version*: ``acreate_user()`` Creates, saves and returns a :class:`~django.contrib.auth.models.User`. @@ -285,11 +330,22 @@ Manager methods See :ref:`Creating users ` for example usage. + .. versionchanged:: 5.2 + + ``acreate_user()`` method was added. + .. method:: create_superuser(username, email=None, password=None, **extra_fields) + .. method:: acreate_superuser(username, email=None, password=None, **extra_fields) + + *Asynchronous version*: ``acreate_superuser()`` Same as :meth:`create_user`, but sets :attr:`~models.User.is_staff` and :attr:`~models.User.is_superuser` to ``True``. + .. versionchanged:: 5.2 + + ``acreate_superuser()`` method was added. + .. method:: with_perm(perm, is_active=True, include_superusers=True, backend=None, obj=None) Returns users that have the given permission ``perm`` either in the @@ -499,23 +555,51 @@ The following backends are available in :mod:`django.contrib.auth.backends`: methods. By default, it will reject any user and provide no permissions. .. method:: get_user_permissions(user_obj, obj=None) + .. method:: aget_user_permissions(user_obj, obj=None) + + *Asynchronous version*: ``aget_user_permissions()`` Returns an empty set. + .. versionchanged:: 5.2 + + ``aget_user_permissions()`` function was added. + .. method:: get_group_permissions(user_obj, obj=None) + .. method:: aget_group_permissions(user_obj, obj=None) + + *Asynchronous version*: ``aget_group_permissions()`` Returns an empty set. + .. versionchanged:: 5.2 + + ``aget_group_permissions()`` function was added. + .. method:: get_all_permissions(user_obj, obj=None) + .. method:: aget_all_permissions(user_obj, obj=None) + + *Asynchronous version*: ``aget_all_permissions()`` Uses :meth:`get_user_permissions` and :meth:`get_group_permissions` to get the set of permission strings the ``user_obj`` has. + .. versionchanged:: 5.2 + + ``aget_all_permissions()`` function was added. + .. method:: has_perm(user_obj, perm, obj=None) + .. method:: ahas_perm(user_obj, perm, obj=None) + + *Asynchronous version*: ``ahas_perm()`` Uses :meth:`get_all_permissions` to check if ``user_obj`` has the permission string ``perm``. + .. versionchanged:: 5.2 + + ``ahas_perm()`` function was added. + .. class:: ModelBackend This is the default authentication backend used by Django. It @@ -539,6 +623,9 @@ The following backends are available in :mod:`django.contrib.auth.backends`: unlike others methods it returns an empty queryset if ``obj is not None``. .. method:: authenticate(request, username=None, password=None, **kwargs) + .. method:: aauthenticate(request, username=None, password=None, **kwargs) + + *Asynchronous version*: ``aauthenticate()`` Tries to authenticate ``username`` with ``password`` by calling :meth:`User.check_password @@ -552,38 +639,77 @@ The following backends are available in :mod:`django.contrib.auth.backends`: if it wasn't provided to :func:`~django.contrib.auth.authenticate` (which passes it on to the backend). + .. versionchanged:: 5.2 + + ``aauthenticate()`` function was added. + .. method:: get_user_permissions(user_obj, obj=None) + .. method:: aget_user_permissions(user_obj, obj=None) + + *Asynchronous version*: ``aget_user_permissions()`` Returns the set of permission strings the ``user_obj`` has from their own user permissions. Returns an empty set if :attr:`~django.contrib.auth.models.AbstractBaseUser.is_anonymous` or :attr:`~django.contrib.auth.models.CustomUser.is_active` is ``False``. + .. versionchanged:: 5.2 + + ``aget_user_permissions()`` function was added. + .. method:: get_group_permissions(user_obj, obj=None) + .. method:: aget_group_permissions(user_obj, obj=None) + + *Asynchronous version*: ``aget_group_permissions()`` Returns the set of permission strings the ``user_obj`` has from the permissions of the groups they belong. Returns an empty set if :attr:`~django.contrib.auth.models.AbstractBaseUser.is_anonymous` or :attr:`~django.contrib.auth.models.CustomUser.is_active` is ``False``. + .. versionchanged:: 5.2 + + ``aget_group_permissions()`` function was added. + .. method:: get_all_permissions(user_obj, obj=None) + .. method:: aget_all_permissions(user_obj, obj=None) + + *Asynchronous version*: ``aget_all_permissions()`` Returns the set of permission strings the ``user_obj`` has, including both user permissions and group permissions. Returns an empty set if :attr:`~django.contrib.auth.models.AbstractBaseUser.is_anonymous` or :attr:`~django.contrib.auth.models.CustomUser.is_active` is ``False``. + + .. versionchanged:: 5.2 + + ``aget_all_permissions()`` function was added. .. method:: has_perm(user_obj, perm, obj=None) + .. method:: ahas_perm(user_obj, perm, obj=None) + + *Asynchronous version*: ``ahas_perm()`` Uses :meth:`get_all_permissions` to check if ``user_obj`` has the permission string ``perm``. Returns ``False`` if the user is not :attr:`~django.contrib.auth.models.CustomUser.is_active`. + .. versionchanged:: 5.2 + + ``ahas_perm()`` function was added. + .. method:: has_module_perms(user_obj, app_label) + .. method:: ahas_module_perms(user_obj, app_label) + + *Asynchronous version*: ``ahas_module_perms()`` Returns whether the ``user_obj`` has any permissions on the app ``app_label``. + .. versionchanged:: 5.2 + + ``ahas_module_perms()`` function was added. + .. method:: user_can_authenticate() Returns whether the user is allowed to authenticate. To match the @@ -637,6 +763,9 @@ The following backends are available in :mod:`django.contrib.auth.backends`: created if not already in the database Defaults to ``True``. .. method:: authenticate(request, remote_user) + .. method:: aauthenticate(request, remote_user) + + *Asynchronous version*: ``aauthenticate()`` The username passed as ``remote_user`` is considered trusted. This method returns the user object with the given username, creating a new @@ -651,6 +780,10 @@ The following backends are available in :mod:`django.contrib.auth.backends`: if it wasn't provided to :func:`~django.contrib.auth.authenticate` (which passes it on to the backend). + .. versionchanged:: 5.2 + + ``aauthenticate()`` function was added. + .. method:: clean_username(username) Performs any cleaning on the ``username`` (e.g. stripping LDAP DN @@ -658,12 +791,17 @@ The following backends are available in :mod:`django.contrib.auth.backends`: the cleaned username. .. method:: configure_user(request, user, created=True) + .. method:: aconfigure_user(request, user, created=True) + + *Asynchronous version*: ``aconfigure_user()`` Configures the user on each authentication attempt. This method is called immediately after fetching or creating the user being authenticated, and can be used to perform custom setup actions, such as setting the user's groups based on attributes in an LDAP directory. - Returns the user object. + Returns the user object. When fetching or creating an user is called + from a synchronous context, ``configure_user`` is called, + ``aconfigure_user`` is called from async contexts. The setup can be performed either once when the user is created (``created`` is ``True``) or on existing users (``created`` is @@ -674,6 +812,10 @@ The following backends are available in :mod:`django.contrib.auth.backends`: if it wasn't provided to :func:`~django.contrib.auth.authenticate` (which passes it on to the backend). + .. versionchanged:: 5.2 + + ``aconfigure_user()`` function was added. + .. method:: user_can_authenticate() Returns whether the user is allowed to authenticate. This method diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt index 2be6ea516c..2d0fafa8ef 100644 --- a/docs/ref/contrib/gis/geoip2.txt +++ b/docs/ref/contrib/gis/geoip2.txt @@ -5,8 +5,8 @@ Geolocation with GeoIP2 .. module:: django.contrib.gis.geoip2 :synopsis: Python interface for MaxMind's GeoIP2 databases. -The :class:`GeoIP2` object is a wrapper for the `MaxMind geoip2 Python -library`__. [#]_ +The :class:`GeoIP2` object is a wrapper for the :pypi:`MaxMind geoip2 Python +library `. [#]_ In order to perform IP-based geolocation, the :class:`GeoIP2` object requires the :pypi:`geoip2` Python package and the GeoIP ``Country`` and/or ``City`` @@ -18,7 +18,6 @@ the :setting:`GEOIP_PATH` setting. Additionally, it is recommended to install the `libmaxminddb C library`__, so that ``geoip2`` can leverage the C library's faster speed. -__ https://geoip2.readthedocs.io/ __ https://dev.maxmind.com/geoip/geolite2-free-geolocation-data __ https://db-ip.com/db/lite.php __ https://github.com/maxmind/libmaxminddb/ @@ -196,8 +195,9 @@ Exceptions .. exception:: GeoIP2Exception - The exception raised when an error occurs in a call to the underlying - ``geoip2`` library. + The exception raised when an error occurs in the :class:`GeoIP2` wrapper. + Exceptions from the underlying ``geoip2`` library are passed through + unchanged. .. rubric:: Footnotes .. [#] GeoIP(R) is a registered trademark of MaxMind, Inc. diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt index a0a66c0dc6..d988cd33f6 100644 --- a/docs/ref/contrib/gis/install/geolibs.txt +++ b/docs/ref/contrib/gis/install/geolibs.txt @@ -5,16 +5,16 @@ Installing Geospatial libraries GeoDjango uses and/or provides interfaces for the following open source geospatial libraries: -======================== ==================================== ================================ =========================================== +======================== ==================================== ================================ ====================================== Program Description Required Supported Versions -======================== ==================================== ================================ =========================================== +======================== ==================================== ================================ ====================================== :doc:`GEOS <../geos>` Geometry Engine Open Source Yes 3.12, 3.11, 3.10, 3.9, 3.8 `PROJ`_ Cartographic Projections library Yes (PostgreSQL and SQLite only) 9.x, 8.x, 7.x, 6.x -:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.8, 3.7, 3.6, 3.5, 3.4, 3.3, 3.2, 3.1, 3.0 +:doc:`GDAL <../gdal>` Geospatial Data Abstraction Library Yes 3.8, 3.7, 3.6, 3.5, 3.4, 3.3, 3.2, 3.1 :doc:`GeoIP <../geoip2>` IP-based geolocation library No 2 `PostGIS`__ Spatial extensions for PostgreSQL Yes (PostgreSQL only) 3.4, 3.3, 3.2, 3.1 `SpatiaLite`__ Spatial extensions for SQLite Yes (SQLite only) 5.1, 5.0, 4.3 -======================== ==================================== ================================ =========================================== +======================== ==================================== ================================ ====================================== Note that older or more recent versions of these libraries *may* also work totally fine with GeoDjango. Your mileage may vary. @@ -26,7 +26,6 @@ totally fine with GeoDjango. Your mileage may vary. GEOS 3.10.0 2021-10-20 GEOS 3.11.0 2022-07-01 GEOS 3.12.0 2023-06-27 - GDAL 3.0.0 2019-05 GDAL 3.1.0 2020-05-07 GDAL 3.2.0 2020-11-02 GDAL 3.3.0 2021-05-03 diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt index 3db1b57652..73a67475fe 100644 --- a/docs/ref/databases.txt +++ b/docs/ref/databases.txt @@ -479,8 +479,6 @@ MySQL has a couple drivers that implement the Python Database API described in .. _MySQL Connector/Python: https://dev.mysql.com/downloads/connector/python/ -These drivers are thread-safe and provide connection pooling. - In addition to a DB API driver, Django needs an adapter to access the database drivers from its ORM. Django provides an adapter for mysqlclient while MySQL Connector/Python includes `its own`_. diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 0546555a30..128abe5587 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -870,11 +870,11 @@ are reserved for the superuser (root). This server uses the WSGI application object specified by the :setting:`WSGI_APPLICATION` setting. -DO NOT USE THIS SERVER IN A PRODUCTION SETTING. It has not gone through -security audits or performance tests. (And that's how it's gonna stay. We're in -the business of making web frameworks, not web servers, so improving this -server to be able to handle a production environment is outside the scope of -Django.) +.. warning:: DO NOT USE THIS SERVER IN A PRODUCTION SETTING. + + This lightweight development server has not gone through security audits or + performance tests, hence is unsuitable for production. Making this server + able to handle a production environment is outside the scope of Django. The development server automatically reloads Python code for each request, as needed. You don't need to restart the server for code changes to take effect. @@ -947,6 +947,20 @@ multithreaded by default. Uses IPv6 for the development server. This changes the default IP address from ``127.0.0.1`` to ``::1``. +.. envvar:: HIDE_PRODUCTION_WARNING + +.. versionadded:: 5.2 + +By default, a warning is printed to the console that ``runserver`` is not +suitable for production: + +.. code-block:: text + + WARNING: This is a development server. Do not use it in a production setting. Use a production WSGI or ASGI server instead. + For more information on production servers see: https://docs.djangoproject.com/en/|version|/howto/deployment/ + +Set this environment variable to ``"true"`` to hide this warning. + Examples of using different ports and addresses ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1078,7 +1092,7 @@ Python interpreter, use ``python`` as the interface name, like so: .. _IPython: https://ipython.org/ .. _bpython: https://bpython-interpreter.org/ -.. django-admin-option:: --nostartup +.. django-admin-option:: --no-startup Disables reading the startup script for the "plain" Python interpreter. By default, the script pointed to by the :envvar:`PYTHONSTARTUP` environment diff --git a/docs/ref/files/storage.txt b/docs/ref/files/storage.txt index e912bcc412..f7c290a150 100644 --- a/docs/ref/files/storage.txt +++ b/docs/ref/files/storage.txt @@ -129,8 +129,7 @@ The ``Storage`` class .. method:: exists(name) Returns ``True`` if a file referenced by the given name already exists - in the storage system, or ``False`` if the name is available for a new - file. + in the storage system. .. method:: get_accessed_time(name) diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt index 2ae4fe2be6..ac1df1bd86 100644 --- a/docs/ref/forms/fields.txt +++ b/docs/ref/forms/fields.txt @@ -801,11 +801,11 @@ For each field, we describe the default widget used if you don't specify * Error message keys: ``required``, ``invalid``, ``missing``, ``empty``, ``invalid_image`` - Using an ``ImageField`` requires that `Pillow`_ is installed with support - for the image formats you use. If you encounter a ``corrupt image`` error - when you upload an image, it usually means that Pillow doesn't understand - its format. To fix this, install the appropriate library and reinstall - Pillow. + Using an ``ImageField`` requires that :pypi:`pillow` is installed with + support for the image formats you use. If you encounter a ``corrupt image`` + error when you upload an image, it usually means that Pillow doesn't + understand its format. To fix this, install the appropriate library and + reinstall Pillow. When you use an ``ImageField`` on a form, you must also remember to :ref:`bind the file data to the form `. @@ -851,7 +851,6 @@ For each field, we describe the default widget used if you don't specify image's content type if Pillow can determine it, otherwise it will be set to ``None``. -.. _Pillow: https://pillow.readthedocs.io/en/latest/ .. _Image: https://pillow.readthedocs.io/en/latest/reference/Image.html ``IntegerField`` diff --git a/docs/ref/forms/widgets.txt b/docs/ref/forms/widgets.txt index 8f52b7e095..333c422ae8 100644 --- a/docs/ref/forms/widgets.txt +++ b/docs/ref/forms/widgets.txt @@ -570,6 +570,48 @@ These widgets make use of the HTML elements ``input`` and ``textarea``. * ``template_name``: ``'django/forms/widgets/url.html'`` * Renders as: ```` +``ColorInput`` +~~~~~~~~~~~~~~ + +.. versionadded:: 5.2 + +.. class:: ColorInput + + * ``input_type``: ``'color'`` + * ``template_name``:``'django/forms/widgets/color.html'`` + * Renders as: ```` + +``SearchInput`` +~~~~~~~~~~~~~~~ + +.. versionadded:: 5.2 + +.. class:: SearchInput + + * ``input_type``: ``'search'`` + * ``template_name``: ``'django/forms/widgets/search.html'`` + * Renders as: ```` + +``TelInput`` +~~~~~~~~~~~~ + +.. versionadded:: 5.2 + +.. class:: TelInput + + * ``input_type``: ``'tel'`` + * ``template_name``: ``'django/forms/widgets/tel.html'`` + * Renders as: ```` + + Browsers perform no client-side validation by default because telephone + number formats vary so much around the world. You can add some by setting + ``pattern``, ``minlength``, or ``maxlength`` in the :attr:`Widget.attrs` + argument. + + Additionally, you can add server-side validation to your form field with a + validator like :class:`~django.core.validators.RegexValidator` or via + third-party packages, such as :pypi:`django-phonenumber-field`. + ``PasswordInput`` ~~~~~~~~~~~~~~~~~ diff --git a/docs/ref/logging.txt b/docs/ref/logging.txt index 8a7e58997e..24ab5d97f3 100644 --- a/docs/ref/logging.txt +++ b/docs/ref/logging.txt @@ -209,6 +209,18 @@ Django development server. This logger generates an ``INFO`` message upon detecting a modification in a source code file and may produce ``WARNING`` messages during filesystem inspection and event subscription processes. +.. _django-contrib-auth-logger: + +``django.contrib.auth`` +~~~~~~~~~~~~~~~~~~~~~~~ + +.. versionadded:: 4.2.16 + +Log messages related to :doc:`contrib/auth`, particularly ``ERROR`` messages +are generated when a :class:`~django.contrib.auth.forms.PasswordResetForm` is +successfully submitted but the password reset email cannot be delivered due to +a mail sending exception. + .. _django-contrib-gis-logger: ``django.contrib.gis`` diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt index c762457839..b5534ce8f6 100644 --- a/docs/ref/middleware.txt +++ b/docs/ref/middleware.txt @@ -34,6 +34,12 @@ defines. See the :doc:`cache documentation `. .. class:: CommonMiddleware + .. attribute:: response_redirect_class + + Defaults to :class:`~django.http.HttpResponsePermanentRedirect`. Subclass + ``CommonMiddleware`` and override the attribute to customize the redirects + issued by the middleware. + Adds a few conveniences for perfectionists: * Forbids access to user agents in the :setting:`DISALLOWED_USER_AGENTS` @@ -75,12 +81,6 @@ Adds a few conveniences for perfectionists: * Sets the ``Content-Length`` header for non-streaming responses. -.. attribute:: CommonMiddleware.response_redirect_class - -Defaults to :class:`~django.http.HttpResponsePermanentRedirect`. Subclass -``CommonMiddleware`` and override the attribute to customize the redirects -issued by the middleware. - .. class:: BrokenLinkEmailsMiddleware * Sends broken link notification emails to :setting:`MANAGERS` (see @@ -164,16 +164,16 @@ Locale middleware .. class:: LocaleMiddleware + .. attribute:: LocaleMiddleware.response_redirect_class + + Defaults to :class:`~django.http.HttpResponseRedirect`. Subclass + ``LocaleMiddleware`` and override the attribute to customize the + redirects issued by the middleware. + Enables language selection based on data from the request. It customizes content for each user. See the :doc:`internationalization documentation `. -.. attribute:: LocaleMiddleware.response_redirect_class - -Defaults to :class:`~django.http.HttpResponseRedirect`. Subclass -``LocaleMiddleware`` and override the attribute to customize the redirects -issued by the middleware. - Message middleware ------------------ @@ -500,56 +500,81 @@ every incoming ``HttpRequest`` object. See :ref:`Authentication in web requests .. class:: LoginRequiredMiddleware + Subclass the middleware and override the following attributes and methods + to customize behavior for unauthenticated requests. + + .. attribute:: redirect_field_name + + Defaults to ``"next"``. + + .. method:: get_login_url() + + Returns the URL that unauthenticated requests will be redirected to. This + result is either the ``login_url`` set on the + :func:`~django.contrib.auth.decorators.login_required` decorator (if not + ``None``), or :setting:`settings.LOGIN_URL `. + + .. method:: get_redirect_field_name() + + Returns the name of the query parameter that contains the URL the user + should be redirected to after a successful login. This result is either + the ``redirect_field_name`` set on the + :func:`~.django.contrib.auth.decorators.login_required` decorator (if not + ``None``), or :attr:`redirect_field_name`. If ``None`` is returned, a query + parameter won't be added. + .. versionadded:: 5.1 -Redirects all unauthenticated requests to a login page. For admin views, this -redirects to the admin login. For all other views, this will redirect to -:setting:`settings.LOGIN_URL `. This can be customized by using the -:func:`~.django.contrib.auth.decorators.login_required` decorator and setting -``login_url`` or ``redirect_field_name`` for the view. For example:: +Redirects all unauthenticated requests to a login page, except for views +excluded with :func:`~.django.contrib.auth.decorators.login_not_required`. The +login page defaults to :setting:`settings.LOGIN_URL `, but can be +customized. + +Enable this middleware by adding it to the :setting:`MIDDLEWARE` setting +**after** :class:`~django.contrib.auth.middleware.AuthenticationMiddleware`:: + + MIDDLEWARE = [ + "...", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.auth.middleware.LoginRequiredMiddleware", + "...", + ] + +Make a view public, allowing unauthenticated requests, with +:func:`~.django.contrib.auth.decorators.login_not_required`. For example:: + + from django.contrib.auth.decorators import login_not_required + + + @login_not_required + def contact_us(request): ... + +Customize the login URL or field name for authenticated views with the +:func:`~.django.contrib.auth.decorators.login_required` decorator to set +``login_url`` or ``redirect_field_name`` respectively. For example:: + + from django.contrib.auth.decorators import login_required + from django.utils.decorators import method_decorator + from django.views.generic import View + + + @login_required(login_url="/books/login/", redirect_field_name="redirect_to") + def book_dashboard(request): ... + @method_decorator( - login_required(login_url="/login/", redirect_field_name="redirect_to"), + login_required(login_url="/books/login/", redirect_field_name="redirect_to"), name="dispatch", ) - class MyView(View): + class BookMetrics(View): pass - - @login_required(login_url="/login/", redirect_field_name="redirect_to") - def my_view(request): ... - -Views using the :func:`~django.contrib.auth.decorators.login_not_required` -decorator are exempt from this requirement. - .. admonition:: Ensure that your login view does not require a login. To prevent infinite redirects, ensure you have :ref:`enabled unauthenticated requests ` to your login view. -**Methods and Attributes** - -.. attribute:: redirect_field_name - - Defaults to ``"next"``. - -.. method:: get_login_url() - - Returns the URL that unauthenticated requests will be redirected to. If - defined, this returns the ``login_url`` set on the - :func:`~.django.contrib.auth.decorators.login_required` decorator. Defaults - to :setting:`settings.LOGIN_URL `. - -.. method:: get_redirect_field_name() - - Returns the name of the query parameter that contains the URL the user - should be redirected to after a successful login. If defined, this returns - the ``redirect_field_name`` set on the - :func:`~.django.contrib.auth.decorators.login_required` decorator. Defaults - to :attr:`redirect_field_name`. If ``None`` is returned, a query parameter - won't be added. - .. class:: RemoteUserMiddleware Middleware for utilizing web server provided authentication. See diff --git a/docs/ref/models/expressions.txt b/docs/ref/models/expressions.txt index 1b6a208d01..f273b00a9e 100644 --- a/docs/ref/models/expressions.txt +++ b/docs/ref/models/expressions.txt @@ -975,9 +975,9 @@ frame includes all rows from the partition to the last row in the set. The accepted values for the ``start`` and ``end`` arguments are ``None``, an integer, or zero. A negative integer for ``start`` results in ``N PRECEDING``, while ``None`` yields ``UNBOUNDED PRECEDING``. In ``ROWS`` mode, a positive -integer can be used for ```start`` resulting in ``N FOLLOWING``. Positive +integer can be used for ``start`` resulting in ``N FOLLOWING``. Positive integers are accepted for ``end`` and results in ``N FOLLOWING``. In ``ROWS`` -mode, a negative integer can be used for ```end`` resulting in ``N PRECEDING``. +mode, a negative integer can be used for ``end`` resulting in ``N PRECEDING``. For both ``start`` and ``end``, zero will return ``CURRENT ROW``. There's a difference in what ``CURRENT ROW`` includes. When specified in @@ -1095,6 +1095,16 @@ calling the appropriate methods on the wrapped expression. :py:data:`NotImplemented` which forces the expression to be computed on the database. + .. attribute:: set_returning + + .. versionadded:: 5.2 + + Tells Django that this expression contains a set-returning function, + enforcing subquery evaluation. It's used, for example, to allow some + Postgres set-returning functions (e.g. ``JSONB_PATH_QUERY``, + ``UNNEST``, etc.) to skip optimization and be properly evaluated when + annotations spawn rows themselves. Defaults to ``False``. + .. method:: resolve_expression(query=None, allow_joins=True, reuse=None, summarize=False, for_save=False) Provides the chance to do any preprocessing or validation of diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt index e8b1cf8cba..899947c17f 100644 --- a/docs/ref/models/fields.txt +++ b/docs/ref/models/fields.txt @@ -12,8 +12,8 @@ This document contains all the API references of :class:`Field` including the .. seealso:: - If the built-in fields don't do the trick, you can try `django-localflavor - `_ (`documentation + If the built-in fields don't do the trick, you can try + :pypi:`django-localflavor` (`documentation `_), which contains assorted pieces of code that are useful for particular countries and cultures. @@ -43,13 +43,15 @@ If ``True``, Django will store empty values as ``NULL`` in the database. Default is ``False``. Avoid using :attr:`~Field.null` on string-based fields such as -:class:`CharField` and :class:`TextField`. If a string-based field has -``null=True``, that means it has two possible values for "no data": ``NULL``, -and the empty string. In most cases, it's redundant to have two possible values -for "no data;" the Django convention is to use the empty string, not -``NULL``. One exception is when a :class:`CharField` has both ``unique=True`` -and ``blank=True`` set. In this situation, ``null=True`` is required to avoid -unique constraint violations when saving multiple objects with blank values. +:class:`CharField` and :class:`TextField`. The Django convention is to use an +empty string, not ``NULL``, as the "no data" state for string-based fields. If a +string-based field has ``null=False``, empty strings can still be saved for "no +data". If a string-based field has ``null=True``, that means it has two possible +values for "no data": ``NULL``, and the empty string. In most cases, it's +redundant to have two possible values for "no data". One exception is when a +:class:`CharField` has both ``unique=True`` and ``blank=True`` set. In this +situation, ``null=True`` is required to avoid unique constraint violations when +saving multiple objects with blank values. For both string-based and non-string-based fields, you will also need to set ``blank=True`` if you wish to permit empty values in forms, as the @@ -718,8 +720,8 @@ The default form widget for this field is a :class:`~django.forms.TextInput`. The maximum length (in characters) of the field. The ``max_length`` is enforced at the database level and in Django's validation using :class:`~django.core.validators.MaxLengthValidator`. It's required for all - database backends included with Django except PostgreSQL, which supports - unlimited ``VARCHAR`` columns. + database backends included with Django except PostgreSQL and SQLite, which + supports unlimited ``VARCHAR`` columns. .. note:: @@ -728,6 +730,10 @@ The default form widget for this field is a :class:`~django.forms.TextInput`. ``max_length`` for some backends. Refer to the :doc:`database backend notes ` for details. + .. versionchanged:: 5.2 + + Support for unlimited ``VARCHAR`` columns was added on SQLite. + .. attribute:: CharField.db_collation Optional. The database collation name of the field. @@ -1357,9 +1363,7 @@ following optional arguments: Name of a model field which is auto-populated with the width of the image each time an image object is set. -Requires the `Pillow`_ library. - -.. _Pillow: https://pillow.readthedocs.io/en/latest/ +Requires the :pypi:`pillow` library. :class:`ImageField` instances are created in your database as ``varchar`` columns with a default max length of 100 characters. As with other fields, you @@ -2441,6 +2445,9 @@ Field API reference Returns the default :class:`django.forms.Field` of this field for :class:`~django.forms.ModelForm`. + If :meth:`~Field.formfield` is overridden to return ``None``, this field + is excluded from the :class:`~django.forms.ModelForm`. + By default, if both ``form_class`` and ``choices_form_class`` are ``None``, it uses :class:`~django.forms.CharField`. If the field has :attr:`~django.db.models.Field.choices` and ``choices_form_class`` diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt index e1011ded66..57ebaf8e17 100644 --- a/docs/ref/models/instances.txt +++ b/docs/ref/models/instances.txt @@ -973,3 +973,14 @@ Other attributes since they are yet to be saved. Instances fetched from a ``QuerySet`` will have ``adding=False`` and ``db`` set to the alias of the associated database. + +``_is_pk_set()`` +---------------- + +.. method:: Model._is_pk_set() + +.. versionadded:: 5.2 + +The ``_is_pk_set()`` method returns whether the model instance's ``pk`` is set. +It abstracts the model's primary key definition, ensuring consistent behavior +regardless of the specific ``pk`` configuration. diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index d708e05a79..c6af3dd7f0 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -1599,9 +1599,7 @@ of the arguments is required, but you should use at least one of them. FROM blog_blog; Note that the parentheses required by most database engines around - subqueries are not required in Django's ``select`` clauses. Also note - that some database backends, such as some MySQL versions, don't support - subqueries. + subqueries are not required in Django's ``select`` clauses. In some rare cases, you might wish to pass parameters to the SQL fragments in ``extra(select=...)``. For this purpose, use the diff --git a/docs/ref/request-response.txt b/docs/ref/request-response.txt index 20c04279b2..31111a435a 100644 --- a/docs/ref/request-response.txt +++ b/docs/ref/request-response.txt @@ -425,10 +425,48 @@ Methods Returns ``True`` if the request is secure; that is, if it was made with HTTPS. +.. method:: HttpRequest.get_preferred_type(media_types) + + .. versionadded:: 5.2 + + Returns the preferred mime type from ``media_types``, based on the + ``Accept`` header, or ``None`` if the client does not accept any of the + provided types. + + Assuming the client sends an ``Accept`` header of + ``text/html,application/json;q=0.8``: + + .. code-block:: pycon + + >>> request.get_preferred_type(["text/html", "application/json"]) + "text/html" + >>> request.get_preferred_type(["application/json", "text/plain"]) + "application/json" + >>> request.get_preferred_type(["application/xml", "text/plain"]) + None + + Most browsers send ``Accept: */*`` by default, meaning they don't have a + preference, in which case the first item in ``media_types`` would be + returned. + + Setting an explicit ``Accept`` header in API requests can be useful for + returning a different content type for those consumers only. See + :ref:`content-negotiation-example` for an example of returning + different content based on the ``Accept`` header. + + .. note:: + + If a response varies depending on the content of the ``Accept`` header + and you are using some form of caching like Django's + :mod:`cache middleware `, you should decorate + the view with :func:`vary_on_headers('Accept') + ` so that the responses + are properly cached. + .. method:: HttpRequest.accepts(mime_type) - Returns ``True`` if the request ``Accept`` header matches the ``mime_type`` - argument: + Returns ``True`` if the request's ``Accept`` header matches the + ``mime_type`` argument: .. code-block:: pycon @@ -436,17 +474,10 @@ Methods True Most browsers send ``Accept: */*`` by default, so this would return - ``True`` for all content types. Setting an explicit ``Accept`` header in - API requests can be useful for returning a different content type for those - consumers only. See :ref:`content-negotiation-example` of using - ``accepts()`` to return different content to API consumers. + ``True`` for all content types. - If a response varies depending on the content of the ``Accept`` header and - you are using some form of caching like Django's :mod:`cache middleware - `, you should decorate the view with - :func:`vary_on_headers('Accept') - ` so that the responses are - properly cached. + See :ref:`content-negotiation-example` for an example of using + ``accepts()`` to return different content based on the ``Accept`` header. .. method:: HttpRequest.read(size=None) .. method:: HttpRequest.readline() diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 34c835fb82..e3a0f6d32a 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -3636,6 +3636,7 @@ Email * :setting:`EMAIL_SUBJECT_PREFIX` * :setting:`EMAIL_TIMEOUT` * :setting:`EMAIL_USE_LOCALTIME` +* :setting:`EMAIL_USE_SSL` * :setting:`EMAIL_USE_TLS` * :setting:`MANAGERS` * :setting:`SERVER_EMAIL` diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index a46717b8d7..8d5c66367d 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -660,7 +660,6 @@ settings file, the default template engine contains the following context processors:: [ - "django.template.context_processors.debug", "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 2413cb1d82..d34742f210 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -2883,8 +2883,8 @@ If ``value`` is ``"https://www.example.org/"``, the output will be Converts URLs and email addresses in text into clickable links. This template tag works on links prefixed with ``http://``, ``https://``, or -``www.``. For example, ``https://goo.gl/aia1t`` will get converted but -``goo.gl/aia1t`` won't. +``www.``. For example, ``https://djangocon.eu`` will get converted but +``djangocon.eu`` won't. It also supports domain-only links ending in one of the original top level domains (``.com``, ``.edu``, ``.gov``, ``.int``, ``.mil``, ``.net``, and @@ -2922,6 +2922,17 @@ Django's built-in :tfilter:`escape` filter. The default value for email addresses that contain single quotes (``'``), things won't work as expected. Apply this filter only to plain text. +.. warning:: + + Using ``urlize`` or ``urlizetrunc`` can incur a performance penalty, which + can become severe when applied to user controlled values such as content + stored in a :class:`~django.db.models.TextField`. You can use + :tfilter:`truncatechars` to add a limit to such inputs: + + .. code-block:: html+django + + {{ value|truncatechars:500|urlize }} + .. templatefilter:: urlizetrunc ``urlizetrunc`` diff --git a/docs/ref/urls.txt b/docs/ref/urls.txt index 2ef873d348..95eb03f35a 100644 --- a/docs/ref/urls.txt +++ b/docs/ref/urls.txt @@ -25,6 +25,9 @@ Returns an element for inclusion in ``urlpatterns``. For example:: ..., ] +``route`` +--------- + The ``route`` argument should be a string or :func:`~django.utils.translation.gettext_lazy()` (see :ref:`translating-urlpatterns`) that contains a URL pattern. The string @@ -33,16 +36,43 @@ URL and send it as a keyword argument to the view. The angle brackets may include a converter specification (like the ``int`` part of ````) which limits the characters matched and may also change the type of the variable passed to the view. For example, ```` matches a string -of decimal digits and converts the value to an ``int``. See +of decimal digits and converts the value to an ``int``. + +When processing a request, Django starts at the first pattern in +``urlpatterns`` and makes its way down the list, comparing the requested URL +against each pattern until it finds one that matches. See :ref:`how-django-processes-a-request` for more details. +Patterns don't match GET and POST parameters, or the domain name. For example, +in a request to ``https://www.example.com/myapp/``, the URLconf will look for +``myapp/``. In a request to ``https://www.example.com/myapp/?page=3``, the +URLconf will also look for ``myapp/``. + +``view`` +-------- + The ``view`` argument is a view function or the result of :meth:`~django.views.generic.base.View.as_view` for class-based views. It can -also be an :func:`django.urls.include`. +also be a :func:`django.urls.include`. + +When Django finds a matching pattern, it calls the specified view function with +an :class:`~django.http.HttpRequest` object as the first argument and any +"captured" values from the route as keyword arguments. + +``kwargs`` +---------- The ``kwargs`` argument allows you to pass additional arguments to the view function or method. See :ref:`views-extra-options` for an example. +``name`` +-------- + +Naming your URL lets you refer to it unambiguously from elsewhere in Django, +especially from within templates. This powerful feature allows you to make +global changes to the URL patterns of your project while only touching a single +file. + See :ref:`Naming URL patterns ` for why the ``name`` argument is useful. diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt index 65dc9952bc..33e0fceadf 100644 --- a/docs/ref/utils.txt +++ b/docs/ref/utils.txt @@ -699,10 +699,29 @@ escaping HTML. joined using ``sep``. ``sep`` is also passed through :func:`conditional_escape`. - ``args_generator`` should be an iterator that returns the sequence of - ``args`` that will be passed to :func:`format_html`. For example:: + ``args_generator`` should be an iterator that yields arguments to pass to + :func:`format_html`, either sequences of positional arguments or mappings of + keyword arguments. - format_html_join("\n", "
  • {} {}
    • ", ((u.first_name, u.last_name) for u in users)) + For example, tuples can be used for positional arguments:: + + format_html_join( + "\n", + "
  • {} {}
    • ", + ((u.first_name, u.last_name) for u in users), + ) + + Or dictionaries can be used for keyword arguments:: + + format_html_join( + "\n", + '
  • {id} {title}
    • ', + ({"id": b.id, "title": b.title} for b in books), + ) + + .. versionchanged:: 5.2 + + Support for mappings in ``args_generator`` was added. .. function:: json_script(value, element_id=None, encoder=None) @@ -1148,7 +1167,7 @@ For a complete discussion on the usage of the following see the ``'es-ar'`` isn't. ``lang_code`` has a maximum accepted length of 500 characters. A - :exc:`ValueError` is raised if ``lang_code`` exceeds this limit and + :exc:`LookupError` is raised if ``lang_code`` exceeds this limit and ``strict`` is ``True``, or if there is no generic variant and ``strict`` is ``False``. @@ -1160,10 +1179,10 @@ For a complete discussion on the usage of the following see the Raises :exc:`LookupError` if nothing is found. - .. versionchanged:: 4.2.14 + .. versionchanged:: 4.2.15 In older versions, ``lang_code`` values over 500 characters were - processed without raising a :exc:`ValueError`. + processed without raising a :exc:`LookupError`. .. function:: to_locale(language) diff --git a/docs/releases/4.2.15.txt b/docs/releases/4.2.15.txt new file mode 100644 index 0000000000..b1d4684596 --- /dev/null +++ b/docs/releases/4.2.15.txt @@ -0,0 +1,45 @@ +=========================== +Django 4.2.15 release notes +=========================== + +*August 6, 2024* + +Django 4.2.15 fixes three security issues with severity "moderate", one +security issue with severity "high", and a regression in 4.2.14. + +CVE-2024-41989: Memory exhaustion in ``django.utils.numberformat.floatformat()`` +================================================================================ + +If :tfilter:`floatformat` received a string representation of a number in +scientific notation with a large exponent, it could lead to significant memory +consumption. + +To avoid this, decimals with more than 200 digits are now returned as is. + +CVE-2024-41990: Potential denial-of-service vulnerability in ``django.utils.html.urlize()`` +=========================================================================================== + +:tfilter:`urlize` and :tfilter:`urlizetrunc` were subject to a potential +denial-of-service attack via very large inputs with a specific sequence of +characters. + +CVE-2024-41991: Potential denial-of-service vulnerability in ``django.utils.html.urlize()`` and ``AdminURLFieldWidget`` +======================================================================================================================= + +:tfilter:`urlize`, :tfilter:`urlizetrunc`, and ``AdminURLFieldWidget`` were +subject to a potential denial-of-service attack via certain inputs with a very +large number of Unicode characters. + +CVE-2024-42005: Potential SQL injection in ``QuerySet.values()`` and ``values_list()`` +====================================================================================== + +:meth:`.QuerySet.values` and :meth:`~.QuerySet.values_list` methods on models +with a ``JSONField`` were subject to SQL injection in column aliases, via a +crafted JSON object key as a passed ``*arg``. + +Bugfixes +======== + +* Fixed a regression in Django 4.2.14 that caused a crash in + ``LocaleMiddleware`` when processing a language code over 500 characters + (:ticket:`35627`). diff --git a/docs/releases/4.2.16.txt b/docs/releases/4.2.16.txt new file mode 100644 index 0000000000..963036345c --- /dev/null +++ b/docs/releases/4.2.16.txt @@ -0,0 +1,26 @@ +=========================== +Django 4.2.16 release notes +=========================== + +*September 3, 2024* + +Django 4.2.16 fixes one security issue with severity "moderate" and one +security issue with severity "low" in 4.2.15. + +CVE-2024-45230: Potential denial-of-service vulnerability in ``django.utils.html.urlize()`` +=========================================================================================== + +:tfilter:`urlize` and :tfilter:`urlizetrunc` were subject to a potential +denial-of-service attack via very large inputs with a specific sequence of +characters. + +CVE-2024-45231: Potential user email enumeration via response status on password reset +====================================================================================== + +Due to unhandled email sending failures, the +:class:`~django.contrib.auth.forms.PasswordResetForm` class allowed remote +attackers to enumerate user emails by issuing password reset requests and +observing the outcomes. + +To mitigate this risk, exceptions occurring during password reset email sending +are now handled and logged using the :ref:`django-contrib-auth-logger` logger. diff --git a/docs/releases/5.0.8.txt b/docs/releases/5.0.8.txt index 1037b78f75..37f51f71c7 100644 --- a/docs/releases/5.0.8.txt +++ b/docs/releases/5.0.8.txt @@ -2,9 +2,40 @@ Django 5.0.8 release notes ========================== -*Expected August 6, 2024* +*August 6, 2024* -Django 5.0.8 fixes several bugs in 5.0.7. +Django 5.0.8 fixes three security issues with severity "moderate", one security +issue with severity "high", and several bugs in 5.0.7. + +CVE-2024-41989: Memory exhaustion in ``django.utils.numberformat.floatformat()`` +================================================================================ + +If :tfilter:`floatformat` received a string representation of a number in +scientific notation with a large exponent, it could lead to significant memory +consumption. + +To avoid this, decimals with more than 200 digits are now returned as is. + +CVE-2024-41990: Potential denial-of-service vulnerability in ``django.utils.html.urlize()`` +=========================================================================================== + +:tfilter:`urlize` and :tfilter:`urlizetrunc` were subject to a potential +denial-of-service attack via very large inputs with a specific sequence of +characters. + +CVE-2024-41991: Potential denial-of-service vulnerability in ``django.utils.html.urlize()`` and ``AdminURLFieldWidget`` +======================================================================================================================= + +:tfilter:`urlize`, :tfilter:`urlizetrunc`, and ``AdminURLFieldWidget`` were +subject to a potential denial-of-service attack via certain inputs with a very +large number of Unicode characters. + +CVE-2024-42005: Potential SQL injection in ``QuerySet.values()`` and ``values_list()`` +====================================================================================== + +:meth:`.QuerySet.values` and :meth:`~.QuerySet.values_list` methods on models +with a ``JSONField`` were subject to SQL injection in column aliases, via a +crafted JSON object key as a passed ``*arg``. Bugfixes ======== @@ -15,3 +46,22 @@ Bugfixes * Fixed a regression in Django 5.0 where ``ModelAdmin.action_checkbox`` could break the admin changelist HTML page when rendering a model instance with a ``__html__`` method (:ticket:`35606`). + +* Fixed a crash when creating a model with a ``Field.db_default`` and a + ``Meta.constraints`` constraint composed of ``__endswith``, ``__startswith``, + or ``__contains`` lookups (:ticket:`35625`). + +* Fixed a regression in Django 5.0.7 that caused a crash in + ``LocaleMiddleware`` when processing a language code over 500 characters + (:ticket:`35627`). + +* Fixed a bug in Django 5.0 that caused a system check crash when + ``ModelAdmin.date_hierarchy`` was a ``GeneratedField`` with an + ``output_field`` of ``DateField`` or ``DateTimeField`` (:ticket:`35628`). + +* Fixed a bug in Django 5.0 which caused constraint validation to either crash + or incorrectly raise validation errors for constraints referring to fields + using ``Field.db_default`` (:ticket:`35638`). + +* Fixed a crash in Django 5.0 when saving a model containing a ``FileField`` + with a ``db_default`` set (:ticket:`35657`). diff --git a/docs/releases/5.0.9.txt b/docs/releases/5.0.9.txt new file mode 100644 index 0000000000..52595ae4ff --- /dev/null +++ b/docs/releases/5.0.9.txt @@ -0,0 +1,26 @@ +=========================== +Django 5.0.9 release notes +=========================== + +*September 3, 2024* + +Django 5.0.9 fixes one security issue with severity "moderate" and one security +issue with severity "low" in 5.0.8. + +CVE-2024-45230: Potential denial-of-service vulnerability in ``django.utils.html.urlize()`` +=========================================================================================== + +:tfilter:`urlize` and :tfilter:`urlizetrunc` were subject to a potential +denial-of-service attack via very large inputs with a specific sequence of +characters. + +CVE-2024-45231: Potential user email enumeration via response status on password reset +====================================================================================== + +Due to unhandled email sending failures, the +:class:`~django.contrib.auth.forms.PasswordResetForm` class allowed remote +attackers to enumerate user emails by issuing password reset requests and +observing the outcomes. + +To mitigate this risk, exceptions occurring during password reset email sending +are now handled and logged using the :ref:`django-contrib-auth-logger` logger. diff --git a/docs/releases/5.1.1.txt b/docs/releases/5.1.1.txt new file mode 100644 index 0000000000..8c0468d727 --- /dev/null +++ b/docs/releases/5.1.1.txt @@ -0,0 +1,58 @@ +========================== +Django 5.1.1 release notes +========================== + +*September 3, 2024* + +Django 5.1.1 fixes one security issue with severity "moderate", one security +issue with severity "low", and several bugs in 5.1. + +CVE-2024-45230: Potential denial-of-service vulnerability in ``django.utils.html.urlize()`` +=========================================================================================== + +:tfilter:`urlize` and :tfilter:`urlizetrunc` were subject to a potential +denial-of-service attack via very large inputs with a specific sequence of +characters. + +CVE-2024-45231: Potential user email enumeration via response status on password reset +====================================================================================== + +Due to unhandled email sending failures, the +:class:`~django.contrib.auth.forms.PasswordResetForm` class allowed remote +attackers to enumerate user emails by issuing password reset requests and +observing the outcomes. + +To mitigate this risk, exceptions occurring during password reset email sending +are now handled and logged using the :ref:`django-contrib-auth-logger` logger. + +Bugfixes +======== + +* Fixed a regression in Django 5.1 that caused a crash of ``Window()`` when + passing an empty sequence to the ``order_by`` parameter, and a crash of + ``Prefetch()`` for a sliced queryset without ordering (:ticket:`35665`). + +* Fixed a regression in Django 5.1 where a new ``usable_password`` field was + included in :class:`~django.contrib.auth.forms.BaseUserCreationForm` (and + children). A new :class:`~django.contrib.auth.forms.AdminUserCreationForm` + including this field was added, isolating the feature to the admin where it + was intended (:ticket:`35678`). + +* Adjusted the deprecation warning ``stacklevel`` in :meth:`.Model.save` and + :meth:`.Model.asave` to correctly point to the offending call site + (:ticket:`35060`). + +* Adjusted the deprecation warning ``stacklevel`` when using ``OS_OPEN_FLAGS`` + in :class:`~django.core.files.storage.FileSystemStorage` to correctly point + to the offending call site (:ticket:`35326`). + +* Adjusted the deprecation warning ``stacklevel`` in + ``FieldCacheMixin.get_cache_name()`` to correctly point to the offending call + site (:ticket:`35405`). + +* Restored, following a regression in Django 5.1, the ability to override the + timezone and role setting behavior used within the ``init_connection_state`` + method of the PostgreSQL backend (:ticket:`35688`). + +* Fixed a bug in Django 5.1 where variable lookup errors were logged when + rendering admin fieldsets (:ticket:`35716`). diff --git a/docs/releases/5.1.2.txt b/docs/releases/5.1.2.txt new file mode 100644 index 0000000000..c6140adcb0 --- /dev/null +++ b/docs/releases/5.1.2.txt @@ -0,0 +1,22 @@ +========================== +Django 5.1.2 release notes +========================== + +*October 8, 2024* + +Django 5.1.2 fixes several bugs in 5.1.1. Also, the latest string translations +from Transifex are incorporated. + +Bugfixes +======== + +* Fixed a regression in Django 5.1 that caused a crash when using the + PostgreSQL lookup :lookup:`trigram_similar` on output fields from ``Concat`` + (:ticket:`35732`). + +* Fixed a regression in Django 5.1 that caused a crash of ``JSONObject()`` + when using server-side binding with PostgreSQL 16+ (:ticket:`35734`). + +* Fixed a regression in Django 5.1 that made selected items in multi-select + widgets indistinguishable from non-selected items in the admin dark theme + (:ticket:`35809`). diff --git a/docs/releases/5.1.3.txt b/docs/releases/5.1.3.txt new file mode 100644 index 0000000000..5541a8824a --- /dev/null +++ b/docs/releases/5.1.3.txt @@ -0,0 +1,13 @@ +========================== +Django 5.1.3 release notes +========================== + +*Expected November 5, 2024* + +Django 5.1.3 fixes several bugs in 5.1.2 and adds compatibility with Python +3.13. + +Bugfixes +======== + +* ... diff --git a/docs/releases/5.1.txt b/docs/releases/5.1.txt index db7ea41e52..037c76fd54 100644 --- a/docs/releases/5.1.txt +++ b/docs/releases/5.1.txt @@ -1,8 +1,8 @@ -============================================ -Django 5.1 release notes - UNDER DEVELOPMENT -============================================ +======================== +Django 5.1 release notes +======================== -*Expected August 2024* +*August 7, 2024* Welcome to Django 5.1! @@ -18,8 +18,9 @@ project. Python compatibility ==================== -Django 5.1 supports Python 3.10, 3.11, and 3.12. We **highly recommend** and -only officially support the latest release of each series. +Django 5.1 supports Python 3.10, 3.11, 3.12, and 3.13 (as of 5.1.3). We +**highly recommend** and only officially support the latest release of each +series. .. _whats-new-5.1: @@ -91,12 +92,15 @@ redirects all unauthenticated requests to a login page. Views can allow unauthenticated requests by using the new :func:`~django.contrib.auth.decorators.login_not_required` decorator. -The :class:`~django.contrib.auth.middleware.LoginRequiredMiddleware` respects -the ``login_url`` and ``redirect_field_name`` values set via the +``LoginRequiredMiddleware`` respects the ``login_url`` and +``redirect_field_name`` values set via the :func:`~.django.contrib.auth.decorators.login_required` decorator, but does not support setting ``login_url`` or ``redirect_field_name`` via the :class:`~django.contrib.auth.mixins.LoginRequiredMixin`. +To enable this, add ``"django.contrib.auth.middleware.LoginRequiredMiddleware"`` +to your :setting:`MIDDLEWARE` setting. + Minor features -------------- @@ -115,11 +119,11 @@ Minor features * The default ``parallelism`` of the ``ScryptPasswordHasher`` is increased from 1 to 5, to follow OWASP recommendations. -* :class:`~django.contrib.auth.forms.BaseUserCreationForm` and - :class:`~django.contrib.auth.forms.AdminPasswordChangeForm` now support - disabling password-based authentication by setting an unusable password on - form save. This is now available in the admin when visiting the user creation - and password change pages. +* The new :class:`~django.contrib.auth.forms.AdminUserCreationForm` and + the existing :class:`~django.contrib.auth.forms.AdminPasswordChangeForm` now + support disabling password-based authentication by setting an unusable + password on form save. This is now available in the admin when visiting the + user creation and password change pages. * :func:`~.django.contrib.auth.decorators.login_required`, :func:`~.django.contrib.auth.decorators.permission_required`, and @@ -394,6 +398,9 @@ Miscellaneous ``width_field`` and ``height_field`` will not match the width and height of the image. +* The minimum supported version of ``asgiref`` is increased from 3.7.0 to + 3.8.1. + .. _deprecated-features-5.1: Features deprecated in 5.1 diff --git a/docs/releases/5.2.txt b/docs/releases/5.2.txt index 5d5887fe34..9aa232b902 100644 --- a/docs/releases/5.2.txt +++ b/docs/releases/5.2.txt @@ -52,6 +52,36 @@ Minor features * The default iteration count for the PBKDF2 password hasher is increased from 870,000 to 1,000,000. +* The following new asynchronous methods on are now provided, using an ``a`` + prefix: + + * :meth:`.UserManager.acreate_user` + * :meth:`.UserManager.acreate_superuser` + * :meth:`.BaseUserManager.aget_by_natural_key` + * :meth:`.User.aget_user_permissions()` + * :meth:`.User.aget_all_permissions()` + * :meth:`.User.aget_group_permissions()` + * :meth:`.User.ahas_perm()` + * :meth:`.User.ahas_perms()` + * :meth:`.User.ahas_module_perms()` + * :meth:`.User.aget_user_permissions()` + * :meth:`.User.aget_group_permissions()` + * :meth:`.User.ahas_perm()` + * :meth:`.ModelBackend.aauthenticate()` + * :meth:`.ModelBackend.aget_user_permissions()` + * :meth:`.ModelBackend.aget_group_permissions()` + * :meth:`.ModelBackend.aget_all_permissions()` + * :meth:`.ModelBackend.ahas_perm()` + * :meth:`.ModelBackend.ahas_module_perms()` + * :meth:`.RemoteUserBackend.aauthenticate()` + * :meth:`.RemoteUserBackend.aconfigure_user()` + +* Auth backends can now provide async implementations which are used when + calling async auth functions (e.g. + :func:`~.django.contrib.auth.aauthenticate`) to reduce context-switching which + improves performance. See :ref:`adding an async interface + ` for more details. + :mod:`django.contrib.contenttypes` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -128,7 +158,8 @@ Database backends Decorators ~~~~~~~~~~ -* ... +* :func:`~django.utils.decorators.method_decorator` now supports wrapping + asynchronous view methods. Email ~~~~~ @@ -150,7 +181,8 @@ Email Error Reporting ~~~~~~~~~~~~~~~ -* ... +* The attribute :attr:`.SafeExceptionReporterFilter.hidden_settings` now + treats values as sensitive if their name includes ``AUTH``. File Storage ~~~~~~~~~~~~ @@ -165,7 +197,15 @@ File Uploads Forms ~~~~~ -* ... +* The new :class:`~django.forms.ColorInput` form widget is for entering a color + in ``rrggbb`` hexadecimal format and renders as ````. + Some browsers support a visual color picker interface for this input type. + +* The new :class:`~django.forms.SearchInput` form widget is for entering search + queries and renders as ````. + +* The new :class:`~django.forms.TelInput` form widget is for entering telephone + numbers and renders as ````. Generic Views ~~~~~~~~~~~~~ @@ -185,7 +225,10 @@ Logging Management Commands ~~~~~~~~~~~~~~~~~~~ -* ... +* A new warning is printed to the console when running :djadmin:`runserver` that + ``runserver`` is unsuitable for production. This warning can be hidden by + setting the :envvar:`HIDE_PRODUCTION_WARNING` environment variable to + ``"true"``. Migrations ~~~~~~~~~~ @@ -203,10 +246,22 @@ Models methods such as :meth:`QuerySet.union()` unpredictable. +* Added support for validation of model constraints which use a + :class:`~django.db.models.GeneratedField`. + +* The new :attr:`.Expression.set_returning` attribute specifies that the + expression contains a set-returning function, enforcing subquery evaluation. + This is necessary for many Postgres set-returning functions. + +* :attr:`CharField.max_length ` is no + longer required to be set on SQLite, which supports unlimited ``VARCHAR`` + columns. + Requests and Responses ~~~~~~~~~~~~~~~~~~~~~~ -* ... +* The new :meth:`.HttpRequest.get_preferred_type` method can be used to query + the preferred media type the client accepts. Security ~~~~~~~~ @@ -216,7 +271,9 @@ Security Serialization ~~~~~~~~~~~~~ -* ... +* Each serialization format now defines a ``Deserializer`` class, rather than a + function, to improve extensibility when defining a + :ref:`custom serialization format `. Signals ~~~~~~~ @@ -231,7 +288,14 @@ Templates Tests ~~~~~ -* ... +* Stack frames from Django's custom assertions are now hidden. This makes test + failures easier to read and enables :option:`test --pdb` to directly enter + into the failing test method. + +* Data loaded from :attr:`~django.test.TransactionTestCase.fixtures` and from + migrations enabled with :ref:`serialized_rollback=True + ` are now available during + ``TransactionTestCase.setUpClass()``. URLs ~~~~ @@ -241,7 +305,14 @@ URLs Utilities ~~~~~~~~~ -* ... +* :class:`~django.utils.safestring.SafeString` now returns + :py:data:`NotImplemented` in ``__add__`` for non-string right-hand side + values. This aligns with the :py:class:`str` addition behavior and allows + ``__radd__`` to be used if available. + +* :func:`~django.utils.html.format_html_join` now supports taking an iterable + of mappings, passing their contents as keyword arguments to + :func:`~django.utils.html.format_html`. Validators ~~~~~~~~~~ @@ -259,13 +330,17 @@ Database backend API This section describes changes that may be needed in third-party database backends. -* ... +* The new :meth:`Model._is_pk_set() ` method + allows checking if a Model instance's primary key is defined. + :mod:`django.contrib.gis` ------------------------- * Support for PostGIS 3.0 is removed. +* Support for GDAL 3.0 is removed. + Dropped support for PostgreSQL 13 --------------------------------- @@ -275,7 +350,16 @@ PostgreSQL 14 and higher. Miscellaneous ------------- -* ... +* Adding :attr:`.EmailMultiAlternatives.alternatives` is now only supported via + the :meth:`~.EmailMultiAlternatives.attach_alternative` method. + +* The minimum supported version of ``gettext`` is increased from 0.15 to 0.19. + +* ``HttpRequest.accepted_types`` is now sorted by the client's preference, based + on the request's ``Accept`` header. + +* The :func:`~django.template.context_processors.debug` context processor is no + longer included in the default project template. .. _deprecated-features-5.2: diff --git a/docs/releases/index.txt b/docs/releases/index.txt index 2ace2b44af..a38053c2a9 100644 --- a/docs/releases/index.txt +++ b/docs/releases/index.txt @@ -32,6 +32,9 @@ versions of the documentation contain the release notes for any later releases. .. toctree:: :maxdepth: 1 + 5.1.3 + 5.1.2 + 5.1.1 5.1 5.0 release @@ -39,6 +42,7 @@ versions of the documentation contain the release notes for any later releases. .. toctree:: :maxdepth: 1 + 5.0.9 5.0.8 5.0.7 5.0.6 @@ -55,6 +59,8 @@ versions of the documentation contain the release notes for any later releases. .. toctree:: :maxdepth: 1 + 4.2.16 + 4.2.15 4.2.14 4.2.13 4.2.12 diff --git a/docs/releases/security.txt b/docs/releases/security.txt index 33b1992768..b83be59dbb 100644 --- a/docs/releases/security.txt +++ b/docs/releases/security.txt @@ -36,6 +36,68 @@ Issues under Django's security process All security issues have been handled under versions of Django's security process. These are listed below. +September 3, 2024 - :cve:`2024-45231` +------------------------------------- + +Potential user email enumeration via response status on password reset. +`Full description +`__ + +* Django 5.1 :commit:`(patch) <3c733c78d6f8e50296d6e248968b6516c92a53ca>` +* Django 5.0 :commit:`(patch) <96d84047715ea1715b4bd1594e46122b8a77b9e2>` +* Django 4.2 :commit:`(patch) ` + +September 3, 2024 - :cve:`2024-45230` +------------------------------------- + +Potential denial-of-service vulnerability in ``django.utils.html.urlize()``. +`Full description +`__ + +* Django 5.1 :commit:`(patch) <022ab0a75c76ab2ea31dfcc5f2cf5501e378d397>` +* Django 5.0 :commit:`(patch) <813de2672bd7361e9a453ab62cd6e52f96b6525b>` +* Django 4.2 :commit:`(patch) ` + +August 6, 2024 - :cve:`2024-42005` +---------------------------------- + +Potential SQL injection in ``QuerySet.values()`` and ``values_list()``. +`Full description +`__ + +* Django 5.0 :commit:`(patch) <32ebcbf2e1fe3e5ba79a6554a167efce81f7422d>` +* Django 4.2 :commit:`(patch) ` + +August 6, 2024 - :cve:`2024-41991` +---------------------------------- + +Potential denial-of-service vulnerability in ``django.utils.html.urlize()`` and +``AdminURLFieldWidget``. `Full description +`__ + +* Django 5.0 :commit:`(patch) <523da8771bce321023f490f70d71a9e973ddc927>` +* Django 4.2 :commit:`(patch) ` + +August 6, 2024 - :cve:`2024-41990` +---------------------------------- + +Potential denial-of-service vulnerability in ``django.utils.html.urlize()``. +`Full description +`__ + +* Django 5.0 :commit:`(patch) <7b7b909579c8311c140c89b8a9431bf537febf93>` +* Django 4.2 :commit:`(patch) ` + +August 6, 2024 - :cve:`2024-41989` +---------------------------------- + +Potential memory exhaustion in ``django.utils.numberformat.floatformat()``. +`Full description +`__ + +* Django 5.0 :commit:`(patch) <27900fe56f3d3cabb4aeb6ccb82f92bab29073a8>` +* Django 4.2 :commit:`(patch) ` + July 9, 2024 - :cve:`2024-39614` -------------------------------- diff --git a/docs/spelling_wordlist b/docs/spelling_wordlist index d715e62e05..d30f2ce440 100644 --- a/docs/spelling_wordlist +++ b/docs/spelling_wordlist @@ -141,6 +141,7 @@ Disqus distro django djangoproject +djangotutorial dm docstring docstrings diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt index 3f8be983f8..6fdcd136c0 100644 --- a/docs/topics/auth/customizing.txt +++ b/docs/topics/auth/customizing.txt @@ -400,10 +400,9 @@ the Django model that you wish to use as your user model. Using a custom user model when starting a project ------------------------------------------------- -If you're starting a new project, it's highly recommended to set up a custom -user model, even if the default :class:`~django.contrib.auth.models.User` model -is sufficient for you. This model behaves identically to the default user -model, but you'll be able to customize it in the future if the need arises:: +If you're starting a new project, you can set up a custom user model that +behaves identically to the default user model by subclassing +:class:`~django.contrib.auth.models.AbstractUser`:: from django.contrib.auth.models import AbstractUser @@ -426,7 +425,7 @@ Changing to a custom user model mid-project ------------------------------------------- Changing :setting:`AUTH_USER_MODEL` after you've created database tables is -significantly more difficult since it affects foreign keys and many-to-many +possible, but can be complex, since it affects foreign keys and many-to-many relationships, for example. This change can't be done automatically and requires manually fixing your @@ -791,10 +790,17 @@ utility methods: email address. .. method:: models.BaseUserManager.get_by_natural_key(username) + .. method:: models.BaseUserManager.aget_by_natural_key(username) + + *Asynchronous version*: ``aget_by_natural_key()`` Retrieves a user instance using the contents of the field nominated by ``USERNAME_FIELD``. + .. versionchanged:: 5.2 + + ``aget_by_natural_key()`` method was added. + Extending Django's default ``User`` ----------------------------------- @@ -1187,3 +1193,25 @@ Finally, specify the custom model as the default user model for your project using the :setting:`AUTH_USER_MODEL` setting in your ``settings.py``:: AUTH_USER_MODEL = "customauth.MyUser" + +.. _writing-authentication-backends-async-interface: + +Adding an async interface +~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. versionadded:: 5.2 + +To optimize performance when called from an async context authentication, +backends can implement async versions of each function - ``aget_user(user_id)`` +and ``aauthenticate(request, **credentials)``. When an authentication backend +extends ``BaseBackend`` and async versions of these functions are not provided, +they will be automatically synthesized with ``sync_to_async``. This has +:ref:`performance penalties `. + +While an async interface is optional, a synchronous interface is always +required. There is no automatic synthesis for a synchronous interface if an +async interface is implemented. + +Django's out-of-the-box authentication backends have native async support. If +these native backends are extended take special care to make sure the async +versions of modified functions are modified as well. diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt index 56f867ede5..a22cebbf15 100644 --- a/docs/topics/auth/default.txt +++ b/docs/topics/auth/default.txt @@ -655,7 +655,7 @@ login view, may need to disable this behavior. .. function:: login_not_required() - Allows unauthenticated requests without redirecting to the login page when + Allows unauthenticated requests to this view when :class:`~django.contrib.auth.middleware.LoginRequiredMiddleware` is installed. @@ -1645,6 +1645,23 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`: Option to disable (or reenable) password-based authentication was added. +.. class:: AdminUserCreationForm + + .. versionadded:: 5.1.1 + + A form used in the admin interface to create a new user. Inherits from + :class:`UserCreationForm`. + + It includes an additional ``usable_password`` field, enabled by default. If + ``usable_password`` is enabled, it verifies that ``password1`` and + ``password2`` are non empty and match, validates the password using + :func:`~django.contrib.auth.password_validation.validate_password`, and + sets the user's password using + :meth:`~django.contrib.auth.models.User.set_password()`. + If ``usable_password`` is disabled, no password validation is done, and + password-based authentication is disabled for the user by calling + :meth:`~django.contrib.auth.models.User.set_unusable_password()`. + .. class:: AuthenticationForm A form for logging a user in. @@ -1691,6 +1708,18 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`: code="no_b_users", ) +.. class:: BaseUserCreationForm + + A :class:`~django.forms.ModelForm` for creating a new user. This is the + recommended base class if you need to customize the user creation form. + + It has three fields: ``username`` (from the user model), ``password1``, + and ``password2``. It verifies that ``password1`` and ``password2`` match, + validates the password using + :func:`~django.contrib.auth.password_validation.validate_password`, and + sets the user's password using + :meth:`~django.contrib.auth.models.User.set_password()`. + .. class:: PasswordChangeForm A form for allowing a user to change their password. @@ -1703,7 +1732,9 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`: .. method:: send_mail(subject_template_name, email_template_name, context, from_email, to_email, html_email_template_name=None) Uses the arguments to send an ``EmailMultiAlternatives``. - Can be overridden to customize how the email is sent to the user. + Can be overridden to customize how the email is sent to the user. If + you choose to override this method, be mindful of handling potential + exceptions raised due to email sending failures. :param subject_template_name: the template for the subject. :param email_template_name: the template for the email body. @@ -1730,27 +1761,6 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`: A form used in the admin interface to change a user's information and permissions. -.. class:: BaseUserCreationForm - - A :class:`~django.forms.ModelForm` for creating a new user. This is the - recommended base class if you need to customize the user creation form. - - It has four fields: ``username`` (from the user model), ``password1``, - ``password2``, and ``usable_password`` (the latter is enabled by default). - If ``usable_password`` is enabled, it verifies that ``password1`` and - ``password2`` are non empty and match, validates the password using - :func:`~django.contrib.auth.password_validation.validate_password`, and - sets the user's password using - :meth:`~django.contrib.auth.models.User.set_password()`. - If ``usable_password`` is disabled, no password validation is done, and - password-based authentication is disabled for the user by calling - :meth:`~django.contrib.auth.models.User.set_unusable_password()`. - - .. versionchanged:: 5.1 - - Option to create users with disabled password-based authentication was - added. - .. class:: UserCreationForm Inherits from :class:`BaseUserCreationForm`. To help prevent confusion with diff --git a/docs/topics/class-based-views/generic-editing.txt b/docs/topics/class-based-views/generic-editing.txt index 5841c703f6..4310ae9dcc 100644 --- a/docs/topics/class-based-views/generic-editing.txt +++ b/docs/topics/class-based-views/generic-editing.txt @@ -273,3 +273,56 @@ works with an API-based workflow as well as 'normal' form POSTs:: class AuthorCreateView(JsonableResponseMixin, CreateView): model = Author fields = ["name"] + +The above example assumes that if the client supports ``text/html``, that they +would prefer it. However, this may not always be true. When requesting a +``.css`` file, many browsers will send the header +``Accept: text/css,*/*;q=0.1``, indicating that they would prefer CSS, but +anything else is fine. This means ``request.accepts("text/html") will be +``True``. + +To determine the correct format, taking into consideration the client's +preference, use :func:`django.http.HttpRequest.get_preferred_type`:: + + class JsonableResponseMixin: + """ + Mixin to add JSON support to a form. + Must be used with an object-based FormView (e.g. CreateView). + """ + + accepted_media_types = ["text/html", "application/json"] + + def dispatch(self, request, *args, **kwargs): + if request.get_preferred_type(self.accepted_media_types) is None: + # No format in common. + return HttpResponse( + status_code=406, headers={"Accept": ",".join(self.accepted_media_types)} + ) + + return super().dispatch(request, *args, **kwargs) + + def form_invalid(self, form): + response = super().form_invalid(form) + accepted_type = request.get_preferred_type(self.accepted_media_types) + if accepted_type == "text/html": + return response + elif accepted_type == "application/json": + return JsonResponse(form.errors, status=400) + + def form_valid(self, form): + # We make sure to call the parent's form_valid() method because + # it might do some processing (in the case of CreateView, it will + # call form.save() for example). + response = super().form_valid(form) + accepted_type = request.get_preferred_type(self.accepted_media_types) + if accepted_type == "text/html": + return response + elif accepted_type == "application/json": + data = { + "pk": self.object.pk, + } + return JsonResponse(data) + +.. versionchanged:: 5.2 + + The :meth:`.HttpRequest.get_preferred_type` method was added. diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt index aefb35ed9c..e7bc1681fb 100644 --- a/docs/topics/db/models.txt +++ b/docs/topics/db/models.txt @@ -720,6 +720,9 @@ Django places some restrictions on model field names: #. A field name cannot end with an underscore, for similar reasons. +#. A field name cannot be ``check``, as this would override the check + framework's ``Model.check()`` method. + These limitations can be worked around, though, because your field name doesn't necessarily have to match your database column name. See the :attr:`~Field.db_column` option. @@ -914,7 +917,7 @@ example:: if ( update_fields := kwargs.get("update_fields") ) is not None and "name" in update_fields: - update_fields = {"slug"}.union(update_fields) + kwargs["update_fields"] = {"slug"}.union(update_fields) super().save(**kwargs) See :ref:`ref-models-update-fields` for more details. diff --git a/docs/topics/db/optimization.txt b/docs/topics/db/optimization.txt index dd252121e2..6b2733643f 100644 --- a/docs/topics/db/optimization.txt +++ b/docs/topics/db/optimization.txt @@ -14,7 +14,7 @@ As general programming practice, this goes without saying. Find out :ref:`what queries you are doing and what they are costing you `. Use :meth:`.QuerySet.explain` to understand how specific ``QuerySet``\s are executed by your database. You may also want to use an external project like -django-debug-toolbar_, or a tool that monitors your database directly. +:pypi:`django-debug-toolbar`, or a tool that monitors your database directly. Remember that you may be optimizing for speed or memory or both, depending on your requirements. Sometimes optimizing for one will be detrimental to the @@ -30,8 +30,6 @@ readability of your code. **All** of the suggestions below come with the caveat that in your circumstances the general principle might not apply, or might even be reversed. -.. _django-debug-toolbar: https://github.com/jazzband/django-debug-toolbar/ - Use standard DB optimization techniques ======================================= diff --git a/docs/topics/db/queries.txt b/docs/topics/db/queries.txt index 45c6183103..7e3338eaea 100644 --- a/docs/topics/db/queries.txt +++ b/docs/topics/db/queries.txt @@ -62,7 +62,8 @@ class represents a particular record in the database table. To create an object, instantiate it using keyword arguments to the model class, then call :meth:`~django.db.models.Model.save` to save it to the database. -Assuming models live in a file ``mysite/blog/models.py``, here's an example: +Assuming models live in a ``models.py`` file inside a ``blog`` Django app, here +is an example: .. code-block:: pycon diff --git a/docs/topics/email.txt b/docs/topics/email.txt index e5d4f277f5..150e25958e 100644 --- a/docs/topics/email.txt +++ b/docs/topics/email.txt @@ -12,10 +12,11 @@ development, and to provide support for platforms that can't use SMTP. The code lives in the ``django.core.mail`` module. -Quick example -============= +Quick examples +============== -In two lines:: +Use :func:`send_mail` for straightforward email sending. For example, to send a +plain text message:: from django.core.mail import send_mail @@ -27,6 +28,39 @@ In two lines:: fail_silently=False, ) +When additional email sending functionality is needed, use +:class:`EmailMessage` or :class:`EmailMultiAlternatives`. For example, to send +a multipart email that includes both HTML and plain text versions with a +specific template and custom headers, you can use the following approach:: + + from django.core.mail import EmailMultiAlternatives + from django.template.loader import render_to_string + + # First, render the plain text content. + text_content = render_to_string( + "templates/emails/my_email.txt", + context={"my_variable": 42}, + ) + + # Secondly, render the HTML content. + html_content = render_to_string( + "templates/emails/my_email.html", + context={"my_variable": 42}, + ) + + # Then, create a multipart email instance. + msg = EmailMultiAlternatives( + "Subject here", + text_content, + "from@example.com", + ["to@example.com"], + headers={"List-Unsubscribe": ""}, + ) + + # Lastly, attach the HTML content to the email instance and send. + msg.attach_alternative(html_content, "text/html") + msg.send() + Mail is sent using the SMTP host and port specified in the :setting:`EMAIL_HOST` and :setting:`EMAIL_PORT` settings. The :setting:`EMAIL_HOST_USER` and :setting:`EMAIL_HOST_PASSWORD` settings, if @@ -282,13 +316,14 @@ All parameters are optional and can be set at any time prior to calling the new connection is created when ``send()`` is called. * ``attachments``: A list of attachments to put on the message. These can - be either :class:`~email.mime.base.MIMEBase` instances, or a named tuple - with attributes ``(filename, content, mimetype)``. + be instances of :class:`~email.mime.base.MIMEBase` or + :class:`~django.core.mail.EmailAttachment`, or a tuple with attributes + ``(filename, content, mimetype)``. .. versionchanged:: 5.2 - In older versions, tuple items of ``attachments`` were regular tuples, - as opposed to named tuples. + Support for :class:`~django.core.mail.EmailAttachment` items of + ``attachments`` were added. * ``headers``: A dictionary of extra headers to put on the message. The keys are the header name, values are the header values. It's up to the @@ -384,6 +419,18 @@ The class has the following methods: For MIME types starting with :mimetype:`text/`, binary data is handled as in ``attach()``. +.. class:: EmailAttachment + + .. versionadded:: 5.2 + + A named tuple to store attachments to an email. + + The named tuple has the following indexes: + + * ``filename`` + * ``content`` + * ``mimetype`` + Sending alternative content types --------------------------------- @@ -404,20 +451,21 @@ Django's email library, you can do this using the .. attribute:: alternatives - A list of named tuples with attributes ``(content, mimetype)``. This is - particularly useful in tests:: + A list of :class:`~django.core.mail.EmailAlternative` named tuples. This + is particularly useful in tests:: self.assertEqual(len(msg.alternatives), 1) self.assertEqual(msg.alternatives[0].content, html_content) self.assertEqual(msg.alternatives[0].mimetype, "text/html") Alternatives should only be added using the :meth:`attach_alternative` - method. + method, or passed to the constructor. .. versionchanged:: 5.2 In older versions, ``alternatives`` was a list of regular tuples, - as opposed to named tuples. + as opposed to :class:`~django.core.mail.EmailAlternative` named + tuples. .. method:: attach_alternative(content, mimetype) @@ -456,6 +504,17 @@ Django's email library, you can do this using the self.assertIs(msg.body_contains("I am content"), True) self.assertIs(msg.body_contains("

    I am content.

    "), False) +.. class:: EmailAlternative + + .. versionadded:: 5.2 + + A named tuple to store alternative versions of email content. + + The named tuple has the following indexes: + + * ``content`` + * ``mimetype`` + Updating the default content type ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -749,7 +808,7 @@ to a file that can be inspected at your leisure. Another approach is to use a "dumb" SMTP server that receives the emails locally and displays them to the terminal, but does not actually send -anything. The `aiosmtpd`_ package provides a way to accomplish this: +anything. The :pypi:`aiosmtpd` package provides a way to accomplish this: .. code-block:: shell diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 273e856910..04dad034cc 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1335,9 +1335,7 @@ whenever you restart your application server:: You can even pre-generate the JavaScript catalog as part of your deployment procedure and serve it as a static file. This radical technique is implemented -in django-statici18n_. - -.. _django-statici18n: https://django-statici18n.readthedocs.io/ +in :pypi:`django-statici18n`. .. _url-internationalization: @@ -1553,7 +1551,7 @@ Django comes with a tool, :djadmin:`django-admin makemessages commands from the GNU gettext toolset: ``xgettext``, ``msgfmt``, ``msgmerge`` and ``msguniq``. - The minimum version of the ``gettext`` utilities supported is 0.15. + The minimum version of the ``gettext`` utilities supported is 0.19. To create or update a message file, run this command: diff --git a/docs/topics/performance.txt b/docs/topics/performance.txt index a346dc7385..cedd824e30 100644 --- a/docs/topics/performance.txt +++ b/docs/topics/performance.txt @@ -55,11 +55,10 @@ code. Django tools ~~~~~~~~~~~~ -`django-debug-toolbar -`_ is a very handy tool that -provides insights into what your code is doing and how much time it spends -doing it. In particular it can show you all the SQL queries your page is -generating, and how long each one has taken. +:pypi:`django-debug-toolbar` is a very handy tool that provides insights into +what your code is doing and how much time it spends doing it. In particular it +can show you all the SQL queries your page is generating, and how long each one +has taken. Third-party panels are also available for the toolbar, that can (for example) report on cache performance and template rendering times. diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt index 0bb57642ab..12cc616a21 100644 --- a/docs/topics/serialization.txt +++ b/docs/topics/serialization.txt @@ -347,6 +347,86 @@ again a mapping with the key being name of the field and the value the value: Referential fields are again represented by the PK or sequence of PKs. +.. _custom-serialization-formats: + +Custom serialization formats +---------------------------- + +In addition to the default formats, you can create a custom serialization +format. + +For example, let’s consider a csv serializer and deserializer. First, define a +``Serializer`` and a ``Deserializer`` class. These can override existing +serialization format classes: + +.. code-block:: python + :caption: ``path/to/custom_csv_serializer.py`` + + import csv + + from django.apps import apps + from django.core import serializers + from django.core.serializers.base import DeserializationError + + + class Serializer(serializers.python.Serializer): + def get_dump_object(self, obj): + dumped_object = super().get_dump_object(obj) + row = [dumped_object["model"], str(dumped_object["pk"])] + row += [str(value) for value in dumped_object["fields"].values()] + return ",".join(row), dumped_object["model"] + + def end_object(self, obj): + dumped_object_str, model = self.get_dump_object(obj) + if self.first: + fields = [field.name for field in apps.get_model(model)._meta.fields] + header = ",".join(fields) + self.stream.write(f"model,{header}\n") + self.stream.write(f"{dumped_object_str}\n") + + def getvalue(self): + return super(serializers.python.Serializer, self).getvalue() + + + class Deserializer(serializers.python.Deserializer): + def __init__(self, stream_or_string, **options): + if isinstance(stream_or_string, bytes): + stream_or_string = stream_or_string.decode() + if isinstance(stream_or_string, str): + stream_or_string = stream_or_string.splitlines() + try: + objects = csv.DictReader(stream_or_string) + except Exception as exc: + raise DeserializationError() from exc + super().__init__(objects, **options) + + def _handle_object(self, obj): + try: + model_fields = apps.get_model(obj["model"])._meta.fields + obj["fields"] = { + field.name: obj[field.name] + for field in model_fields + if field.name in obj + } + yield from super()._handle_object(obj) + except (GeneratorExit, DeserializationError): + raise + except Exception as exc: + raise DeserializationError(f"Error deserializing object: {exc}") from exc + +Then add the module containing the serializer definitions to your +:setting:`SERIALIZATION_MODULES` setting:: + + SERIALIZATION_MODULES = { + "csv": "path.to.custom_csv_serializer", + "json": "django.core.serializers.json", + } + +.. versionchanged:: 5.2 + + A ``Deserializer`` class definition was added to each of the provided + serialization formats. + .. _topics-serialization-natural-keys: Natural keys diff --git a/docs/topics/signing.txt b/docs/topics/signing.txt index 9572f9baf9..c0394da2e5 100644 --- a/docs/topics/signing.txt +++ b/docs/topics/signing.txt @@ -50,7 +50,7 @@ To sign a value, first instantiate a ``Signer`` instance: >>> signer = Signer() >>> value = signer.sign("My string") >>> value - 'My string:GdMGD6HNQ_qdgxYP8yBZAdAIV1w' + 'My string:v9G-nxfz3iQGTXrePqYPlGvH79WTcIgj1QIQSUODTW0' The signature is appended to the end of the string, following the colon. You can retrieve the original value using the ``unsign`` method: @@ -79,7 +79,7 @@ If you wish to protect a list, tuple, or dictionary you can do so using the >>> signed_obj = signer.sign_object({"message": "Hello!"}) >>> signed_obj - 'eyJtZXNzYWdlIjoiSGVsbG8hIn0:Xdc-mOFDjs22KsQAqfVfi8PQSPdo3ckWJxPWwQOFhR4' + 'eyJtZXNzYWdlIjoiSGVsbG8hIn0:bzb48DBkB-bwLaCnUVB75r5VAPUEpzWJPrTb80JMIXM' >>> obj = signer.unsign_object(signed_obj) >>> obj {'message': 'Hello!'} @@ -108,7 +108,7 @@ generate signatures. You can use a different secret by passing it to the >>> signer = Signer(key="my-other-secret") >>> value = signer.sign("My string") >>> value - 'My string:EkfQJafvGyiofrdGnuthdxImIJw' + 'My string:o3DrrsT6JRB73t-HDymfDNbTSxfMlom2d8TiUlb1hWY' .. class:: Signer(*, key=None, sep=':', salt=None, algorithm=None, fallback_keys=None) @@ -132,13 +132,13 @@ your :setting:`SECRET_KEY`: >>> signer = Signer() >>> signer.sign("My string") - 'My string:GdMGD6HNQ_qdgxYP8yBZAdAIV1w' + 'My string:v9G-nxfz3iQGTXrePqYPlGvH79WTcIgj1QIQSUODTW0' >>> signer.sign_object({"message": "Hello!"}) - 'eyJtZXNzYWdlIjoiSGVsbG8hIn0:Xdc-mOFDjs22KsQAqfVfi8PQSPdo3ckWJxPWwQOFhR4' + 'eyJtZXNzYWdlIjoiSGVsbG8hIn0:bzb48DBkB-bwLaCnUVB75r5VAPUEpzWJPrTb80JMIXM' >>> signer = Signer(salt="extra") >>> signer.sign("My string") - 'My string:Ee7vGi-ING6n02gkcJ-QLHg6vFw' - >>> signer.unsign("My string:Ee7vGi-ING6n02gkcJ-QLHg6vFw") + 'My string:YMD-FR6rof3heDkFRffdmG4pXbAZSOtb-aQxg3vmmfc' + >>> signer.unsign("My string:YMD-FR6rof3heDkFRffdmG4pXbAZSOtb-aQxg3vmmfc") 'My string' >>> signer.sign_object({"message": "Hello!"}) 'eyJtZXNzYWdlIjoiSGVsbG8hIn0:-UWSLCE-oUAHzhkHviYz3SOZYBjFKllEOyVZNuUtM-I' @@ -172,7 +172,7 @@ created within a specified period of time: >>> signer = TimestampSigner() >>> value = signer.sign("hello") >>> value - 'hello:1NMg5H:oPVuCqlJWmChm1rA2lyTUtelC-c' + 'hello:1stLqR:_rvr4oXCgT4HyfwjXaU39QvTnuNuUthFRCzNOy4Hqt0' >>> signer.unsign(value) 'hello' >>> signer.unsign(value, max_age=10) @@ -224,12 +224,12 @@ arbitrary commands by exploiting the pickle format: >>> signer = signing.TimestampSigner() >>> value = signer.sign_object({"foo": "bar"}) >>> value - 'eyJmb28iOiJiYXIifQ:1kx6R3:D4qGKiptAqo5QW9iv4eNLc6xl4RwiFfes6oOcYhkYnc' + 'eyJmb28iOiJiYXIifQ:1stLrZ:_QiOBHafwucBF9FyAr54qEs84ZO1UdsO1XiTJCvvdno' >>> signer.unsign_object(value) {'foo': 'bar'} >>> value = signing.dumps({"foo": "bar"}) >>> value - 'eyJmb28iOiJiYXIifQ:1kx6Rf:LBB39RQmME-SRvilheUe5EmPYRbuDBgQp2tCAi7KGLk' + 'eyJmb28iOiJiYXIifQ:1stLsC:JItq2ZVjmAK6ivrWI-v1Gk1QVf2hOF52oaEqhZHca7I' >>> signing.loads(value) {'foo': 'bar'} diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt index 6caa1ab131..a975ec099d 100644 --- a/docs/topics/testing/overview.txt +++ b/docs/topics/testing/overview.txt @@ -280,6 +280,11 @@ To prevent serialized data from being loaded twice, setting :data:`~django.db.models.signals.post_migrate` signal when flushing the test database. +.. versionchanged:: 5.2 + + For :class:`TransactionTestCase`, serialized migration data is made + available during ``setUpClass()``. + Other test conditions --------------------- diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt index 363505a0fc..7830f5e575 100644 --- a/docs/topics/testing/tools.txt +++ b/docs/topics/testing/tools.txt @@ -1262,25 +1262,35 @@ subclass:: Here's specifically what will happen: -* At the start of each test, before ``setUp()`` is run, Django will flush the - database, returning the database to the state it was in directly after - :djadmin:`migrate` was called. +* During ``setUpClass()``, all the named fixtures are installed. In this + example, Django will install any JSON fixture named ``mammals``, followed by + any fixture named ``birds``. See the :ref:`fixtures-explanation` topic for + more details on defining and installing fixtures. -* Then, all the named fixtures are installed. In this example, Django will - install any JSON fixture named ``mammals``, followed by any fixture named - ``birds``. See the :ref:`fixtures-explanation` topic for more details on - defining and installing fixtures. +For most unit tests using :class:`TestCase`, Django doesn't need to do +anything else, because transactions are used to clean the database after each +test for performance reasons. But for :class:`TransactionTestCase`, the +following actions will take place: -For performance reasons, :class:`TestCase` loads fixtures once for the entire -test class, before :meth:`~TestCase.setUpTestData`, instead of before each -test, and it uses transactions to clean the database before each test. In any case, -you can be certain that the outcome of a test will not be affected by another -test or by the order of test execution. +* At the end of each test Django will flush the database, returning the + database to the state it was in directly after :djadmin:`migrate` was + called. + +* For each subsequent test, the fixtures will be reloaded before ``setUp()`` + is run. + +In any case, you can be certain that the outcome of a test will not be +affected by another test or by the order of test execution. By default, fixtures are only loaded into the ``default`` database. If you are using multiple databases and set :attr:`TransactionTestCase.databases`, fixtures will be loaded into all specified databases. +.. versionchanged:: 5.2 + + For :class:`TransactionTestCase`, fixtures were made available during + ``setUpClass()``. + URLconf configuration --------------------- diff --git a/package.json b/package.json index 88d154cd28..b3bc782c40 100644 --- a/package.json +++ b/package.json @@ -9,12 +9,12 @@ "npm": ">=1.3.0" }, "devDependencies": { - "eslint": "^9.2.0", - "puppeteer": "^22.2.0", - "globals": "^15.1.0", + "eslint": "^9.12.0", + "puppeteer": "^23.5.1", + "globals": "^15.8.0", "grunt": "^1.6.1", - "grunt-cli": "^1.4.3", - "grunt-contrib-qunit": "^8.0.1", - "qunit": "^2.20.1" + "grunt-cli": "^1.5.0", + "grunt-contrib-qunit": "^10.1.1", + "qunit": "^2.21.1" } } diff --git a/pyproject.toml b/pyproject.toml index 51c4a31173..86ea7393ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,7 @@ name = "Django" dynamic = ["version"] requires-python = ">= 3.10" dependencies = [ - "asgiref>=3.7.0", + "asgiref>=3.8.1", "sqlparse>=0.3.1", "tzdata; sys_platform == 'win32'", ] @@ -30,6 +30,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", "Topic :: Internet :: WWW/HTTP :: WSGI", diff --git a/scripts/manage_translations.py b/scripts/manage_translations.py index 5b82011f20..bc569fbd0a 100644 --- a/scripts/manage_translations.py +++ b/scripts/manage_translations.py @@ -20,13 +20,86 @@ import os from argparse import ArgumentParser +from collections import defaultdict +from configparser import ConfigParser +from datetime import datetime from subprocess import run +import requests + import django from django.conf import settings from django.core.management import call_command HAVE_JS = ["admin"] +LANG_OVERRIDES = { + "zh_CN": "zh_Hans", + "zh_TW": "zh_Hant", +} + + +def list_resources_with_updates(date_since, date_skip=None, verbose=False): + resource_lang_changed = defaultdict(list) + resource_lang_unchanged = defaultdict(list) + + # Read token from ENV, otherwise read from the ~/.transifexrc file. + api_token = os.getenv("TRANSIFEX_API_TOKEN") + if not api_token: + parser = ConfigParser() + parser.read(os.path.expanduser("~/.transifexrc")) + api_token = parser.get("https://www.transifex.com", "token") + + assert api_token, "Please define the TRANSIFEX_API_TOKEN env var." + headers = {"Authorization": f"Bearer {api_token}"} + base_url = "https://rest.api.transifex.com" + base_params = {"filter[project]": "o:django:p:django"} + + resources_url = base_url + "/resources" + resource_stats_url = base_url + "/resource_language_stats" + + response = requests.get(resources_url, headers=headers, params=base_params) + assert response.ok, response.content + data = response.json()["data"] + + for item in data: + if item["type"] != "resources": + continue + resource_id = item["id"] + resource_name = item["attributes"]["name"] + params = base_params.copy() + params.update({"filter[resource]": resource_id}) + stats = requests.get(resource_stats_url, headers=headers, params=params) + stats_data = stats.json()["data"] + for lang_data in stats_data: + lang_id = lang_data["id"].split(":")[-1] + lang_attributes = lang_data["attributes"] + last_update = lang_attributes["last_translation_update"] + if verbose: + print( + f"CHECKING {resource_name} for {lang_id=} updated on {last_update}" + ) + if last_update is None: + resource_lang_unchanged[resource_name].append(lang_id) + continue + + last_update = datetime.strptime(last_update, "%Y-%m-%dT%H:%M:%SZ") + if last_update > date_since and ( + date_skip is None or last_update.date() != date_skip.date() + ): + if verbose: + print(f"=> CHANGED {lang_attributes=} {date_skip=}") + resource_lang_changed[resource_name].append(lang_id) + else: + resource_lang_unchanged[resource_name].append(lang_id) + + if verbose: + unchanged = "\n".join( + f"\n * resource {res} languages {' '.join(sorted(langs))}" + for res, langs in resource_lang_unchanged.items() + ) + print(f"== SUMMARY for unchanged resources ==\n{unchanged}") + + return resource_lang_changed def _get_locale_dirs(resources, include_core=True): @@ -152,27 +225,27 @@ def fetch(resources=None, languages=None): errors = [] for name, dir_ in locale_dirs: + cmd = [ + "tx", + "pull", + "-r", + _tx_resource_for_name(name), + "-f", + "--minimum-perc=5", + ] # Transifex pull if languages is None: - run( - [ - "tx", - "pull", - "-r", - _tx_resource_for_name(name), - "-a", - "-f", - "--minimum-perc=5", - ] - ) + run(cmd + ["--all"]) target_langs = sorted( d for d in os.listdir(dir_) if not d.startswith("_") and d != "en" ) else: for lang in languages: - run(["tx", "pull", "-r", _tx_resource_for_name(name), "-f", "-l", lang]) + run(cmd + ["-l", lang]) target_langs = languages + target_langs = [LANG_OVERRIDES.get(d, d) for d in target_langs] + # msgcat to wrap lines and msgfmt for compilation of .mo file for lang in target_langs: po_path = "%(path)s/%(lang)s/LC_MESSAGES/django%(ext)s.po" % { @@ -197,11 +270,25 @@ def fetch(resources=None, languages=None): exit(1) -if __name__ == "__main__": - RUNABLE_SCRIPTS = ("update_catalogs", "lang_stats", "fetch") +def fetch_since(date_since, date_skip=None, verbose=False, dry_run=False): + """ + Fetch translations from Transifex that were modified since the given date. + """ + changed = list_resources_with_updates( + date_since=date_since, date_skip=date_skip, verbose=verbose + ) + if verbose: + print(f"== SUMMARY for changed resources {dry_run=} ==\n") + for res, langs in changed.items(): + if verbose: + print(f"\n * resource {res} languages {' '.join(sorted(langs))}") + if not dry_run: + fetch(resources=[res], languages=sorted(langs)) + if not changed and verbose: + print(f"\n No resource changed since {date_since}") - parser = ArgumentParser() - parser.add_argument("cmd", nargs=1, choices=RUNABLE_SCRIPTS) + +def add_common_arguments(parser): parser.add_argument( "-r", "--resources", @@ -214,6 +301,60 @@ if __name__ == "__main__": action="append", help="limit operation to the specified languages", ) - options = parser.parse_args() - eval(options.cmd[0])(options.resources, options.languages) + +if __name__ == "__main__": + parser = ArgumentParser() + + subparsers = parser.add_subparsers( + dest="cmd", help="choose the operation to perform" + ) + + parser_update = subparsers.add_parser( + "update_catalogs", + help="update English django.po files with new/updated translatable strings", + ) + add_common_arguments(parser_update) + + parser_stats = subparsers.add_parser( + "lang_stats", + help="print the approximate number of changed/added strings in the en catalog", + ) + add_common_arguments(parser_stats) + + parser_fetch = subparsers.add_parser( + "fetch", + help="fetch translations from Transifex, wrap long lines, generate mo files", + ) + add_common_arguments(parser_fetch) + + parser_fetch = subparsers.add_parser( + "fetch_since", + help=( + "fetch translations from Transifex modified since a given date " + "(for all languages and all resources)" + ), + ) + parser_fetch.add_argument("-v", "--verbose", action="store_true") + parser_fetch.add_argument( + "-s", + "--since", + required=True, + dest="date_since", + metavar="YYYY-MM-DD", + type=datetime.fromisoformat, + help="fetch new translations since this date (ISO format YYYY-MM-DD).", + ) + parser_fetch.add_argument( + "--skip", + dest="date_skip", + metavar="YYYY-MM-DD", + type=datetime.fromisoformat, + help="skip changes from this date (ISO format YYYY-MM-DD).", + ) + parser_fetch.add_argument("--dry-run", dest="dry_run", action="store_true") + + options = parser.parse_args() + kwargs = options.__dict__ + cmd = kwargs.pop("cmd") + eval(cmd)(**kwargs) diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 4d8845e11e..d8055a809b 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -1264,6 +1264,24 @@ class ChangeListTests(TestCase): # Check only the first few characters since the UUID may have dashes. self.assertIn(str(a.pk)[:8], context.captured_queries[4]["sql"]) + def test_list_editable_error_title(self): + a = Swallow.objects.create(origin="Swallow A", load=4, speed=1) + Swallow.objects.create(origin="Swallow B", load=2, speed=2) + data = { + "form-TOTAL_FORMS": "2", + "form-INITIAL_FORMS": "2", + "form-MIN_NUM_FORMS": "0", + "form-MAX_NUM_FORMS": "1000", + "form-0-uuid": str(a.pk), + "form-0-load": "invalid", + "_save": "Save", + } + superuser = self._create_superuser("superuser") + self.client.force_login(superuser) + changelist_url = reverse("admin:admin_changelist_swallow_changelist") + response = self.client.post(changelist_url, data=data) + self.assertContains(response, "Error: Select swallow to change") + def test_deterministic_order_for_unordered_model(self): """ The primary key is used in the ordering of the changelist's results to @@ -1310,6 +1328,20 @@ class ChangeListTests(TestCase): UnorderedObjectAdmin.ordering = ["id", "bool"] check_results_order(ascending=True) + def test_ordering_from_model_meta(self): + Swallow.objects.create(origin="Swallow A", load=4, speed=2) + Swallow.objects.create(origin="Swallow B", load=2, speed=1) + Swallow.objects.create(origin="Swallow C", load=5, speed=1) + m = SwallowAdmin(Swallow, custom_site) + request = self._mocked_authenticated_request("/swallow/?o=", self.superuser) + changelist = m.get_changelist_instance(request) + queryset = changelist.get_queryset(request) + self.assertQuerySetEqual( + queryset, + [(1.0, 2.0), (1.0, 5.0), (2.0, 4.0)], + lambda s: (s.speed, s.load), + ) + def test_deterministic_order_for_model_ordered_by_its_manager(self): """ The primary key is used in the ordering of the changelist's results to @@ -1608,7 +1640,7 @@ class ChangeListTests(TestCase): response = m.changelist_view(request) self.assertIn('
      ', response.rendered_content) # The "Add" button inside the object-tools shouldn't appear. - self.assertNotIn("Add ", response.rendered_content) + self.assertNotIn("Add event", response.rendered_content) def test_search_help_text(self): superuser = self._create_superuser("superuser") diff --git a/tests/admin_inlines/models.py b/tests/admin_inlines/models.py index 64aaca8d14..86a859727a 100644 --- a/tests/admin_inlines/models.py +++ b/tests/admin_inlines/models.py @@ -332,7 +332,7 @@ class SomeParentModel(models.Model): class SomeChildModel(models.Model): name = models.CharField(max_length=1) - position = models.PositiveIntegerField() + position = models.PositiveIntegerField(help_text="Position help_text.") parent = models.ForeignKey(SomeParentModel, models.CASCADE) readonly_field = models.CharField(max_length=1) diff --git a/tests/admin_inlines/tests.py b/tests/admin_inlines/tests.py index 620aac10a8..8e69edb841 100644 --- a/tests/admin_inlines/tests.py +++ b/tests/admin_inlines/tests.py @@ -349,7 +349,12 @@ class TestInline(TestDataMixin, TestCase): ) response = self.client.get(url) self.assertInHTML( - 'Position', + 'Position' + '' + "", response.rendered_content, ) self.assertInHTML( @@ -379,13 +384,15 @@ class TestInline(TestDataMixin, TestCase): self.assertInHTML( '', + '
      0
    ' + '', response.rendered_content, ) self.assertInHTML( '', + '
    1
    ' + '', response.rendered_content, ) @@ -407,13 +414,17 @@ class TestInline(TestDataMixin, TestCase): self.assertInHTML( '', + '
    0
    ' + '' + "
    ", response.rendered_content, ) self.assertInHTML( '', + '
    1
    ' + '' + "", response.rendered_content, ) @@ -448,7 +459,12 @@ class TestInline(TestDataMixin, TestCase): self.assertInHTML( '' 'Name' - 'Position' + 'Position' + '' + "" "Delete?", response.rendered_content, ) @@ -1768,6 +1784,13 @@ class TestInlineWithFieldsets(TestDataMixin, TestCase): def setUp(self): self.client.force_login(self.superuser) + @override_settings(DEBUG=True) + def test_fieldset_context_fully_set(self): + url = reverse("admin:admin_inlines_photographer_add") + with self.assertRaisesMessage(AssertionError, "no logs"): + with self.assertLogs("django.template", "DEBUG"): + self.client.get(url) + def test_inline_headings(self): response = self.client.get(reverse("admin:admin_inlines_photographer_add")) # Page main title. diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 2e77f2c97a..29023b74c3 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -25,6 +25,7 @@ from django.core.management import ( color, execute_from_command_line, ) +from django.core.management.base import LabelCommand from django.core.management.commands.loaddata import Command as LoaddataCommand from django.core.management.commands.runserver import Command as RunserverCommand from django.core.management.commands.testserver import Command as TestserverCommand @@ -33,7 +34,7 @@ from django.db.migrations.recorder import MigrationRecorder from django.test import LiveServerTestCase, SimpleTestCase, TestCase, override_settings from django.test.utils import captured_stderr, captured_stdout from django.urls import path -from django.utils.version import PY313 +from django.utils.version import PY313, get_docs_version from django.views.static import serve from . import urls @@ -1597,6 +1598,15 @@ class ManageRunserver(SimpleTestCase): "Starting development server at http://0.0.0.0:8000/", self.output.getvalue(), ) + docs_version = get_docs_version() + self.assertIn( + "WARNING: This is a development server. Do not use it in a " + "production setting. Use a production WSGI or ASGI server instead." + "\nFor more information on production servers see: " + f"https://docs.djangoproject.com/en/{docs_version}/howto/" + "deployment/", + self.output.getvalue(), + ) def test_on_bind(self): self.cmd.addr = "127.0.0.1" @@ -1606,6 +1616,34 @@ class ManageRunserver(SimpleTestCase): "Starting development server at http://127.0.0.1:14437/", self.output.getvalue(), ) + docs_version = get_docs_version() + self.assertIn( + "WARNING: This is a development server. Do not use it in a " + "production setting. Use a production WSGI or ASGI server instead." + "\nFor more information on production servers see: " + f"https://docs.djangoproject.com/en/{docs_version}/howto/" + "deployment/", + self.output.getvalue(), + ) + + @mock.patch.dict(os.environ, {"HIDE_PRODUCTION_WARNING": "true"}) + def test_hide_production_warning_with_environment_variable(self): + self.cmd.addr = "0" + self.cmd._raw_ipv6 = False + self.cmd.on_bind("8000") + self.assertIn( + "Starting development server at http://0.0.0.0:8000/", + self.output.getvalue(), + ) + docs_version = get_docs_version() + self.assertNotIn( + "WARNING: This is a development server. Do not use it in a " + "production setting. Use a production WSGI or ASGI server instead." + "\nFor more information on production servers see: " + f"https://docs.djangoproject.com/en/{docs_version}/howto/" + "deployment/", + self.output.getvalue(), + ) @unittest.skipUnless(socket.has_ipv6, "platform doesn't support IPv6") def test_runner_addrport_ipv6(self): @@ -2243,6 +2281,20 @@ class CommandTypes(AdminScriptTestCase): "('settings', None), ('traceback', False), ('verbosity', 1)]", ) + def test_custom_label_command_custom_missing_args_message(self): + class Command(LabelCommand): + missing_args_message = "Missing argument." + + with self.assertRaisesMessage(CommandError, "Error: Missing argument."): + call_command(Command()) + + def test_custom_label_command_none_missing_args_message(self): + class Command(LabelCommand): + missing_args_message = None + + with self.assertRaisesMessage(CommandError, ""): + call_command(Command()) + def test_suppress_base_options_command_help(self): args = ["suppress_base_options_command", "--help"] out, err = self.run_manage(args) diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py index 20bbcccb1c..e97441eb2e 100644 --- a/tests/admin_utils/test_logentry.py +++ b/tests/admin_utils/test_logentry.py @@ -240,7 +240,7 @@ class LogEntryTests(TestCase): def test_log_action(self): msg = "LogEntryManager.log_action() is deprecated. Use log_actions() instead." content_type_val = ContentType.objects.get_for_model(Article).pk - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: log_entry = LogEntry.objects.log_action( self.user.pk, content_type_val, @@ -250,6 +250,7 @@ class LogEntryTests(TestCase): change_message="Changed something else", ) self.assertEqual(log_entry, LogEntry.objects.latest("id")) + self.assertEqual(ctx.filename, __file__) def test_log_actions(self): queryset = Article.objects.all().order_by("-id") @@ -297,9 +298,12 @@ class LogEntryTests(TestCase): msg = ( "The usage of log_action() is deprecated. Implement log_actions() instead." ) - with self.assertNumQueries(3): - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): - LogEntry.objects2.log_actions(self.user.pk, queryset, DELETION) + with ( + self.assertNumQueries(3), + self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx, + ): + LogEntry.objects2.log_actions(self.user.pk, queryset, DELETION) + self.assertEqual(ctx.filename, __file__) log_values = ( LogEntry.objects.filter(action_flag=DELETION) .order_by("id") diff --git a/tests/admin_views/test_actions.py b/tests/admin_views/test_actions.py index 8e1fc144e4..467fe046ef 100644 --- a/tests/admin_views/test_actions.py +++ b/tests/admin_views/test_actions.py @@ -72,6 +72,7 @@ class AdminActionsTest(TestCase): self.assertContains( confirmation, "Are you sure you want to delete the selected subscribers?" ) + self.assertContains(confirmation, "

    Delete multiple objects

    ") self.assertContains(confirmation, "

    Summary

    ") self.assertContains(confirmation, "
  • Subscribers: 2
    • ") self.assertContains(confirmation, "
  • External subscribers: 1
    • ") diff --git a/tests/admin_views/test_related_object_lookups.py b/tests/admin_views/test_related_object_lookups.py index 761819a50f..4b2171a09f 100644 --- a/tests/admin_views/test_related_object_lookups.py +++ b/tests/admin_views/test_related_object_lookups.py @@ -3,6 +3,8 @@ from django.contrib.auth.models import User from django.test import override_settings from django.urls import reverse +from .models import CamelCaseModel + @override_settings(ROOT_URLCONF="admin_views.urls") class SeleniumTests(AdminSeleniumTestCase): @@ -100,6 +102,8 @@ class SeleniumTests(AdminSeleniumTestCase): self.wait_until(lambda d: len(d.window_handles) == 1, 1) self.selenium.switch_to.window(self.selenium.window_handles[0]) + id_value = CamelCaseModel.objects.get(interesting_name=interesting_name).id + # Check that both the "Available" m2m box and the "Fk" dropdown now # include the newly added CamelCaseModel instance. fk_dropdown = self.selenium.find_element(By.ID, "id_fk") @@ -107,7 +111,7 @@ class SeleniumTests(AdminSeleniumTestCase): fk_dropdown.get_attribute("innerHTML"), f""" - + """, ) # Check the newly added instance is not also added in the "to" box. @@ -117,6 +121,61 @@ class SeleniumTests(AdminSeleniumTestCase): self.assertHTMLEqual( m2m_box.get_attribute("innerHTML"), f""" - + """, ) + + def test_related_object_add_js_actions(self): + from selenium.webdriver.common.by import By + + add_url = reverse("admin:admin_views_camelcaserelatedmodel_add") + self.selenium.get(self.live_server_url + add_url) + m2m_to = self.selenium.find_element(By.ID, "id_m2m_to") + m2m_box = self.selenium.find_element(By.ID, "id_m2m_from") + fk_dropdown = self.selenium.find_element(By.ID, "id_fk") + + # Add new related entry using +. + name = "Bergeron" + self.selenium.find_element(By.ID, "add_id_m2m").click() + self.wait_for_and_switch_to_popup() + self.selenium.find_element(By.ID, "id_interesting_name").send_keys(name) + self.selenium.find_element(By.NAME, "_save").click() + self.wait_until(lambda d: len(d.window_handles) == 1, 1) + self.selenium.switch_to.window(self.selenium.window_handles[0]) + + id_value = CamelCaseModel.objects.get(interesting_name=name).id + + # Check the new value correctly appears in the "to" box. + self.assertHTMLEqual( + m2m_to.get_attribute("innerHTML"), + f"""""", + ) + self.assertHTMLEqual(m2m_box.get_attribute("innerHTML"), "") + self.assertHTMLEqual( + fk_dropdown.get_attribute("innerHTML"), + f""" + + + """, + ) + + # Move the new value to the from box. + self.selenium.find_element(By.XPATH, "//*[@id='id_m2m_to']/option").click() + self.selenium.find_element(By.XPATH, "//*[@id='id_m2m_remove_link']").click() + + self.assertHTMLEqual( + m2m_box.get_attribute("innerHTML"), + f"""""", + ) + self.assertHTMLEqual(m2m_to.get_attribute("innerHTML"), "") + + # Move the new value to the to box. + self.selenium.find_element(By.XPATH, "//*[@id='id_m2m_from']/option").click() + self.selenium.find_element(By.XPATH, "//*[@id='id_m2m_add_link']").click() + + self.assertHTMLEqual(m2m_box.get_attribute("innerHTML"), "") + self.assertHTMLEqual( + m2m_to.get_attribute("innerHTML"), + f"""""", + ) diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index e0a4926b91..f63a9ca56f 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -799,7 +799,9 @@ class AdminViewBasicTest(AdminViewBasicTestCase): reverse("admin:admin_views_complexsortedperson_changelist"), {} ) # Should have 5 columns (including action checkbox col) - self.assertContains(response, '(.*?)') + result_list_table_head = result_list_table_re.search(str(response.content))[0] + self.assertEqual(result_list_table_head.count('(.*?)') + result_list_table_head = result_list_table_re.search(str(response.content))[ + 0 + ] + self.assertEqual(result_list_table_head.count('Change article") self.assertContains(response, "

    Article 2

    ") + def test_error_in_titles(self): + for url, subtitle in [ + ( + reverse("admin:admin_views_article_change", args=(self.a1.pk,)), + "Article 1 | Change article", + ), + (reverse("admin:admin_views_article_add"), "Add article"), + (reverse("admin:login"), "Log in"), + (reverse("admin:password_change"), "Password change"), + ( + reverse("admin:auth_user_password_change", args=(self.superuser.id,)), + "Change password: super", + ), + ]: + with self.subTest(url=url, subtitle=subtitle): + response = self.client.post(url, {}) + self.assertContains(response, f"Error: {subtitle}") + def test_view_subtitle_per_object(self): viewuser = User.objects.create_user( username="viewuser", @@ -1662,7 +1686,6 @@ class AdminViewBasicTest(AdminViewBasicTestCase): "APP_DIRS": True, "OPTIONS": { "context_processors": [ - "django.template.context_processors.debug", "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", @@ -3003,6 +3026,7 @@ class AdminViewPermissionsTest(TestCase): response = self.client.get( reverse("admin:admin_views_section_delete", args=(self.s1.pk,)) ) + self.assertContains(response, "<h1>Delete</h1>") self.assertContains(response, "<h2>Summary</h2>") self.assertContains(response, "<li>Articles: 3</li>") # test response contains link to related Article @@ -6151,6 +6175,65 @@ class SeleniumTests(AdminSeleniumTestCase): ) self.take_screenshot("selectbox-non-collapsible") + @screenshot_cases(["desktop_size", "mobile_size", "rtl", "dark", "high_contrast"]) + def test_selectbox_selected_rows(self): + from selenium.webdriver import ActionChains + from selenium.webdriver.common.by import By + from selenium.webdriver.common.keys import Keys + + self.admin_login( + username="super", password="secret", login_url=reverse("admin:index") + ) + # Create a new user to ensure that no extra permissions have been set. + user = User.objects.create_user(username="new", password="newuser") + url = self.live_server_url + reverse("admin:auth_user_change", args=[user.id]) + self.selenium.get(url) + + # Scroll to the User permissions section. + user_permissions = self.selenium.find_element( + By.CSS_SELECTOR, "#id_user_permissions_from" + ) + ActionChains(self.selenium).move_to_element(user_permissions).perform() + self.take_screenshot("selectbox-available-perms-none-selected") + + # Select multiple permissions from the "Available" list. + ct = ContentType.objects.get_for_model(Permission) + perms = list(Permission.objects.filter(content_type=ct)) + for perm in perms: + elem = self.selenium.find_element( + By.CSS_SELECTOR, f"#id_user_permissions_from option[value='{perm.id}']" + ) + ActionChains(self.selenium).key_down(Keys.CONTROL).click(elem).key_up( + Keys.CONTROL + ).perform() + + # Move focus to other element. + self.selenium.find_element( + By.CSS_SELECTOR, "#id_user_permissions_input" + ).click() + self.take_screenshot("selectbox-available-perms-some-selected") + + # Move permissions to the "Chosen" list, but none is selected yet. + self.selenium.find_element( + By.CSS_SELECTOR, "#id_user_permissions_add_link" + ).click() + self.take_screenshot("selectbox-chosen-perms-none-selected") + + # Select some permissions from the "Chosen" list. + for perm in [perms[0], perms[-1]]: + elem = self.selenium.find_element( + By.CSS_SELECTOR, f"#id_user_permissions_to option[value='{perm.id}']" + ) + ActionChains(self.selenium).key_down(Keys.CONTROL).click(elem).key_up( + Keys.CONTROL + ).perform() + + # Move focus to other element. + self.selenium.find_element( + By.CSS_SELECTOR, "#id_user_permissions_selected_input" + ).click() + self.take_screenshot("selectbox-chosen-perms-some-selected") + @screenshot_cases(["desktop_size", "mobile_size", "rtl", "dark", "high_contrast"]) def test_first_field_focus(self): """JavaScript-assisted auto-focus on first usable form field.""" @@ -7497,12 +7580,26 @@ class CSSTest(TestCase): # General index page response = self.client.get(reverse("admin:index")) self.assertContains(response, '<div class="app-admin_views module') + self.assertContains( + response, + '<thead class="visually-hidden"><tr><th scope="col">Model name</th>' + '<th scope="col">Add link</th><th scope="col">Change or view list link</th>' + "</tr></thead>", + html=True, + ) self.assertContains(response, '<tr class="model-actor">') self.assertContains(response, '<tr class="model-album">') # App index page response = self.client.get(reverse("admin:app_list", args=("admin_views",))) self.assertContains(response, '<div class="app-admin_views module') + self.assertContains( + response, + '<thead class="visually-hidden"><tr><th scope="col">Model name</th>' + '<th scope="col">Add link</th><th scope="col">Change or view list link</th>' + "</tr></thead>", + html=True, + ) self.assertContains(response, '<tr class="model-actor">') self.assertContains(response, '<tr class="model-album">') @@ -7656,7 +7753,6 @@ class AdminDocsTest(TestCase): "APP_DIRS": True, "OPTIONS": { "context_processors": [ - "django.template.context_processors.debug", "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 6f009a6f3f..5da4adf8c9 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -23,6 +23,7 @@ from django.db.models import ( UUIDField, ) from django.test import SimpleTestCase, TestCase, ignore_warnings, override_settings +from django.test.selenium import screenshot_cases from django.test.utils import requires_tz_support from django.urls import reverse from django.utils import translation @@ -462,7 +463,12 @@ class AdminSplitDateTimeWidgetTest(SimpleTestCase): class AdminURLWidgetTest(SimpleTestCase): def test_get_context_validates_url(self): w = widgets.AdminURLFieldWidget() - for invalid in ["", "/not/a/full/url/", 'javascript:alert("Danger XSS!")']: + for invalid in [ + "", + "/not/a/full/url/", + 'javascript:alert("Danger XSS!")', + "http://" + "한.글." * 1_000_000 + "com", + ]: with self.subTest(url=invalid): self.assertFalse(w.get_context("name", invalid, {})["url_valid"]) self.assertTrue(w.get_context("name", "http://example.com", {})["url_valid"]) @@ -684,21 +690,21 @@ class ForeignKeyRawIdWidgetTest(TestCase): w = widgets.ForeignKeyRawIdWidget(rel_uuid, widget_admin_site) self.assertHTMLEqual( w.render("test", band.uuid, attrs={}), - '<input type="text" name="test" value="%(banduuid)s" ' + '<div><input type="text" name="test" value="%(banduuid)s" ' 'class="vForeignKeyRawIdAdminField vUUIDField">' '<a href="/admin_widgets/band/?_to_field=uuid" class="related-lookup" ' 'id="lookup_id_test" title="Lookup"></a> <strong>' '<a href="/admin_widgets/band/%(bandpk)s/change/">Linkin Park</a>' - "</strong>" % {"banduuid": band.uuid, "bandpk": band.pk}, + "</strong></div>" % {"banduuid": band.uuid, "bandpk": band.pk}, ) rel_id = ReleaseEvent._meta.get_field("album").remote_field w = widgets.ForeignKeyRawIdWidget(rel_id, widget_admin_site) self.assertHTMLEqual( w.render("test", None, attrs={}), - '<input type="text" name="test" class="vForeignKeyRawIdAdminField">' + '<div><input type="text" name="test" class="vForeignKeyRawIdAdminField">' '<a href="/admin_widgets/album/?_to_field=id" class="related-lookup" ' - 'id="lookup_id_test" title="Lookup"></a>', + 'id="lookup_id_test" title="Lookup"></a></div>', ) def test_relations_to_non_primary_key(self): @@ -711,12 +717,12 @@ class ForeignKeyRawIdWidgetTest(TestCase): w = widgets.ForeignKeyRawIdWidget(rel, widget_admin_site) self.assertHTMLEqual( w.render("test", core.parent_id, attrs={}), - '<input type="text" name="test" value="86" ' + '<div><input type="text" name="test" value="86" ' 'class="vForeignKeyRawIdAdminField">' '<a href="/admin_widgets/inventory/?_to_field=barcode" ' 'class="related-lookup" id="lookup_id_test" title="Lookup"></a>' ' <strong><a href="/admin_widgets/inventory/%(pk)s/change/">' - "Apple</a></strong>" % {"pk": apple.pk}, + "Apple</a></strong></div>" % {"pk": apple.pk}, ) def test_fk_related_model_not_in_admin(self): @@ -760,12 +766,12 @@ class ForeignKeyRawIdWidgetTest(TestCase): ) self.assertHTMLEqual( w.render("test", child_of_hidden.parent_id, attrs={}), - '<input type="text" name="test" value="93" ' + '<div><input type="text" name="test" value="93" ' ' class="vForeignKeyRawIdAdminField">' '<a href="/admin_widgets/inventory/?_to_field=barcode" ' 'class="related-lookup" id="lookup_id_test" title="Lookup"></a>' ' <strong><a href="/admin_widgets/inventory/%(pk)s/change/">' - "Hidden</a></strong>" % {"pk": hidden.pk}, + "Hidden</a></strong></div>" % {"pk": hidden.pk}, ) def test_render_unsafe_limit_choices_to(self): @@ -773,10 +779,10 @@ class ForeignKeyRawIdWidgetTest(TestCase): w = widgets.ForeignKeyRawIdWidget(rel, widget_admin_site) self.assertHTMLEqual( w.render("test", None), - '<input type="text" name="test" class="vForeignKeyRawIdAdminField">\n' + '<div><input type="text" name="test" class="vForeignKeyRawIdAdminField">' '<a href="/admin_widgets/band/?name=%22%26%3E%3Cescapeme&' '_to_field=artist_ptr" class="related-lookup" id="lookup_id_test" ' - 'title="Lookup"></a>', + 'title="Lookup"></a></div>', ) def test_render_fk_as_pk_model(self): @@ -784,9 +790,9 @@ class ForeignKeyRawIdWidgetTest(TestCase): w = widgets.ForeignKeyRawIdWidget(rel, widget_admin_site) self.assertHTMLEqual( w.render("test", None), - '<input type="text" name="test" class="vForeignKeyRawIdAdminField">\n' + '<div><input type="text" name="test" class="vForeignKeyRawIdAdminField">' '<a href="/admin_widgets/releaseevent/?_to_field=album" ' - 'class="related-lookup" id="lookup_id_test" title="Lookup"></a>', + 'class="related-lookup" id="lookup_id_test" title="Lookup"></a></div>', ) @@ -804,10 +810,10 @@ class ManyToManyRawIdWidgetTest(TestCase): self.assertHTMLEqual( w.render("test", [m1.pk, m2.pk], attrs={}), ( - '<input type="text" name="test" value="%(m1pk)s,%(m2pk)s" ' + '<div><input type="text" name="test" value="%(m1pk)s,%(m2pk)s" ' ' class="vManyToManyRawIdAdminField">' '<a href="/admin_widgets/member/" class="related-lookup" ' - ' id="lookup_id_test" title="Lookup"></a>' + ' id="lookup_id_test" title="Lookup"></a></div>' ) % {"m1pk": m1.pk, "m2pk": m2.pk}, ) @@ -815,10 +821,10 @@ class ManyToManyRawIdWidgetTest(TestCase): self.assertHTMLEqual( w.render("test", [m1.pk]), ( - '<input type="text" name="test" value="%(m1pk)s" ' + '<div><input type="text" name="test" value="%(m1pk)s" ' ' class="vManyToManyRawIdAdminField">' '<a href="/admin_widgets/member/" class="related-lookup" ' - ' id="lookup_id_test" title="Lookup"></a>' + ' id="lookup_id_test" title="Lookup"></a></div>' ) % {"m1pk": m1.pk}, ) @@ -1680,6 +1686,7 @@ class AdminRawIdWidgetSeleniumTests(AdminWidgetSeleniumTestCase): Band.objects.create(id=42, name="Bogey Blues") Band.objects.create(id=98, name="Green Potatoes") + @screenshot_cases(["desktop_size", "mobile_size", "rtl", "dark", "high_contrast"]) def test_ForeignKey(self): from selenium.webdriver.common.by import By @@ -1688,6 +1695,7 @@ class AdminRawIdWidgetSeleniumTests(AdminWidgetSeleniumTestCase): self.live_server_url + reverse("admin:admin_widgets_event_add") ) main_window = self.selenium.current_window_handle + self.take_screenshot("raw_id_widget") # No value has been selected yet self.assertEqual( diff --git a/tests/aggregation/tests.py b/tests/aggregation/tests.py index 075e707102..b6ba728e77 100644 --- a/tests/aggregation/tests.py +++ b/tests/aggregation/tests.py @@ -1750,6 +1750,26 @@ class AggregateTestCase(TestCase): ], ) + def test_order_by_aggregate_default_alias(self): + publisher_books = ( + Publisher.objects.values("book") + .annotate(Count("book")) + .order_by("book__count", "book__id") + .values_list("book", flat=True) + ) + self.assertQuerySetEqual( + publisher_books, + [ + None, + self.b1.id, + self.b2.id, + self.b3.id, + self.b4.id, + self.b5.id, + self.b6.id, + ], + ) + def test_empty_result_optimization(self): with self.assertNumQueries(0): self.assertEqual( @@ -2345,6 +2365,7 @@ class AggregateAnnotationPruningTests(TestCase): ).aggregate(count=Count("id", filter=Q(id__in=[F("max_book_author"), 0]))) self.assertEqual(aggregates, {"count": 1}) + @skipUnlessDBFeature("supports_select_union") def test_aggregate_combined_queries(self): # Combined queries could have members in their values select mask while # others have them in their annotation mask which makes annotation diff --git a/tests/annotations/models.py b/tests/annotations/models.py index fbb9ca6988..914770d2fe 100644 --- a/tests/annotations/models.py +++ b/tests/annotations/models.py @@ -58,3 +58,11 @@ class Company(models.Model): class Ticket(models.Model): active_at = models.DateTimeField() duration = models.DurationField() + + +class JsonModel(models.Model): + data = models.JSONField(default=dict, blank=True) + id = models.IntegerField(primary_key=True) + + class Meta: + required_db_features = {"supports_json_field"} diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py index 703847e1dd..29660a827e 100644 --- a/tests/annotations/tests.py +++ b/tests/annotations/tests.py @@ -1,7 +1,9 @@ import datetime from decimal import Decimal +from unittest import skipUnless from django.core.exceptions import FieldDoesNotExist, FieldError +from django.db import connection from django.db.models import ( BooleanField, Case, @@ -15,6 +17,7 @@ from django.db.models import ( FloatField, Func, IntegerField, + JSONField, Max, OuterRef, Q, @@ -43,6 +46,7 @@ from .models import ( Company, DepartmentStore, Employee, + JsonModel, Publisher, Store, Ticket, @@ -1167,6 +1171,23 @@ class NonAggregateAnnotationTestCase(TestCase): with self.assertRaisesMessage(ValueError, msg): Book.objects.annotate(**{crafted_alias: Value(1)}) + @skipUnless(connection.vendor == "postgresql", "PostgreSQL tests") + @skipUnlessDBFeature("supports_json_field") + def test_set_returning_functions(self): + class JSONBPathQuery(Func): + function = "jsonb_path_query" + output_field = JSONField() + set_returning = True + + test_model = JsonModel.objects.create( + data={"key": [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]}, id=1 + ) + qs = JsonModel.objects.annotate( + table_element=JSONBPathQuery("data", Value("$.key[*]")) + ).filter(pk=test_model.pk) + + self.assertEqual(qs.count(), len(qs)) + class AliasTests(TestCase): @classmethod diff --git a/tests/async/test_async_auth.py b/tests/async/test_async_auth.py index f6551c63ee..37884d13a6 100644 --- a/tests/async/test_async_auth.py +++ b/tests/async/test_async_auth.py @@ -33,9 +33,40 @@ class AsyncAuthTest(TestCase): self.assertIsInstance(user, User) self.assertEqual(user.username, self.test_user.username) + async def test_changed_password_invalidates_aget_user(self): + request = HttpRequest() + request.session = await self.client.asession() + await alogin(request, self.test_user) + + self.test_user.set_password("new_password") + await self.test_user.asave() + + user = await aget_user(request) + + self.assertIsNotNone(user) + self.assertTrue(user.is_anonymous) + # Session should be flushed. + self.assertIsNone(request.session.session_key) + + async def test_alogin_new_user(self): + request = HttpRequest() + request.session = await self.client.asession() + await alogin(request, self.test_user) + second_user = await User.objects.acreate_user( + "testuser2", "test2@example.com", "testpw2" + ) + await alogin(request, second_user) + user = await aget_user(request) + self.assertIsInstance(user, User) + self.assertEqual(user.username, second_user.username) + async def test_alogin_without_user(self): + async def auser(): + return self.test_user + request = HttpRequest() request.user = self.test_user + request.auser = auser request.session = await self.client.asession() await alogin(request, None) user = await aget_user(request) diff --git a/tests/auth_tests/models/custom_user.py b/tests/auth_tests/models/custom_user.py index b9938681ca..4586e452cd 100644 --- a/tests/auth_tests/models/custom_user.py +++ b/tests/auth_tests/models/custom_user.py @@ -29,6 +29,19 @@ class CustomUserManager(BaseUserManager): user.save(using=self._db) return user + async def acreate_user(self, email, date_of_birth, password=None, **fields): + """See create_user()""" + if not email: + raise ValueError("Users must have an email address") + + user = self.model( + email=self.normalize_email(email), date_of_birth=date_of_birth, **fields + ) + + user.set_password(password) + await user.asave(using=self._db) + return user + def create_superuser(self, email, password, date_of_birth, **fields): u = self.create_user( email, password=password, date_of_birth=date_of_birth, **fields diff --git a/tests/auth_tests/test_auth_backends.py b/tests/auth_tests/test_auth_backends.py index 3b4f40e6e0..b612d27ab0 100644 --- a/tests/auth_tests/test_auth_backends.py +++ b/tests/auth_tests/test_auth_backends.py @@ -2,6 +2,8 @@ import sys from datetime import date from unittest import mock +from asgiref.sync import sync_to_async + from django.contrib.auth import ( BACKEND_SESSION_KEY, SESSION_KEY, @@ -55,17 +57,33 @@ class BaseBackendTest(TestCase): def test_get_user_permissions(self): self.assertEqual(self.user.get_user_permissions(), {"user_perm"}) + async def test_aget_user_permissions(self): + self.assertEqual(await self.user.aget_user_permissions(), {"user_perm"}) + def test_get_group_permissions(self): self.assertEqual(self.user.get_group_permissions(), {"group_perm"}) + async def test_aget_group_permissions(self): + self.assertEqual(await self.user.aget_group_permissions(), {"group_perm"}) + def test_get_all_permissions(self): self.assertEqual(self.user.get_all_permissions(), {"user_perm", "group_perm"}) + async def test_aget_all_permissions(self): + self.assertEqual( + await self.user.aget_all_permissions(), {"user_perm", "group_perm"} + ) + def test_has_perm(self): self.assertIs(self.user.has_perm("user_perm"), True) self.assertIs(self.user.has_perm("group_perm"), True) self.assertIs(self.user.has_perm("other_perm", TestObj()), False) + async def test_ahas_perm(self): + self.assertIs(await self.user.ahas_perm("user_perm"), True) + self.assertIs(await self.user.ahas_perm("group_perm"), True) + self.assertIs(await self.user.ahas_perm("other_perm", TestObj()), False) + def test_has_perms_perm_list_invalid(self): msg = "perm_list must be an iterable of permissions." with self.assertRaisesMessage(ValueError, msg): @@ -73,6 +91,13 @@ class BaseBackendTest(TestCase): with self.assertRaisesMessage(ValueError, msg): self.user.has_perms(object()) + async def test_ahas_perms_perm_list_invalid(self): + msg = "perm_list must be an iterable of permissions." + with self.assertRaisesMessage(ValueError, msg): + await self.user.ahas_perms("user_perm") + with self.assertRaisesMessage(ValueError, msg): + await self.user.ahas_perms(object()) + class CountingMD5PasswordHasher(MD5PasswordHasher): """Hasher that counts how many times it computes a hash.""" @@ -125,6 +150,25 @@ class BaseModelBackendTest: user.save() self.assertIs(user.has_perm("auth.test"), False) + async def test_ahas_perm(self): + user = await self.UserModel._default_manager.aget(pk=self.user.pk) + self.assertIs(await user.ahas_perm("auth.test"), False) + + user.is_staff = True + await user.asave() + self.assertIs(await user.ahas_perm("auth.test"), False) + + user.is_superuser = True + await user.asave() + self.assertIs(await user.ahas_perm("auth.test"), True) + self.assertIs(await user.ahas_module_perms("auth"), True) + + user.is_staff = True + user.is_superuser = True + user.is_active = False + await user.asave() + self.assertIs(await user.ahas_perm("auth.test"), False) + def test_custom_perms(self): user = self.UserModel._default_manager.get(pk=self.user.pk) content_type = ContentType.objects.get_for_model(Group) @@ -174,6 +218,55 @@ class BaseModelBackendTest: self.assertIs(user.has_perm("test"), False) self.assertIs(user.has_perms(["auth.test2", "auth.test3"]), False) + async def test_acustom_perms(self): + user = await self.UserModel._default_manager.aget(pk=self.user.pk) + content_type = await sync_to_async(ContentType.objects.get_for_model)(Group) + perm = await Permission.objects.acreate( + name="test", content_type=content_type, codename="test" + ) + await user.user_permissions.aadd(perm) + + # Reloading user to purge the _perm_cache. + user = await self.UserModel._default_manager.aget(pk=self.user.pk) + self.assertEqual(await user.aget_all_permissions(), {"auth.test"}) + self.assertEqual(await user.aget_user_permissions(), {"auth.test"}) + self.assertEqual(await user.aget_group_permissions(), set()) + self.assertIs(await user.ahas_module_perms("Group"), False) + self.assertIs(await user.ahas_module_perms("auth"), True) + + perm = await Permission.objects.acreate( + name="test2", content_type=content_type, codename="test2" + ) + await user.user_permissions.aadd(perm) + perm = await Permission.objects.acreate( + name="test3", content_type=content_type, codename="test3" + ) + await user.user_permissions.aadd(perm) + user = await self.UserModel._default_manager.aget(pk=self.user.pk) + expected_user_perms = {"auth.test2", "auth.test", "auth.test3"} + self.assertEqual(await user.aget_all_permissions(), expected_user_perms) + self.assertIs(await user.ahas_perm("test"), False) + self.assertIs(await user.ahas_perm("auth.test"), True) + self.assertIs(await user.ahas_perms(["auth.test2", "auth.test3"]), True) + + perm = await Permission.objects.acreate( + name="test_group", content_type=content_type, codename="test_group" + ) + group = await Group.objects.acreate(name="test_group") + await group.permissions.aadd(perm) + await user.groups.aadd(group) + user = await self.UserModel._default_manager.aget(pk=self.user.pk) + self.assertEqual( + await user.aget_all_permissions(), {*expected_user_perms, "auth.test_group"} + ) + self.assertEqual(await user.aget_user_permissions(), expected_user_perms) + self.assertEqual(await user.aget_group_permissions(), {"auth.test_group"}) + self.assertIs(await user.ahas_perms(["auth.test3", "auth.test_group"]), True) + + user = AnonymousUser() + self.assertIs(await user.ahas_perm("test"), False) + self.assertIs(await user.ahas_perms(["auth.test2", "auth.test3"]), False) + def test_has_no_object_perm(self): """Regressiontest for #12462""" user = self.UserModel._default_manager.get(pk=self.user.pk) @@ -188,6 +281,20 @@ class BaseModelBackendTest: self.assertIs(user.has_perm("auth.test"), True) self.assertEqual(user.get_all_permissions(), {"auth.test"}) + async def test_ahas_no_object_perm(self): + """See test_has_no_object_perm()""" + user = await self.UserModel._default_manager.aget(pk=self.user.pk) + content_type = await sync_to_async(ContentType.objects.get_for_model)(Group) + perm = await Permission.objects.acreate( + name="test", content_type=content_type, codename="test" + ) + await user.user_permissions.aadd(perm) + + self.assertIs(await user.ahas_perm("auth.test", "object"), False) + self.assertEqual(await user.aget_all_permissions("object"), set()) + self.assertIs(await user.ahas_perm("auth.test"), True) + self.assertEqual(await user.aget_all_permissions(), {"auth.test"}) + def test_anonymous_has_no_permissions(self): """ #17903 -- Anonymous users shouldn't have permissions in @@ -220,6 +327,38 @@ class BaseModelBackendTest: self.assertEqual(backend.get_user_permissions(user), set()) self.assertEqual(backend.get_group_permissions(user), set()) + async def test_aanonymous_has_no_permissions(self): + """See test_anonymous_has_no_permissions()""" + backend = ModelBackend() + + user = await self.UserModel._default_manager.aget(pk=self.user.pk) + content_type = await sync_to_async(ContentType.objects.get_for_model)(Group) + user_perm = await Permission.objects.acreate( + name="test", content_type=content_type, codename="test_user" + ) + group_perm = await Permission.objects.acreate( + name="test2", content_type=content_type, codename="test_group" + ) + await user.user_permissions.aadd(user_perm) + + group = await Group.objects.acreate(name="test_group") + await user.groups.aadd(group) + await group.permissions.aadd(group_perm) + + self.assertEqual( + await backend.aget_all_permissions(user), + {"auth.test_user", "auth.test_group"}, + ) + self.assertEqual(await backend.aget_user_permissions(user), {"auth.test_user"}) + self.assertEqual( + await backend.aget_group_permissions(user), {"auth.test_group"} + ) + + with mock.patch.object(self.UserModel, "is_anonymous", True): + self.assertEqual(await backend.aget_all_permissions(user), set()) + self.assertEqual(await backend.aget_user_permissions(user), set()) + self.assertEqual(await backend.aget_group_permissions(user), set()) + def test_inactive_has_no_permissions(self): """ #17903 -- Inactive users shouldn't have permissions in @@ -254,11 +393,52 @@ class BaseModelBackendTest: self.assertEqual(backend.get_user_permissions(user), set()) self.assertEqual(backend.get_group_permissions(user), set()) + async def test_ainactive_has_no_permissions(self): + """See test_inactive_has_no_permissions()""" + backend = ModelBackend() + + user = await self.UserModel._default_manager.aget(pk=self.user.pk) + content_type = await sync_to_async(ContentType.objects.get_for_model)(Group) + user_perm = await Permission.objects.acreate( + name="test", content_type=content_type, codename="test_user" + ) + group_perm = await Permission.objects.acreate( + name="test2", content_type=content_type, codename="test_group" + ) + await user.user_permissions.aadd(user_perm) + + group = await Group.objects.acreate(name="test_group") + await user.groups.aadd(group) + await group.permissions.aadd(group_perm) + + self.assertEqual( + await backend.aget_all_permissions(user), + {"auth.test_user", "auth.test_group"}, + ) + self.assertEqual(await backend.aget_user_permissions(user), {"auth.test_user"}) + self.assertEqual( + await backend.aget_group_permissions(user), {"auth.test_group"} + ) + + user.is_active = False + await user.asave() + + self.assertEqual(await backend.aget_all_permissions(user), set()) + self.assertEqual(await backend.aget_user_permissions(user), set()) + self.assertEqual(await backend.aget_group_permissions(user), set()) + def test_get_all_superuser_permissions(self): """A superuser has all permissions. Refs #14795.""" user = self.UserModel._default_manager.get(pk=self.superuser.pk) self.assertEqual(len(user.get_all_permissions()), len(Permission.objects.all())) + async def test_aget_all_superuser_permissions(self): + """See test_get_all_superuser_permissions()""" + user = await self.UserModel._default_manager.aget(pk=self.superuser.pk) + self.assertEqual( + len(await user.aget_all_permissions()), await Permission.objects.acount() + ) + @override_settings( PASSWORD_HASHERS=["auth_tests.test_auth_backends.CountingMD5PasswordHasher"] ) @@ -277,6 +457,24 @@ class BaseModelBackendTest: authenticate(username="no_such_user", password="test") self.assertEqual(CountingMD5PasswordHasher.calls, 1) + @override_settings( + PASSWORD_HASHERS=["auth_tests.test_auth_backends.CountingMD5PasswordHasher"] + ) + async def test_aauthentication_timing(self): + """See test_authentication_timing()""" + # Re-set the password, because this tests overrides PASSWORD_HASHERS. + self.user.set_password("test") + await self.user.asave() + + CountingMD5PasswordHasher.calls = 0 + username = getattr(self.user, self.UserModel.USERNAME_FIELD) + await aauthenticate(username=username, password="test") + self.assertEqual(CountingMD5PasswordHasher.calls, 1) + + CountingMD5PasswordHasher.calls = 0 + await aauthenticate(username="no_such_user", password="test") + self.assertEqual(CountingMD5PasswordHasher.calls, 1) + @override_settings( PASSWORD_HASHERS=["auth_tests.test_auth_backends.CountingMD5PasswordHasher"] ) @@ -320,6 +518,15 @@ class ModelBackendTest(BaseModelBackendTest, TestCase): self.user.save() self.assertIsNone(authenticate(**self.user_credentials)) + async def test_aauthenticate_inactive(self): + """ + An inactive user can't authenticate. + """ + self.assertEqual(await aauthenticate(**self.user_credentials), self.user) + self.user.is_active = False + await self.user.asave() + self.assertIsNone(await aauthenticate(**self.user_credentials)) + @override_settings(AUTH_USER_MODEL="auth_tests.CustomUserWithoutIsActiveField") def test_authenticate_user_without_is_active_field(self): """ @@ -332,6 +539,18 @@ class ModelBackendTest(BaseModelBackendTest, TestCase): ) self.assertEqual(authenticate(username="test", password="test"), user) + @override_settings(AUTH_USER_MODEL="auth_tests.CustomUserWithoutIsActiveField") + async def test_aauthenticate_user_without_is_active_field(self): + """ + A custom user without an `is_active` field is allowed to authenticate. + """ + user = await CustomUserWithoutIsActiveField.objects._acreate_user( + username="test", + email="test@example.com", + password="test", + ) + self.assertEqual(await aauthenticate(username="test", password="test"), user) + @override_settings(AUTH_USER_MODEL="auth_tests.ExtensionUser") class ExtensionUserModelBackendTest(BaseModelBackendTest, TestCase): @@ -403,6 +622,15 @@ class CustomUserModelBackendAuthenticateTest(TestCase): authenticated_user = authenticate(email="test@example.com", password="test") self.assertEqual(test_user, authenticated_user) + async def test_aauthenticate(self): + test_user = await CustomUser._default_manager.acreate_user( + email="test@example.com", password="test", date_of_birth=date(2006, 4, 25) + ) + authenticated_user = await aauthenticate( + email="test@example.com", password="test" + ) + self.assertEqual(test_user, authenticated_user) + @override_settings(AUTH_USER_MODEL="auth_tests.UUIDUser") class UUIDUserTests(TestCase): @@ -416,6 +644,13 @@ class UUIDUserTests(TestCase): UUIDUser.objects.get(pk=self.client.session[SESSION_KEY]), user ) + async def test_alogin(self): + """See test_login()""" + user = await UUIDUser.objects.acreate_user(username="uuid", password="test") + self.assertTrue(await self.client.alogin(username="uuid", password="test")) + session_key = await self.client.session.aget(SESSION_KEY) + self.assertEqual(await UUIDUser.objects.aget(pk=session_key), user) + class TestObj: pass @@ -435,9 +670,15 @@ class SimpleRowlevelBackend: return True return False + async def ahas_perm(self, user, perm, obj=None): + return self.has_perm(user, perm, obj) + def has_module_perms(self, user, app_label): return (user.is_anonymous or user.is_active) and app_label == "app1" + async def ahas_module_perms(self, user, app_label): + return self.has_module_perms(user, app_label) + def get_all_permissions(self, user, obj=None): if not obj: return [] # We only support row level perms @@ -452,6 +693,9 @@ class SimpleRowlevelBackend: else: return ["simple"] + async def aget_all_permissions(self, user, obj=None): + return self.get_all_permissions(user, obj) + def get_group_permissions(self, user, obj=None): if not obj: return # We only support row level perms @@ -524,10 +768,18 @@ class AnonymousUserBackendTest(SimpleTestCase): self.assertIs(self.user1.has_perm("perm", TestObj()), False) self.assertIs(self.user1.has_perm("anon", TestObj()), True) + async def test_ahas_perm(self): + self.assertIs(await self.user1.ahas_perm("perm", TestObj()), False) + self.assertIs(await self.user1.ahas_perm("anon", TestObj()), True) + def test_has_perms(self): self.assertIs(self.user1.has_perms(["anon"], TestObj()), True) self.assertIs(self.user1.has_perms(["anon", "perm"], TestObj()), False) + async def test_ahas_perms(self): + self.assertIs(await self.user1.ahas_perms(["anon"], TestObj()), True) + self.assertIs(await self.user1.ahas_perms(["anon", "perm"], TestObj()), False) + def test_has_perms_perm_list_invalid(self): msg = "perm_list must be an iterable of permissions." with self.assertRaisesMessage(ValueError, msg): @@ -535,13 +787,27 @@ class AnonymousUserBackendTest(SimpleTestCase): with self.assertRaisesMessage(ValueError, msg): self.user1.has_perms(object()) + async def test_ahas_perms_perm_list_invalid(self): + msg = "perm_list must be an iterable of permissions." + with self.assertRaisesMessage(ValueError, msg): + await self.user1.ahas_perms("perm") + with self.assertRaisesMessage(ValueError, msg): + await self.user1.ahas_perms(object()) + def test_has_module_perms(self): self.assertIs(self.user1.has_module_perms("app1"), True) self.assertIs(self.user1.has_module_perms("app2"), False) + async def test_ahas_module_perms(self): + self.assertIs(await self.user1.ahas_module_perms("app1"), True) + self.assertIs(await self.user1.ahas_module_perms("app2"), False) + def test_get_all_permissions(self): self.assertEqual(self.user1.get_all_permissions(TestObj()), {"anon"}) + async def test_aget_all_permissions(self): + self.assertEqual(await self.user1.aget_all_permissions(TestObj()), {"anon"}) + @override_settings(AUTHENTICATION_BACKENDS=[]) class NoBackendsTest(TestCase): @@ -561,6 +827,14 @@ class NoBackendsTest(TestCase): with self.assertRaisesMessage(ImproperlyConfigured, msg): self.user.has_perm(("perm", TestObj())) + async def test_araises_exception(self): + msg = ( + "No authentication backends have been defined. " + "Does AUTHENTICATION_BACKENDS contain anything?" + ) + with self.assertRaisesMessage(ImproperlyConfigured, msg): + await self.user.ahas_perm(("perm", TestObj())) + @override_settings( AUTHENTICATION_BACKENDS=["auth_tests.test_auth_backends.SimpleRowlevelBackend"] @@ -593,12 +867,21 @@ class PermissionDeniedBackend: def authenticate(self, request, username=None, password=None): raise PermissionDenied + async def aauthenticate(self, request, username=None, password=None): + raise PermissionDenied + def has_perm(self, user_obj, perm, obj=None): raise PermissionDenied + async def ahas_perm(self, user_obj, perm, obj=None): + raise PermissionDenied + def has_module_perms(self, user_obj, app_label): raise PermissionDenied + async def ahas_module_perms(self, user_obj, app_label): + raise PermissionDenied + class PermissionDeniedBackendTest(TestCase): """ @@ -631,10 +914,25 @@ class PermissionDeniedBackendTest(TestCase): [{"password": "********************", "username": "test"}], ) + @modify_settings(AUTHENTICATION_BACKENDS={"prepend": backend}) + async def test_aauthenticate_permission_denied(self): + self.assertIsNone(await aauthenticate(username="test", password="test")) + # user_login_failed signal is sent. + self.assertEqual( + self.user_login_failed, + [{"password": "********************", "username": "test"}], + ) + @modify_settings(AUTHENTICATION_BACKENDS={"append": backend}) def test_authenticates(self): self.assertEqual(authenticate(username="test", password="test"), self.user1) + @modify_settings(AUTHENTICATION_BACKENDS={"append": backend}) + async def test_aauthenticate(self): + self.assertEqual( + await aauthenticate(username="test", password="test"), self.user1 + ) + @modify_settings(AUTHENTICATION_BACKENDS={"prepend": backend}) def test_has_perm_denied(self): content_type = ContentType.objects.get_for_model(Group) @@ -646,6 +944,17 @@ class PermissionDeniedBackendTest(TestCase): self.assertIs(self.user1.has_perm("auth.test"), False) self.assertIs(self.user1.has_module_perms("auth"), False) + @modify_settings(AUTHENTICATION_BACKENDS={"prepend": backend}) + async def test_ahas_perm_denied(self): + content_type = await sync_to_async(ContentType.objects.get_for_model)(Group) + perm = await Permission.objects.acreate( + name="test", content_type=content_type, codename="test" + ) + await self.user1.user_permissions.aadd(perm) + + self.assertIs(await self.user1.ahas_perm("auth.test"), False) + self.assertIs(await self.user1.ahas_module_perms("auth"), False) + @modify_settings(AUTHENTICATION_BACKENDS={"append": backend}) def test_has_perm(self): content_type = ContentType.objects.get_for_model(Group) @@ -657,6 +966,17 @@ class PermissionDeniedBackendTest(TestCase): self.assertIs(self.user1.has_perm("auth.test"), True) self.assertIs(self.user1.has_module_perms("auth"), True) + @modify_settings(AUTHENTICATION_BACKENDS={"append": backend}) + async def test_ahas_perm(self): + content_type = await sync_to_async(ContentType.objects.get_for_model)(Group) + perm = await Permission.objects.acreate( + name="test", content_type=content_type, codename="test" + ) + await self.user1.user_permissions.aadd(perm) + + self.assertIs(await self.user1.ahas_perm("auth.test"), True) + self.assertIs(await self.user1.ahas_module_perms("auth"), True) + class NewModelBackend(ModelBackend): pass @@ -715,6 +1035,10 @@ class TypeErrorBackend: def authenticate(self, request, username=None, password=None): raise TypeError + @sensitive_variables("password") + async def aauthenticate(self, request, username=None, password=None): + raise TypeError + class SkippedBackend: def authenticate(self): diff --git a/tests/auth_tests/test_basic.py b/tests/auth_tests/test_basic.py index d7a7750b54..8d54e187fc 100644 --- a/tests/auth_tests/test_basic.py +++ b/tests/auth_tests/test_basic.py @@ -1,5 +1,3 @@ -from asgiref.sync import sync_to_async - from django.conf import settings from django.contrib.auth import aget_user, get_user, get_user_model from django.contrib.auth.models import AnonymousUser, User @@ -44,6 +42,12 @@ class BasicTestCase(TestCase): u2 = User.objects.create_user("testuser2", "test2@example.com") self.assertFalse(u2.has_usable_password()) + async def test_acreate(self): + u = await User.objects.acreate_user("testuser", "test@example.com", "testpw") + self.assertTrue(u.has_usable_password()) + self.assertFalse(await u.acheck_password("bad")) + self.assertTrue(await u.acheck_password("testpw")) + def test_unicode_username(self): User.objects.create_user("jörg") User.objects.create_user("Григорий") @@ -73,6 +77,15 @@ class BasicTestCase(TestCase): self.assertTrue(super.is_active) self.assertTrue(super.is_staff) + async def test_asuperuser(self): + "Check the creation and properties of a superuser" + super = await User.objects.acreate_superuser( + "super", "super@example.com", "super" + ) + self.assertTrue(super.is_superuser) + self.assertTrue(super.is_active) + self.assertTrue(super.is_staff) + def test_superuser_no_email_or_password(self): cases = [ {}, @@ -171,13 +184,25 @@ class TestGetUser(TestCase): self.assertIsInstance(user, User) self.assertEqual(user.username, created_user.username) - async def test_aget_user(self): - created_user = await sync_to_async(User.objects.create_user)( + async def test_aget_user_fallback_secret(self): + created_user = await User.objects.acreate_user( "testuser", "test@example.com", "testpw" ) await self.client.alogin(username="testuser", password="testpw") request = HttpRequest() request.session = await self.client.asession() - user = await aget_user(request) - self.assertIsInstance(user, User) - self.assertEqual(user.username, created_user.username) + prev_session_key = request.session.session_key + with override_settings( + SECRET_KEY="newsecret", + SECRET_KEY_FALLBACKS=[settings.SECRET_KEY], + ): + user = await aget_user(request) + self.assertIsInstance(user, User) + self.assertEqual(user.username, created_user.username) + self.assertNotEqual(request.session.session_key, prev_session_key) + # Remove the fallback secret. + # The session hash should be updated using the current secret. + with override_settings(SECRET_KEY="newsecret"): + user = await aget_user(request) + self.assertIsInstance(user, User) + self.assertEqual(user.username, created_user.username) diff --git a/tests/auth_tests/test_decorators.py b/tests/auth_tests/test_decorators.py index e585b28bd5..fa2672beb4 100644 --- a/tests/auth_tests/test_decorators.py +++ b/tests/auth_tests/test_decorators.py @@ -1,7 +1,5 @@ from asyncio import iscoroutinefunction -from asgiref.sync import sync_to_async - from django.conf import settings from django.contrib.auth import models from django.contrib.auth.decorators import ( @@ -374,7 +372,7 @@ class UserPassesTestDecoratorTest(TestCase): def test_decorator_async_test_func(self): async def async_test_func(user): - return await sync_to_async(user.has_perms)(["auth_tests.add_customuser"]) + return await user.ahas_perms(["auth_tests.add_customuser"]) @user_passes_test(async_test_func) def sync_view(request): @@ -410,7 +408,7 @@ class UserPassesTestDecoratorTest(TestCase): async def test_decorator_async_view_async_test_func(self): async def async_test_func(user): - return await sync_to_async(user.has_perms)(["auth_tests.add_customuser"]) + return await user.ahas_perms(["auth_tests.add_customuser"]) @user_passes_test(async_test_func) async def async_view(request): diff --git a/tests/auth_tests/test_forms.py b/tests/auth_tests/test_forms.py index 3dd9324304..5d81d8f7fd 100644 --- a/tests/auth_tests/test_forms.py +++ b/tests/auth_tests/test_forms.py @@ -5,6 +5,7 @@ from unittest import mock from django.contrib.auth.forms import ( AdminPasswordChangeForm, + AdminUserCreationForm, AuthenticationForm, BaseUserCreationForm, PasswordChangeForm, @@ -76,13 +77,22 @@ class ExtraValidationFormMixin: class BaseUserCreationFormTest(TestDataMixin, TestCase): + + form_class = BaseUserCreationForm + + def test_form_fields(self): + form = self.form_class() + self.assertEqual( + list(form.fields.keys()), ["username", "password1", "password2"] + ) + def test_user_already_exists(self): data = { "username": "testclient", "password1": "test123", "password2": "test123", } - form = BaseUserCreationForm(data) + form = self.form_class(data) self.assertFalse(form.is_valid()) self.assertEqual( form["username"].errors, @@ -95,7 +105,7 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): "password1": "test123", "password2": "test123", } - form = BaseUserCreationForm(data) + form = self.form_class(data) self.assertFalse(form.is_valid()) validator = next( v @@ -111,7 +121,7 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): "password1": "test123", "password2": "test", } - form = BaseUserCreationForm(data) + form = self.form_class(data) self.assertFalse(form.is_valid()) self.assertEqual( form["password2"].errors, [str(form.error_messages["password_mismatch"])] @@ -120,14 +130,14 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): def test_both_passwords(self): # One (or both) passwords weren't given data = {"username": "jsmith"} - form = BaseUserCreationForm(data) + form = self.form_class(data) required_error = [str(Field.default_error_messages["required"])] self.assertFalse(form.is_valid()) self.assertEqual(form["password1"].errors, required_error) self.assertEqual(form["password2"].errors, required_error) data["password2"] = "test123" - form = UserCreationForm(data) + form = self.form_class(data) self.assertFalse(form.is_valid()) self.assertEqual(form["password1"].errors, required_error) self.assertEqual(form["password2"].errors, []) @@ -140,7 +150,7 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): "password1": "test123", "password2": "test123", } - form = BaseUserCreationForm(data) + form = self.form_class(data) self.assertTrue(form.is_valid()) form.save(commit=False) self.assertEqual(password_changed.call_count, 0) @@ -154,7 +164,7 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): "password1": "test123", "password2": "test123", } - form = BaseUserCreationForm(data) + form = self.form_class(data) self.assertTrue(form.is_valid()) u = form.save() self.assertEqual(u.username, "宝") @@ -168,7 +178,7 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): "password1": "pwd2", "password2": "pwd2", } - form = BaseUserCreationForm(data) + form = self.form_class(data) self.assertTrue(form.is_valid()) user = form.save() self.assertNotEqual(user.username, ohm_username) @@ -195,7 +205,7 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): "password1": "pwd2", "password2": "pwd2", } - form = BaseUserCreationForm(data) + form = self.form_class(data) self.assertFalse(form.is_valid()) self.assertEqual( form.errors["username"], ["A user with that username already exists."] @@ -221,11 +231,11 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): ) def test_validates_password(self): data = { - "username": "testclient", - "password1": "testclient", - "password2": "testclient", + "username": "otherclient", + "password1": "otherclient", + "password2": "otherclient", } - form = BaseUserCreationForm(data) + form = self.form_class(data) self.assertFalse(form.is_valid()) self.assertEqual(len(form["password2"].errors), 2) self.assertIn( @@ -236,15 +246,108 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): form["password2"].errors, ) - # passwords are not validated if `usable_password` is unset + def test_password_whitespace_not_stripped(self): data = { - "username": "othertestclient", - "password1": "othertestclient", - "password2": "othertestclient", - "usable_password": "false", + "username": "testuser", + "password1": " testpassword ", + "password2": " testpassword ", } - form = BaseUserCreationForm(data) - self.assertIs(form.is_valid(), True, form.errors) + form = self.form_class(data) + self.assertTrue(form.is_valid()) + self.assertEqual(form.cleaned_data["password1"], data["password1"]) + self.assertEqual(form.cleaned_data["password2"], data["password2"]) + + @override_settings( + AUTH_PASSWORD_VALIDATORS=[ + { + "NAME": ( + "django.contrib.auth.password_validation." + "UserAttributeSimilarityValidator" + ) + }, + ] + ) + def test_password_help_text(self): + form = self.form_class() + self.assertEqual( + form.fields["password1"].help_text, + "<ul><li>" + "Your password can’t be too similar to your other personal information." + "</li></ul>", + ) + + def test_password_extra_validations(self): + class ExtraValidationForm(ExtraValidationFormMixin, self.form_class): + def clean_password1(self): + return self.failing_helper("password1") + + def clean_password2(self): + return self.failing_helper("password2") + + data = {"username": "extra", "password1": "abc", "password2": "abc"} + for fields in (["password1"], ["password2"], ["password1", "password2"]): + with self.subTest(fields=fields): + errors = {field: [f"Extra validation for {field}."] for field in fields} + form = ExtraValidationForm(data, failing_fields=errors) + self.assertIs(form.is_valid(), False) + self.assertDictEqual(form.errors, errors) + + @override_settings( + AUTH_PASSWORD_VALIDATORS=[ + { + "NAME": ( + "django.contrib.auth.password_validation." + "UserAttributeSimilarityValidator" + ) + }, + ] + ) + def test_user_create_form_validates_password_with_all_data(self): + """ + BaseUserCreationForm password validation uses all of the form's data. + """ + + class CustomUserCreationForm(self.form_class): + class Meta(self.form_class.Meta): + model = User + fields = ("username", "email", "first_name", "last_name") + + form = CustomUserCreationForm( + { + "username": "testuser", + "password1": "testpassword", + "password2": "testpassword", + "first_name": "testpassword", + "last_name": "lastname", + } + ) + self.assertFalse(form.is_valid()) + self.assertEqual( + form.errors["password2"], + ["The password is too similar to the first name."], + ) + + def test_username_field_autocapitalize_none(self): + form = self.form_class() + self.assertEqual( + form.fields["username"].widget.attrs.get("autocapitalize"), "none" + ) + + def test_html_autocomplete_attributes(self): + form = self.form_class() + tests = ( + ("username", "username"), + ("password1", "new-password"), + ("password2", "new-password"), + ) + for field_name, autocomplete in tests: + with self.subTest(field_name=field_name, autocomplete=autocomplete): + self.assertEqual( + form.fields[field_name].widget.attrs["autocomplete"], autocomplete + ) + + +class CustomUserCreationFormTest(TestDataMixin, TestCase): def test_custom_form(self): class CustomUserCreationForm(BaseUserCreationForm): @@ -309,132 +412,11 @@ class BaseUserCreationFormTest(TestDataMixin, TestCase): user = form.save(commit=True) self.assertSequenceEqual(user.orgs.all(), [organization]) - def test_password_whitespace_not_stripped(self): - data = { - "username": "testuser", - "password1": " testpassword ", - "password2": " testpassword ", - } - form = BaseUserCreationForm(data) - self.assertTrue(form.is_valid()) - self.assertEqual(form.cleaned_data["password1"], data["password1"]) - self.assertEqual(form.cleaned_data["password2"], data["password2"]) - @override_settings( - AUTH_PASSWORD_VALIDATORS=[ - { - "NAME": ( - "django.contrib.auth.password_validation." - "UserAttributeSimilarityValidator" - ) - }, - ] - ) - def test_password_help_text(self): - form = BaseUserCreationForm() - self.assertEqual( - form.fields["password1"].help_text, - "<ul><li>" - "Your password can’t be too similar to your other personal information." - "</li></ul>", - ) +class UserCreationFormTest(BaseUserCreationFormTest): - def test_password_extra_validations(self): - class ExtraValidationForm(ExtraValidationFormMixin, BaseUserCreationForm): - def clean_password1(self): - return self.failing_helper("password1") + form_class = UserCreationForm - def clean_password2(self): - return self.failing_helper("password2") - - data = {"username": "extra", "password1": "abc", "password2": "abc"} - for fields in (["password1"], ["password2"], ["password1", "password2"]): - with self.subTest(fields=fields): - errors = {field: [f"Extra validation for {field}."] for field in fields} - form = ExtraValidationForm(data, failing_fields=errors) - self.assertIs(form.is_valid(), False) - self.assertDictEqual(form.errors, errors) - - @override_settings( - AUTH_PASSWORD_VALIDATORS=[ - { - "NAME": ( - "django.contrib.auth.password_validation." - "UserAttributeSimilarityValidator" - ) - }, - ] - ) - def test_user_create_form_validates_password_with_all_data(self): - """ - BaseUserCreationForm password validation uses all of the form's data. - """ - - class CustomUserCreationForm(BaseUserCreationForm): - class Meta(BaseUserCreationForm.Meta): - model = User - fields = ("username", "email", "first_name", "last_name") - - form = CustomUserCreationForm( - { - "username": "testuser", - "password1": "testpassword", - "password2": "testpassword", - "first_name": "testpassword", - "last_name": "lastname", - } - ) - self.assertFalse(form.is_valid()) - self.assertEqual( - form.errors["password2"], - ["The password is too similar to the first name."], - ) - - # passwords are not validated if `usable_password` is unset - form = CustomUserCreationForm( - { - "username": "testuser", - "password1": "testpassword", - "password2": "testpassword", - "first_name": "testpassword", - "last_name": "lastname", - "usable_password": "false", - } - ) - self.assertIs(form.is_valid(), True, form.errors) - - def test_username_field_autocapitalize_none(self): - form = BaseUserCreationForm() - self.assertEqual( - form.fields["username"].widget.attrs.get("autocapitalize"), "none" - ) - - def test_html_autocomplete_attributes(self): - form = BaseUserCreationForm() - tests = ( - ("username", "username"), - ("password1", "new-password"), - ("password2", "new-password"), - ) - for field_name, autocomplete in tests: - with self.subTest(field_name=field_name, autocomplete=autocomplete): - self.assertEqual( - form.fields[field_name].widget.attrs["autocomplete"], autocomplete - ) - - def test_unusable_password(self): - data = { - "username": "new-user-which-does-not-exist", - "usable_password": "false", - } - form = BaseUserCreationForm(data) - self.assertIs(form.is_valid(), True, form.errors) - u = form.save() - self.assertEqual(u.username, data["username"]) - self.assertFalse(u.has_usable_password()) - - -class UserCreationFormTest(TestDataMixin, TestCase): def test_case_insensitive_username(self): data = { "username": "TeStClIeNt", @@ -1161,6 +1143,14 @@ class PasswordResetFormTest(TestDataMixin, TestCase): # makes tests interfere with each other, see #11505 Site.objects.clear_cache() + def assertEmailMessageSent(self, **kwargs): + self.assertEqual(len(mail.outbox), 1) + msg = mail.outbox[0] + for attr, expected in kwargs.items(): + with self.subTest(attr=attr): + self.assertEqual(getattr(msg, attr), expected) + return msg + def create_dummy_user(self): """ Create a user and return a tuple (user_object, username, email). @@ -1183,8 +1173,7 @@ class PasswordResetFormTest(TestDataMixin, TestCase): form = PasswordResetForm(data) self.assertTrue(form.is_valid()) form.save() - self.assertEqual(len(mail.outbox), 1) - self.assertEqual(mail.outbox[0].to, ["mıke@example.org"]) + self.assertEmailMessageSent(to=["mıke@example.org"]) def test_user_email_domain_unicode_collision(self): User.objects.create_user("mike123", "mike@ixample.org", "test123") @@ -1193,8 +1182,7 @@ class PasswordResetFormTest(TestDataMixin, TestCase): form = PasswordResetForm(data) self.assertTrue(form.is_valid()) form.save() - self.assertEqual(len(mail.outbox), 1) - self.assertEqual(mail.outbox[0].to, ["mike@ıxample.org"]) + self.assertEmailMessageSent(to=["mike@ıxample.org"]) def test_user_email_unicode_collision_nonexistent(self): User.objects.create_user("mike123", "mike@example.org", "test123") @@ -1229,7 +1217,7 @@ class PasswordResetFormTest(TestDataMixin, TestCase): self.assertTrue(form.is_valid()) form.save(domain_override="example.com") self.assertEqual(form.cleaned_data["email"], email) - self.assertEqual(len(mail.outbox), 1) + self.assertEmailMessageSent() def test_custom_email_subject(self): data = {"email": "testclient@example.com"} @@ -1239,8 +1227,7 @@ class PasswordResetFormTest(TestDataMixin, TestCase): # domain_override to prevent the save operation from failing in the # potential case where contrib.sites is not installed. Refs #16412. form.save(domain_override="example.com") - self.assertEqual(len(mail.outbox), 1) - self.assertEqual(mail.outbox[0].subject, "Custom password reset on example.com") + self.assertEmailMessageSent(subject="Custom password reset on example.com") def test_custom_email_constructor(self): data = {"email": "testclient@example.com"} @@ -1273,10 +1260,11 @@ class PasswordResetFormTest(TestDataMixin, TestCase): # domain_override to prevent the save operation from failing in the # potential case where contrib.sites is not installed. Refs #16412. form.save(domain_override="example.com") - self.assertEqual(len(mail.outbox), 1) - self.assertEqual(mail.outbox[0].subject, "Forgot your password?") - self.assertEqual(mail.outbox[0].bcc, ["site_monitor@example.com"]) - self.assertEqual(mail.outbox[0].content_subtype, "plain") + self.assertEmailMessageSent( + subject="Forgot your password?", + bcc=["site_monitor@example.com"], + content_subtype="plain", + ) def test_preserve_username_case(self): """ @@ -1323,12 +1311,12 @@ class PasswordResetFormTest(TestDataMixin, TestCase): form = PasswordResetForm({"email": email}) self.assertTrue(form.is_valid()) form.save() - self.assertEqual(len(mail.outbox), 1) - message = mail.outbox[0].message() + msg = self.assertEmailMessageSent() + self.assertEqual(len(msg.alternatives), 0) + message = msg.message() self.assertFalse(message.is_multipart()) self.assertEqual(message.get_content_type(), "text/plain") self.assertEqual(message.get("subject"), "Custom password reset on example.com") - self.assertEqual(len(mail.outbox[0].alternatives), 0) self.assertEqual(message.get_all("to"), [email]) self.assertTrue( re.match(r"^http://example.com/reset/[\w+/-]", message.get_payload()) @@ -1347,9 +1335,9 @@ class PasswordResetFormTest(TestDataMixin, TestCase): form.save( html_email_template_name="registration/html_password_reset_email.html" ) - self.assertEqual(len(mail.outbox), 1) - self.assertEqual(len(mail.outbox[0].alternatives), 1) - message = mail.outbox[0].message() + msg = self.assertEmailMessageSent() + self.assertEqual(len(msg.alternatives), 1) + message = msg.message() self.assertEqual(message.get("subject"), "Custom password reset on example.com") self.assertEqual(len(message.get_payload()), 2) self.assertTrue(message.is_multipart()) @@ -1369,6 +1357,27 @@ class PasswordResetFormTest(TestDataMixin, TestCase): ) ) + @override_settings(EMAIL_BACKEND="mail.custombackend.FailingEmailBackend") + def test_save_send_email_exceptions_are_catched_and_logged(self): + (user, username, email) = self.create_dummy_user() + form = PasswordResetForm({"email": email}) + self.assertTrue(form.is_valid()) + + with self.assertLogs("django.contrib.auth", level=0) as cm: + form.save() + + self.assertEqual(len(mail.outbox), 0) + self.assertEqual(len(cm.output), 1) + errors = cm.output[0].split("\n") + pk = user.pk + self.assertEqual( + errors[0], + f"ERROR:django.contrib.auth:Failed to send password reset email to {pk}", + ) + self.assertEqual( + errors[-1], "ValueError: FailingEmailBackend is doomed to fail." + ) + @override_settings(AUTH_USER_MODEL="auth_tests.CustomEmailField") def test_custom_email_field(self): email = "test@mail.com" @@ -1593,3 +1602,72 @@ class AdminPasswordChangeFormTest(TestDataMixin, TestCase): self.assertIs(form.is_valid(), True) # Valid despite password empty/mismatch. user = form.save(commit=True) self.assertIs(user.has_usable_password(), False) + + +class AdminUserCreationFormTest(BaseUserCreationFormTest): + + form_class = AdminUserCreationForm + + def test_form_fields(self): + form = self.form_class() + self.assertEqual( + list(form.fields.keys()), + ["username", "password1", "password2", "usable_password"], + ) + + @override_settings( + AUTH_PASSWORD_VALIDATORS=[ + { + "NAME": ( + "django.contrib.auth.password_validation." + "UserAttributeSimilarityValidator" + ) + }, + { + "NAME": ( + "django.contrib.auth.password_validation.MinimumLengthValidator" + ), + "OPTIONS": { + "min_length": 12, + }, + }, + ] + ) + def test_no_password_validation_if_unusable_password_set(self): + data = { + "username": "otherclient", + "password1": "otherclient", + "password2": "otherclient", + "usable_password": "false", + } + form = self.form_class(data) + # Passwords are not validated if `usable_password` is unset. + self.assertIs(form.is_valid(), True, form.errors) + + class CustomUserCreationForm(self.form_class): + class Meta(self.form_class.Meta): + model = User + fields = ("username", "email", "first_name", "last_name") + + form = CustomUserCreationForm( + { + "username": "testuser", + "password1": "testpassword", + "password2": "testpassword", + "first_name": "testpassword", + "last_name": "lastname", + "usable_password": "false", + } + ) + self.assertIs(form.is_valid(), True, form.errors) + + def test_unusable_password(self): + data = { + "username": "new-user-which-does-not-exist", + "usable_password": "false", + } + form = self.form_class(data) + self.assertIs(form.is_valid(), True, form.errors) + u = form.save() + self.assertEqual(u.username, data["username"]) + self.assertFalse(u.has_usable_password()) diff --git a/tests/auth_tests/test_hashers.py b/tests/auth_tests/test_hashers.py index 1b41c75e69..77242bca4f 100644 --- a/tests/auth_tests/test_hashers.py +++ b/tests/auth_tests/test_hashers.py @@ -1,3 +1,4 @@ +from contextlib import contextmanager from unittest import mock, skipUnless from django.conf.global_settings import PASSWORD_HASHERS @@ -452,8 +453,33 @@ class TestUtilsHashPass(SimpleTestCase): check_password("wrong_password", encoded) self.assertEqual(hasher.harden_runtime.call_count, 1) - def test_check_password_calls_make_password_to_fake_runtime(self): + @contextmanager + def assertMakePasswordCalled(self, password, encoded, hasher_side_effect): hasher = get_hasher("default") + with ( + mock.patch( + "django.contrib.auth.hashers.identify_hasher", + side_effect=hasher_side_effect, + ) as mock_identify_hasher, + mock.patch( + "django.contrib.auth.hashers.make_password" + ) as mock_make_password, + mock.patch( + "django.contrib.auth.hashers.get_random_string", + side_effect=lambda size: "x" * size, + ), + mock.patch.object(hasher, "verify"), + ): + # Ensure make_password is called to standardize timing. + yield + self.assertEqual(hasher.verify.call_count, 0) + self.assertEqual(mock_identify_hasher.mock_calls, [mock.call(encoded)]) + self.assertEqual( + mock_make_password.mock_calls, + [mock.call("x" * UNUSABLE_PASSWORD_SUFFIX_LENGTH)], + ) + + def test_check_password_calls_make_password_to_fake_runtime(self): cases = [ (None, None, None), # no plain text password provided ("foo", make_password(password=None), None), # unusable encoded @@ -462,27 +488,22 @@ class TestUtilsHashPass(SimpleTestCase): for password, encoded, hasher_side_effect in cases: with ( self.subTest(encoded=encoded), - mock.patch( - "django.contrib.auth.hashers.identify_hasher", - side_effect=hasher_side_effect, - ) as mock_identify_hasher, - mock.patch( - "django.contrib.auth.hashers.make_password" - ) as mock_make_password, - mock.patch( - "django.contrib.auth.hashers.get_random_string", - side_effect=lambda size: "x" * size, - ), - mock.patch.object(hasher, "verify"), + self.assertMakePasswordCalled(password, encoded, hasher_side_effect), ): - # Ensure make_password is called to standardize timing. check_password(password, encoded) - self.assertEqual(hasher.verify.call_count, 0) - self.assertEqual(mock_identify_hasher.mock_calls, [mock.call(encoded)]) - self.assertEqual( - mock_make_password.mock_calls, - [mock.call("x" * UNUSABLE_PASSWORD_SUFFIX_LENGTH)], - ) + + async def test_acheck_password_calls_make_password_to_fake_runtime(self): + cases = [ + (None, None, None), # no plain text password provided + ("foo", make_password(password=None), None), # unusable encoded + ("letmein", make_password(password="letmein"), ValueError), # valid encoded + ] + for password, encoded, hasher_side_effect in cases: + with ( + self.subTest(encoded=encoded), + self.assertMakePasswordCalled(password, encoded, hasher_side_effect), + ): + await acheck_password(password, encoded) def test_encode_invalid_salt(self): hasher_classes = [ diff --git a/tests/auth_tests/test_models.py b/tests/auth_tests/test_models.py index 34f411f2f9..a3e7a3205b 100644 --- a/tests/auth_tests/test_models.py +++ b/tests/auth_tests/test_models.py @@ -1,7 +1,5 @@ from unittest import mock -from asgiref.sync import sync_to_async - from django.conf.global_settings import PASSWORD_HASHERS from django.contrib.auth import get_user_model from django.contrib.auth.backends import ModelBackend @@ -30,10 +28,19 @@ class NaturalKeysTestCase(TestCase): self.assertEqual(User.objects.get_by_natural_key("staff"), staff_user) self.assertEqual(staff_user.natural_key(), ("staff",)) + async def test_auser_natural_key(self): + staff_user = await User.objects.acreate_user(username="staff") + self.assertEqual(await User.objects.aget_by_natural_key("staff"), staff_user) + self.assertEqual(staff_user.natural_key(), ("staff",)) + def test_group_natural_key(self): users_group = Group.objects.create(name="users") self.assertEqual(Group.objects.get_by_natural_key("users"), users_group) + async def test_agroup_natural_key(self): + users_group = await Group.objects.acreate(name="users") + self.assertEqual(await Group.objects.aget_by_natural_key("users"), users_group) + class LoadDataWithoutNaturalKeysTestCase(TestCase): fixtures = ["regular.json"] @@ -157,6 +164,17 @@ class UserManagerTestCase(TransactionTestCase): is_superuser=False, ) + async def test_acreate_super_user_raises_error_on_false_is_superuser(self): + with self.assertRaisesMessage( + ValueError, "Superuser must have is_superuser=True." + ): + await User.objects.acreate_superuser( + username="test", + email="test@test.com", + password="test", + is_superuser=False, + ) + def test_create_superuser_raises_error_on_false_is_staff(self): with self.assertRaisesMessage(ValueError, "Superuser must have is_staff=True."): User.objects.create_superuser( @@ -166,6 +184,15 @@ class UserManagerTestCase(TransactionTestCase): is_staff=False, ) + async def test_acreate_superuser_raises_error_on_false_is_staff(self): + with self.assertRaisesMessage(ValueError, "Superuser must have is_staff=True."): + await User.objects.acreate_superuser( + username="test", + email="test@test.com", + password="test", + is_staff=False, + ) + def test_runpython_manager_methods(self): def forwards(apps, schema_editor): UserModel = apps.get_model("auth", "User") @@ -301,9 +328,7 @@ class AbstractUserTestCase(TestCase): @override_settings(PASSWORD_HASHERS=PASSWORD_HASHERS) async def test_acheck_password_upgrade(self): - user = await sync_to_async(User.objects.create_user)( - username="user", password="foo" - ) + user = await User.objects.acreate_user(username="user", password="foo") initial_password = user.password self.assertIs(await user.acheck_password("foo"), True) hasher = get_hasher("default") @@ -433,6 +458,13 @@ class UserWithPermTestCase(TestCase): backend="invalid.backend.CustomModelBackend", ) + def test_invalid_backend_submodule(self): + with self.assertRaises(ImportError): + User.objects.with_perm( + "auth.test", + backend="json.tool", + ) + @override_settings( AUTHENTICATION_BACKENDS=["auth_tests.test_models.CustomModelBackend"] ) @@ -550,6 +582,12 @@ class AnonymousUserTests(SimpleTestCase): self.assertEqual(self.user.get_user_permissions(), set()) self.assertEqual(self.user.get_group_permissions(), set()) + async def test_properties_async_versions(self): + self.assertEqual(await self.user.groups.acount(), 0) + self.assertEqual(await self.user.user_permissions.acount(), 0) + self.assertEqual(await self.user.aget_user_permissions(), set()) + self.assertEqual(await self.user.aget_group_permissions(), set()) + def test_str(self): self.assertEqual(str(self.user), "AnonymousUser") diff --git a/tests/auth_tests/test_remote_user.py b/tests/auth_tests/test_remote_user.py index d3cf4b9da5..85de931c1a 100644 --- a/tests/auth_tests/test_remote_user.py +++ b/tests/auth_tests/test_remote_user.py @@ -1,12 +1,18 @@ from datetime import datetime, timezone from django.conf import settings -from django.contrib.auth import authenticate +from django.contrib.auth import aauthenticate, authenticate from django.contrib.auth.backends import RemoteUserBackend from django.contrib.auth.middleware import RemoteUserMiddleware from django.contrib.auth.models import User from django.middleware.csrf import _get_new_csrf_string, _mask_cipher_secret -from django.test import Client, TestCase, modify_settings, override_settings +from django.test import ( + AsyncClient, + Client, + TestCase, + modify_settings, + override_settings, +) @override_settings(ROOT_URLCONF="auth_tests.urls") @@ -30,6 +36,11 @@ class RemoteUserTest(TestCase): ) super().setUpClass() + def test_passing_explicit_none(self): + msg = "get_response must be provided." + with self.assertRaisesMessage(ValueError, msg): + RemoteUserMiddleware(None) + def test_no_remote_user(self): """Users are not created when remote user is not specified.""" num_users = User.objects.count() @@ -46,6 +57,18 @@ class RemoteUserTest(TestCase): self.assertTrue(response.context["user"].is_anonymous) self.assertEqual(User.objects.count(), num_users) + async def test_no_remote_user_async(self): + """See test_no_remote_user.""" + num_users = await User.objects.acount() + + response = await self.async_client.get("/remote_user/") + self.assertTrue(response.context["user"].is_anonymous) + self.assertEqual(await User.objects.acount(), num_users) + + response = await self.async_client.get("/remote_user/", **{self.header: ""}) + self.assertTrue(response.context["user"].is_anonymous) + self.assertEqual(await User.objects.acount(), num_users) + def test_csrf_validation_passes_after_process_request_login(self): """ CSRF check must access the CSRF token from the session or cookie, @@ -75,6 +98,31 @@ class RemoteUserTest(TestCase): response = csrf_client.post("/remote_user/", data, **headers) self.assertEqual(response.status_code, 200) + async def test_csrf_validation_passes_after_process_request_login_async(self): + """See test_csrf_validation_passes_after_process_request_login.""" + csrf_client = AsyncClient(enforce_csrf_checks=True) + csrf_secret = _get_new_csrf_string() + csrf_token = _mask_cipher_secret(csrf_secret) + csrf_token_form = _mask_cipher_secret(csrf_secret) + headers = {self.header: "fakeuser"} + data = {"csrfmiddlewaretoken": csrf_token_form} + + # Verify that CSRF is configured for the view + csrf_client.cookies.load({settings.CSRF_COOKIE_NAME: csrf_token}) + response = await csrf_client.post("/remote_user/", **headers) + self.assertEqual(response.status_code, 403) + self.assertIn(b"CSRF verification failed.", response.content) + + # This request will call django.contrib.auth.alogin() which will call + # django.middleware.csrf.rotate_token() thus changing the value of + # request.META['CSRF_COOKIE'] from the user submitted value set by + # CsrfViewMiddleware.process_request() to the new csrftoken value set + # by rotate_token(). Csrf validation should still pass when the view is + # later processed by CsrfViewMiddleware.process_view() + csrf_client.cookies.load({settings.CSRF_COOKIE_NAME: csrf_token}) + response = await csrf_client.post("/remote_user/", data, **headers) + self.assertEqual(response.status_code, 200) + def test_unknown_user(self): """ Tests the case where the username passed in the header does not exist @@ -90,6 +138,22 @@ class RemoteUserTest(TestCase): response = self.client.get("/remote_user/", **{self.header: "newuser"}) self.assertEqual(User.objects.count(), num_users + 1) + async def test_unknown_user_async(self): + """See test_unknown_user.""" + num_users = await User.objects.acount() + response = await self.async_client.get( + "/remote_user/", **{self.header: "newuser"} + ) + self.assertEqual(response.context["user"].username, "newuser") + self.assertEqual(await User.objects.acount(), num_users + 1) + await User.objects.aget(username="newuser") + + # Another request with same user should not create any new users. + response = await self.async_client.get( + "/remote_user/", **{self.header: "newuser"} + ) + self.assertEqual(await User.objects.acount(), num_users + 1) + def test_known_user(self): """ Tests the case where the username passed in the header is a valid User. @@ -106,6 +170,24 @@ class RemoteUserTest(TestCase): self.assertEqual(response.context["user"].username, "knownuser2") self.assertEqual(User.objects.count(), num_users) + async def test_known_user_async(self): + """See test_known_user.""" + await User.objects.acreate(username="knownuser") + await User.objects.acreate(username="knownuser2") + num_users = await User.objects.acount() + response = await self.async_client.get( + "/remote_user/", **{self.header: self.known_user} + ) + self.assertEqual(response.context["user"].username, "knownuser") + self.assertEqual(await User.objects.acount(), num_users) + # A different user passed in the headers causes the new user + # to be logged in. + response = await self.async_client.get( + "/remote_user/", **{self.header: self.known_user2} + ) + self.assertEqual(response.context["user"].username, "knownuser2") + self.assertEqual(await User.objects.acount(), num_users) + def test_last_login(self): """ A user's last_login is set the first time they make a @@ -128,6 +210,29 @@ class RemoteUserTest(TestCase): response = self.client.get("/remote_user/", **{self.header: self.known_user}) self.assertEqual(default_login, response.context["user"].last_login) + async def test_last_login_async(self): + """See test_last_login.""" + user = await User.objects.acreate(username="knownuser") + # Set last_login to something so we can determine if it changes. + default_login = datetime(2000, 1, 1) + if settings.USE_TZ: + default_login = default_login.replace(tzinfo=timezone.utc) + user.last_login = default_login + await user.asave() + + response = await self.async_client.get( + "/remote_user/", **{self.header: self.known_user} + ) + self.assertNotEqual(default_login, response.context["user"].last_login) + + user = await User.objects.aget(username="knownuser") + user.last_login = default_login + await user.asave() + response = await self.async_client.get( + "/remote_user/", **{self.header: self.known_user} + ) + self.assertEqual(default_login, response.context["user"].last_login) + def test_header_disappears(self): """ A logged in user is logged out automatically when @@ -148,6 +253,25 @@ class RemoteUserTest(TestCase): response = self.client.get("/remote_user/") self.assertEqual(response.context["user"].username, "modeluser") + async def test_header_disappears_async(self): + """See test_header_disappears.""" + await User.objects.acreate(username="knownuser") + # Known user authenticates + response = await self.async_client.get( + "/remote_user/", **{self.header: self.known_user} + ) + self.assertEqual(response.context["user"].username, "knownuser") + # During the session, the REMOTE_USER header disappears. Should trigger logout. + response = await self.async_client.get("/remote_user/") + self.assertTrue(response.context["user"].is_anonymous) + # verify the remoteuser middleware will not remove a user + # authenticated via another backend + await User.objects.acreate_user(username="modeluser", password="foo") + await self.async_client.alogin(username="modeluser", password="foo") + await aauthenticate(username="modeluser", password="foo") + response = await self.async_client.get("/remote_user/") + self.assertEqual(response.context["user"].username, "modeluser") + def test_user_switch_forces_new_login(self): """ If the username in the header changes between requests @@ -164,11 +288,35 @@ class RemoteUserTest(TestCase): # In backends that do not create new users, it is '' (anonymous user) self.assertNotEqual(response.context["user"].username, "knownuser") + async def test_user_switch_forces_new_login_async(self): + """See test_user_switch_forces_new_login.""" + await User.objects.acreate(username="knownuser") + # Known user authenticates + response = await self.async_client.get( + "/remote_user/", **{self.header: self.known_user} + ) + self.assertEqual(response.context["user"].username, "knownuser") + # During the session, the REMOTE_USER changes to a different user. + response = await self.async_client.get( + "/remote_user/", **{self.header: "newnewuser"} + ) + # The current user is not the prior remote_user. + # In backends that create a new user, username is "newnewuser" + # In backends that do not create new users, it is '' (anonymous user) + self.assertNotEqual(response.context["user"].username, "knownuser") + def test_inactive_user(self): User.objects.create(username="knownuser", is_active=False) response = self.client.get("/remote_user/", **{self.header: "knownuser"}) self.assertTrue(response.context["user"].is_anonymous) + async def test_inactive_user_async(self): + await User.objects.acreate(username="knownuser", is_active=False) + response = await self.async_client.get( + "/remote_user/", **{self.header: "knownuser"} + ) + self.assertTrue(response.context["user"].is_anonymous) + class RemoteUserNoCreateBackend(RemoteUserBackend): """Backend that doesn't create unknown users.""" @@ -190,6 +338,14 @@ class RemoteUserNoCreateTest(RemoteUserTest): self.assertTrue(response.context["user"].is_anonymous) self.assertEqual(User.objects.count(), num_users) + async def test_unknown_user_async(self): + num_users = await User.objects.acount() + response = await self.async_client.get( + "/remote_user/", **{self.header: "newuser"} + ) + self.assertTrue(response.context["user"].is_anonymous) + self.assertEqual(await User.objects.acount(), num_users) + class AllowAllUsersRemoteUserBackendTest(RemoteUserTest): """Backend that allows inactive users.""" @@ -201,6 +357,13 @@ class AllowAllUsersRemoteUserBackendTest(RemoteUserTest): response = self.client.get("/remote_user/", **{self.header: self.known_user}) self.assertEqual(response.context["user"].username, user.username) + async def test_inactive_user_async(self): + user = await User.objects.acreate(username="knownuser", is_active=False) + response = await self.async_client.get( + "/remote_user/", **{self.header: self.known_user} + ) + self.assertEqual(response.context["user"].username, user.username) + class CustomRemoteUserBackend(RemoteUserBackend): """ @@ -311,3 +474,16 @@ class PersistentRemoteUserTest(RemoteUserTest): response = self.client.get("/remote_user/") self.assertFalse(response.context["user"].is_anonymous) self.assertEqual(response.context["user"].username, "knownuser") + + async def test_header_disappears_async(self): + """See test_header_disappears.""" + await User.objects.acreate(username="knownuser") + # Known user authenticates + response = await self.async_client.get( + "/remote_user/", **{self.header: self.known_user} + ) + self.assertEqual(response.context["user"].username, "knownuser") + # Should stay logged in if the REMOTE_USER header disappears. + response = await self.async_client.get("/remote_user/") + self.assertFalse(response.context["user"].is_anonymous) + self.assertEqual(response.context["user"].username, "knownuser") diff --git a/tests/auth_tests/test_templates.py b/tests/auth_tests/test_templates.py index ceecfa3325..edde6ca6b4 100644 --- a/tests/auth_tests/test_templates.py +++ b/tests/auth_tests/test_templates.py @@ -37,6 +37,12 @@ class AuthTemplateTests(TestCase): ) self.assertContains(response, "<h1>Password reset</h1>") + def test_password_reset_view_error_title(self): + response = self.client.post(reverse("password_reset"), {}) + self.assertContains( + response, "<title>Error: Password reset | Django site admin" + ) + def test_password_reset_done_view(self): response = PasswordResetDoneView.as_view()(self.request) self.assertContains( @@ -77,6 +83,19 @@ class AuthTemplateTests(TestCase): '', ) + def test_password_reset_confirm_view_error_title(self): + client = PasswordResetConfirmClient() + default_token_generator = PasswordResetTokenGenerator() + token = default_token_generator.make_token(self.user) + uidb64 = urlsafe_base64_encode(str(self.user.pk).encode()) + url = reverse( + "password_reset_confirm", kwargs={"uidb64": uidb64, "token": token} + ) + response = client.post(url, {}) + self.assertContains( + response, "Error: Enter new password | Django site admin" + ) + @override_settings(AUTH_USER_MODEL="auth_tests.CustomUser") def test_password_reset_confirm_view_custom_username_hint(self): custom_user = CustomUser.custom_objects.create_user( diff --git a/tests/auth_tests/test_validators.py b/tests/auth_tests/test_validators.py index 4da031a793..506c85c0ae 100644 --- a/tests/auth_tests/test_validators.py +++ b/tests/auth_tests/test_validators.py @@ -14,7 +14,7 @@ from django.contrib.auth.password_validation import ( password_validators_help_texts, validate_password, ) -from django.core.exceptions import ValidationError +from django.core.exceptions import ImproperlyConfigured, ValidationError from django.db import models from django.test import SimpleTestCase, TestCase, override_settings from django.test.utils import isolate_apps @@ -50,6 +50,15 @@ class PasswordValidationTest(SimpleTestCase): self.assertEqual(get_password_validators([]), []) + def test_get_password_validators_custom_invalid(self): + validator_config = [{"NAME": "json.tool"}] + msg = ( + "The module in NAME could not be imported: json.tool. " + "Check your AUTH_PASSWORD_VALIDATORS setting." + ) + with self.assertRaisesMessage(ImproperlyConfigured, msg): + get_password_validators(validator_config) + def test_validate_password(self): self.assertIsNone(validate_password("sufficiently-long")) msg_too_short = ( diff --git a/tests/backends/base/test_operations.py b/tests/backends/base/test_operations.py index 8df02ee76b..18433352ad 100644 --- a/tests/backends/base/test_operations.py +++ b/tests/backends/base/test_operations.py @@ -239,8 +239,9 @@ class DeprecationTests(TestCase): "DatabaseOperations.field_cast_sql() is deprecated use " "DatabaseOperations.lookup_cast() instead." ) - with self.assertRaisesMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: base_ops.field_cast_sql("integer", "IntegerField") + self.assertEqual(ctx.filename, __file__) def test_field_cast_sql_usage_warning(self): compiler = Author.objects.all().query.get_compiler(connection.alias) diff --git a/tests/backends/postgresql/tests.py b/tests/backends/postgresql/tests.py index 0b4f580612..37c5ee562b 100644 --- a/tests/backends/postgresql/tests.py +++ b/tests/backends/postgresql/tests.py @@ -567,3 +567,49 @@ class Tests(TestCase): ) finally: new_connection.close() + + def test_bypass_timezone_configuration(self): + from django.db.backends.postgresql.base import DatabaseWrapper + + class CustomDatabaseWrapper(DatabaseWrapper): + def _configure_timezone(self, connection): + return False + + for Wrapper, commit in [ + (DatabaseWrapper, True), + (CustomDatabaseWrapper, False), + ]: + with self.subTest(wrapper=Wrapper, commit=commit): + new_connection = no_pool_connection() + self.addCleanup(new_connection.close) + + # Set the database default time zone to be different from + # the time zone in new_connection.settings_dict. + with new_connection.cursor() as cursor: + cursor.execute("RESET TIMEZONE") + cursor.execute("SHOW TIMEZONE") + db_default_tz = cursor.fetchone()[0] + new_tz = "Europe/Paris" if db_default_tz == "UTC" else "UTC" + new_connection.timezone_name = new_tz + + settings = new_connection.settings_dict.copy() + conn = new_connection.connection + self.assertIs(Wrapper(settings)._configure_connection(conn), commit) + + def test_bypass_role_configuration(self): + from django.db.backends.postgresql.base import DatabaseWrapper + + class CustomDatabaseWrapper(DatabaseWrapper): + def _configure_role(self, connection): + return False + + new_connection = no_pool_connection() + self.addCleanup(new_connection.close) + new_connection.connect() + + settings = new_connection.settings_dict.copy() + settings["OPTIONS"]["assume_role"] = "django_nonexistent_role" + conn = new_connection.connection + self.assertIs( + CustomDatabaseWrapper(settings)._configure_connection(conn), False + ) diff --git a/tests/backends/tests.py b/tests/backends/tests.py index 08a21d8ded..2adfa51360 100644 --- a/tests/backends/tests.py +++ b/tests/backends/tests.py @@ -225,6 +225,7 @@ class LongNameTest(TransactionTestCase): connection.ops.execute_sql_flush(sql_list) +@skipUnlessDBFeature("supports_sequence_reset") class SequenceResetTest(TestCase): def test_generic_relation(self): "Sequence names are correct when resetting generic relations (Ref #13941)" @@ -557,8 +558,9 @@ class BackendTestCase(TransactionTestCase): "Limit for query logging exceeded, only the last 3 queries will be " "returned." ) - with self.assertWarnsMessage(UserWarning, msg): + with self.assertWarnsMessage(UserWarning, msg) as ctx: self.assertEqual(3, len(new_connection.queries)) + self.assertEqual(ctx.filename, __file__) finally: BaseDatabaseWrapper.queries_limit = old_queries_limit diff --git a/tests/basic/tests.py b/tests/basic/tests.py index 6fb67f7e6e..cb267be0b1 100644 --- a/tests/basic/tests.py +++ b/tests/basic/tests.py @@ -206,9 +206,10 @@ class ModelInstanceCreationTests(TestCase): def test_save_deprecation(self): a = Article(headline="original", pub_date=datetime(2014, 5, 16)) msg = "Passing positional arguments to save() is deprecated" - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: a.save(False, False, None, None) self.assertEqual(Article.objects.count(), 1) + self.assertEqual(ctx.filename, __file__) def test_save_deprecation_positional_arguments_used(self): a = Article() @@ -259,9 +260,10 @@ class ModelInstanceCreationTests(TestCase): async def test_asave_deprecation(self): a = Article(headline="original", pub_date=datetime(2014, 5, 16)) msg = "Passing positional arguments to asave() is deprecated" - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: await a.asave(False, False, None, None) self.assertEqual(await Article.objects.acount(), 1) + self.assertEqual(ctx.filename, __file__) async def test_asave_deprecation_positional_arguments_used(self): a = Article() @@ -659,6 +661,31 @@ class ModelTest(TestCase): headline__startswith="Area", ) + def test_is_pk_unset(self): + cases = [ + Article(), + Article(id=None), + ] + for case in cases: + with self.subTest(case=case): + self.assertIs(case._is_pk_set(), False) + + def test_is_pk_set(self): + def new_instance(): + a = Article(pub_date=datetime.today()) + a.save() + return a + + cases = [ + Article(id=1), + Article(id=0), + Article.objects.create(pub_date=datetime.today()), + new_instance(), + ] + for case in cases: + with self.subTest(case=case): + self.assertIs(case._is_pk_set(), True) + class ModelLookupTest(TestCase): @classmethod diff --git a/tests/cache/tests.py b/tests/cache/tests.py index 978efdd9d3..2636a7d6ce 100644 --- a/tests/cache/tests.py +++ b/tests/cache/tests.py @@ -11,6 +11,7 @@ import tempfile import threading import time import unittest +from functools import wraps from pathlib import Path from unittest import mock, skipIf @@ -89,6 +90,25 @@ KEY_ERRORS_WITH_MEMCACHED_MSG = ( ) +def retry(retries=3, delay=1): + def decorator(func): + @wraps(func) + def wrapper(*args, **kwargs): + attempts = 0 + while attempts < retries: + try: + return func(*args, **kwargs) + except AssertionError: + attempts += 1 + if attempts >= retries: + raise + time.sleep(delay) + + return wrapper + + return decorator + + @override_settings( CACHES={ "default": { @@ -489,6 +509,7 @@ class BaseCacheTests: self.assertEqual(cache.get("expire2"), "newvalue") self.assertIs(cache.has_key("expire3"), False) + @retry() def test_touch(self): # cache.touch() updates the timeout. cache.set("expire1", "very quickly", timeout=1) @@ -616,6 +637,7 @@ class BaseCacheTests: self.assertEqual(cache.get("key3"), "sausage") self.assertEqual(cache.get("key4"), "lobster bisque") + @retry() def test_forever_timeout(self): """ Passing in None into timeout results in a value that is cached forever @@ -1397,6 +1419,7 @@ class LocMemCacheTests(BaseCacheTests, TestCase): self.assertEqual(cache.decr(key), 1) self.assertEqual(expire, cache._expire_info[_key]) + @retry() @limit_locmem_entries def test_lru_get(self): """get() moves cache keys.""" @@ -1424,6 +1447,7 @@ class LocMemCacheTests(BaseCacheTests, TestCase): for key in range(3): self.assertIsNone(cache.get(key)) + @retry() @limit_locmem_entries def test_lru_incr(self): """incr() moves cache keys.""" @@ -2674,6 +2698,7 @@ class CacheMiddlewareTest(SimpleTestCase): response = other_with_prefix_view(request, "16") self.assertEqual(response.content, b"Hello World 16") + @retry() def test_cache_page_timeout(self): # Page timeout takes precedence over the "max-age" section of the # "Cache-Control". diff --git a/tests/constraints/models.py b/tests/constraints/models.py index 87b97b2a85..829f671cdd 100644 --- a/tests/constraints/models.py +++ b/tests/constraints/models.py @@ -1,4 +1,5 @@ from django.db import models +from django.db.models.functions import Coalesce, Lower class Product(models.Model): @@ -28,6 +29,46 @@ class Product(models.Model): ] +class GeneratedFieldStoredProduct(models.Model): + name = models.CharField(max_length=255, null=True) + price = models.IntegerField(null=True) + discounted_price = models.IntegerField(null=True) + rebate = models.GeneratedField( + expression=Coalesce("price", 0) + - Coalesce("discounted_price", Coalesce("price", 0)), + output_field=models.IntegerField(), + db_persist=True, + ) + lower_name = models.GeneratedField( + expression=Lower(models.F("name")), + output_field=models.CharField(max_length=255, null=True), + db_persist=True, + ) + + class Meta: + required_db_features = {"supports_stored_generated_columns"} + + +class GeneratedFieldVirtualProduct(models.Model): + name = models.CharField(max_length=255, null=True) + price = models.IntegerField(null=True) + discounted_price = models.IntegerField(null=True) + rebate = models.GeneratedField( + expression=Coalesce("price", 0) + - Coalesce("discounted_price", Coalesce("price", 0)), + output_field=models.IntegerField(), + db_persist=False, + ) + lower_name = models.GeneratedField( + expression=Lower(models.F("name")), + output_field=models.CharField(max_length=255, null=True), + db_persist=False, + ) + + class Meta: + required_db_features = {"supports_virtual_generated_columns"} + + class UniqueConstraintProduct(models.Model): name = models.CharField(max_length=255) color = models.CharField(max_length=32, null=True) @@ -128,3 +169,10 @@ class JSONFieldModel(models.Model): class Meta: required_db_features = {"supports_json_field"} + + +class ModelWithDatabaseDefault(models.Model): + field = models.CharField(max_length=255) + field_with_db_default = models.CharField( + max_length=255, db_default=models.Value("field_with_db_default") + ) diff --git a/tests/constraints/tests.py b/tests/constraints/tests.py index 31c5d64652..e1c431956f 100644 --- a/tests/constraints/tests.py +++ b/tests/constraints/tests.py @@ -4,7 +4,7 @@ from django.core.exceptions import ValidationError from django.db import IntegrityError, connection, models from django.db.models import F from django.db.models.constraints import BaseConstraint, UniqueConstraint -from django.db.models.functions import Abs, Lower +from django.db.models.functions import Abs, Lower, Sqrt, Upper from django.db.transaction import atomic from django.test import SimpleTestCase, TestCase, skipIfDBFeature, skipUnlessDBFeature from django.test.utils import ignore_warnings @@ -13,7 +13,10 @@ from django.utils.deprecation import RemovedInDjango60Warning from .models import ( ChildModel, ChildUniqueConstraintProduct, + GeneratedFieldStoredProduct, + GeneratedFieldVirtualProduct, JSONFieldModel, + ModelWithDatabaseDefault, Product, UniqueConstraintConditionProduct, UniqueConstraintDeferrable, @@ -383,18 +386,72 @@ class CheckConstraintTests(TestCase): with self.assertRaisesMessage(ValidationError, msg): json_exact_constraint.validate(JSONFieldModel, JSONFieldModel(data=data)) + @skipUnlessDBFeature("supports_stored_generated_columns") + def test_validate_generated_field_stored(self): + self.assertGeneratedFieldIsValidated(model=GeneratedFieldStoredProduct) + + @skipUnlessDBFeature("supports_virtual_generated_columns") + def test_validate_generated_field_virtual(self): + self.assertGeneratedFieldIsValidated(model=GeneratedFieldVirtualProduct) + + def assertGeneratedFieldIsValidated(self, model): + constraint = models.CheckConstraint( + condition=models.Q(rebate__range=(0, 100)), name="bounded_rebate" + ) + constraint.validate(model, model(price=50, discounted_price=20)) + + invalid_product = model(price=1200, discounted_price=500) + msg = f"Constraint “{constraint.name}” is violated." + with self.assertRaisesMessage(ValidationError, msg): + constraint.validate(model, invalid_product) + + # Excluding referenced or generated fields should skip validation. + constraint.validate(model, invalid_product, exclude={"price"}) + constraint.validate(model, invalid_product, exclude={"rebate"}) + def test_check_deprecation(self): msg = "CheckConstraint.check is deprecated in favor of `.condition`." condition = models.Q(foo="bar") - with self.assertWarnsRegex(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: constraint = models.CheckConstraint(name="constraint", check=condition) - with self.assertWarnsRegex(RemovedInDjango60Warning, msg): + self.assertEqual(ctx.filename, __file__) + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: self.assertIs(constraint.check, condition) + self.assertEqual(ctx.filename, __file__) other_condition = models.Q(something="else") - with self.assertWarnsRegex(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: constraint.check = other_condition - with self.assertWarnsRegex(RemovedInDjango60Warning, msg): + self.assertEqual(ctx.filename, __file__) + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: self.assertIs(constraint.check, other_condition) + self.assertEqual(ctx.filename, __file__) + + def test_database_default(self): + models.CheckConstraint( + condition=models.Q(field_with_db_default="field_with_db_default"), + name="check_field_with_db_default", + ).validate(ModelWithDatabaseDefault, ModelWithDatabaseDefault()) + + # Ensure that a check also does not silently pass with either + # FieldError or DatabaseError when checking with a db_default. + with self.assertRaises(ValidationError): + models.CheckConstraint( + condition=models.Q( + field_with_db_default="field_with_db_default", field="field" + ), + name="check_field_with_db_default_2", + ).validate( + ModelWithDatabaseDefault, ModelWithDatabaseDefault(field="not-field") + ) + + with self.assertRaises(ValidationError): + models.CheckConstraint( + condition=models.Q(field_with_db_default="field_with_db_default"), + name="check_field_with_db_default", + ).validate( + ModelWithDatabaseDefault, + ModelWithDatabaseDefault(field_with_db_default="other value"), + ) class UniqueConstraintTests(TestCase): @@ -896,6 +953,7 @@ class UniqueConstraintTests(TestCase): ChildUniqueConstraintProduct(name=self.p1.name, color=self.p1.color), ) + @skipUnlessDBFeature("supports_table_check_constraints") def test_validate_fields_unattached(self): Product.objects.create(price=42) constraint = models.UniqueConstraint(fields=["price"], name="uniq_prices") @@ -1033,6 +1091,90 @@ class UniqueConstraintTests(TestCase): exclude={"name"}, ) + @skipUnlessDBFeature("supports_stored_generated_columns") + def test_validate_expression_generated_field_stored(self): + self.assertGeneratedFieldWithExpressionIsValidated( + model=GeneratedFieldStoredProduct + ) + + @skipUnlessDBFeature("supports_virtual_generated_columns") + def test_validate_expression_generated_field_virtual(self): + self.assertGeneratedFieldWithExpressionIsValidated( + model=GeneratedFieldVirtualProduct + ) + + def assertGeneratedFieldWithExpressionIsValidated(self, model): + constraint = UniqueConstraint(Sqrt("rebate"), name="unique_rebate_sqrt") + model.objects.create(price=100, discounted_price=84) + + valid_product = model(price=100, discounted_price=75) + constraint.validate(model, valid_product) + + invalid_product = model(price=20, discounted_price=4) + with self.assertRaisesMessage( + ValidationError, f"Constraint “{constraint.name}” is violated." + ): + constraint.validate(model, invalid_product) + + # Excluding referenced or generated fields should skip validation. + constraint.validate(model, invalid_product, exclude={"rebate"}) + constraint.validate(model, invalid_product, exclude={"price"}) + + @skipUnlessDBFeature("supports_stored_generated_columns") + def test_validate_fields_generated_field_stored(self): + self.assertGeneratedFieldWithFieldsIsValidated( + model=GeneratedFieldStoredProduct + ) + + @skipUnlessDBFeature("supports_virtual_generated_columns") + def test_validate_fields_generated_field_virtual(self): + self.assertGeneratedFieldWithFieldsIsValidated( + model=GeneratedFieldVirtualProduct + ) + + def assertGeneratedFieldWithFieldsIsValidated(self, model): + constraint = models.UniqueConstraint( + fields=["lower_name"], name="lower_name_unique" + ) + model.objects.create(name="Box") + constraint.validate(model, model(name="Case")) + + invalid_product = model(name="BOX") + msg = str(invalid_product.unique_error_message(model, ["lower_name"])) + with self.assertRaisesMessage(ValidationError, msg): + constraint.validate(model, invalid_product) + + # Excluding referenced or generated fields should skip validation. + constraint.validate(model, invalid_product, exclude={"lower_name"}) + constraint.validate(model, invalid_product, exclude={"name"}) + + @skipUnlessDBFeature("supports_stored_generated_columns") + def test_validate_fields_generated_field_stored_nulls_distinct(self): + self.assertGeneratedFieldNullsDistinctIsValidated( + model=GeneratedFieldStoredProduct + ) + + @skipUnlessDBFeature("supports_virtual_generated_columns") + def test_validate_fields_generated_field_virtual_nulls_distinct(self): + self.assertGeneratedFieldNullsDistinctIsValidated( + model=GeneratedFieldVirtualProduct + ) + + def assertGeneratedFieldNullsDistinctIsValidated(self, model): + constraint = models.UniqueConstraint( + fields=["lower_name"], + name="lower_name_unique_nulls_distinct", + nulls_distinct=False, + ) + model.objects.create(name=None) + valid_product = model(name="Box") + constraint.validate(model, valid_product) + + invalid_product = model(name=None) + msg = str(invalid_product.unique_error_message(model, ["lower_name"])) + with self.assertRaisesMessage(ValidationError, msg): + constraint.validate(model, invalid_product) + @skipUnlessDBFeature("supports_table_check_constraints") def test_validate_nullable_textfield_with_isnull_true(self): is_null_constraint = models.UniqueConstraint( @@ -1070,6 +1212,7 @@ class UniqueConstraintTests(TestCase): is_not_null_constraint.validate(Product, Product(price=4, discounted_price=3)) is_not_null_constraint.validate(Product, Product(price=2, discounted_price=1)) + @skipUnlessDBFeature("supports_table_check_constraints") def test_validate_nulls_distinct_fields(self): Product.objects.create(price=42) constraint = models.UniqueConstraint( @@ -1083,6 +1226,7 @@ class UniqueConstraintTests(TestCase): with self.assertRaisesMessage(ValidationError, msg): constraint.validate(Product, Product(price=None)) + @skipUnlessDBFeature("supports_table_check_constraints") def test_validate_nulls_distinct_expressions(self): Product.objects.create(price=42) constraint = models.UniqueConstraint( @@ -1262,3 +1406,30 @@ class UniqueConstraintTests(TestCase): msg = "A unique constraint must be named." with self.assertRaisesMessage(ValueError, msg): models.UniqueConstraint(fields=["field"]) + + def test_database_default(self): + models.UniqueConstraint( + fields=["field_with_db_default"], name="unique_field_with_db_default" + ).validate(ModelWithDatabaseDefault, ModelWithDatabaseDefault()) + models.UniqueConstraint( + Upper("field_with_db_default"), + name="unique_field_with_db_default_expression", + ).validate(ModelWithDatabaseDefault, ModelWithDatabaseDefault()) + + ModelWithDatabaseDefault.objects.create() + + msg = ( + "Model with database default with this Field with db default already " + "exists." + ) + with self.assertRaisesMessage(ValidationError, msg): + models.UniqueConstraint( + fields=["field_with_db_default"], name="unique_field_with_db_default" + ).validate(ModelWithDatabaseDefault, ModelWithDatabaseDefault()) + + msg = "Constraint “unique_field_with_db_default_expression” is violated." + with self.assertRaisesMessage(ValidationError, msg): + models.UniqueConstraint( + Upper("field_with_db_default"), + name="unique_field_with_db_default_expression", + ).validate(ModelWithDatabaseDefault, ModelWithDatabaseDefault()) diff --git a/tests/contenttypes_tests/test_fields.py b/tests/contenttypes_tests/test_fields.py index 15f1dafd63..ab16324fb6 100644 --- a/tests/contenttypes_tests/test_fields.py +++ b/tests/contenttypes_tests/test_fields.py @@ -98,8 +98,9 @@ class GetPrefetchQuerySetDeprecation(TestCase): "get_prefetch_queryset() is deprecated. Use get_prefetch_querysets() " "instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: questions[0].answer_set.get_prefetch_queryset(questions) + self.assertEqual(ctx.filename, __file__) def test_generic_foreign_key_warning(self): answers = Answer.objects.all() @@ -107,8 +108,9 @@ class GetPrefetchQuerySetDeprecation(TestCase): "get_prefetch_queryset() is deprecated. Use get_prefetch_querysets() " "instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Answer.question.get_prefetch_queryset(answers) + self.assertEqual(ctx.filename, __file__) class GetPrefetchQuerySetsTests(TestCase): diff --git a/tests/decorators/tests.py b/tests/decorators/tests.py index 58f822f2a5..1f8d623e02 100644 --- a/tests/decorators/tests.py +++ b/tests/decorators/tests.py @@ -1,6 +1,9 @@ +import asyncio from functools import update_wrapper, wraps from unittest import TestCase +from asgiref.sync import iscoroutinefunction + from django.contrib.admin.views.decorators import staff_member_required from django.contrib.auth.decorators import ( login_required, @@ -434,3 +437,262 @@ class MethodDecoratorTests(SimpleTestCase): Test().method() self.assertEqual(func_name, "method") self.assertIsNotNone(func_module) + + +def async_simple_dec(func): + @wraps(func) + async def wrapper(*args, **kwargs): + result = await func(*args, **kwargs) + return f"returned: {result}" + + return wrapper + + +async_simple_dec_m = method_decorator(async_simple_dec) + + +class AsyncMethodDecoratorTests(SimpleTestCase): + """ + Tests for async method_decorator + """ + + async def test_preserve_signature(self): + class Test: + @async_simple_dec_m + async def say(self, msg): + return f"Saying {msg}" + + self.assertEqual(await Test().say("hello"), "returned: Saying hello") + + def test_preserve_attributes(self): + async def func(*args, **kwargs): + await asyncio.sleep(0.01) + return args, kwargs + + def myattr_dec(func): + async def wrapper(*args, **kwargs): + return await func(*args, **kwargs) + + wrapper.myattr = True + return wrapper + + def myattr2_dec(func): + async def wrapper(*args, **kwargs): + return await func(*args, **kwargs) + + wrapper.myattr2 = True + return wrapper + + # Sanity check myattr_dec and myattr2_dec + func = myattr_dec(func) + + self.assertIs(getattr(func, "myattr", False), True) + + func = myattr2_dec(func) + self.assertIs(getattr(func, "myattr2", False), True) + + func = myattr_dec(myattr2_dec(func)) + self.assertIs(getattr(func, "myattr", False), True) + self.assertIs(getattr(func, "myattr2", False), False) + + myattr_dec_m = method_decorator(myattr_dec) + myattr2_dec_m = method_decorator(myattr2_dec) + + # Decorate using method_decorator() on the async method. + class TestPlain: + @myattr_dec_m + @myattr2_dec_m + async def method(self): + "A method" + + # Decorate using method_decorator() on both the class and the method. + # The decorators applied to the methods are applied before the ones + # applied to the class. + @method_decorator(myattr_dec_m, "method") + class TestMethodAndClass: + @method_decorator(myattr2_dec_m) + async def method(self): + "A method" + + # Decorate using an iterable of function decorators. + @method_decorator((myattr_dec, myattr2_dec), "method") + class TestFunctionIterable: + async def method(self): + "A method" + + # Decorate using an iterable of method decorators. + @method_decorator((myattr_dec_m, myattr2_dec_m), "method") + class TestMethodIterable: + async def method(self): + "A method" + + tests = ( + TestPlain, + TestMethodAndClass, + TestFunctionIterable, + TestMethodIterable, + ) + for Test in tests: + with self.subTest(Test=Test): + self.assertIs(getattr(Test().method, "myattr", False), True) + self.assertIs(getattr(Test().method, "myattr2", False), True) + self.assertIs(getattr(Test.method, "myattr", False), True) + self.assertIs(getattr(Test.method, "myattr2", False), True) + self.assertEqual(Test.method.__doc__, "A method") + self.assertEqual(Test.method.__name__, "method") + + async def test_new_attribute(self): + """A decorator that sets a new attribute on the method.""" + + def decorate(func): + func.x = 1 + return func + + class MyClass: + @method_decorator(decorate) + async def method(self): + return True + + obj = MyClass() + self.assertEqual(obj.method.x, 1) + self.assertIs(await obj.method(), True) + + def test_bad_iterable(self): + decorators = {async_simple_dec} + msg = "'set' object is not subscriptable" + with self.assertRaisesMessage(TypeError, msg): + + @method_decorator(decorators, "method") + class TestIterable: + async def method(self): + await asyncio.sleep(0.01) + + async def test_argumented(self): + + class ClsDecAsync: + def __init__(self, myattr): + self.myattr = myattr + + def __call__(self, f): + async def wrapper(): + result = await f() + return f"{result} appending {self.myattr}" + + return update_wrapper(wrapper, f) + + class Test: + @method_decorator(ClsDecAsync(False)) + async def method(self): + return True + + self.assertEqual(await Test().method(), "True appending False") + + async def test_descriptors(self): + class bound_wrapper: + def __init__(self, wrapped): + self.wrapped = wrapped + self.__name__ = wrapped.__name__ + + async def __call__(self, *args, **kwargs): + return await self.wrapped(*args, **kwargs) + + def __get__(self, instance, cls=None): + return self + + class descriptor_wrapper: + def __init__(self, wrapped): + self.wrapped = wrapped + self.__name__ = wrapped.__name__ + + def __get__(self, instance, cls=None): + return bound_wrapper(self.wrapped.__get__(instance, cls)) + + class Test: + @async_simple_dec_m + @descriptor_wrapper + async def method(self, arg): + return arg + + self.assertEqual(await Test().method(1), "returned: 1") + + async def test_class_decoration(self): + """ + @method_decorator can be used to decorate a class and its methods. + """ + + @method_decorator(async_simple_dec, name="method") + class Test: + async def method(self): + return False + + async def not_method(self): + return "a string" + + self.assertEqual(await Test().method(), "returned: False") + self.assertEqual(await Test().not_method(), "a string") + + async def test_tuple_of_decorators(self): + """ + @method_decorator can accept a tuple of decorators. + """ + + def add_question_mark(func): + async def _wrapper(*args, **kwargs): + await asyncio.sleep(0.01) + return await func(*args, **kwargs) + "?" + + return _wrapper + + def add_exclamation_mark(func): + async def _wrapper(*args, **kwargs): + await asyncio.sleep(0.01) + return await func(*args, **kwargs) + "!" + + return _wrapper + + decorators = (add_exclamation_mark, add_question_mark) + + @method_decorator(decorators, name="method") + class TestFirst: + async def method(self): + return "hello world" + + class TestSecond: + @method_decorator(decorators) + async def method(self): + return "world hello" + + self.assertEqual(await TestFirst().method(), "hello world?!") + self.assertEqual(await TestSecond().method(), "world hello?!") + + async def test_wrapper_assignments(self): + """@method_decorator preserves wrapper assignments.""" + func_data = {} + + def decorator(func): + @wraps(func) + async def inner(*args, **kwargs): + func_data["func_name"] = getattr(func, "__name__", None) + func_data["func_module"] = getattr(func, "__module__", None) + return await func(*args, **kwargs) + + return inner + + class Test: + @method_decorator(decorator) + async def method(self): + return "tests" + + await Test().method() + expected = {"func_name": "method", "func_module": "decorators.tests"} + self.assertEqual(func_data, expected) + + async def test_markcoroutinefunction_applied(self): + class Test: + @async_simple_dec_m + async def method(self): + return "tests" + + method = Test().method + self.assertIs(iscoroutinefunction(method), True) + self.assertEqual(await method(), "returned: tests") diff --git a/tests/deprecation/test_middleware_mixin.py b/tests/deprecation/test_middleware_mixin.py index f4eafc14e3..7e86832e2b 100644 --- a/tests/deprecation/test_middleware_mixin.py +++ b/tests/deprecation/test_middleware_mixin.py @@ -6,7 +6,6 @@ from django.contrib.admindocs.middleware import XViewMiddleware from django.contrib.auth.middleware import ( AuthenticationMiddleware, LoginRequiredMiddleware, - RemoteUserMiddleware, ) from django.contrib.flatpages.middleware import FlatpageFallbackMiddleware from django.contrib.messages.middleware import MessageMiddleware @@ -48,7 +47,6 @@ class MiddlewareMixinTests(SimpleTestCase): LocaleMiddleware, MessageMiddleware, RedirectFallbackMiddleware, - RemoteUserMiddleware, SecurityMiddleware, SessionMiddleware, UpdateCacheMiddleware, diff --git a/tests/deprecation/tests.py b/tests/deprecation/tests.py index 5548e90285..66f6a4d922 100644 --- a/tests/deprecation/tests.py +++ b/tests/deprecation/tests.py @@ -20,12 +20,14 @@ class RenameMethodsTests(SimpleTestCase): the faulty method. """ msg = "`Manager.old` method should be renamed `new`." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: class Manager(metaclass=RenameManagerMethods): def old(self): pass + self.assertEqual(ctx.filename, __file__) + def test_get_new_defined(self): """ Ensure `old` complains and not `new` when only `new` is defined. @@ -43,20 +45,23 @@ class RenameMethodsTests(SimpleTestCase): self.assertEqual(len(recorded), 0) msg = "`Manager.old` is deprecated, use `new` instead." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: manager.old() + self.assertEqual(ctx.filename, __file__) def test_get_old_defined(self): """ Ensure `old` complains when only `old` is defined. """ msg = "`Manager.old` method should be renamed `new`." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: class Manager(metaclass=RenameManagerMethods): def old(self): pass + self.assertEqual(ctx.filename, __file__) + manager = Manager() with warnings.catch_warnings(record=True) as recorded: @@ -65,8 +70,9 @@ class RenameMethodsTests(SimpleTestCase): self.assertEqual(len(recorded), 0) msg = "`Manager.old` is deprecated, use `new` instead." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: manager.old() + self.assertEqual(ctx.filename, __file__) def test_deprecated_subclass_renamed(self): """ @@ -79,21 +85,25 @@ class RenameMethodsTests(SimpleTestCase): pass msg = "`Deprecated.old` method should be renamed `new`." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: class Deprecated(Renamed): def old(self): super().old() + self.assertEqual(ctx.filename, __file__) + deprecated = Deprecated() msg = "`Renamed.old` is deprecated, use `new` instead." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: deprecated.new() + self.assertEqual(ctx.filename, __file__) msg = "`Deprecated.old` is deprecated, use `new` instead." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: deprecated.old() + self.assertEqual(ctx.filename, __file__) def test_renamed_subclass_deprecated(self): """ @@ -101,12 +111,14 @@ class RenameMethodsTests(SimpleTestCase): `old` subclass one that didn't. """ msg = "`Deprecated.old` method should be renamed `new`." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: class Deprecated(metaclass=RenameManagerMethods): def old(self): pass + self.assertEqual(ctx.filename, __file__) + class Renamed(Deprecated): def new(self): super().new() @@ -119,8 +131,9 @@ class RenameMethodsTests(SimpleTestCase): self.assertEqual(len(recorded), 0) msg = "`Renamed.old` is deprecated, use `new` instead." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: renamed.old() + self.assertEqual(ctx.filename, __file__) def test_deprecated_subclass_renamed_and_mixins(self): """ @@ -142,20 +155,24 @@ class RenameMethodsTests(SimpleTestCase): super().old() msg = "`DeprecatedMixin.old` method should be renamed `new`." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: class Deprecated(DeprecatedMixin, RenamedMixin, Renamed): pass + self.assertEqual(ctx.filename, __file__) + deprecated = Deprecated() msg = "`RenamedMixin.old` is deprecated, use `new` instead." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: deprecated.new() + self.assertEqual(ctx.filename, __file__) msg = "`DeprecatedMixin.old` is deprecated, use `new` instead." - with self.assertWarnsMessage(DeprecationWarning, msg): + with self.assertWarnsMessage(DeprecationWarning, msg) as ctx: deprecated.old() + self.assertEqual(ctx.filename, __file__) def test_removedafternextversionwarning_pending(self): self.assertTrue( diff --git a/tests/expressions/models.py b/tests/expressions/models.py index 31891a13d7..3909bdf0cd 100644 --- a/tests/expressions/models.py +++ b/tests/expressions/models.py @@ -115,3 +115,10 @@ class UUID(models.Model): class Text(models.Model): name = models.TextField() + + +class JSONFieldModel(models.Model): + data = models.JSONField(null=True) + + class Meta: + required_db_features = {"supports_json_field"} diff --git a/tests/expressions/test_queryset_values.py b/tests/expressions/test_queryset_values.py index 80addef37b..47bd1358de 100644 --- a/tests/expressions/test_queryset_values.py +++ b/tests/expressions/test_queryset_values.py @@ -1,7 +1,7 @@ from django.db.models import F, Sum -from django.test import TestCase +from django.test import TestCase, skipUnlessDBFeature -from .models import Company, Employee +from .models import Company, Employee, JSONFieldModel class ValuesExpressionsTests(TestCase): @@ -43,6 +43,19 @@ class ValuesExpressionsTests(TestCase): with self.assertRaisesMessage(ValueError, msg): Company.objects.values(**{crafted_alias: F("ceo__salary")}) + @skipUnlessDBFeature("supports_json_field") + def test_values_expression_alias_sql_injection_json_field(self): + crafted_alias = """injected_name" from "expressions_company"; --""" + msg = ( + "Column aliases cannot contain whitespace characters, quotation marks, " + "semicolons, or SQL comments." + ) + with self.assertRaisesMessage(ValueError, msg): + JSONFieldModel.objects.values(f"data__{crafted_alias}") + + with self.assertRaisesMessage(ValueError, msg): + JSONFieldModel.objects.values_list(f"data__{crafted_alias}") + def test_values_expression_group_by(self): # values() applies annotate() first, so values selected are grouped by # id, not firstname. diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 64103f14db..af4cf01fca 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -47,6 +47,7 @@ from django.db.models import ( ) from django.db.models.expressions import ( Col, + ColPairs, Combinable, CombinedExpression, NegatedExpression, @@ -208,24 +209,28 @@ class BasicExpressionsTests(TestCase): def _test_slicing_of_f_expressions(self, model): tests = [ - (F("name")[:], "Example Inc.", "Example Inc."), - (F("name")[:7], "Example Inc.", "Example"), - (F("name")[:6][:5], "Example", "Examp"), # Nested slicing. - (F("name")[0], "Examp", "E"), - (F("name")[5], "E", ""), - (F("name")[7:], "Foobar Ltd.", "Ltd."), - (F("name")[0:10], "Ltd.", "Ltd."), - (F("name")[2:7], "Test GmbH", "st Gm"), - (F("name")[1:][:3], "st Gm", "t G"), - (F("name")[2:2], "t G", ""), + (F("name")[:], "Example Inc."), + (F("name")[:7], "Example"), + (F("name")[:6][:5], "Examp"), # Nested slicing. + (F("name")[0], "E"), + (F("name")[13], ""), + (F("name")[8:], "Inc."), + (F("name")[0:15], "Example Inc."), + (F("name")[2:7], "ample"), + (F("name")[1:][:3], "xam"), + (F("name")[2:2], ""), ] - for expression, name, expected in tests: - with self.subTest(expression=expression, name=name, expected=expected): - obj = model.objects.get(name=name) - obj.name = expression - obj.save() - obj.refresh_from_db() - self.assertEqual(obj.name, expected) + for expression, expected in tests: + with self.subTest(expression=expression, expected=expected): + obj = model.objects.get(name="Example Inc.") + try: + obj.name = expression + obj.save(update_fields=["name"]) + obj.refresh_from_db() + self.assertEqual(obj.name, expected) + finally: + obj.name = "Example Inc." + obj.save(update_fields=["name"]) def test_slicing_of_f_expressions_charfield(self): self._test_slicing_of_f_expressions(Company) @@ -2311,11 +2316,6 @@ class ValueTests(TestCase): self.assertNotEqual(value, other_value) self.assertNotEqual(value, no_output_field) - def test_raise_empty_expressionlist(self): - msg = "ExpressionList requires at least one expression" - with self.assertRaisesMessage(ValueError, msg): - ExpressionList() - def test_compile_unresolved(self): # This test might need to be revisited later on if #25425 is enforced. compiler = Time.objects.all().query.get_compiler(connection=connection) @@ -2467,6 +2467,10 @@ class ReprTests(SimpleTestCase): " THEN Value('legal')>", ) self.assertEqual(repr(Col("alias", "field")), "Col(alias, field)") + self.assertEqual( + repr(ColPairs("alias", ["t1", "t2"], ["s1", "s2"], "f")), + "ColPairs('alias', ['t1', 't2'], ['s1', 's2'], 'f')", + ) self.assertEqual(repr(F("published")), "F(published)") self.assertEqual( repr(F("cost") + F("tax")), "" diff --git a/tests/expressions_window/tests.py b/tests/expressions_window/tests.py index fd674e319b..fd9858ccf9 100644 --- a/tests/expressions_window/tests.py +++ b/tests/expressions_window/tests.py @@ -928,6 +928,20 @@ class WindowFunctionTests(TestCase): ), ) + def test_empty_ordering(self): + """ + Explicit empty ordering makes little sense but it is something that + was historically allowed. + """ + qs = Employee.objects.annotate( + sum=Window( + expression=Sum("salary"), + partition_by="department", + order_by=[], + ) + ).order_by("department", "sum") + self.assertEqual(len(qs), 12) + def test_related_ordering_with_count(self): qs = Employee.objects.annotate( department_sum=Window( diff --git a/tests/file_storage/models.py b/tests/file_storage/models.py index 873c3e176a..cb0207cae9 100644 --- a/tests/file_storage/models.py +++ b/tests/file_storage/models.py @@ -72,6 +72,9 @@ class Storage(models.Model): default = models.FileField( storage=temp_storage, upload_to="tests", default="tests/default.txt" ) + db_default = models.FileField( + storage=temp_storage, upload_to="tests", db_default="tests/db_default.txt" + ) empty = models.FileField(storage=temp_storage) limited_length = models.FileField( storage=temp_storage, upload_to="tests", max_length=20 diff --git a/tests/file_storage/test_generate_filename.py b/tests/file_storage/test_generate_filename.py index 9631705fc8..483115e09c 100644 --- a/tests/file_storage/test_generate_filename.py +++ b/tests/file_storage/test_generate_filename.py @@ -80,11 +80,14 @@ class GenerateFilenameStorageTests(SimpleTestCase): ("", ""), ] s = FileSystemStorage() + s_overwrite = FileSystemStorage(allow_overwrite=True) msg = "Could not derive file name from '%s'" for file_name, base_name in candidates: with self.subTest(file_name=file_name): with self.assertRaisesMessage(SuspiciousFileOperation, msg % base_name): s.get_available_name(file_name) + with self.assertRaisesMessage(SuspiciousFileOperation, msg % base_name): + s_overwrite.get_available_name(file_name) with self.assertRaisesMessage(SuspiciousFileOperation, msg % base_name): s.generate_filename(file_name) @@ -98,11 +101,14 @@ class GenerateFilenameStorageTests(SimpleTestCase): ("\\tmp\\..\\path", "/tmp/.."), ] s = FileSystemStorage() + s_overwrite = FileSystemStorage(allow_overwrite=True) for file_name, path in candidates: msg = "Detected path traversal attempt in '%s'" % path with self.subTest(file_name=file_name): with self.assertRaisesMessage(SuspiciousFileOperation, msg): s.get_available_name(file_name) + with self.assertRaisesMessage(SuspiciousFileOperation, msg): + s_overwrite.get_available_name(file_name) with self.assertRaisesMessage(SuspiciousFileOperation, msg): s.generate_filename(file_name) diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py index 38d87dc7f2..5f0024b81a 100644 --- a/tests/file_storage/tests.py +++ b/tests/file_storage/tests.py @@ -95,18 +95,18 @@ class FileStorageTests(SimpleTestCase): """ Standard file access options are available, and work as expected. """ - self.assertFalse(os.path.exists(os.path.join(self.temp_dir, "storage_test"))) + self.assertFalse(self.storage.exists("storage_test")) f = self.storage.open("storage_test", "w") f.write("storage contents") f.close() - self.assertTrue(os.path.exists(os.path.join(self.temp_dir, "storage_test"))) + self.assertTrue(self.storage.exists("storage_test")) f = self.storage.open("storage_test", "r") self.assertEqual(f.read(), "storage contents") f.close() self.storage.delete("storage_test") - self.assertFalse(os.path.exists(os.path.join(self.temp_dir, "storage_test"))) + self.assertFalse(self.storage.exists("storage_test")) def _test_file_time_getter(self, getter): # Check for correct behavior under both USE_TZ=True and USE_TZ=False. @@ -275,10 +275,10 @@ class FileStorageTests(SimpleTestCase): """ Saving a pathname should create intermediate directories as necessary. """ - self.assertFalse(os.path.exists(os.path.join(self.temp_dir, "path/to"))) + self.assertFalse(self.storage.exists("path/to")) self.storage.save("path/to/test.file", ContentFile("file saved with path")) - self.assertTrue(os.path.exists(os.path.join(self.temp_dir, "path/to"))) + self.assertTrue(self.storage.exists("path/to")) with self.storage.open("path/to/test.file") as f: self.assertEqual(f.read(), b"file saved with path") @@ -635,10 +635,11 @@ class OverwritingStorageOSOpenFlagsWarningTests(SimpleTestCase): def test_os_open_flags_deprecation_warning(self): msg = "Overriding OS_OPEN_FLAGS is deprecated. Use the allow_overwrite " msg += "parameter instead." - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: self.storage = self.storage_class( location=self.temp_dir, base_url="/test_media_url/" ) + self.assertEqual(ctx.filename, __file__) # RemovedInDjango60Warning: Remove this test class. @@ -692,12 +693,12 @@ class OverwritingStorageTests(FileStorageTests): stored_name_1 = self.storage.save(name, f_1) try: self.assertEqual(stored_name_1, name) - self.assertTrue(os.path.exists(os.path.join(self.temp_dir, name))) + self.assertTrue(self.storage.exists(name)) with self.storage.open(name) as fp: self.assertEqual(fp.read(), content_1) stored_name_2 = self.storage.save(name, f_2) self.assertEqual(stored_name_2, name) - self.assertTrue(os.path.exists(os.path.join(self.temp_dir, name))) + self.assertTrue(self.storage.exists(name)) with self.storage.open(name) as fp: self.assertEqual(fp.read(), content_2) finally: @@ -729,6 +730,22 @@ class OverwritingStorageTests(FileStorageTests): finally: self.storage.delete(name) + def test_file_name_truncation(self): + name = "test_long_file_name.txt" + file = ContentFile(b"content") + stored_name = self.storage.save(name, file, max_length=10) + self.addCleanup(self.storage.delete, stored_name) + self.assertEqual(stored_name, "test_l.txt") + self.assertEqual(len(stored_name), 10) + + def test_file_name_truncation_extension_too_long(self): + name = "file_name.longext" + file = ContentFile(b"content") + with self.assertRaisesMessage( + SuspiciousFileOperation, "Storage can not find an available filename" + ): + self.storage.save(name, file, max_length=5) + class DiscardingFalseContentStorage(FileSystemStorage): def _save(self, name, content): @@ -755,7 +772,8 @@ class DiscardingFalseContentStorageTests(FileStorageTests): class FileFieldStorageTests(TestCase): def tearDown(self): - shutil.rmtree(temp_storage_location) + if os.path.exists(temp_storage_location): + shutil.rmtree(temp_storage_location) def _storage_max_filename_length(self, storage): """ @@ -928,6 +946,20 @@ class FileFieldStorageTests(TestCase): self.assertEqual(obj.default.read(), b"default content") obj.default.close() + def test_filefield_db_default(self): + temp_storage.save("tests/db_default.txt", ContentFile("default content")) + obj = Storage.objects.create() + self.assertEqual(obj.db_default.name, "tests/db_default.txt") + self.assertEqual(obj.db_default.read(), b"default content") + obj.db_default.close() + + # File is not deleted, even if there are no more objects using it. + obj.delete() + s = Storage() + self.assertEqual(s.db_default.name, "tests/db_default.txt") + self.assertEqual(s.db_default.read(), b"default content") + s.db_default.close() + def test_empty_upload_to(self): # upload_to can be empty, meaning it does not use subdirectory. obj = Storage() @@ -994,6 +1026,23 @@ class FileFieldStorageTests(TestCase): with temp_storage.open("tests/stringio") as f: self.assertEqual(f.read(), b"content") + @override_settings( + STORAGES={ + DEFAULT_STORAGE_ALIAS: { + "BACKEND": "django.core.files.storage.InMemoryStorage" + } + } + ) + def test_create_file_field_from_another_file_field_in_memory_storage(self): + f = ContentFile("content", "file.txt") + obj = Storage.objects.create(storage_callable_default=f) + new_obj = Storage.objects.create( + storage_callable_default=obj.storage_callable_default.file + ) + storage = callable_default_storage() + with storage.open(new_obj.storage_callable_default.name) as f: + self.assertEqual(f.read(), b"content") + class FieldCallableFileStorageTests(SimpleTestCase): def setUp(self): diff --git a/tests/fixtures_regress/fixtures/sequence_empty_lines_jsonl.jsonl b/tests/fixtures_regress/fixtures/sequence_empty_lines_jsonl.jsonl new file mode 100644 index 0000000000..c8ac372cab --- /dev/null +++ b/tests/fixtures_regress/fixtures/sequence_empty_lines_jsonl.jsonl @@ -0,0 +1,3 @@ + + +{"pk": "1", "model": "fixtures_regress.animal", "fields": {"name": "Eagle", "latin_name": "Aquila", "count": 3, "weight": 1.2}} diff --git a/tests/fixtures_regress/fixtures/sequence_extra_jsonl.jsonl b/tests/fixtures_regress/fixtures/sequence_extra_jsonl.jsonl new file mode 100644 index 0000000000..6644eaf95d --- /dev/null +++ b/tests/fixtures_regress/fixtures/sequence_extra_jsonl.jsonl @@ -0,0 +1,2 @@ +{"pk": "1", "model": "fixtures_regress.animal", "fields": {"name": "Eagle", "extra_name": "Super Eagle", "latin_name": "Aquila", "count": 3, "weight": 1.2}} +{"pk": "1", "model": "fixtures_regress.animal_extra", "fields": {"name": "Nonexistent model", "extra_name": "test for ticket #29522", "latin_name": "Aquila", "count": 3, "weight": 1.2}} diff --git a/tests/fixtures_regress/fixtures/sequence_extra_yaml.yaml b/tests/fixtures_regress/fixtures/sequence_extra_yaml.yaml new file mode 100644 index 0000000000..760b2d4275 --- /dev/null +++ b/tests/fixtures_regress/fixtures/sequence_extra_yaml.yaml @@ -0,0 +1,17 @@ +- pk: "1" + model: fixtures_regress.animal + fields: + name: Cat + extra_name: Super Cat + latin_name: Felis catus + count: 3 + weight: 1.2 + +- pk: "1" + model: fixtures_regress.animal_extra + fields: + name: Nonexistent model + extra_name: test for ticket \#29522 + latin_name: Felis catus + count: 3 + weight: 1.2 diff --git a/tests/fixtures_regress/tests.py b/tests/fixtures_regress/tests.py index 54d7cac50a..4a982c7262 100644 --- a/tests/fixtures_regress/tests.py +++ b/tests/fixtures_regress/tests.py @@ -2,6 +2,7 @@ import json import os import re +import unittest from io import StringIO from pathlib import Path @@ -55,6 +56,13 @@ from .models import ( Widget, ) +try: + import yaml # NOQA + + HAS_YAML = True +except ImportError: + HAS_YAML = False + _cur_dir = os.path.dirname(os.path.abspath(__file__)) @@ -96,12 +104,22 @@ class TestFixtures(TestCase): the serialized data for fields that have been removed from the database when not ignored. """ - with self.assertRaises(DeserializationError): - management.call_command( - "loaddata", - "sequence_extra", - verbosity=0, - ) + test_fixtures = [ + "sequence_extra", + "sequence_extra_jsonl", + ] + if HAS_YAML: + test_fixtures.append("sequence_extra_yaml") + for fixture_file in test_fixtures: + with ( + self.subTest(fixture_file=fixture_file), + self.assertRaises(DeserializationError), + ): + management.call_command( + "loaddata", + fixture_file, + verbosity=0, + ) def test_loaddata_not_found_fields_ignore(self): """ @@ -130,6 +148,33 @@ class TestFixtures(TestCase): ) self.assertEqual(Animal.specimens.all()[0].name, "Wolf") + def test_loaddata_not_found_fields_ignore_jsonl(self): + management.call_command( + "loaddata", + "sequence_extra_jsonl", + ignore=True, + verbosity=0, + ) + self.assertEqual(Animal.specimens.all()[0].name, "Eagle") + + @unittest.skipUnless(HAS_YAML, "No yaml library detected") + def test_loaddata_not_found_fields_ignore_yaml(self): + management.call_command( + "loaddata", + "sequence_extra_yaml", + ignore=True, + verbosity=0, + ) + self.assertEqual(Animal.specimens.all()[0].name, "Cat") + + def test_loaddata_empty_lines_jsonl(self): + management.call_command( + "loaddata", + "sequence_empty_lines_jsonl.jsonl", + verbosity=0, + ) + self.assertEqual(Animal.specimens.all()[0].name, "Eagle") + @skipIfDBFeature("interprets_empty_strings_as_nulls") def test_pretty_print_xml(self): """ diff --git a/tests/foreign_object/models/person.py b/tests/foreign_object/models/person.py index 33063e728a..f0848e6c3e 100644 --- a/tests/foreign_object/models/person.py +++ b/tests/foreign_object/models/person.py @@ -49,7 +49,7 @@ class Group(models.Model): class Membership(models.Model): # Table Column Fields - membership_country = models.ForeignKey(Country, models.CASCADE) + membership_country = models.ForeignKey(Country, models.CASCADE, null=True) date_joined = models.DateTimeField(default=datetime.datetime.now) invite_reason = models.CharField(max_length=64, null=True) person_id = models.IntegerField() diff --git a/tests/foreign_object/test_tuple_lookups.py b/tests/foreign_object/test_tuple_lookups.py new file mode 100644 index 0000000000..e2561676f3 --- /dev/null +++ b/tests/foreign_object/test_tuple_lookups.py @@ -0,0 +1,383 @@ +import unittest + +from django.db import NotSupportedError, connection +from django.db.models import F +from django.db.models.fields.tuple_lookups import ( + TupleExact, + TupleGreaterThan, + TupleGreaterThanOrEqual, + TupleIn, + TupleIsNull, + TupleLessThan, + TupleLessThanOrEqual, +) +from django.test import TestCase + +from .models import Contact, Customer + + +class TupleLookupsTests(TestCase): + @classmethod + def setUpTestData(cls): + super().setUpTestData() + cls.customer_1 = Customer.objects.create(customer_id=1, company="a") + cls.customer_2 = Customer.objects.create(customer_id=1, company="b") + cls.customer_3 = Customer.objects.create(customer_id=2, company="c") + cls.customer_4 = Customer.objects.create(customer_id=3, company="d") + cls.customer_5 = Customer.objects.create(customer_id=1, company="e") + cls.contact_1 = Contact.objects.create(customer=cls.customer_1) + cls.contact_2 = Contact.objects.create(customer=cls.customer_1) + cls.contact_3 = Contact.objects.create(customer=cls.customer_2) + cls.contact_4 = Contact.objects.create(customer=cls.customer_3) + cls.contact_5 = Contact.objects.create(customer=cls.customer_1) + cls.contact_6 = Contact.objects.create(customer=cls.customer_5) + + def test_exact(self): + test_cases = ( + (self.customer_1, (self.contact_1, self.contact_2, self.contact_5)), + (self.customer_2, (self.contact_3,)), + (self.customer_3, (self.contact_4,)), + (self.customer_4, ()), + (self.customer_5, (self.contact_6,)), + ) + + for customer, contacts in test_cases: + with self.subTest( + "filter(customer=customer)", + customer=customer, + contacts=contacts, + ): + self.assertSequenceEqual( + Contact.objects.filter(customer=customer).order_by("id"), contacts + ) + with self.subTest( + "filter(TupleExact)", + customer=customer, + contacts=contacts, + ): + lhs = (F("customer_code"), F("company_code")) + rhs = (customer.customer_id, customer.company) + lookup = TupleExact(lhs, rhs) + self.assertSequenceEqual( + Contact.objects.filter(lookup).order_by("id"), contacts + ) + + def test_exact_subquery(self): + with self.assertRaisesMessage( + NotSupportedError, "'exact' doesn't support multi-column subqueries." + ): + subquery = Customer.objects.filter(id=self.customer_1.id)[:1] + self.assertSequenceEqual( + Contact.objects.filter(customer=subquery).order_by("id"), () + ) + + def test_in(self): + cust_1, cust_2, cust_3, cust_4, cust_5 = ( + self.customer_1, + self.customer_2, + self.customer_3, + self.customer_4, + self.customer_5, + ) + c1, c2, c3, c4, c5, c6 = ( + self.contact_1, + self.contact_2, + self.contact_3, + self.contact_4, + self.contact_5, + self.contact_6, + ) + test_cases = ( + ((), ()), + ((cust_1,), (c1, c2, c5)), + ((cust_1, cust_2), (c1, c2, c3, c5)), + ((cust_1, cust_2, cust_3), (c1, c2, c3, c4, c5)), + ((cust_1, cust_2, cust_3, cust_4), (c1, c2, c3, c4, c5)), + ((cust_1, cust_2, cust_3, cust_4, cust_5), (c1, c2, c3, c4, c5, c6)), + ) + + for customers, contacts in test_cases: + with self.subTest( + "filter(customer__in=customers)", + customers=customers, + contacts=contacts, + ): + self.assertSequenceEqual( + Contact.objects.filter(customer__in=customers).order_by("id"), + contacts, + ) + with self.subTest( + "filter(TupleIn)", + customers=customers, + contacts=contacts, + ): + lhs = (F("customer_code"), F("company_code")) + rhs = [(c.customer_id, c.company) for c in customers] + lookup = TupleIn(lhs, rhs) + self.assertSequenceEqual( + Contact.objects.filter(lookup).order_by("id"), contacts + ) + + @unittest.skipIf( + connection.vendor == "mysql", + "MySQL doesn't support LIMIT & IN/ALL/ANY/SOME subquery", + ) + def test_in_subquery(self): + subquery = Customer.objects.filter(id=self.customer_1.id)[:1] + self.assertSequenceEqual( + Contact.objects.filter(customer__in=subquery).order_by("id"), + (self.contact_1, self.contact_2, self.contact_5), + ) + + def test_lt(self): + c1, c2, c3, c4, c5, c6 = ( + self.contact_1, + self.contact_2, + self.contact_3, + self.contact_4, + self.contact_5, + self.contact_6, + ) + test_cases = ( + (self.customer_1, ()), + (self.customer_2, (c1, c2, c5)), + (self.customer_5, (c1, c2, c3, c5)), + (self.customer_3, (c1, c2, c3, c5, c6)), + (self.customer_4, (c1, c2, c3, c4, c5, c6)), + ) + + for customer, contacts in test_cases: + with self.subTest( + "filter(customer__lt=customer)", + customer=customer, + contacts=contacts, + ): + self.assertSequenceEqual( + Contact.objects.filter(customer__lt=customer).order_by("id"), + contacts, + ) + with self.subTest( + "filter(TupleLessThan)", + customer=customer, + contacts=contacts, + ): + lhs = (F("customer_code"), F("company_code")) + rhs = (customer.customer_id, customer.company) + lookup = TupleLessThan(lhs, rhs) + self.assertSequenceEqual( + Contact.objects.filter(lookup).order_by("id"), contacts + ) + + def test_lt_subquery(self): + with self.assertRaisesMessage( + NotSupportedError, "'lt' doesn't support multi-column subqueries." + ): + subquery = Customer.objects.filter(id=self.customer_1.id)[:1] + self.assertSequenceEqual( + Contact.objects.filter(customer__lt=subquery).order_by("id"), () + ) + + def test_lte(self): + c1, c2, c3, c4, c5, c6 = ( + self.contact_1, + self.contact_2, + self.contact_3, + self.contact_4, + self.contact_5, + self.contact_6, + ) + test_cases = ( + (self.customer_1, (c1, c2, c5)), + (self.customer_2, (c1, c2, c3, c5)), + (self.customer_5, (c1, c2, c3, c5, c6)), + (self.customer_3, (c1, c2, c3, c4, c5, c6)), + (self.customer_4, (c1, c2, c3, c4, c5, c6)), + ) + + for customer, contacts in test_cases: + with self.subTest( + "filter(customer__lte=customer)", + customer=customer, + contacts=contacts, + ): + self.assertSequenceEqual( + Contact.objects.filter(customer__lte=customer).order_by("id"), + contacts, + ) + with self.subTest( + "filter(TupleLessThanOrEqual)", + customer=customer, + contacts=contacts, + ): + lhs = (F("customer_code"), F("company_code")) + rhs = (customer.customer_id, customer.company) + lookup = TupleLessThanOrEqual(lhs, rhs) + self.assertSequenceEqual( + Contact.objects.filter(lookup).order_by("id"), contacts + ) + + def test_lte_subquery(self): + with self.assertRaisesMessage( + NotSupportedError, "'lte' doesn't support multi-column subqueries." + ): + subquery = Customer.objects.filter(id=self.customer_1.id)[:1] + self.assertSequenceEqual( + Contact.objects.filter(customer__lte=subquery).order_by("id"), () + ) + + def test_gt(self): + test_cases = ( + (self.customer_1, (self.contact_3, self.contact_4, self.contact_6)), + (self.customer_2, (self.contact_4, self.contact_6)), + (self.customer_5, (self.contact_4,)), + (self.customer_3, ()), + (self.customer_4, ()), + ) + + for customer, contacts in test_cases: + with self.subTest( + "filter(customer__gt=customer)", + customer=customer, + contacts=contacts, + ): + self.assertSequenceEqual( + Contact.objects.filter(customer__gt=customer).order_by("id"), + contacts, + ) + with self.subTest( + "filter(TupleGreaterThan)", + customer=customer, + contacts=contacts, + ): + lhs = (F("customer_code"), F("company_code")) + rhs = (customer.customer_id, customer.company) + lookup = TupleGreaterThan(lhs, rhs) + self.assertSequenceEqual( + Contact.objects.filter(lookup).order_by("id"), contacts + ) + + def test_gt_subquery(self): + with self.assertRaisesMessage( + NotSupportedError, "'gt' doesn't support multi-column subqueries." + ): + subquery = Customer.objects.filter(id=self.customer_1.id)[:1] + self.assertSequenceEqual( + Contact.objects.filter(customer__gt=subquery).order_by("id"), () + ) + + def test_gte(self): + c1, c2, c3, c4, c5, c6 = ( + self.contact_1, + self.contact_2, + self.contact_3, + self.contact_4, + self.contact_5, + self.contact_6, + ) + test_cases = ( + (self.customer_1, (c1, c2, c3, c4, c5, c6)), + (self.customer_2, (c3, c4, c6)), + (self.customer_5, (c4, c6)), + (self.customer_3, (c4,)), + (self.customer_4, ()), + ) + + for customer, contacts in test_cases: + with self.subTest( + "filter(customer__gte=customer)", + customer=customer, + contacts=contacts, + ): + self.assertSequenceEqual( + Contact.objects.filter(customer__gte=customer).order_by("pk"), + contacts, + ) + with self.subTest( + "filter(TupleGreaterThanOrEqual)", + customer=customer, + contacts=contacts, + ): + lhs = (F("customer_code"), F("company_code")) + rhs = (customer.customer_id, customer.company) + lookup = TupleGreaterThanOrEqual(lhs, rhs) + self.assertSequenceEqual( + Contact.objects.filter(lookup).order_by("id"), contacts + ) + + def test_gte_subquery(self): + with self.assertRaisesMessage( + NotSupportedError, "'gte' doesn't support multi-column subqueries." + ): + subquery = Customer.objects.filter(id=self.customer_1.id)[:1] + self.assertSequenceEqual( + Contact.objects.filter(customer__gte=subquery).order_by("id"), () + ) + + def test_isnull(self): + contacts = ( + self.contact_1, + self.contact_2, + self.contact_3, + self.contact_4, + self.contact_5, + self.contact_6, + ) + + with self.subTest("filter(customer__isnull=True)"): + self.assertSequenceEqual( + Contact.objects.filter(customer__isnull=True).order_by("id"), + (), + ) + with self.subTest("filter(TupleIsNull(True))"): + lhs = (F("customer_code"), F("company_code")) + lookup = TupleIsNull(lhs, True) + self.assertSequenceEqual( + Contact.objects.filter(lookup).order_by("id"), + (), + ) + with self.subTest("filter(customer__isnull=False)"): + self.assertSequenceEqual( + Contact.objects.filter(customer__isnull=False).order_by("id"), + contacts, + ) + with self.subTest("filter(TupleIsNull(False))"): + lhs = (F("customer_code"), F("company_code")) + lookup = TupleIsNull(lhs, False) + self.assertSequenceEqual( + Contact.objects.filter(lookup).order_by("id"), + contacts, + ) + + def test_isnull_subquery(self): + with self.assertRaisesMessage( + NotSupportedError, "'isnull' doesn't support multi-column subqueries." + ): + subquery = Customer.objects.filter(id=0)[:1] + self.assertSequenceEqual( + Contact.objects.filter(customer__isnull=subquery).order_by("id"), () + ) + + def test_lookup_errors(self): + m_2_elements = "'%s' lookup of 'customer' field must have 2 elements" + m_2_elements_each = "'in' lookup of 'customer' field must have 2 elements each" + test_cases = ( + ({"customer": 1}, m_2_elements % "exact"), + ({"customer": (1, 2, 3)}, m_2_elements % "exact"), + ({"customer__in": (1, 2, 3)}, m_2_elements_each), + ({"customer__in": ("foo", "bar")}, m_2_elements_each), + ({"customer__gt": 1}, m_2_elements % "gt"), + ({"customer__gt": (1, 2, 3)}, m_2_elements % "gt"), + ({"customer__gte": 1}, m_2_elements % "gte"), + ({"customer__gte": (1, 2, 3)}, m_2_elements % "gte"), + ({"customer__lt": 1}, m_2_elements % "lt"), + ({"customer__lt": (1, 2, 3)}, m_2_elements % "lt"), + ({"customer__lte": 1}, m_2_elements % "lte"), + ({"customer__lte": (1, 2, 3)}, m_2_elements % "lte"), + ) + + for kwargs, message in test_cases: + with ( + self.subTest(kwargs=kwargs), + self.assertRaisesMessage(ValueError, message), + ): + Contact.objects.get(**kwargs) diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py index 2d3aa800f7..e288ecd7d4 100644 --- a/tests/foreign_object/tests.py +++ b/tests/foreign_object/tests.py @@ -516,18 +516,35 @@ class MultiColumnFKTests(TestCase): def test_isnull_lookup(self): m1 = Membership.objects.create( - membership_country=self.usa, person=self.bob, group_id=None + person_id=self.bob.id, + membership_country_id=self.usa.id, + group_id=None, ) m2 = Membership.objects.create( - membership_country=self.usa, person=self.bob, group=self.cia + person_id=self.jim.id, + membership_country_id=None, + group_id=self.cia.id, ) + m3 = Membership.objects.create( + person_id=self.jane.id, + membership_country_id=None, + group_id=None, + ) + m4 = Membership.objects.create( + person_id=self.george.id, + membership_country_id=self.soviet_union.id, + group_id=self.kgb.id, + ) + for member in [m1, m2, m3]: + with self.assertRaises(Membership.group.RelatedObjectDoesNotExist): + getattr(member, "group") self.assertSequenceEqual( Membership.objects.filter(group__isnull=True), - [m1], + [m1, m2, m3], ) self.assertSequenceEqual( Membership.objects.filter(group__isnull=False), - [m2], + [m4], ) @@ -703,24 +720,27 @@ class GetJoiningDeprecationTests(TestCase): "ForeignObject.get_joining_columns() is deprecated. Use " "get_joining_fields() instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Membership.person.field.get_joining_columns() + self.assertEqual(ctx.filename, __file__) def test_foreign_object_get_reverse_joining_columns_warning(self): msg = ( "ForeignObject.get_reverse_joining_columns() is deprecated. Use " "get_reverse_joining_fields() instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Membership.person.field.get_reverse_joining_columns() + self.assertEqual(ctx.filename, __file__) def test_foreign_object_rel_get_joining_columns_warning(self): msg = ( "ForeignObjectRel.get_joining_columns() is deprecated. Use " "get_joining_fields() instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Membership.person.field.remote_field.get_joining_columns() + self.assertEqual(ctx.filename, __file__) def test_join_get_joining_columns_warning(self): class CustomForeignKey(models.ForeignKey): diff --git a/tests/forms_tests/field_tests/test_urlfield.py b/tests/forms_tests/field_tests/test_urlfield.py index 8ba7842064..54bc7c5e46 100644 --- a/tests/forms_tests/field_tests/test_urlfield.py +++ b/tests/forms_tests/field_tests/test_urlfield.py @@ -163,9 +163,10 @@ class URLFieldAssumeSchemeDeprecationTest(FormFieldAssertionsMixin, SimpleTestCa "or set the FORMS_URLFIELD_ASSUME_HTTPS transitional setting to True to " "opt into using 'https' as the new default scheme." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: f = URLField() self.assertEqual(f.clean("example.com"), "http://example.com") + self.assertEqual(ctx.filename, __file__) @ignore_warnings(category=RemovedInDjango60Warning) def test_urlfield_forms_urlfield_assume_https(self): diff --git a/tests/forms_tests/tests/test_renderers.py b/tests/forms_tests/tests/test_renderers.py index dbde6df49d..3c1d8bb8ea 100644 --- a/tests/forms_tests/tests/test_renderers.py +++ b/tests/forms_tests/tests/test_renderers.py @@ -64,16 +64,18 @@ class DeprecationTests(SimpleTestCase): "The DjangoDivFormRenderer transitional form renderer is deprecated. Use " "DjangoTemplates instead." ) - with self.assertRaisesMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: DjangoDivFormRenderer() + self.assertEqual(ctx.filename, __file__) def test_jinja2_div_renderer_warning(self): msg = ( "The Jinja2DivFormRenderer transitional form renderer is deprecated. Use " "Jinja2 instead." ) - with self.assertRaisesMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Jinja2DivFormRenderer() + self.assertEqual(ctx.filename, __file__) @ignore_warnings(category=RemovedInDjango60Warning) def test_deprecation_renderers_can_be_instantiated(self): diff --git a/tests/forms_tests/widget_tests/test_colorinput.py b/tests/forms_tests/widget_tests/test_colorinput.py new file mode 100644 index 0000000000..f316534bfa --- /dev/null +++ b/tests/forms_tests/widget_tests/test_colorinput.py @@ -0,0 +1,15 @@ +from django.forms import ColorInput + +from .base import WidgetTest + + +class ColorInputTest(WidgetTest): + widget = ColorInput() + + def test_render(self): + self.check_html( + self.widget, + "color", + "", + html="", + ) diff --git a/tests/forms_tests/widget_tests/test_searchinput.py b/tests/forms_tests/widget_tests/test_searchinput.py new file mode 100644 index 0000000000..b11ffaaa82 --- /dev/null +++ b/tests/forms_tests/widget_tests/test_searchinput.py @@ -0,0 +1,12 @@ +from django.forms import SearchInput + +from .base import WidgetTest + + +class SearchInputTest(WidgetTest): + widget = SearchInput() + + def test_render(self): + self.check_html( + self.widget, "search", "", html='' + ) diff --git a/tests/forms_tests/widget_tests/test_telinput.py b/tests/forms_tests/widget_tests/test_telinput.py new file mode 100644 index 0000000000..1477f153d1 --- /dev/null +++ b/tests/forms_tests/widget_tests/test_telinput.py @@ -0,0 +1,12 @@ +from django.forms import TelInput + +from .base import WidgetTest + + +class TelInputTest(WidgetTest): + widget = TelInput() + + def test_render(self): + self.check_html( + self.widget, "telephone", "", html='' + ) diff --git a/tests/gis_tests/gdal_tests/test_geom.py b/tests/gis_tests/gdal_tests/test_geom.py index 3967b945a4..5c23a6f2cf 100644 --- a/tests/gis_tests/gdal_tests/test_geom.py +++ b/tests/gis_tests/gdal_tests/test_geom.py @@ -972,6 +972,7 @@ class DeprecationTests(SimpleTestCase): def test_coord_setter_deprecation(self): geom = OGRGeometry("POINT (1 2)") msg = "coord_dim setter is deprecated. Use set_3d() instead." - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: geom.coord_dim = 3 self.assertEqual(geom.coord_dim, 3) + self.assertEqual(ctx.filename, __file__) diff --git a/tests/gis_tests/gis_migrations/test_operations.py b/tests/gis_tests/gis_migrations/test_operations.py index 3ecde2025e..98201ed3f7 100644 --- a/tests/gis_tests/gis_migrations/test_operations.py +++ b/tests/gis_tests/gis_migrations/test_operations.py @@ -92,6 +92,20 @@ class OperationTestCase(TransactionTestCase): else: self.assertIn([column], [c["columns"] for c in constraints.values()]) + def assertSpatialIndexNotExists(self, table, column, raster=False): + with connection.cursor() as cursor: + constraints = connection.introspection.get_constraints(cursor, table) + if raster: + self.assertFalse( + any( + "st_convexhull(%s)" % column in c["definition"] + for c in constraints.values() + if c["definition"] is not None + ) + ) + else: + self.assertNotIn([column], [c["columns"] for c in constraints.values()]) + def alter_gis_model( self, migration_class, @@ -239,6 +253,102 @@ class OperationTests(OperationTestCase): if connection.features.supports_raster: self.assertSpatialIndexExists("gis_neighborhood", "rast", raster=True) + @skipUnlessDBFeature("can_alter_geometry_field") + def test_alter_field_add_spatial_index(self): + if not self.has_spatial_indexes: + self.skipTest("No support for Spatial indexes") + + self.alter_gis_model( + migrations.AddField, + "Neighborhood", + "point", + fields.PointField, + field_class_kwargs={"spatial_index": False}, + ) + self.assertSpatialIndexNotExists("gis_neighborhood", "point") + + self.alter_gis_model( + migrations.AlterField, + "Neighborhood", + "point", + fields.PointField, + field_class_kwargs={"spatial_index": True}, + ) + self.assertSpatialIndexExists("gis_neighborhood", "point") + + @skipUnlessDBFeature("can_alter_geometry_field") + def test_alter_field_remove_spatial_index(self): + if not self.has_spatial_indexes: + self.skipTest("No support for Spatial indexes") + + self.assertSpatialIndexExists("gis_neighborhood", "geom") + + self.alter_gis_model( + migrations.AlterField, + "Neighborhood", + "geom", + fields.MultiPolygonField, + field_class_kwargs={"spatial_index": False}, + ) + self.assertSpatialIndexNotExists("gis_neighborhood", "geom") + + @skipUnlessDBFeature("can_alter_geometry_field") + @skipUnless(connection.vendor == "mysql", "MySQL specific test") + def test_alter_field_nullable_with_spatial_index(self): + if not self.has_spatial_indexes: + self.skipTest("No support for Spatial indexes") + + self.alter_gis_model( + migrations.AddField, + "Neighborhood", + "point", + fields.PointField, + field_class_kwargs={"spatial_index": False, "null": True}, + ) + # MySQL doesn't support spatial indexes on NULL columns. + self.assertSpatialIndexNotExists("gis_neighborhood", "point") + + self.alter_gis_model( + migrations.AlterField, + "Neighborhood", + "point", + fields.PointField, + field_class_kwargs={"spatial_index": True, "null": True}, + ) + self.assertSpatialIndexNotExists("gis_neighborhood", "point") + + self.alter_gis_model( + migrations.AlterField, + "Neighborhood", + "point", + fields.PointField, + field_class_kwargs={"spatial_index": False, "null": True}, + ) + self.assertSpatialIndexNotExists("gis_neighborhood", "point") + + @skipUnlessDBFeature("can_alter_geometry_field") + def test_alter_field_with_spatial_index(self): + if not self.has_spatial_indexes: + self.skipTest("No support for Spatial indexes") + + self.alter_gis_model( + migrations.AddField, + "Neighborhood", + "point", + fields.PointField, + field_class_kwargs={"spatial_index": True}, + ) + self.assertSpatialIndexExists("gis_neighborhood", "point") + + self.alter_gis_model( + migrations.AlterField, + "Neighborhood", + "point", + fields.PointField, + field_class_kwargs={"spatial_index": True, "srid": 3086}, + ) + self.assertSpatialIndexExists("gis_neighborhood", "point") + @skipUnlessDBFeature("supports_3d_storage") def test_add_3d_field_opclass(self): if not connection.ops.postgis: diff --git a/tests/gis_tests/test_geoip2.py b/tests/gis_tests/test_geoip2.py index 12837725c9..11c73bec0c 100644 --- a/tests/gis_tests/test_geoip2.py +++ b/tests/gis_tests/test_geoip2.py @@ -207,16 +207,18 @@ class GeoLite2Test(SimpleTestCase): def test_coords_deprecation_warning(self): g = GeoIP2() msg = "GeoIP2.coords() is deprecated. Use GeoIP2.lon_lat() instead." - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: e1, e2 = g.coords(self.ipv4_str) self.assertIsInstance(e1, float) self.assertIsInstance(e2, float) + self.assertEqual(ctx.filename, __file__) def test_open_deprecation_warning(self): msg = "GeoIP2.open() is deprecated. Use GeoIP2() instead." - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: g = GeoIP2.open(settings.GEOIP_PATH, GeoIP2.MODE_AUTO) self.assertTrue(g._reader) + self.assertEqual(ctx.filename, __file__) @skipUnless(HAS_GEOIP2, "GeoIP2 is required.") diff --git a/tests/handlers/tests.py b/tests/handlers/tests.py index ffa362abdd..e73fc15195 100644 --- a/tests/handlers/tests.py +++ b/tests/handlers/tests.py @@ -258,8 +258,9 @@ class HandlerRequestTests(SimpleTestCase): "StreamingHttpResponse must consume asynchronous iterators in order to " "serve them synchronously. Use a synchronous iterator instead." ) - with self.assertWarnsMessage(Warning, msg): + with self.assertWarnsMessage(Warning, msg) as ctx: self.assertEqual(b"".join(list(response)), b"streaming content") + self.assertEqual(ctx.filename, __file__) class ScriptNameTests(SimpleTestCase): @@ -350,10 +351,11 @@ class AsyncHandlerRequestTests(SimpleTestCase): "StreamingHttpResponse must consume synchronous iterators in order to " "serve them asynchronously. Use an asynchronous iterator instead." ) - with self.assertWarnsMessage(Warning, msg): + with self.assertWarnsMessage(Warning, msg) as ctx: self.assertEqual( b"".join([chunk async for chunk in response]), b"streaming content" ) + self.assertEqual(ctx.filename, __file__) async def test_async_streaming(self): response = await self.async_client.get("/async_streaming/") diff --git a/tests/i18n/test_compilation.py b/tests/i18n/test_compilation.py index 7da95ba9e9..7b02776dbe 100644 --- a/tests/i18n/test_compilation.py +++ b/tests/i18n/test_compilation.py @@ -8,7 +8,6 @@ from subprocess import run from unittest import mock from django.core.management import CommandError, call_command, execute_from_command_line -from django.core.management.commands.makemessages import Command as MakeMessagesCommand from django.core.management.utils import find_command from django.test import SimpleTestCase, override_settings from django.test.utils import captured_stderr, captured_stdout @@ -269,9 +268,6 @@ class CompilationErrorHandling(MessageCompilationTests): "django.core.management.utils.run", lambda *args, **kwargs: run(*args, env=env, **kwargs), ): - cmd = MakeMessagesCommand() - if cmd.gettext_version < (0, 18, 3): - self.skipTest("python-brace-format is a recent gettext addition.") stderr = StringIO() with self.assertRaisesMessage( CommandError, "compilemessages generated one or more errors" diff --git a/tests/i18n/test_extraction.py b/tests/i18n/test_extraction.py index 226d51ce11..7aa600c4c1 100644 --- a/tests/i18n/test_extraction.py +++ b/tests/i18n/test_extraction.py @@ -6,7 +6,7 @@ import time import warnings from io import StringIO from pathlib import Path -from unittest import mock, skipIf, skipUnless +from unittest import mock, skipUnless from admin_scripts.tests import AdminScriptTestCase @@ -25,10 +25,6 @@ from .utils import POFileAssertionMixin, RunInTmpDirMixin, copytree LOCALE = "de" has_xgettext = find_command("xgettext") -gettext_version = MakeMessagesCommand().gettext_version if has_xgettext else None -requires_gettext_019 = skipIf( - has_xgettext and gettext_version < (0, 19), "gettext 0.19 required" -) @skipUnless(has_xgettext, "xgettext is mandatory for extraction tests") @@ -836,7 +832,6 @@ class LocationCommentsTests(ExtractorTests): self.assertLocationCommentNotPresent(self.PO_FILE, None, ".html.py") self.assertLocationCommentPresent(self.PO_FILE, 5, "templates", "test.html") - @requires_gettext_019 def test_add_location_full(self): """makemessages --add-location=full""" management.call_command( @@ -848,7 +843,6 @@ class LocationCommentsTests(ExtractorTests): self.PO_FILE, "Translatable literal #6b", "templates", "test.html" ) - @requires_gettext_019 def test_add_location_file(self): """makemessages --add-location=file""" management.call_command( @@ -862,7 +856,6 @@ class LocationCommentsTests(ExtractorTests): self.PO_FILE, "Translatable literal #6b", "templates", "test.html" ) - @requires_gettext_019 def test_add_location_never(self): """makemessages --add-location=never""" management.call_command( @@ -871,24 +864,6 @@ class LocationCommentsTests(ExtractorTests): self.assertTrue(os.path.exists(self.PO_FILE)) self.assertLocationCommentNotPresent(self.PO_FILE, None, "test.html") - @mock.patch( - "django.core.management.commands.makemessages.Command.gettext_version", - new=(0, 18, 99), - ) - def test_add_location_gettext_version_check(self): - """ - CommandError is raised when using makemessages --add-location with - gettext < 0.19. - """ - msg = ( - "The --add-location option requires gettext 0.19 or later. You have " - "0.18.99." - ) - with self.assertRaisesMessage(CommandError, msg): - management.call_command( - "makemessages", locale=[LOCALE], verbosity=0, add_location="full" - ) - class NoObsoleteExtractorTests(ExtractorTests): work_subdir = "obsolete_translations" diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index 1bd1dadf93..1f50ba1112 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -8,7 +8,7 @@ import tempfile from contextlib import contextmanager from importlib import import_module from pathlib import Path -from unittest import mock +from unittest import mock, skipUnless from asgiref.local import Local @@ -17,6 +17,7 @@ from django.apps import AppConfig from django.conf import settings from django.conf.locale import LANG_INFO from django.conf.urls.i18n import i18n_patterns +from django.core.management.utils import find_command, popen_wrapper from django.template import Context, Template from django.test import RequestFactory, SimpleTestCase, TestCase, override_settings from django.utils import translation @@ -99,7 +100,7 @@ class TranslationTests(SimpleTestCase): ) self.assertEqual( ngettext("%(num)d year", "%(num)d years", 2) % {"num": 2}, - "2 années", + "2 ans", ) self.assertEqual( ngettext("%(size)d byte", "%(size)d bytes", 0) % {"size": 0}, "0 octet" @@ -130,6 +131,49 @@ class TranslationTests(SimpleTestCase): self.assertEqual(french._catalog[("%d singular", 0)], "%d singulier") self.assertEqual(french._catalog[("%(num)d hour", 0)], "%(num)d heure") + @translation.override("fr") + @skipUnless(find_command("msgfmt"), "msgfmt is mandatory for this test") + def test_multiple_plurals_merge(self): + def _create_translation_from_string(content): + with tempfile.TemporaryDirectory() as dirname: + po_path = Path(dirname).joinpath("fr", "LC_MESSAGES", "django.po") + po_path.parent.mkdir(parents=True) + po_path.write_text(content) + errors = popen_wrapper( + ["msgfmt", "-o", po_path.with_suffix(".mo"), po_path] + )[1] + if errors: + self.fail(f"msgfmt compilation error: {errors}") + return gettext_module.translation( + domain="django", + localedir=dirname, + languages=["fr"], + ) + + french = trans_real.catalog() + # Merge a new translation file with different plural forms. + catalog1 = _create_translation_from_string( + 'msgid ""\n' + 'msgstr ""\n' + '"Content-Type: text/plain; charset=UTF-8\\n"\n' + '"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 ? 1 : 2);\\n"\n' + 'msgid "I win"\n' + 'msgstr "Je perds"\n' + ) + french.merge(catalog1) + # Merge a second translation file with plural forms from django.conf. + catalog2 = _create_translation_from_string( + 'msgid ""\n' + 'msgstr ""\n' + '"Content-Type: text/plain; charset=UTF-8\\n"\n' + '"Plural-Forms: Plural-Forms: nplurals=2; plural=(n > 1);\\n"\n' + 'msgid "I win"\n' + 'msgstr "Je gagne"\n' + ) + french.merge(catalog2) + # Translations from this last one are supposed to win. + self.assertEqual(french.gettext("I win"), "Je gagne") + def test_override(self): activate("de") try: @@ -1673,14 +1717,13 @@ class MiscTests(SimpleTestCase): g("xyz") with self.assertRaises(LookupError): g("xy-zz") - msg = "'lang_code' exceeds the maximum accepted length" with self.assertRaises(LookupError): g("x" * LANGUAGE_CODE_MAX_LENGTH) - with self.assertRaisesMessage(ValueError, msg): + with self.assertRaises(LookupError): g("x" * (LANGUAGE_CODE_MAX_LENGTH + 1)) # 167 * 3 = 501 which is LANGUAGE_CODE_MAX_LENGTH + 1. self.assertEqual(g("en-" * 167), "en") - with self.assertRaisesMessage(ValueError, msg): + with self.assertRaises(LookupError): g("en-" * 167, strict=True) self.assertEqual(g("en-" * 30000), "en") # catastrophic test @@ -1734,6 +1777,7 @@ class MiscTests(SimpleTestCase): ("/i-mingo/", "i-mingo"), ("/kl-tunumiit/", "kl-tunumiit"), ("/nan-hani-tw/", "nan-hani-tw"), + (f"/{'a' * 501}/", None), ] for path, language in tests: with self.subTest(path=path): @@ -2009,6 +2053,11 @@ class CountrySpecificLanguageTests(SimpleTestCase): lang = get_language_from_request(request) self.assertEqual("bg", lang) + def test_get_language_from_request_code_too_long(self): + request = self.rf.get("/", headers={"accept-language": "a" * 501}) + lang = get_language_from_request(request) + self.assertEqual("en-us", lang) + def test_get_language_from_request_null(self): lang = trans_null.get_language_from_request(None) self.assertEqual(lang, "en") diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py index 28acd72874..df96546d04 100644 --- a/tests/lookup/tests.py +++ b/tests/lookup/tests.py @@ -24,6 +24,7 @@ from django.db.models.lookups import ( Exact, GreaterThan, GreaterThanOrEqual, + In, IsNull, LessThan, LessThanOrEqual, @@ -327,6 +328,13 @@ class LookupTests(TestCase): with self.assertRaisesMessage(TypeError, msg): Article.objects.all()[0:5].in_bulk([self.a1.id, self.a2.id]) + def test_in_bulk_not_model_iterable(self): + msg = "in_bulk() cannot be used with values() or values_list()." + with self.assertRaisesMessage(TypeError, msg): + Author.objects.values().in_bulk() + with self.assertRaisesMessage(TypeError, msg): + Author.objects.values_list().in_bulk() + def test_values(self): # values() returns a list of dictionaries instead of object instances -- # and you can specify which fields you want to retrieve. @@ -1504,6 +1512,25 @@ class LookupQueryingTests(TestCase): [self.s1, self.s3], ) + def test_in_lookup_in_filter(self): + test_cases = [ + ((), ()), + ((1942,), (self.s1,)), + ((1842,), (self.s2,)), + ((2042,), (self.s3,)), + ((1942, 1842), (self.s1, self.s2)), + ((1942, 2042), (self.s1, self.s3)), + ((1842, 2042), (self.s2, self.s3)), + ((1942, 1942, 1942), (self.s1,)), + ((1942, 2042, 1842), (self.s1, self.s2, self.s3)), + ] + + for years, seasons in test_cases: + with self.subTest(years=years, seasons=seasons): + self.assertSequenceEqual( + Season.objects.filter(In(F("year"), years)).order_by("pk"), seasons + ) + def test_filter_lookup_lhs(self): qs = Season.objects.annotate(before_20=LessThan(F("year"), 2000)).filter( before_20=LessThan(F("year"), 1900), diff --git a/tests/mail/custombackend.py b/tests/mail/custombackend.py index 14e7f077ba..c63f1c07b5 100644 --- a/tests/mail/custombackend.py +++ b/tests/mail/custombackend.py @@ -12,3 +12,9 @@ class EmailBackend(BaseEmailBackend): # Messages are stored in an instance variable for testing. self.test_outbox.extend(email_messages) return len(email_messages) + + +class FailingEmailBackend(BaseEmailBackend): + + def send_messages(self, email_messages): + raise ValueError("FailingEmailBackend is doomed to fail.") diff --git a/tests/mail/tests.py b/tests/mail/tests.py index a0d28eb0ce..6280bfa5c8 100644 --- a/tests/mail/tests.py +++ b/tests/mail/tests.py @@ -17,6 +17,8 @@ from unittest import mock, skipUnless from django.core import mail from django.core.mail import ( DNS_NAME, + EmailAlternative, + EmailAttachment, EmailMessage, EmailMultiAlternatives, mail_admins, @@ -557,12 +559,50 @@ class MailTests(HeadersCheckMixin, SimpleTestCase): mime_type = "text/html" msg.attach_alternative(html_content, mime_type) + self.assertIsInstance(msg.alternatives[0], EmailAlternative) + self.assertEqual(msg.alternatives[0][0], html_content) self.assertEqual(msg.alternatives[0].content, html_content) self.assertEqual(msg.alternatives[0][1], mime_type) self.assertEqual(msg.alternatives[0].mimetype, mime_type) + self.assertIn(html_content, msg.message().as_string()) + + def test_alternatives_constructor(self): + html_content = "

    This is html

    " + mime_type = "text/html" + + msg = EmailMultiAlternatives( + alternatives=[EmailAlternative(html_content, mime_type)] + ) + + self.assertIsInstance(msg.alternatives[0], EmailAlternative) + + self.assertEqual(msg.alternatives[0][0], html_content) + self.assertEqual(msg.alternatives[0].content, html_content) + + self.assertEqual(msg.alternatives[0][1], mime_type) + self.assertEqual(msg.alternatives[0].mimetype, mime_type) + + self.assertIn(html_content, msg.message().as_string()) + + def test_alternatives_constructor_from_tuple(self): + html_content = "

    This is html

    " + mime_type = "text/html" + + msg = EmailMultiAlternatives(alternatives=[(html_content, mime_type)]) + + self.assertIsInstance(msg.alternatives[0], EmailAlternative) + + self.assertEqual(msg.alternatives[0][0], html_content) + self.assertEqual(msg.alternatives[0].content, html_content) + + self.assertEqual(msg.alternatives[0][1], mime_type) + self.assertEqual(msg.alternatives[0].mimetype, mime_type) + + self.assertIn(html_content, msg.message().as_string()) + def test_none_body(self): msg = EmailMessage("subject", None, "from@example.com", ["to@example.com"]) self.assertEqual(msg.body, "") @@ -654,6 +694,51 @@ class MailTests(HeadersCheckMixin, SimpleTestCase): self.assertEqual(msg.attachments[0][2], mime_type) self.assertEqual(msg.attachments[0].mimetype, mime_type) + attachments = self.get_decoded_attachments(msg) + self.assertEqual(attachments[0], (file_name, file_content.encode(), mime_type)) + + def test_attachments_constructor(self): + file_name = "example.txt" + file_content = "Text file content" + mime_type = "text/plain" + msg = EmailMessage( + attachments=[EmailAttachment(file_name, file_content, mime_type)] + ) + + self.assertIsInstance(msg.attachments[0], EmailAttachment) + + self.assertEqual(msg.attachments[0][0], file_name) + self.assertEqual(msg.attachments[0].filename, file_name) + + self.assertEqual(msg.attachments[0][1], file_content) + self.assertEqual(msg.attachments[0].content, file_content) + + self.assertEqual(msg.attachments[0][2], mime_type) + self.assertEqual(msg.attachments[0].mimetype, mime_type) + + attachments = self.get_decoded_attachments(msg) + self.assertEqual(attachments[0], (file_name, file_content.encode(), mime_type)) + + def test_attachments_constructor_from_tuple(self): + file_name = "example.txt" + file_content = "Text file content" + mime_type = "text/plain" + msg = EmailMessage(attachments=[(file_name, file_content, mime_type)]) + + self.assertIsInstance(msg.attachments[0], EmailAttachment) + + self.assertEqual(msg.attachments[0][0], file_name) + self.assertEqual(msg.attachments[0].filename, file_name) + + self.assertEqual(msg.attachments[0][1], file_content) + self.assertEqual(msg.attachments[0].content, file_content) + + self.assertEqual(msg.attachments[0][2], mime_type) + self.assertEqual(msg.attachments[0].mimetype, mime_type) + + attachments = self.get_decoded_attachments(msg) + self.assertEqual(attachments[0], (file_name, file_content.encode(), mime_type)) + def test_decoded_attachments(self): """Regression test for #9367""" headers = {"Date": "Fri, 09 Nov 2001 01:08:47 -0000", "Message-ID": "foo"} diff --git a/tests/many_to_many/tests.py b/tests/many_to_many/tests.py index 351e4eb8cc..c17ed0258c 100644 --- a/tests/many_to_many/tests.py +++ b/tests/many_to_many/tests.py @@ -583,8 +583,9 @@ class ManyToManyTests(TestCase): "get_prefetch_queryset() is deprecated. Use get_prefetch_querysets() " "instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: self.a1.publications.get_prefetch_queryset(articles) + self.assertEqual(ctx.filename, __file__) def test_get_prefetch_querysets_invalid_querysets_length(self): articles = Article.objects.all() diff --git a/tests/many_to_one/tests.py b/tests/many_to_one/tests.py index ac5b35e055..e7dd0f229f 100644 --- a/tests/many_to_one/tests.py +++ b/tests/many_to_one/tests.py @@ -894,8 +894,9 @@ class ManyToOneTests(TestCase): "get_prefetch_queryset() is deprecated. Use get_prefetch_querysets() " "instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: City.country.get_prefetch_queryset(cities) + self.assertEqual(ctx.filename, __file__) def test_get_prefetch_queryset_reverse_warning(self): usa = Country.objects.create(name="United States") @@ -905,8 +906,9 @@ class ManyToOneTests(TestCase): "get_prefetch_queryset() is deprecated. Use get_prefetch_querysets() " "instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: usa.cities.get_prefetch_queryset(countries) + self.assertEqual(ctx.filename, __file__) def test_get_prefetch_querysets_invalid_querysets_length(self): City.objects.create(name="Chicago") diff --git a/tests/messages_tests/tests.py b/tests/messages_tests/tests.py index 19aeee9a08..3f5cd56e85 100644 --- a/tests/messages_tests/tests.py +++ b/tests/messages_tests/tests.py @@ -1,5 +1,7 @@ import importlib import sys +import traceback +import unittest from unittest import mock from django.conf import settings @@ -185,3 +187,17 @@ class AssertMessagesTest(MessagesTestMixin, SimpleTestCase): ) with self.assertRaisesMessage(AssertionError, msg): self.assertMessages(response, []) + + def test_method_frames_ignored_by_unittest(self): + response = FakeResponse() + try: + self.assertMessages(response, [object()]) + except AssertionError: + exc_type, exc, tb = sys.exc_info() + + result = unittest.TestResult() + result.addFailure(self, (exc_type, exc, tb)) + stack = traceback.extract_tb(exc.__traceback__) + self.assertEqual(len(stack), 1) + # Top element in the stack is this method, not assertMessages. + self.assertEqual(stack[-1].name, "test_method_frames_ignored_by_unittest") diff --git a/tests/migration_test_data_persistence/tests.py b/tests/migration_test_data_persistence/tests.py index 862a06c4a5..a04259bba1 100644 --- a/tests/migration_test_data_persistence/tests.py +++ b/tests/migration_test_data_persistence/tests.py @@ -1,3 +1,4 @@ +from django.core.management import call_command from django.test import TestCase, TransactionTestCase from .models import Book @@ -19,6 +20,26 @@ class MigrationDataPersistenceTestCase(TransactionTestCase): ) +class MigrationDataPersistenceClassSetup(TransactionTestCase): + """ + Data loaded in migrations is available during class setup if + TransactionTestCase.serialized_rollback = True. + """ + + available_apps = ["migration_test_data_persistence"] + serialized_rollback = True + + @classmethod + def setUpClass(cls): + # Simulate another TransactionTestCase having just torn down. + call_command("flush", verbosity=0, interactive=False) + super().setUpClass() + cls.book = Book.objects.first() + + def test_data_available_in_class_setup(self): + self.assertIsInstance(self.book, Book) + + class MigrationDataNormalPersistenceTestCase(TestCase): """ Data loaded in migrations is available on TestCase diff --git a/tests/migrations/migrations_test_apps/without_init_file/migrations/.keep b/tests/migrations/migrations_test_apps/distributed_app_location_1/namespace_app/migrations/.gitkeep similarity index 100% rename from tests/migrations/migrations_test_apps/without_init_file/migrations/.keep rename to tests/migrations/migrations_test_apps/distributed_app_location_1/namespace_app/migrations/.gitkeep diff --git a/tests/migrations/migrations_test_apps/distributed_app_location_2/namespace_app/migrations/.gitkeep b/tests/migrations/migrations_test_apps/distributed_app_location_2/namespace_app/migrations/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/migrations/migrations_test_apps/without_init_file/migrations/.gitkeep b/tests/migrations/migrations_test_apps/without_init_file/migrations/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/migrations/test_base.py b/tests/migrations/test_base.py index 0ff1dda1d9..cde4063d04 100644 --- a/tests/migrations/test_base.py +++ b/tests/migrations/test_base.py @@ -7,9 +7,11 @@ from importlib import import_module from django.apps import apps from django.db import connection, connections, migrations, models from django.db.migrations.migration import Migration +from django.db.migrations.optimizer import MigrationOptimizer from django.db.migrations.recorder import MigrationRecorder +from django.db.migrations.serializer import serializer_factory from django.db.migrations.state import ProjectState -from django.test import TransactionTestCase +from django.test import SimpleTestCase, TransactionTestCase from django.test.utils import extend_sys_path from django.utils.module_loading import module_dir @@ -400,3 +402,38 @@ class OperationTestBase(MigrationTestBase): ) ) return self.apply_operations(app_label, ProjectState(), operations) + + +class OptimizerTestBase(SimpleTestCase): + """Common functions to help test the optimizer.""" + + def optimize(self, operations, app_label): + """ + Handy shortcut for getting results + number of loops + """ + optimizer = MigrationOptimizer() + return optimizer.optimize(operations, app_label), optimizer._iterations + + def serialize(self, value): + return serializer_factory(value).serialize()[0] + + def assertOptimizesTo( + self, operations, expected, exact=None, less_than=None, app_label=None + ): + result, iterations = self.optimize(operations, app_label or "migrations") + result = [self.serialize(f) for f in result] + expected = [self.serialize(f) for f in expected] + self.assertEqual(expected, result) + if exact is not None and iterations != exact: + raise self.failureException( + "Optimization did not take exactly %s iterations (it took %s)" + % (exact, iterations) + ) + if less_than is not None and iterations >= less_than: + raise self.failureException( + "Optimization did not take less than %s iterations (it took %s)" + % (less_than, iterations) + ) + + def assertDoesNotOptimize(self, operations, **kwargs): + self.assertOptimizesTo(operations, operations, **kwargs) diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py index 6ef172ee6f..cab2906ed1 100644 --- a/tests/migrations/test_commands.py +++ b/tests/migrations/test_commands.py @@ -4,6 +4,7 @@ import io import os import shutil import sys +from pathlib import Path from unittest import mock from django.apps import apps @@ -21,7 +22,7 @@ from django.db.backends.utils import truncate_name from django.db.migrations.exceptions import InconsistentMigrationHistory from django.db.migrations.recorder import MigrationRecorder from django.test import TestCase, override_settings, skipUnlessDBFeature -from django.test.utils import captured_stdout +from django.test.utils import captured_stdout, extend_sys_path from django.utils import timezone from django.utils.version import get_docs_version @@ -1729,6 +1730,25 @@ class MakeMigrationsTests(MigrationTestBase): call_command("makemigrations", stdout=out) self.assertIn("0001_initial.py", out.getvalue()) + def test_makemigrations_no_init_ambiguous(self): + """ + Migration directories without an __init__.py file are not allowed if + there are multiple namespace search paths that resolve to them. + """ + out = io.StringIO() + with self.temporary_migration_module( + module="migrations.test_migrations_no_init" + ) as migration_dir: + # Copy the project directory into another place under sys.path. + app_dir = Path(migration_dir).parent + os.remove(app_dir / "__init__.py") + project_dir = app_dir.parent + dest = project_dir.parent / "other_dir_in_path" + shutil.copytree(project_dir, dest) + with extend_sys_path(str(dest)): + call_command("makemigrations", stdout=out) + self.assertEqual("No changes detected\n", out.getvalue()) + def test_makemigrations_migrations_announce(self): """ makemigrations announces the migration at the default verbosity level. diff --git a/tests/migrations/test_operations.py b/tests/migrations/test_operations.py index f865500829..3ac813b899 100644 --- a/tests/migrations/test_operations.py +++ b/tests/migrations/test_operations.py @@ -4107,6 +4107,64 @@ class OperationTests(OperationTestBase): definition[2], {"model_name": "Pony", "constraint": gt_constraint} ) + @skipUnlessDBFeature("supports_table_check_constraints") + def test_create_model_constraint_percent_escaping(self): + app_label = "add_constraint_string_quoting" + from_state = ProjectState() + checks = [ + # "%" generated in startswith lookup should be escaped in a way + # that is considered a leading wildcard. + ( + models.Q(name__startswith="Albert"), + {"name": "Alberta"}, + {"name": "Artur"}, + ), + # Literal "%" should be escaped in a way that is not a considered a + # wildcard. + (models.Q(rebate__endswith="%"), {"rebate": "10%"}, {"rebate": "10%$"}), + # Right-hand-side baked "%" literals should not be used for + # parameters interpolation. + ( + ~models.Q(surname__startswith=models.F("name")), + {"name": "Albert"}, + {"name": "Albert", "surname": "Alberto"}, + ), + # Exact matches against "%" literals should also be supported. + ( + models.Q(name="%"), + {"name": "%"}, + {"name": "Albert"}, + ), + ] + for check, valid, invalid in checks: + with self.subTest(condition=check, valid=valid, invalid=invalid): + constraint = models.CheckConstraint(condition=check, name="constraint") + operation = migrations.CreateModel( + "Author", + fields=[ + ("id", models.AutoField(primary_key=True)), + ("name", models.CharField(max_length=100)), + ("surname", models.CharField(max_length=100, db_default="")), + ("rebate", models.CharField(max_length=100)), + ], + options={"constraints": [constraint]}, + ) + to_state = from_state.clone() + operation.state_forwards(app_label, to_state) + with connection.schema_editor() as editor: + operation.database_forwards(app_label, editor, from_state, to_state) + Author = to_state.apps.get_model(app_label, "Author") + try: + with transaction.atomic(): + Author.objects.create(**valid).delete() + with self.assertRaises(IntegrityError), transaction.atomic(): + Author.objects.create(**invalid) + finally: + with connection.schema_editor() as editor: + migrations.DeleteModel("Author").database_forwards( + app_label, editor, to_state, from_state + ) + @skipUnlessDBFeature("supports_table_check_constraints") def test_add_constraint_percent_escaping(self): app_label = "add_constraint_string_quoting" diff --git a/tests/migrations/test_optimizer.py b/tests/migrations/test_optimizer.py index 2acbc7f09f..0a40b50edc 100644 --- a/tests/migrations/test_optimizer.py +++ b/tests/migrations/test_optimizer.py @@ -1,49 +1,17 @@ from django.db import migrations, models from django.db.migrations import operations from django.db.migrations.optimizer import MigrationOptimizer -from django.db.migrations.serializer import serializer_factory from django.db.models.functions import Abs -from django.test import SimpleTestCase from .models import EmptyManager, UnicodeModel +from .test_base import OptimizerTestBase -class OptimizerTests(SimpleTestCase): +class OptimizerTests(OptimizerTestBase): """ - Tests the migration autodetector. + Tests the migration optimizer. """ - def optimize(self, operations, app_label): - """ - Handy shortcut for getting results + number of loops - """ - optimizer = MigrationOptimizer() - return optimizer.optimize(operations, app_label), optimizer._iterations - - def serialize(self, value): - return serializer_factory(value).serialize()[0] - - def assertOptimizesTo( - self, operations, expected, exact=None, less_than=None, app_label=None - ): - result, iterations = self.optimize(operations, app_label or "migrations") - result = [self.serialize(f) for f in result] - expected = [self.serialize(f) for f in expected] - self.assertEqual(expected, result) - if exact is not None and iterations != exact: - raise self.failureException( - "Optimization did not take exactly %s iterations (it took %s)" - % (exact, iterations) - ) - if less_than is not None and iterations >= less_than: - raise self.failureException( - "Optimization did not take less than %s iterations (it took %s)" - % (less_than, iterations) - ) - - def assertDoesNotOptimize(self, operations, **kwargs): - self.assertOptimizesTo(operations, operations, **kwargs) - def test_none_app_label(self): optimizer = MigrationOptimizer() with self.assertRaisesMessage(TypeError, "app_label must be a str"): @@ -154,6 +122,46 @@ class OptimizerTests(SimpleTestCase): ], ) + def test_create_alter_model_table(self): + self.assertOptimizesTo( + [ + migrations.CreateModel("Foo", fields=[]), + migrations.AlterModelTable( + name="foo", + table="foo", + ), + ], + [ + migrations.CreateModel( + "Foo", + fields=[], + options={ + "db_table": "foo", + }, + ), + ], + ) + + def test_create_alter_model_table_comment(self): + self.assertOptimizesTo( + [ + migrations.CreateModel("Foo", fields=[]), + migrations.AlterModelTableComment( + name="foo", + table_comment="A lovely table.", + ), + ], + [ + migrations.CreateModel( + "Foo", + fields=[], + options={ + "db_table_comment": "A lovely table.", + }, + ), + ], + ) + def test_create_model_and_remove_model_options(self): self.assertOptimizesTo( [ diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py index 891efd8ac7..51783b7346 100644 --- a/tests/migrations/test_writer.py +++ b/tests/migrations/test_writer.py @@ -22,7 +22,8 @@ from django.core.validators import EmailValidator, RegexValidator from django.db import migrations, models from django.db.migrations.serializer import BaseSerializer from django.db.migrations.writer import MigrationWriter, OperationWriter -from django.test import SimpleTestCase +from django.test import SimpleTestCase, override_settings +from django.test.utils import extend_sys_path from django.utils.deconstruct import deconstructible from django.utils.functional import SimpleLazyObject from django.utils.timezone import get_default_timezone, get_fixed_timezone @@ -954,6 +955,29 @@ class WriterTests(SimpleTestCase): writer = MigrationWriter(migration) self.assertEqual(writer.path, expected_path) + @override_settings( + MIGRATION_MODULES={"namespace_app": "namespace_app.migrations"}, + INSTALLED_APPS=[ + "migrations.migrations_test_apps.distributed_app_location_2.namespace_app" + ], + ) + def test_migration_path_distributed_namespace(self): + base_dir = os.path.dirname(os.path.dirname(__file__)) + test_apps_dir = os.path.join(base_dir, "migrations", "migrations_test_apps") + expected_msg = ( + "Could not locate an appropriate location to create " + "migrations package namespace_app.migrations. Make sure the toplevel " + "package exists and can be imported." + ) + with extend_sys_path( + os.path.join(test_apps_dir, "distributed_app_location_1"), + os.path.join(test_apps_dir, "distributed_app_location_2"), + ): + migration = migrations.Migration("0001_initial", "namespace_app") + writer = MigrationWriter(migration) + with self.assertRaisesMessage(ValueError, expected_msg): + writer.path + def test_custom_operation(self): migration = type( "Migration", diff --git a/tests/model_enums/tests.py b/tests/model_enums/tests.py index 306bfc8d67..ee9dc369f6 100644 --- a/tests/model_enums/tests.py +++ b/tests/model_enums/tests.py @@ -328,5 +328,6 @@ class ChoicesMetaDeprecationTests(SimpleTestCase): from django.db.models import enums msg = "ChoicesMeta is deprecated in favor of ChoicesType." - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: enums.ChoicesMeta + self.assertEqual(ctx.filename, __file__) diff --git a/tests/model_fields/models.py b/tests/model_fields/models.py index 5dfed00329..599efafe7e 100644 --- a/tests/model_fields/models.py +++ b/tests/model_fields/models.py @@ -21,6 +21,10 @@ except ImportError: Image = None +# Set up a temp directory for file storage. +temp_storage_dir = tempfile.mkdtemp() +temp_storage = FileSystemStorage(temp_storage_dir) + test_collation = SimpleLazyObject( lambda: connection.features.test_collations["virtual"] ) @@ -206,7 +210,9 @@ class VerboseNameField(models.Model): field5 = models.DateTimeField("verbose field5") field6 = models.DecimalField("verbose field6", max_digits=6, decimal_places=1) field7 = models.EmailField("verbose field7") - field8 = models.FileField("verbose field8", upload_to="unused") + field8 = models.FileField( + "verbose field8", storage=temp_storage, upload_to="unused" + ) field9 = models.FilePathField("verbose field9") field10 = models.FloatField("verbose field10") # Don't want to depend on Pillow in this test @@ -256,7 +262,7 @@ class DataModel(models.Model): class Document(models.Model): - myfile = models.FileField(upload_to="unused", unique=True) + myfile = models.FileField(storage=temp_storage, upload_to="unused", unique=True) ############################################################################### @@ -282,10 +288,6 @@ if Image: class TestImageField(models.ImageField): attr_class = TestImageFieldFile - # Set up a temp directory for file storage. - temp_storage_dir = tempfile.mkdtemp() - temp_storage = FileSystemStorage(temp_storage_dir) - class Person(models.Model): """ Model that defines an ImageField with no dimension fields. diff --git a/tests/model_fields/test_mixins.py b/tests/model_fields/test_mixins.py index 5ccfac4d78..8847f25987 100644 --- a/tests/model_fields/test_mixins.py +++ b/tests/model_fields/test_mixins.py @@ -34,9 +34,10 @@ class FieldCacheMixinTests(SimpleTestCase): # RemovedInDjango60Warning. def test_get_cache_name_deprecated(self): msg = "Override ExampleOld.cache_name instead of get_cache_name()." - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: result = ExampleOld().cache_name self.assertEqual(result, "example") + self.assertEqual(ctx.filename, __file__) def test_cache_name(self): result = Example().cache_name diff --git a/tests/model_fields/tests.py b/tests/model_fields/tests.py index 36e54d4b8b..3d856d36c5 100644 --- a/tests/model_fields/tests.py +++ b/tests/model_fields/tests.py @@ -183,6 +183,33 @@ class ChoicesTests(SimpleTestCase): self.choices_from_callable.choices.func(), [(0, "0"), (1, "1"), (2, "2")] ) + def test_choices_slice(self): + for choices, expected_slice in [ + (self.empty_choices.choices, []), + (self.empty_choices_bool.choices, []), + (self.empty_choices_text.choices, []), + (self.with_choices.choices, [(1, "A")]), + (self.with_choices_dict.choices, [(1, "A")]), + (self.with_choices_nested_dict.choices, [("Thing", [(1, "A")])]), + (self.choices_from_iterator.choices, [(0, "0"), (1, "1")]), + (self.choices_from_callable.choices.func(), [(0, "0"), (1, "1")]), + (self.choices_from_callable.choices, [(0, "0"), (1, "1")]), + ]: + with self.subTest(choices=choices): + self.assertEqual(choices[:2], expected_slice) + + def test_choices_negative_index(self): + for choices, expected_choice in [ + (self.with_choices.choices, (1, "A")), + (self.with_choices_dict.choices, (1, "A")), + (self.with_choices_nested_dict.choices, ("Thing", [(1, "A")])), + (self.choices_from_iterator.choices, (2, "2")), + (self.choices_from_callable.choices.func(), (2, "2")), + (self.choices_from_callable.choices, (2, "2")), + ]: + with self.subTest(choices=choices): + self.assertEqual(choices[-1], expected_choice) + def test_flatchoices(self): self.assertEqual(self.no_choices.flatchoices, []) self.assertEqual(self.empty_choices.flatchoices, []) diff --git a/tests/modeladmin/test_checks.py b/tests/modeladmin/test_checks.py index f767a6c92b..94a80ca006 100644 --- a/tests/modeladmin/test_checks.py +++ b/tests/modeladmin/test_checks.py @@ -4,16 +4,17 @@ from django.contrib.admin import BooleanFieldListFilter, SimpleListFilter from django.contrib.admin.options import VERTICAL, ModelAdmin, TabularInline from django.contrib.admin.sites import AdminSite from django.core.checks import Error +from django.db import models from django.db.models import CASCADE, F, Field, ForeignKey, ManyToManyField, Model from django.db.models.functions import Upper from django.forms.models import BaseModelFormSet -from django.test import SimpleTestCase +from django.test import TestCase, skipUnlessDBFeature from django.test.utils import isolate_apps from .models import Band, Song, User, ValidationTestInlineModel, ValidationTestModel -class CheckTestCase(SimpleTestCase): +class CheckTestCase(TestCase): def assertIsInvalid( self, model_admin, @@ -97,6 +98,29 @@ class RawIdCheckTests(CheckTestCase): self.assertIsValid(TestModelAdmin, ValidationTestModel) + @isolate_apps("modeladmin") + def assertGeneratedDateTimeFieldIsValid(self, *, db_persist): + class TestModel(Model): + date = models.DateTimeField() + date_copy = models.GeneratedField( + expression=F("date"), + output_field=models.DateTimeField(), + db_persist=db_persist, + ) + + class TestModelAdmin(ModelAdmin): + date_hierarchy = "date_copy" + + self.assertIsValid(TestModelAdmin, TestModel) + + @skipUnlessDBFeature("supports_stored_generated_columns") + def test_valid_case_stored_generated_field(self): + self.assertGeneratedDateTimeFieldIsValid(db_persist=True) + + @skipUnlessDBFeature("supports_virtual_generated_columns") + def test_valid_case_virtual_generated_field(self): + self.assertGeneratedDateTimeFieldIsValid(db_persist=False) + def test_field_attname(self): class TestModelAdmin(ModelAdmin): raw_id_fields = ["band_id"] @@ -1029,6 +1053,33 @@ class DateHierarchyCheckTests(CheckTestCase): "admin.E128", ) + @isolate_apps("modeladmin") + def assertGeneratedIntegerFieldIsInvalid(self, *, db_persist): + class TestModel(Model): + generated = models.GeneratedField( + expression=models.Value(1), + output_field=models.IntegerField(), + db_persist=db_persist, + ) + + class TestModelAdmin(ModelAdmin): + date_hierarchy = "generated" + + self.assertIsInvalid( + TestModelAdmin, + TestModel, + "The value of 'date_hierarchy' must be a DateField or DateTimeField.", + "admin.E128", + ) + + @skipUnlessDBFeature("supports_stored_generated_columns") + def test_related_invalid_field_type_stored_generated_field(self): + self.assertGeneratedIntegerFieldIsInvalid(db_persist=True) + + @skipUnlessDBFeature("supports_virtual_generated_columns") + def test_related_invalid_field_type_virtual_generated_field(self): + self.assertGeneratedIntegerFieldIsInvalid(db_persist=False) + def test_valid_case(self): class TestModelAdmin(ModelAdmin): date_hierarchy = "pub_date" diff --git a/tests/modeladmin/tests.py b/tests/modeladmin/tests.py index e8b59ed0bf..062368d94e 100644 --- a/tests/modeladmin/tests.py +++ b/tests/modeladmin/tests.py @@ -928,8 +928,9 @@ class ModelAdminTests(TestCase): mock_request.user = User.objects.create(username="bill") content_type = get_content_type_for_model(self.band) msg = "ModelAdmin.log_deletion() is deprecated. Use log_deletions() instead." - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: created = ma.log_deletion(mock_request, self.band, str(self.band)) + self.assertEqual(ctx.filename, __file__) fetched = LogEntry.objects.filter(action_flag=DELETION).latest("id") self.assertEqual(created, fetched) self.assertEqual(fetched.action_flag, DELETION) @@ -966,8 +967,9 @@ class ModelAdminTests(TestCase): "instead." ) with self.assertNumQueries(3): - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: ima.log_deletions(mock_request, queryset) + self.assertEqual(ctx.filename, __file__) logs = ( LogEntry.objects.filter(action_flag=DELETION) .order_by("id") diff --git a/tests/one_to_one/tests.py b/tests/one_to_one/tests.py index 280a8273fb..0d30dd8f27 100644 --- a/tests/one_to_one/tests.py +++ b/tests/one_to_one/tests.py @@ -612,8 +612,9 @@ class OneToOneTests(TestCase): "get_prefetch_queryset() is deprecated. Use get_prefetch_querysets() " "instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: Place.bar.get_prefetch_queryset(places) + self.assertEqual(ctx.filename, __file__) def test_get_prefetch_querysets_invalid_querysets_length(self): places = Place.objects.all() diff --git a/tests/postgres_tests/migrations/0002_create_test_models.py b/tests/postgres_tests/migrations/0002_create_test_models.py index 5538b436ad..188f79607d 100644 --- a/tests/postgres_tests/migrations/0002_create_test_models.py +++ b/tests/postgres_tests/migrations/0002_create_test_models.py @@ -434,7 +434,7 @@ class Migration(migrations.Migration): primary_key=True, ), ), - ("ints", IntegerRangeField(null=True, blank=True)), + ("ints", IntegerRangeField(null=True, blank=True, db_default=(5, 10))), ("bigints", BigIntegerRangeField(null=True, blank=True)), ("decimals", DecimalRangeField(null=True, blank=True)), ("timestamps", DateTimeRangeField(null=True, blank=True)), diff --git a/tests/postgres_tests/models.py b/tests/postgres_tests/models.py index a97894e327..e3118bc590 100644 --- a/tests/postgres_tests/models.py +++ b/tests/postgres_tests/models.py @@ -130,7 +130,7 @@ class LineSavedSearch(PostgreSQLModel): class RangesModel(PostgreSQLModel): - ints = IntegerRangeField(blank=True, null=True) + ints = IntegerRangeField(blank=True, null=True, db_default=(5, 10)) bigints = BigIntegerRangeField(blank=True, null=True) decimals = DecimalRangeField(blank=True, null=True) timestamps = DateTimeRangeField(blank=True, null=True) diff --git a/tests/postgres_tests/test_array.py b/tests/postgres_tests/test_array.py index ff0c4aabb1..ea7807687e 100644 --- a/tests/postgres_tests/test_array.py +++ b/tests/postgres_tests/test_array.py @@ -1339,6 +1339,22 @@ class TestSplitFormField(PostgreSQLSimpleTestCase): ], ) + def test_invalid_char_length_with_remove_trailing_nulls(self): + field = SplitArrayField( + forms.CharField(max_length=2, required=False), + size=3, + remove_trailing_nulls=True, + ) + with self.assertRaises(exceptions.ValidationError) as cm: + field.clean(["abc", "", ""]) + self.assertEqual( + cm.exception.messages, + [ + "Item 1 in the array did not validate: Ensure this value has at most 2 " + "characters (it has 3).", + ], + ) + def test_splitarraywidget_value_omitted_from_data(self): class Form(forms.ModelForm): field = SplitArrayField(forms.IntegerField(), required=False, size=2) diff --git a/tests/postgres_tests/test_constraints.py b/tests/postgres_tests/test_constraints.py index 770d4b1702..ab5bf2bab1 100644 --- a/tests/postgres_tests/test_constraints.py +++ b/tests/postgres_tests/test_constraints.py @@ -14,6 +14,7 @@ from django.db.models import ( F, ForeignKey, Func, + GeneratedField, IntegerField, Model, Q, @@ -32,6 +33,7 @@ try: from django.contrib.postgres.constraints import ExclusionConstraint from django.contrib.postgres.fields import ( DateTimeRangeField, + IntegerRangeField, RangeBoundary, RangeOperators, ) @@ -866,6 +868,38 @@ class ExclusionConstraintTests(PostgreSQLTestCase): constraint.validate(RangesModel, RangesModel(ints=(51, 60))) constraint.validate(RangesModel, RangesModel(ints=(10, 20)), exclude={"ints"}) + @skipUnlessDBFeature("supports_stored_generated_columns") + @isolate_apps("postgres_tests") + def test_validate_generated_field_range_adjacent(self): + class RangesModelGeneratedField(Model): + ints = IntegerRangeField(blank=True, null=True) + ints_generated = GeneratedField( + expression=F("ints"), + output_field=IntegerRangeField(null=True), + db_persist=True, + ) + + with connection.schema_editor() as editor: + editor.create_model(RangesModelGeneratedField) + + constraint = ExclusionConstraint( + name="ints_adjacent", + expressions=[("ints_generated", RangeOperators.ADJACENT_TO)], + violation_error_code="custom_code", + violation_error_message="Custom error message.", + ) + RangesModelGeneratedField.objects.create(ints=(20, 50)) + + range_obj = RangesModelGeneratedField(ints=(3, 20)) + with self.assertRaisesMessage(ValidationError, "Custom error message."): + constraint.validate(RangesModelGeneratedField, range_obj) + + # Excluding referenced or generated field should skip validation. + constraint.validate(RangesModelGeneratedField, range_obj, exclude={"ints"}) + constraint.validate( + RangesModelGeneratedField, range_obj, exclude={"ints_generated"} + ) + def test_validate_with_custom_code_and_condition(self): constraint = ExclusionConstraint( name="ints_adjacent", @@ -1213,3 +1247,12 @@ class ExclusionConstraintTests(PostgreSQLTestCase): constraint_name, self.get_constraints(ModelWithExclusionConstraint._meta.db_table), ) + + def test_database_default(self): + constraint = ExclusionConstraint( + name="ints_equal", expressions=[("ints", RangeOperators.EQUAL)] + ) + RangesModel.objects.create() + msg = "Constraint “ints_equal” is violated." + with self.assertRaisesMessage(ValidationError, msg): + constraint.validate(RangesModel, RangesModel()) diff --git a/tests/postgres_tests/test_operations.py b/tests/postgres_tests/test_operations.py index 5780348251..f344d4ae74 100644 --- a/tests/postgres_tests/test_operations.py +++ b/tests/postgres_tests/test_operations.py @@ -1,8 +1,9 @@ import unittest -from migrations.test_base import OperationTestBase +from migrations.test_base import OperationTestBase, OptimizerTestBase from django.db import IntegrityError, NotSupportedError, connection, transaction +from django.db.migrations.operations import RemoveIndex, RenameIndex from django.db.migrations.state import ProjectState from django.db.migrations.writer import OperationWriter from django.db.models import CheckConstraint, Index, Q, UniqueConstraint @@ -30,7 +31,7 @@ except ImportError: @unittest.skipUnless(connection.vendor == "postgresql", "PostgreSQL specific tests.") @modify_settings(INSTALLED_APPS={"append": "migrations"}) -class AddIndexConcurrentlyTests(OperationTestBase): +class AddIndexConcurrentlyTests(OptimizerTestBase, OperationTestBase): app_label = "test_add_concurrently" def test_requires_atomic_false(self): @@ -129,6 +130,51 @@ class AddIndexConcurrentlyTests(OperationTestBase): ) self.assertIndexNotExists(table_name, ["pink"]) + def test_reduce_add_remove_concurrently(self): + self.assertOptimizesTo( + [ + AddIndexConcurrently( + "Pony", + Index(fields=["pink"], name="pony_pink_idx"), + ), + RemoveIndex("Pony", "pony_pink_idx"), + ], + [], + ) + + def test_reduce_add_remove(self): + self.assertOptimizesTo( + [ + AddIndexConcurrently( + "Pony", + Index(fields=["pink"], name="pony_pink_idx"), + ), + RemoveIndexConcurrently("Pony", "pony_pink_idx"), + ], + [], + ) + + def test_reduce_add_rename(self): + self.assertOptimizesTo( + [ + AddIndexConcurrently( + "Pony", + Index(fields=["pink"], name="pony_pink_idx"), + ), + RenameIndex( + "Pony", + old_name="pony_pink_idx", + new_name="pony_pink_index", + ), + ], + [ + AddIndexConcurrently( + "Pony", + Index(fields=["pink"], name="pony_pink_index"), + ), + ], + ) + @unittest.skipUnless(connection.vendor == "postgresql", "PostgreSQL specific tests.") @modify_settings(INSTALLED_APPS={"append": "migrations"}) diff --git a/tests/postgres_tests/test_trigram.py b/tests/postgres_tests/test_trigram.py index 812403a324..b6c88c38a6 100644 --- a/tests/postgres_tests/test_trigram.py +++ b/tests/postgres_tests/test_trigram.py @@ -1,3 +1,6 @@ +from django.db.models import F, Value +from django.db.models.functions import Concat + from . import PostgreSQLTestCase from .models import CharFieldModel, TextFieldModel @@ -149,6 +152,21 @@ class TrigramTest(PostgreSQLTestCase): ], ) + def test_trigram_concat_precedence(self): + search_term = "im matthew" + self.assertSequenceEqual( + self.Model.objects.annotate( + concat_result=Concat( + Value("I'm "), + F("field"), + output_field=self.Model._meta.get_field("field"), + ), + ) + .filter(concat_result__trigram_similar=search_term) + .values("field"), + [{"field": "Matthew"}], + ) + class TrigramTextFieldTest(TrigramTest): """ diff --git a/tests/prefetch_related/tests.py b/tests/prefetch_related/tests.py index a418beb5a5..856f766d30 100644 --- a/tests/prefetch_related/tests.py +++ b/tests/prefetch_related/tests.py @@ -1999,6 +1999,21 @@ class PrefetchLimitTests(TestDataMixin, TestCase): with self.assertRaisesMessage(NotSupportedError, msg): list(Book.objects.prefetch_related(Prefetch("authors", authors[1:]))) + @skipUnlessDBFeature("supports_over_clause") + def test_empty_order(self): + authors = Author.objects.order_by() + with self.assertNumQueries(3): + books = list( + Book.objects.prefetch_related( + Prefetch("authors", authors), + Prefetch("authors", authors[:1], to_attr="authors_sliced"), + ) + ) + for book in books: + with self.subTest(book=book): + self.assertEqual(len(book.authors_sliced), 1) + self.assertIn(book.authors_sliced[0], list(book.authors.all())) + class DeprecationTests(TestCase): def test_get_current_queryset_warning(self): @@ -2007,13 +2022,15 @@ class DeprecationTests(TestCase): "get_current_querysets() instead." ) authors = Author.objects.all() - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: self.assertEqual( Prefetch("authors", authors).get_current_queryset(1), authors, ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + self.assertEqual(ctx.filename, __file__) + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: self.assertIsNone(Prefetch("authors").get_current_queryset(1)) + self.assertEqual(ctx.filename, __file__) @ignore_warnings(category=RemovedInDjango60Warning) def test_prefetch_one_level_fallback(self): diff --git a/tests/queries/test_explain.py b/tests/queries/test_explain.py index 44689aedf8..67440cb502 100644 --- a/tests/queries/test_explain.py +++ b/tests/queries/test_explain.py @@ -19,8 +19,11 @@ class ExplainTests(TestCase): Tag.objects.filter(name="test").prefetch_related("children"), Tag.objects.filter(name="test").annotate(Count("children")), Tag.objects.filter(name="test").values_list("name"), - Tag.objects.order_by().union(Tag.objects.order_by().filter(name="test")), ] + if connection.features.supports_select_union: + querysets.append( + Tag.objects.order_by().union(Tag.objects.order_by().filter(name="test")) + ) if connection.features.has_select_for_update: querysets.append(Tag.objects.select_for_update().filter(name="test")) supported_formats = connection.features.supported_explain_formats @@ -96,6 +99,7 @@ class ExplainTests(TestCase): option = "{} {}".format(name.upper(), "true" if value else "false") self.assertIn(option, captured_queries[0]["sql"]) + @skipUnlessDBFeature("supports_select_union") def test_multi_page_text_explain(self): if "TEXT" not in connection.features.supported_explain_formats: self.skipTest("This backend does not support TEXT format.") diff --git a/tests/queries/test_q.py b/tests/queries/test_q.py index f7192a430a..f37d7becac 100644 --- a/tests/queries/test_q.py +++ b/tests/queries/test_q.py @@ -1,4 +1,5 @@ from django.core.exceptions import FieldError +from django.db import connection from django.db.models import ( BooleanField, Exists, @@ -327,3 +328,6 @@ class QCheckTests(TestCase): f"Got a database error calling check() on {q!r}: ", cm.records[0].getMessage(), ) + + # We must leave the connection in a usable state (#35712). + self.assertTrue(connection.is_usable()) diff --git a/tests/queries/tests.py b/tests/queries/tests.py index ec88fa558d..45866fd50f 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -1375,6 +1375,7 @@ class Queries1Tests(TestCase): self.assertCountEqual(items_after, [self.i2, self.i3, self.i4]) self.assertCountEqual(items_before, items_after) + @skipUnlessDBFeature("supports_select_union") def test_union_values_subquery(self): items = Item.objects.filter(creator=OuterRef("pk")) item_authors = Author.objects.annotate(is_creator=Exists(items)).order_by() diff --git a/tests/requests_tests/test_accept_header.py b/tests/requests_tests/test_accept_header.py index 5afb9e9993..6585fec678 100644 --- a/tests/requests_tests/test_accept_header.py +++ b/tests/requests_tests/test_accept_header.py @@ -56,6 +56,35 @@ class MediaTypeTests(TestCase): with self.subTest(accepted_type, mime_type=mime_type): self.assertIs(MediaType(accepted_type).match(mime_type), False) + def test_quality(self): + tests = [ + ("*/*; q=0.8", 0.8), + ("*/*; q=0.0001", 0), + ("*/*; q=0.12345", 0.123), + ("*/*; q=0.1", 0.1), + ("*/*; q=-1", 1), + ("*/*; q=2", 1), + ("*/*; q=h", 1), + ("*/*", 1), + ] + for accepted_type, quality in tests: + with self.subTest(accepted_type, quality=quality): + self.assertEqual(MediaType(accepted_type).quality, quality) + + def test_specificity(self): + tests = [ + ("*/*", 0), + ("*/*;q=0.5", 0), + ("text/*", 1), + ("text/*;q=0.5", 1), + ("text/html", 2), + ("text/html;q=1", 2), + ("text/html;q=0.5", 3), + ] + for accepted_type, specificity in tests: + with self.subTest(accepted_type, specificity=specificity): + self.assertEqual(MediaType(accepted_type).specificity, specificity) + class AcceptHeaderTests(TestCase): def test_no_headers(self): @@ -69,13 +98,14 @@ class AcceptHeaderTests(TestCase): def test_accept_headers(self): request = HttpRequest() request.META["HTTP_ACCEPT"] = ( - "text/html, application/xhtml+xml,application/xml ;q=0.9,*/*;q=0.8" + "text/*,text/html, application/xhtml+xml,application/xml ;q=0.9,*/*;q=0.8," ) self.assertEqual( [str(accepted_type) for accepted_type in request.accepted_types], [ "text/html", "application/xhtml+xml", + "text/*", "application/xml; q=0.9", "*/*; q=0.8", ], @@ -85,12 +115,20 @@ class AcceptHeaderTests(TestCase): request = HttpRequest() request.META["HTTP_ACCEPT"] = "*/*" self.assertIs(request.accepts("application/json"), True) + self.assertIsNone(request.get_preferred_type([])) + self.assertEqual( + request.get_preferred_type(["application/json", "text/plain"]), + "application/json", + ) def test_request_accepts_none(self): request = HttpRequest() request.META["HTTP_ACCEPT"] = "" self.assertIs(request.accepts("application/json"), False) self.assertEqual(request.accepted_types, []) + self.assertIsNone( + request.get_preferred_type(["application/json", "text/plain"]) + ) def test_request_accepts_some(self): request = HttpRequest() @@ -101,3 +139,39 @@ class AcceptHeaderTests(TestCase): self.assertIs(request.accepts("application/xhtml+xml"), True) self.assertIs(request.accepts("application/xml"), True) self.assertIs(request.accepts("application/json"), False) + + def test_accept_header_priority(self): + request = HttpRequest() + request.META["HTTP_ACCEPT"] = ( + "text/html,application/xml;q=0.9,*/*;q=0.1,text/*;q=0.5" + ) + + tests = [ + (["text/html", "application/xml"], "text/html"), + (["application/xml", "application/json"], "application/xml"), + (["application/json"], "application/json"), + (["application/json", "text/plain"], "text/plain"), + ] + for types, preferred_type in tests: + with self.subTest(types, preferred_type=preferred_type): + self.assertEqual(str(request.get_preferred_type(types)), preferred_type) + + def test_accept_header_priority_overlapping_mime(self): + request = HttpRequest() + request.META["HTTP_ACCEPT"] = "text/*;q=0.8,text/html;q=0.8" + + self.assertEqual( + [str(accepted_type) for accepted_type in request.accepted_types], + [ + "text/html; q=0.8", + "text/*; q=0.8", + ], + ) + + def test_no_matching_accepted_type(self): + request = HttpRequest() + request.META["HTTP_ACCEPT"] = "text/html" + + self.assertIsNone( + request.get_preferred_type(["application/json", "text/plain"]) + ) diff --git a/tests/requirements/py3.txt b/tests/requirements/py3.txt index d1f3708720..a9679af97c 100644 --- a/tests/requirements/py3.txt +++ b/tests/requirements/py3.txt @@ -1,20 +1,20 @@ aiosmtpd -asgiref >= 3.7.0 -argon2-cffi >= 19.2.0; sys_platform != 'win32' or python_version < '3.13' +asgiref >= 3.8.1 +argon2-cffi >= 19.2.0 bcrypt black docutils >= 0.19 -geoip2; python_version < '3.13' +geoip2 jinja2 >= 2.11.0 -numpy; sys_platform != 'win32' or python_version < '3.13' -Pillow >= 6.2.1; sys_platform != 'win32' or python_version < '3.13' +numpy +Pillow >= 6.2.1 # pylibmc/libmemcached can't be built on Windows. pylibmc; sys_platform != 'win32' pymemcache >= 3.4.0 pywatchman; sys_platform != 'win32' PyYAML redis >= 3.4.0 -selenium >= 4.8.0; sys_platform != 'win32' or python_version < '3.13' +selenium >= 4.8.0 sqlparse >= 0.3.1 tblib >= 1.5.0 tzdata diff --git a/tests/runtests.py b/tests/runtests.py index c5bb637d33..516da84768 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -221,7 +221,6 @@ def setup_collect_tests(start_at, start_after, test_labels=None): "APP_DIRS": True, "OPTIONS": { "context_processors": [ - "django.template.context_processors.debug", "django.template.context_processors.request", "django.contrib.auth.context_processors.auth", "django.contrib.messages.context_processors.messages", diff --git a/tests/schema/tests.py b/tests/schema/tests.py index 3a2947cf43..33a4bc527b 100644 --- a/tests/schema/tests.py +++ b/tests/schema/tests.py @@ -2160,6 +2160,19 @@ class SchemaTests(TransactionTestCase): with connection.schema_editor() as editor: editor.alter_field(SmallIntegerPK, old_field, new_field, strict=True) + # A model representing the updated model. + class IntegerPKToSmallAutoField(Model): + i = SmallAutoField(primary_key=True) + + class Meta: + app_label = "schema" + apps = new_apps + db_table = SmallIntegerPK._meta.db_table + + # An id (i) is generated by the database. + obj = IntegerPKToSmallAutoField.objects.create() + self.assertIsNotNone(obj.i) + @isolate_apps("schema") @unittest.skipUnless(connection.vendor == "postgresql", "PostgreSQL specific") def test_alter_serial_auto_field_to_bigautofield(self): diff --git a/tests/serializers/test_deserialization.py b/tests/serializers/test_deserialization.py new file mode 100644 index 0000000000..0bbb46b7ce --- /dev/null +++ b/tests/serializers/test_deserialization.py @@ -0,0 +1,135 @@ +import json +import unittest + +from django.core.serializers.base import DeserializationError, DeserializedObject +from django.core.serializers.json import Deserializer as JsonDeserializer +from django.core.serializers.jsonl import Deserializer as JsonlDeserializer +from django.core.serializers.python import Deserializer +from django.test import SimpleTestCase + +from .models import Author + +try: + import yaml # NOQA + + HAS_YAML = True +except ImportError: + HAS_YAML = False + + +class TestDeserializer(SimpleTestCase): + def setUp(self): + self.object_list = [ + {"pk": 1, "model": "serializers.author", "fields": {"name": "Jane"}}, + {"pk": 2, "model": "serializers.author", "fields": {"name": "Joe"}}, + ] + self.deserializer = Deserializer(self.object_list) + self.jane = Author(name="Jane", pk=1) + self.joe = Author(name="Joe", pk=2) + + def test_deserialized_object_repr(self): + deserial_obj = DeserializedObject(obj=self.jane) + self.assertEqual( + repr(deserial_obj), "" + ) + + def test_next_functionality(self): + first_item = next(self.deserializer) + + self.assertEqual(first_item.object, self.jane) + + second_item = next(self.deserializer) + self.assertEqual(second_item.object, self.joe) + + with self.assertRaises(StopIteration): + next(self.deserializer) + + def test_invalid_model_identifier(self): + invalid_object_list = [ + {"pk": 1, "model": "serializers.author2", "fields": {"name": "Jane"}} + ] + self.deserializer = Deserializer(invalid_object_list) + with self.assertRaises(DeserializationError): + next(self.deserializer) + + deserializer = Deserializer(object_list=[]) + with self.assertRaises(StopIteration): + next(deserializer) + + def test_custom_deserializer(self): + class CustomDeserializer(Deserializer): + @staticmethod + def _get_model_from_node(model_identifier): + return Author + + deserializer = CustomDeserializer(self.object_list) + result = next(iter(deserializer)) + deserialized_object = result.object + self.assertEqual( + self.jane, + deserialized_object, + ) + + def test_empty_object_list(self): + deserializer = Deserializer(object_list=[]) + with self.assertRaises(StopIteration): + next(deserializer) + + def test_json_bytes_input(self): + test_string = json.dumps(self.object_list) + stream = test_string.encode("utf-8") + deserializer = JsonDeserializer(stream_or_string=stream) + + first_item = next(deserializer) + second_item = next(deserializer) + + self.assertEqual(first_item.object, self.jane) + self.assertEqual(second_item.object, self.joe) + + def test_jsonl_bytes_input(self): + test_string = """ + {"pk": 1, "model": "serializers.author", "fields": {"name": "Jane"}} + {"pk": 2, "model": "serializers.author", "fields": {"name": "Joe"}} + {"pk": 3, "model": "serializers.author", "fields": {"name": "John"}} + {"pk": 4, "model": "serializers.author", "fields": {"name": "Smith"}}""" + stream = test_string.encode("utf-8") + deserializer = JsonlDeserializer(stream_or_string=stream) + + first_item = next(deserializer) + second_item = next(deserializer) + + self.assertEqual(first_item.object, self.jane) + self.assertEqual(second_item.object, self.joe) + + @unittest.skipUnless(HAS_YAML, "No yaml library detected") + def test_yaml_bytes_input(self): + from django.core.serializers.pyyaml import Deserializer as YamlDeserializer + + test_string = """- pk: 1 + model: serializers.author + fields: + name: Jane + +- pk: 2 + model: serializers.author + fields: + name: Joe + +- pk: 3 + model: serializers.author + fields: + name: John + +- pk: 4 + model: serializers.author + fields: + name: Smith +""" + stream = test_string.encode("utf-8") + deserializer = YamlDeserializer(stream_or_string=stream) + + first_item = next(deserializer) + second_item = next(deserializer) + + self.assertEqual(first_item.object, self.jane) + self.assertEqual(second_item.object, self.joe) diff --git a/tests/serializers/test_deserializedobject.py b/tests/serializers/test_deserializedobject.py deleted file mode 100644 index 1252052100..0000000000 --- a/tests/serializers/test_deserializedobject.py +++ /dev/null @@ -1,13 +0,0 @@ -from django.core.serializers.base import DeserializedObject -from django.test import SimpleTestCase - -from .models import Author - - -class TestDeserializedObjectTests(SimpleTestCase): - def test_repr(self): - author = Author(name="John", pk=1) - deserial_obj = DeserializedObject(obj=author) - self.assertEqual( - repr(deserial_obj), "" - ) diff --git a/tests/staticfiles_tests/project/documents/cached/module.js b/tests/staticfiles_tests/project/documents/cached/module.js index 7764e740d6..c56530aea6 100644 --- a/tests/staticfiles_tests/project/documents/cached/module.js +++ b/tests/staticfiles_tests/project/documents/cached/module.js @@ -2,6 +2,10 @@ import rootConst from "/static/absolute_root.js"; import testConst from "./module_test.js"; import * as NewModule from "./module_test.js"; +import*as m from "./module_test.js"; +import *as m from "./module_test.js"; +import* as m from "./module_test.js"; +import* as m from "./module_test.js"; import { testConst as alias } from "./module_test.js"; import { firstConst, secondConst } from "./module_test.js"; import { diff --git a/tests/staticfiles_tests/project/loop/baz.css b/tests/staticfiles_tests/project/loop/baz.css new file mode 100644 index 0000000000..4021a1b1e6 --- /dev/null +++ b/tests/staticfiles_tests/project/loop/baz.css @@ -0,0 +1,3 @@ +body { + background-color: #fafafa; +} diff --git a/tests/staticfiles_tests/test_finders.py b/tests/staticfiles_tests/test_finders.py index ddae508c5c..2f1863a1d4 100644 --- a/tests/staticfiles_tests/test_finders.py +++ b/tests/staticfiles_tests/test_finders.py @@ -37,11 +37,12 @@ class TestFinders: def test_find_all_deprecated_param(self): src, dst = self.find_all - with self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG): + with self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG) as ctx: found = self.finder.find(src, all=True) found = [os.path.normcase(f) for f in found] dst = [os.path.normcase(d) for d in dst] self.assertEqual(found, dst) + self.assertEqual(ctx.filename, __file__) def test_find_all_conflicting_params(self): src, dst = self.find_all @@ -50,10 +51,11 @@ class TestFinders: "argument 'find_all'" ) with ( - self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG), + self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG) as ctx, self.assertRaisesMessage(TypeError, msg), ): self.finder.find(src, find_all=True, all=True) + self.assertEqual(ctx.filename, __file__) def test_find_all_unexpected_params(self): src, dst = self.find_all @@ -62,10 +64,11 @@ class TestFinders: "argument 'wrong'" ) with ( - self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG), + self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG) as ctx, self.assertRaisesMessage(TypeError, msg), ): self.finder.find(src, all=True, wrong=1) + self.assertEqual(ctx.filename, __file__) with self.assertRaisesMessage(TypeError, msg): self.finder.find(src, find_all=True, wrong=1) @@ -165,28 +168,31 @@ class TestMiscFinder(SimpleTestCase): ) def test_searched_locations_deprecated_all(self): - with self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG): + with self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG) as ctx: finders.find("spam", all=True) self.assertEqual( finders.searched_locations, [os.path.join(TEST_ROOT, "project", "documents")], ) + self.assertEqual(ctx.filename, __file__) def test_searched_locations_conflicting_params(self): msg = "find() got multiple values for argument 'find_all'" with ( - self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG), + self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG) as ctx, self.assertRaisesMessage(TypeError, msg), ): finders.find("spam", find_all=True, all=True) + self.assertEqual(ctx.filename, __file__) def test_searched_locations_unexpected_params(self): msg = "find() got an unexpected keyword argument 'wrong'" with ( - self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG), + self.assertWarnsMessage(RemovedInDjango61Warning, DEPRECATION_MSG) as ctx, self.assertRaisesMessage(TypeError, msg), ): finders.find("spam", all=True, wrong=1) + self.assertEqual(ctx.filename, __file__) with self.assertRaisesMessage(TypeError, msg): finders.find("spam", find_all=True, wrong=1) diff --git a/tests/staticfiles_tests/test_management.py b/tests/staticfiles_tests/test_management.py index c0d3817383..1b9179af49 100644 --- a/tests/staticfiles_tests/test_management.py +++ b/tests/staticfiles_tests/test_management.py @@ -124,6 +124,11 @@ class TestFindStatic(TestDefaults, CollectionTestCase): searched_locations, ) + def test_missing_args_message(self): + msg = "Enter at least one staticfile." + with self.assertRaisesMessage(CommandError, msg): + call_command("findstatic") + class TestConfiguration(StaticFilesTestCase): def test_location_empty(self): diff --git a/tests/staticfiles_tests/test_storage.py b/tests/staticfiles_tests/test_storage.py index 030b7dc6db..9ca4d62553 100644 --- a/tests/staticfiles_tests/test_storage.py +++ b/tests/staticfiles_tests/test_storage.py @@ -186,7 +186,9 @@ class TestHashedFiles: err = StringIO() with self.assertRaisesMessage(RuntimeError, "Max post-process passes exceeded"): call_command("collectstatic", interactive=False, verbosity=0, stderr=err) - self.assertEqual("Post-processing 'All' failed!\n\n", err.getvalue()) + self.assertEqual( + "Post-processing 'bar.css, foo.css' failed!\n\n", err.getvalue() + ) self.assertPostCondition() def test_post_processing(self): @@ -674,7 +676,7 @@ class TestCollectionJSModuleImportAggregationManifestStorage(CollectionTestCase) def test_module_import(self): relpath = self.hashed_file_path("cached/module.js") - self.assertEqual(relpath, "cached/module.55fd6938fbc5.js") + self.assertEqual(relpath, "cached/module.4326210cf0bd.js") tests = [ # Relative imports. b'import testConst from "./module_test.477bbebe77f0.js";', @@ -686,6 +688,11 @@ class TestCollectionJSModuleImportAggregationManifestStorage(CollectionTestCase) b'const dynamicModule = import("./module_test.477bbebe77f0.js");', # Creating a module object. b'import * as NewModule from "./module_test.477bbebe77f0.js";', + # Creating a minified module object. + b'import*as m from "./module_test.477bbebe77f0.js";', + b'import* as m from "./module_test.477bbebe77f0.js";', + b'import *as m from "./module_test.477bbebe77f0.js";', + b'import* as m from "./module_test.477bbebe77f0.js";', # Aliases. b'import { testConst as alias } from "./module_test.477bbebe77f0.js";', b"import {\n" @@ -701,7 +708,7 @@ class TestCollectionJSModuleImportAggregationManifestStorage(CollectionTestCase) def test_aggregating_modules(self): relpath = self.hashed_file_path("cached/module.js") - self.assertEqual(relpath, "cached/module.55fd6938fbc5.js") + self.assertEqual(relpath, "cached/module.4326210cf0bd.js") tests = [ b'export * from "./module_test.477bbebe77f0.js";', b'export { testConst } from "./module_test.477bbebe77f0.js";', diff --git a/tests/template_tests/filter_tests/test_floatformat.py b/tests/template_tests/filter_tests/test_floatformat.py index db17622309..6183f6a069 100644 --- a/tests/template_tests/filter_tests/test_floatformat.py +++ b/tests/template_tests/filter_tests/test_floatformat.py @@ -4,6 +4,7 @@ from django.template.defaultfilters import floatformat from django.test import SimpleTestCase from django.utils import translation from django.utils.safestring import mark_safe +from django.utils.version import PYPY from ..utils import setup @@ -60,12 +61,8 @@ class FunctionTests(SimpleTestCase): floatformat(Decimal("123456.123456789012345678901"), 21), "123456.123456789012345678901", ) - self.assertEqual(floatformat("foo"), "") self.assertEqual(floatformat(13.1031, "bar"), "13.1031") self.assertEqual(floatformat(18.125, 2), "18.13") - self.assertEqual(floatformat("foo", "bar"), "") - self.assertEqual(floatformat("¿Cómo esta usted?"), "") - self.assertEqual(floatformat(None), "") self.assertEqual( floatformat(-1.323297138040798e35, 2), "-132329713804079800000000000000000000.00", @@ -77,6 +74,46 @@ class FunctionTests(SimpleTestCase): self.assertEqual(floatformat(1.5e-15, 20), "0.00000000000000150000") self.assertEqual(floatformat(1.5e-15, -20), "0.00000000000000150000") self.assertEqual(floatformat(1.00000000000000015, 16), "1.0000000000000002") + self.assertEqual(floatformat("1e199"), "1" + "0" * 199) + + def test_invalid_inputs(self): + cases = [ + # Non-numeric strings. + None, + [], + {}, + object(), + "abc123", + "123abc", + "foo", + "error", + "¿Cómo esta usted?", + # Scientific notation - missing exponent value. + "1e", + "1e+", + "1e-", + # Scientific notation - missing base number. + "e400", + "e+400", + "e-400", + # Scientific notation - invalid exponent value. + "1e^2", + "1e2e3", + "1e2a", + "1e2.0", + "1e2,0", + # Scientific notation - misplaced decimal point. + "1e.2", + "1e2.", + # Scientific notation - misplaced '+' sign. + "1+e2", + "1e2+", + ] + for value in cases: + with self.subTest(value=value): + self.assertEqual(floatformat(value), "") + with self.subTest(value=value, arg="bar"): + self.assertEqual(floatformat(value, "bar"), "") def test_force_grouping(self): with translation.override("en"): @@ -134,6 +171,31 @@ class FunctionTests(SimpleTestCase): self.assertEqual(floatformat(pos_inf), "inf") self.assertEqual(floatformat(neg_inf), "-inf") self.assertEqual(floatformat(pos_inf / pos_inf), "nan") + self.assertEqual(floatformat("inf"), "inf") + self.assertEqual(floatformat("NaN"), "NaN") + + def test_too_many_digits_to_render(self): + cases = [ + "1e200", + "1E200", + "1E10000000000000000", + "-1E10000000000000000", + "1e10000000000000000", + "-1e10000000000000000", + ] + for value in cases: + with self.subTest(value=value): + self.assertEqual(floatformat(value), value) + + def test_too_many_digits_to_render_very_long(self): + value = "1" + "0" * 1_000_000 + if PYPY: + # PyPy casts decimal parts to int, which reaches the integer string + # conversion length limit (default 4300 digits, CVE-2020-10735). + with self.assertRaises(ValueError): + floatformat(value) + else: + self.assertEqual(floatformat(value), value) def test_float_dunder_method(self): class FloatWrapper: diff --git a/tests/template_tests/filter_tests/test_urlize.py b/tests/template_tests/filter_tests/test_urlize.py index c19103859e..546bd6c7d6 100644 --- a/tests/template_tests/filter_tests/test_urlize.py +++ b/tests/template_tests/filter_tests/test_urlize.py @@ -321,6 +321,11 @@ class FunctionTests(SimpleTestCase): '' "http://example.com?x=&;;", ) + self.assertEqual( + urlize("http://example.com?x=&.;...;", autoescape=False), + '' + "http://example.com?x=&.;...;", + ) def test_brackets(self): """ diff --git a/tests/template_tests/syntax_tests/test_basic.py b/tests/template_tests/syntax_tests/test_basic.py index 20bf30d55c..50e7a4c7b1 100644 --- a/tests/template_tests/syntax_tests/test_basic.py +++ b/tests/template_tests/syntax_tests/test_basic.py @@ -346,6 +346,52 @@ class BasicSyntaxTests(SimpleTestCase): output = self.engine.render_to_string("tpl-weird-percent") self.assertEqual(output, "% %s") + @setup( + {"template": "{{ class_var.class_property }} | {{ class_var.class_method }}"} + ) + def test_subscriptable_class(self): + class MyClass(list): + # As of Python 3.9 list defines __class_getitem__ which makes it + # subscriptable. + class_property = "Example property" + do_not_call_in_templates = True + + @classmethod + def class_method(cls): + return "Example method" + + for case in (MyClass, lambda: MyClass): + with self.subTest(case=case): + output = self.engine.render_to_string("template", {"class_var": case}) + self.assertEqual(output, "Example property | Example method") + + @setup({"template": "{{ meals.lunch }}"}) + def test_access_class_property_if_getitem_is_defined_in_metaclass(self): + """ + If the metaclass defines __getitem__, the template system should use + it to resolve the dot notation. + """ + + class MealMeta(type): + def __getitem__(cls, name): + return getattr(cls, name) + " is yummy." + + class Meals(metaclass=MealMeta): + lunch = "soup" + do_not_call_in_templates = True + + # Make class type subscriptable. + def __class_getitem__(cls, key): + from types import GenericAlias + + return GenericAlias(cls, key) + + self.assertEqual(Meals.lunch, "soup") + self.assertEqual(Meals["lunch"], "soup is yummy.") + + output = self.engine.render_to_string("template", {"meals": Meals}) + self.assertEqual(output, "soup is yummy.") + class BlockContextTests(SimpleTestCase): def test_repr(self): diff --git a/tests/template_tests/test_base.py b/tests/template_tests/test_base.py index 7b85d1de80..6457d4d4e6 100644 --- a/tests/template_tests/test_base.py +++ b/tests/template_tests/test_base.py @@ -8,7 +8,7 @@ class LexerTestMixin: template_string = ( "text\n" "{% if test %}{{ varvalue }}{% endif %}" - "{#comment {{not a var}} %{not a block}% #}" + "{#comment {{not a var}} {%not a block%} #}" "end text" ) expected_token_tuples = [ @@ -17,7 +17,7 @@ class LexerTestMixin: (TokenType.BLOCK, "if test", 2, (5, 18)), (TokenType.VAR, "varvalue", 2, (18, 32)), (TokenType.BLOCK, "endif", 2, (32, 43)), - (TokenType.COMMENT, "comment {{not a var}} %{not a block}%", 2, (43, 85)), + (TokenType.COMMENT, "comment {{not a var}} {%not a block%}", 2, (43, 85)), (TokenType.TEXT, "end text", 2, (85, 93)), ] diff --git a/tests/test_utils/fixtures/should_not_be_loaded.json b/tests/test_utils/fixtures/person.json similarity index 100% rename from tests/test_utils/fixtures/should_not_be_loaded.json rename to tests/test_utils/fixtures/person.json diff --git a/tests/test_utils/test_testcase.py b/tests/test_utils/test_testcase.py index efca01e29e..866e0dccc6 100644 --- a/tests/test_utils/test_testcase.py +++ b/tests/test_utils/test_testcase.py @@ -65,14 +65,12 @@ class TestTestCase(TestCase): @skipUnlessDBFeature("supports_transactions") def test_reset_sequences(self): - old_reset_sequences = self.reset_sequences - self.reset_sequences = True + old_reset_sequences = self.__class__.reset_sequences + self.__class__.reset_sequences = True + self.addCleanup(setattr, self.__class__, "reset_sequences", old_reset_sequences) msg = "reset_sequences cannot be used on TestCase instances" - try: - with self.assertRaisesMessage(TypeError, msg): - self._fixture_setup() - finally: - self.reset_sequences = old_reset_sequences + with self.assertRaisesMessage(TypeError, msg): + self._fixture_setup() def assert_no_queries(test): diff --git a/tests/test_utils/test_transactiontestcase.py b/tests/test_utils/test_transactiontestcase.py index 0032e2ee0c..12ef4c9a1c 100644 --- a/tests/test_utils/test_transactiontestcase.py +++ b/tests/test_utils/test_transactiontestcase.py @@ -4,7 +4,7 @@ from django.db import connections from django.test import TestCase, TransactionTestCase, override_settings from django.test.testcases import DatabaseOperationForbidden -from .models import Car +from .models import Car, Person class TestSerializedRollbackInhibitsPostMigrate(TransactionTestCase): @@ -68,3 +68,16 @@ class DisallowedDatabaseQueriesTests(TransactionTestCase): ) with self.assertRaisesMessage(DatabaseOperationForbidden, message): Car.objects.using("other").get() + + +class FixtureAvailableInSetUpClassTest(TransactionTestCase): + available_apps = ["test_utils"] + fixtures = ["person.json"] + + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.elvis = Person.objects.get(name="Elvis Presley") + + def test_fixture_loaded_during_class_setup(self): + self.assertIsInstance(self.elvis, Person) diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py index cd64c087c4..4fd9267429 100644 --- a/tests/test_utils/tests.py +++ b/tests/test_utils/tests.py @@ -1,6 +1,7 @@ import os import sys import threading +import traceback import unittest import warnings from io import StringIO @@ -1113,6 +1114,19 @@ class JSONEqualTests(SimpleTestCase): with self.assertRaises(AssertionError): self.assertJSONNotEqual(valid_json, invalid_json) + def test_method_frames_ignored_by_unittest(self): + try: + self.assertJSONEqual("1", "2") + except AssertionError: + exc_type, exc, tb = sys.exc_info() + + result = unittest.TestResult() + result.addFailure(self, (exc_type, exc, tb)) + stack = traceback.extract_tb(exc.__traceback__) + self.assertEqual(len(stack), 1) + # Top element in the stack is this method, not assertJSONEqual. + self.assertEqual(stack[-1].name, "test_method_frames_ignored_by_unittest") + class XMLEqualTests(SimpleTestCase): def test_simple_equal(self): @@ -1200,7 +1214,7 @@ class XMLEqualTests(SimpleTestCase): class SkippingExtraTests(TestCase): - fixtures = ["should_not_be_loaded.json"] + fixtures = ["person.json"] # HACK: This depends on internals of our TestCase subclasses def __call__(self, result=None): @@ -2172,6 +2186,8 @@ class AllowedDatabaseQueriesTests(SimpleTestCase): finally: new_connection.validate_thread_sharing() new_connection._close() + if hasattr(new_connection, "close_pool"): + new_connection.close_pool() class DatabaseAliasTests(SimpleTestCase): diff --git a/tests/update_only_fields/tests.py b/tests/update_only_fields/tests.py index 816112bc33..a6a5b7cb8e 100644 --- a/tests/update_only_fields/tests.py +++ b/tests/update_only_fields/tests.py @@ -262,10 +262,11 @@ class UpdateOnlyFieldsTests(TestCase): msg = "Passing positional arguments to save() is deprecated" with ( - self.assertWarnsMessage(RemovedInDjango60Warning, msg), + self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx, self.assertNumQueries(0), ): s.save(False, False, None, []) + self.assertEqual(ctx.filename, __file__) async def test_empty_update_fields_positional_asave(self): s = await Person.objects.acreate(name="Sara", gender="F") @@ -273,8 +274,9 @@ class UpdateOnlyFieldsTests(TestCase): s.name = "Other" msg = "Passing positional arguments to asave() is deprecated" - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: await s.asave(False, False, None, []) + self.assertEqual(ctx.filename, __file__) # No save occurred for an empty update_fields. await s.arefresh_from_db() diff --git a/tests/urlpatterns/tests.py b/tests/urlpatterns/tests.py index 78b71fe325..6c8d6470c0 100644 --- a/tests/urlpatterns/tests.py +++ b/tests/urlpatterns/tests.py @@ -212,10 +212,11 @@ class SimplifiedURLTests(SimpleTestCase): "converters is deprecated and will be removed in Django 6.0." ) try: - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: register_converter(IntConverter, "int") finally: REGISTERED_CONVERTERS.pop("int", None) + self.assertEqual(ctx.filename, __file__) def test_warning_override_converter(self): # RemovedInDjango60Warning: when the deprecation ends, replace with @@ -226,11 +227,12 @@ class SimplifiedURLTests(SimpleTestCase): "registered converters is deprecated and will be removed in Django 6.0." ) try: - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: register_converter(Base64Converter, "base64") register_converter(Base64Converter, "base64") finally: REGISTERED_CONVERTERS.pop("base64", None) + self.assertEqual(ctx.filename, __file__) def test_invalid_view(self): msg = "view must be a callable or a list/tuple in the case of include()." diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py index 9fe782ed2f..b47919df99 100644 --- a/tests/utils_tests/test_html.py +++ b/tests/utils_tests/test_html.py @@ -10,6 +10,7 @@ from django.utils.html import ( escape, escapejs, format_html, + format_html_join, html_safe, json_script, linebreaks, @@ -70,10 +71,31 @@ class TestUtilsHtml(SimpleTestCase): msg = "Calling format_html() without passing args or kwargs is deprecated." # RemovedInDjango60Warning: when the deprecation ends, replace with: # msg = "args or kwargs must be provided." - # with self.assertRaisesMessage(ValueError, msg): - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + # with self.assertRaisesMessage(TypeError, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: name = "Adam" self.assertEqual(format_html(f"{name}"), "Adam") + self.assertEqual(ctx.filename, __file__) + + def test_format_html_join_with_positional_arguments(self): + self.assertEqual( + format_html_join( + "\n", + "
  • {}) {}
    • ", + [(1, "Emma"), (2, "Matilda")], + ), + "
  • 1) Emma
    • \n
  • 2) Matilda
    • ", + ) + + def test_format_html_join_with_keyword_arguments(self): + self.assertEqual( + format_html_join( + "\n", + "
  • {id}) {text}
    • ", + [{"id": 1, "text": "Emma"}, {"id": 2, "text": "Matilda"}], + ), + "
  • 1) Emma
    • \n
  • 2) Matilda
    • ", + ) def test_linebreaks(self): items = ( @@ -338,6 +360,15 @@ class TestUtilsHtml(SimpleTestCase): 'Search for google.com/?q=!', ), ("foo@example.com", 'foo@example.com'), + ( + "test@" + "한.글." * 15 + "aaa", + '' + + "test@" + + "한.글." * 15 + + "aaa", + ), ) for value, output in tests: with self.subTest(value=value): @@ -346,6 +377,10 @@ class TestUtilsHtml(SimpleTestCase): def test_urlize_unchanged_inputs(self): tests = ( ("a" + "@a" * 50000) + "a", # simple_email_re catastrophic test + # Unicode domain catastrophic tests. + "a@" + "한.글." * 1_000_000 + "a", + "http://" + "한.글." * 1_000_000 + "com", + "www." + "한.글." * 1_000_000 + "com", ("a" + "." * 1000000) + "a", # trailing_punctuation catastrophic test "foo@", "@foo.com", @@ -359,6 +394,9 @@ class TestUtilsHtml(SimpleTestCase): "[(" * 100_000 + ":" + ")]" * 100_000, "([[" * 100_000 + ":" + "]])" * 100_000, "&:" + ";" * 100_000, + "&.;" * 100_000, + ".;" * 100_000, + "&" + ";:" * 100_000, ) for value in tests: with self.subTest(value=value): diff --git a/tests/utils_tests/test_itercompat.py b/tests/utils_tests/test_itercompat.py index e6ea278ab4..a95867c621 100644 --- a/tests/utils_tests/test_itercompat.py +++ b/tests/utils_tests/test_itercompat.py @@ -11,5 +11,6 @@ class TestIterCompat(SimpleTestCase): "django.utils.itercompat.is_iterable() is deprecated. " "Use isinstance(..., collections.abc.Iterable) instead." ) - with self.assertWarnsMessage(RemovedInDjango60Warning, msg): + with self.assertWarnsMessage(RemovedInDjango60Warning, msg) as ctx: is_iterable([]) + self.assertEqual(ctx.filename, __file__) diff --git a/tests/utils_tests/test_jslex.py b/tests/utils_tests/test_jslex.py deleted file mode 100644 index 59551930c6..0000000000 --- a/tests/utils_tests/test_jslex.py +++ /dev/null @@ -1,401 +0,0 @@ -"""Tests for jslex.""" - -# originally from https://bitbucket.org/ned/jslex - -from django.test import SimpleTestCase -from django.utils.jslex import JsLexer, prepare_js_for_gettext - - -class JsTokensTest(SimpleTestCase): - LEX_CASES = [ - # ids - ("a ABC $ _ a123", ["id a", "id ABC", "id $", "id _", "id a123"]), - ( - "\\u1234 abc\\u0020 \\u0065_\\u0067", - ["id \\u1234", "id abc\\u0020", "id \\u0065_\\u0067"], - ), - # numbers - ( - "123 1.234 0.123e-3 0 1E+40 1e1 .123", - [ - "dnum 123", - "dnum 1.234", - "dnum 0.123e-3", - "dnum 0", - "dnum 1E+40", - "dnum 1e1", - "dnum .123", - ], - ), - ("0x1 0xabCD 0XABcd", ["hnum 0x1", "hnum 0xabCD", "hnum 0XABcd"]), - ("010 0377 090", ["onum 010", "onum 0377", "dnum 0", "dnum 90"]), - ("0xa123ghi", ["hnum 0xa123", "id ghi"]), - # keywords - ( - "function Function FUNCTION", - ["keyword function", "id Function", "id FUNCTION"], - ), - ( - "const constructor in inherits", - ["keyword const", "id constructor", "keyword in", "id inherits"], - ), - ("true true_enough", ["reserved true", "id true_enough"]), - # strings - (""" 'hello' "hello" """, ["string 'hello'", 'string "hello"']), - ( - r""" 'don\'t' "don\"t" '"' "'" '\'' "\"" """, - [ - r"""string 'don\'t'""", - r'''string "don\"t"''', - r"""string '"'""", - r'''string "'"''', - r"""string '\''""", - r'''string "\""''', - ], - ), - (r'"ƃuıxǝ⅂ ʇdıɹɔsɐʌɐſ\""', [r'string "ƃuıxǝ⅂ ʇdıɹɔsɐʌɐſ\""']), - # comments - ("a//b", ["id a", "linecomment //b"]), - ( - "/****/a/=2//hello", - ["comment /****/", "id a", "punct /=", "dnum 2", "linecomment //hello"], - ), - ( - "/*\n * Header\n */\na=1;", - ["comment /*\n * Header\n */", "id a", "punct =", "dnum 1", "punct ;"], - ), - # punctuation - ("a+++b", ["id a", "punct ++", "punct +", "id b"]), - # regex - (r"a=/a*/,1", ["id a", "punct =", "regex /a*/", "punct ,", "dnum 1"]), - (r"a=/a*[^/]+/,1", ["id a", "punct =", "regex /a*[^/]+/", "punct ,", "dnum 1"]), - (r"a=/a*\[^/,1", ["id a", "punct =", r"regex /a*\[^/", "punct ,", "dnum 1"]), - (r"a=/\//,1", ["id a", "punct =", r"regex /\//", "punct ,", "dnum 1"]), - # next two are from https://www-archive.mozilla.org/js/language/js20-2002-04/rationale/syntax.html#regular-expressions # NOQA - ( - 'for (var x = a in foo && "" || mot ? z:/x:3;x<5;y"', - "punct ||", - "id mot", - "punct ?", - "id z", - "punct :", - "regex /x:3;x<5;y" || mot ? z/x:3;x<5;y"', - "punct ||", - "id mot", - "punct ?", - "id z", - "punct /", - "id x", - "punct :", - "dnum 3", - "punct ;", - "id x", - "punct <", - "dnum 5", - "punct ;", - "id y", - "punct <", - "regex /g/i", - "punct )", - "punct {", - "id xyz", - "punct (", - "id x", - "punct ++", - "punct )", - "punct ;", - "punct }", - ], - ), - # Various "illegal" regexes that are valid according to the std. - ( - r"""/????/, /++++/, /[----]/ """, - ["regex /????/", "punct ,", "regex /++++/", "punct ,", "regex /[----]/"], - ), - # Stress cases from https://stackoverflow.com/questions/5533925/what-javascript-constructs-does-jslex-incorrectly-lex/5573409#5573409 # NOQA - (r"""/\[/""", [r"""regex /\[/"""]), - (r"""/[i]/""", [r"""regex /[i]/"""]), - (r"""/[\]]/""", [r"""regex /[\]]/"""]), - (r"""/a[\]]/""", [r"""regex /a[\]]/"""]), - (r"""/a[\]]b/""", [r"""regex /a[\]]b/"""]), - (r"""/[\]/]/gi""", [r"""regex /[\]/]/gi"""]), - (r"""/\[[^\]]+\]/gi""", [r"""regex /\[[^\]]+\]/gi"""]), - ( - r""" - rexl.re = { - NAME: /^(?![0-9])(?:\w)+|^"(?:[^"]|"")+"/, - UNQUOTED_LITERAL: /^@(?:(?![0-9])(?:\w|\:)+|^"(?:[^"]|"")+")\[[^\]]+\]/, - QUOTED_LITERAL: /^'(?:[^']|'')*'/, - NUMERIC_LITERAL: /^[0-9]+(?:\.[0-9]*(?:[eE][-+][0-9]+)?)?/, - SYMBOL: /^(?:==|=|<>|<=|<|>=|>|!~~|!~|~~|~|!==|!=|!~=|!~|!|&|\||\.|\:|,|\(|\)|\[|\]|\{|\}|\?|\:|;|@|\^|\/\+|\/|\*|\+|-)/ - }; - """, # NOQA - [ - "id rexl", - "punct .", - "id re", - "punct =", - "punct {", - "id NAME", - "punct :", - r"""regex /^(?![0-9])(?:\w)+|^"(?:[^"]|"")+"/""", - "punct ,", - "id UNQUOTED_LITERAL", - "punct :", - r"""regex /^@(?:(?![0-9])(?:\w|\:)+|^"(?:[^"]|"")+")\[[^\]]+\]/""", - "punct ,", - "id QUOTED_LITERAL", - "punct :", - r"""regex /^'(?:[^']|'')*'/""", - "punct ,", - "id NUMERIC_LITERAL", - "punct :", - r"""regex /^[0-9]+(?:\.[0-9]*(?:[eE][-+][0-9]+)?)?/""", - "punct ,", - "id SYMBOL", - "punct :", - r"""regex /^(?:==|=|<>|<=|<|>=|>|!~~|!~|~~|~|!==|!=|!~=|!~|!|&|\||\.|\:|,|\(|\)|\[|\]|\{|\}|\?|\:|;|@|\^|\/\+|\/|\*|\+|-)/""", # NOQA - "punct }", - "punct ;", - ], - ), - ( - r""" - rexl.re = { - NAME: /^(?![0-9])(?:\w)+|^"(?:[^"]|"")+"/, - UNQUOTED_LITERAL: /^@(?:(?![0-9])(?:\w|\:)+|^"(?:[^"]|"")+")\[[^\]]+\]/, - QUOTED_LITERAL: /^'(?:[^']|'')*'/, - NUMERIC_LITERAL: /^[0-9]+(?:\.[0-9]*(?:[eE][-+][0-9]+)?)?/, - SYMBOL: /^(?:==|=|<>|<=|<|>=|>|!~~|!~|~~|~|!==|!=|!~=|!~|!|&|\||\.|\:|,|\(|\)|\[|\]|\{|\}|\?|\:|;|@|\^|\/\+|\/|\*|\+|-)/ - }; - str = '"'; - """, # NOQA - [ - "id rexl", - "punct .", - "id re", - "punct =", - "punct {", - "id NAME", - "punct :", - r"""regex /^(?![0-9])(?:\w)+|^"(?:[^"]|"")+"/""", - "punct ,", - "id UNQUOTED_LITERAL", - "punct :", - r"""regex /^@(?:(?![0-9])(?:\w|\:)+|^"(?:[^"]|"")+")\[[^\]]+\]/""", - "punct ,", - "id QUOTED_LITERAL", - "punct :", - r"""regex /^'(?:[^']|'')*'/""", - "punct ,", - "id NUMERIC_LITERAL", - "punct :", - r"""regex /^[0-9]+(?:\.[0-9]*(?:[eE][-+][0-9]+)?)?/""", - "punct ,", - "id SYMBOL", - "punct :", - r"""regex /^(?:==|=|<>|<=|<|>=|>|!~~|!~|~~|~|!==|!=|!~=|!~|!|&|\||\.|\:|,|\(|\)|\[|\]|\{|\}|\?|\:|;|@|\^|\/\+|\/|\*|\+|-)/""", # NOQA - "punct }", - "punct ;", - "id str", - "punct =", - """string '"'""", - "punct ;", - ], - ), - ( - r' this._js = "e.str(\"" + this.value.replace(/\\/g, "\\\\")' - r'.replace(/"/g, "\\\"") + "\")"; ', - [ - "keyword this", - "punct .", - "id _js", - "punct =", - r'''string "e.str(\""''', - "punct +", - "keyword this", - "punct .", - "id value", - "punct .", - "id replace", - "punct (", - r"regex /\\/g", - "punct ,", - r'string "\\\\"', - "punct )", - "punct .", - "id replace", - "punct (", - r'regex /"/g', - "punct ,", - r'string "\\\""', - "punct )", - "punct +", - r'string "\")"', - "punct ;", - ], - ), - ] - - -def make_function(input, toks): - def test_func(self): - lexer = JsLexer() - result = [ - "%s %s" % (name, tok) for name, tok in lexer.lex(input) if name != "ws" - ] - self.assertEqual(result, toks) - - return test_func - - -for i, (input, toks) in enumerate(JsTokensTest.LEX_CASES): - setattr(JsTokensTest, "test_case_%d" % i, make_function(input, toks)) - - -GETTEXT_CASES = ( - ( - r""" - a = 1; /* /[0-9]+/ */ - b = 0x2a0b / 1; // /[0-9]+/ - c = 3; - """, - r""" - a = 1; /* /[0-9]+/ */ - b = 0x2a0b / 1; // /[0-9]+/ - c = 3; - """, - ), - ( - r""" - a = 1.234e-5; - /* - * /[0-9+/ - */ - b = .0123; - """, - r""" - a = 1.234e-5; - /* - * /[0-9+/ - */ - b = .0123; - """, - ), - ( - r""" - x = y / z; - alert(gettext("hello")); - x /= 3; - """, - r""" - x = y / z; - alert(gettext("hello")); - x /= 3; - """, - ), - ( - r""" - s = "Hello \"th/foo/ere\""; - s = 'He\x23llo \'th/foo/ere\''; - s = 'slash quote \", just quote "'; - """, - r""" - s = "Hello \"th/foo/ere\""; - s = "He\x23llo \'th/foo/ere\'"; - s = "slash quote \", just quote \""; - """, - ), - ( - r""" - s = "Line continuation\ - continued /hello/ still the string";/hello/; - """, - r""" - s = "Line continuation\ - continued /hello/ still the string";"REGEX"; - """, - ), - ( - r""" - var regex = /pattern/; - var regex2 = /matter/gm; - var regex3 = /[*/]+/gm.foo("hey"); - """, - r""" - var regex = "REGEX"; - var regex2 = "REGEX"; - var regex3 = "REGEX".foo("hey"); - """, - ), - ( - r""" - for (var x = a in foo && "" || mot ? z:/x:3;x<5;y" || mot ? z/x:3;x<5;y" || mot ? z:"REGEX"/i) {xyz(x++);} - for (var x = a in foo && "" || mot ? z/x:3;x<5;y<"REGEX") {xyz(x++);} - """, - ), - ( - """ - \\u1234xyz = gettext('Hello there'); - """, - r""" - Uu1234xyz = gettext("Hello there"); - """, - ), -) - - -class JsToCForGettextTest(SimpleTestCase): - pass - - -def make_function(js, c): - def test_func(self): - self.assertEqual(prepare_js_for_gettext(js), c) - - return test_func - - -for i, pair in enumerate(GETTEXT_CASES): - setattr(JsToCForGettextTest, "test_case_%d" % i, make_function(*pair)) diff --git a/tests/utils_tests/test_safestring.py b/tests/utils_tests/test_safestring.py index 1a79afbf48..2ae8e57b19 100644 --- a/tests/utils_tests/test_safestring.py +++ b/tests/utils_tests/test_safestring.py @@ -121,3 +121,65 @@ class SafeStringTest(SimpleTestCase): msg = "object has no attribute 'dynamic_attr'" with self.assertRaisesMessage(AttributeError, msg): s.dynamic_attr = True + + def test_add_str(self): + s = SafeString("a&b") + cases = [ + ("test", "a&btest"), + ("

    unsafe

    ", "a&b<p>unsafe</p>"), + (SafeString("

    safe

    "), SafeString("a&b

    safe

    ")), + ] + for case, expected in cases: + with self.subTest(case=case): + self.assertRenderEqual("{{ s }}", expected, s=s + case) + + def test_add_obj(self): + + base_str = "strange" + add_str = "hello
    " + + class Add: + def __add__(self, other): + return base_str + other + + class AddSafe: + def __add__(self, other): + return mark_safe(base_str) + other + + class Radd: + def __radd__(self, other): + return other + base_str + + class RaddSafe: + def __radd__(self, other): + return other + mark_safe(base_str) + + left_add_expected = f"{base_str}{add_str}" + right_add_expected = f"{add_str}{base_str}" + cases = [ + # Left-add test cases. + (Add(), add_str, left_add_expected, str), + (Add(), mark_safe(add_str), left_add_expected, str), + (AddSafe(), add_str, left_add_expected, str), + (AddSafe(), mark_safe(add_str), left_add_expected, SafeString), + # Right-add test cases. + (add_str, Radd(), right_add_expected, str), + (mark_safe(add_str), Radd(), right_add_expected, str), + (add_str, Radd(), right_add_expected, str), + (mark_safe(add_str), RaddSafe(), right_add_expected, SafeString), + ] + for lhs, rhs, expected, expected_type in cases: + with self.subTest(lhs=lhs, rhs=rhs): + result = lhs + rhs + self.assertEqual(result, expected) + self.assertEqual(type(result), expected_type) + + cases = [ + ("hello", Add()), + ("hello", AddSafe()), + (Radd(), "hello"), + (RaddSafe(), "hello"), + ] + for lhs, rhs in cases: + with self.subTest(lhs=lhs, rhs=rhs), self.assertRaises(TypeError): + lhs + rhs diff --git a/tests/validation/models.py b/tests/validation/models.py index 653be4a239..ed88750364 100644 --- a/tests/validation/models.py +++ b/tests/validation/models.py @@ -48,7 +48,7 @@ class ModelToValidate(models.Model): class UniqueFieldsModel(models.Model): unique_charfield = models.CharField(max_length=100, unique=True) - unique_integerfield = models.IntegerField(unique=True) + unique_integerfield = models.IntegerField(unique=True, db_default=42) non_unique_field = models.IntegerField() diff --git a/tests/validation/test_unique.py b/tests/validation/test_unique.py index 4a8b3894f0..36ee6e9da0 100644 --- a/tests/validation/test_unique.py +++ b/tests/validation/test_unique.py @@ -146,6 +146,20 @@ class PerformUniqueChecksTest(TestCase): mtv = ModelToValidate(number=10, name="Some Name") mtv.full_clean() + def test_unique_db_default(self): + UniqueFieldsModel.objects.create(unique_charfield="foo", non_unique_field=42) + um = UniqueFieldsModel(unique_charfield="bar", non_unique_field=42) + with self.assertRaises(ValidationError) as cm: + um.full_clean() + self.assertEqual( + cm.exception.message_dict, + { + "unique_integerfield": [ + "Unique fields model with this Unique integerfield already exists." + ] + }, + ) + def test_unique_for_date(self): Post.objects.create( title="Django 1.0 is released", diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index 9383c0d873..c65514a170 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -398,6 +398,15 @@ class DebugViewTests(SimpleTestCase): response, "

    The install worked successfully! Congratulations!

    " ) + @override_settings( + ROOT_URLCONF="view_tests.default_urls", FORCE_SCRIPT_NAME="/FORCED_PREFIX" + ) + def test_default_urlconf_script_name(self): + response = self.client.request(**{"path": "/FORCED_PREFIX/"}) + self.assertContains( + response, "

    The install worked successfully! Congratulations!

    " + ) + @override_settings(ROOT_URLCONF="view_tests.regression_21530_urls") def test_regression_21530(self): """ @@ -1552,6 +1561,14 @@ class ExceptionReporterFilterTests( """ rf = RequestFactory() + sensitive_settings = [ + "SECRET_KEY", + "SECRET_KEY_FALLBACKS", + "PASSWORD", + "API_KEY", + "SOME_TOKEN", + "MY_AUTH", + ] def test_non_sensitive_request(self): """ @@ -1774,42 +1791,30 @@ class ExceptionReporterFilterTests( The debug page should not show some sensitive settings (password, secret key, ...). """ - sensitive_settings = [ - "SECRET_KEY", - "SECRET_KEY_FALLBACKS", - "PASSWORD", - "API_KEY", - "AUTH_TOKEN", - ] - for setting in sensitive_settings: - with self.settings(DEBUG=True, **{setting: "should not be displayed"}): - response = self.client.get("/raises500/") - self.assertNotContains( - response, "should not be displayed", status_code=500 - ) + for setting in self.sensitive_settings: + with self.subTest(setting=setting): + with self.settings(DEBUG=True, **{setting: "should not be displayed"}): + response = self.client.get("/raises500/") + self.assertNotContains( + response, "should not be displayed", status_code=500 + ) def test_settings_with_sensitive_keys(self): """ The debug page should filter out some sensitive information found in dict settings. """ - sensitive_settings = [ - "SECRET_KEY", - "SECRET_KEY_FALLBACKS", - "PASSWORD", - "API_KEY", - "AUTH_TOKEN", - ] - for setting in sensitive_settings: + for setting in self.sensitive_settings: FOOBAR = { setting: "should not be displayed", "recursive": {setting: "should not be displayed"}, } - with self.settings(DEBUG=True, FOOBAR=FOOBAR): - response = self.client.get("/raises500/") - self.assertNotContains( - response, "should not be displayed", status_code=500 - ) + with self.subTest(setting=setting): + with self.settings(DEBUG=True, FOOBAR=FOOBAR): + response = self.client.get("/raises500/") + self.assertNotContains( + response, "should not be displayed", status_code=500 + ) def test_cleanse_setting_basic(self): reporter_filter = SafeExceptionReporterFilter() @@ -1883,10 +1888,26 @@ class ExceptionReporterFilterTests( ) def test_request_meta_filtering(self): - request = self.rf.get("/", headers={"secret-header": "super_secret"}) + headers = { + "API_URL": "super secret", + "A_SIGNATURE_VALUE": "super secret", + "MY_KEY": "super secret", + "PASSWORD": "super secret", + "SECRET_VALUE": "super secret", + "SOME_TOKEN": "super secret", + "THE_AUTH": "super secret", + } + request = self.rf.get("/", headers=headers) reporter_filter = SafeExceptionReporterFilter() + cleansed_headers = reporter_filter.get_safe_request_meta(request) + for header in headers: + with self.subTest(header=header): + self.assertEqual( + cleansed_headers[f"HTTP_{header}"], + reporter_filter.cleansed_substitute, + ) self.assertEqual( - reporter_filter.get_safe_request_meta(request)["HTTP_SECRET_HEADER"], + cleansed_headers["HTTP_COOKIE"], reporter_filter.cleansed_substitute, ) @@ -1910,9 +1931,7 @@ class ExceptionReporterFilterTests( class CustomExceptionReporterFilter(SafeExceptionReporterFilter): cleansed_substitute = "XXXXXXXXXXXXXXXXXXXX" - hidden_settings = _lazy_re_compile( - "API|TOKEN|KEY|SECRET|PASS|SIGNATURE|DATABASE_URL", flags=re.I - ) + hidden_settings = _lazy_re_compile("PASS|DATABASE", flags=re.I) @override_settings( diff --git a/tox.ini b/tox.ini index c635a129b2..7a76693f21 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ setenv = PYTHONDONTWRITEBYTECODE=1 deps = -e . - py{3,310,311,312,py3}: -rtests/requirements/py3.txt + py{3,310,311,312,313,py3}: -rtests/requirements/py3.txt postgres: -rtests/requirements/postgres.txt mysql: -rtests/requirements/mysql.txt oracle: -rtests/requirements/oracle.txt