Merge branch 'master' into feature-improve-cleartokens-performance

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
       - id: black
         exclude: ^(oauth2_provider/migrations/|tests/migrations/)
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: check-ast
       - id: trailing-whitespace

AUTHORS

@@ -65,4 +65,4 @@ pySilver
 Shaheed Haque
 Andrea Greco
 Vinay Karanam
-
+Eduardo Oliveira

CHANGELOG.md

@@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 * #651 Batch expired token deletions in `cleartokens` management command
 
+### Added
+
+* Added pt-BR translations.
+
 ## [1.6.1] 2021-12-23
 
 ### Changed

docs/contributing.rst

@@ -256,7 +256,7 @@ The following notes are to remind the project maintainers and leads of the steps
 review and merge PRs and to publish a new release.
 
 Reviewing and Merging PRs
-------------------------
+-------------------------
 
 - Make sure the PR description includes the `pull request template
   <https://github.com/jazzband/django-oauth-toolkit/blob/master/.github/pull_request_template.md>`_
@@ -272,18 +272,25 @@ PRs that are incorrectly merged may (reluctantly) be reverted by the Project Lea
 Publishing a Release
 --------------------
 
-Only Project Leads can publish a release to pypi.org and rtfd.io. This checklist is a reminder
-of steps.
+Only Project Leads can `publish a release <https://jazzband.co/about/releases>`_ to pypi.org
+and rtfd.io. This checklist is a reminder of the required steps.
 
 - When planning a new release, create a `milestone
   <https://github.com/jazzband/django-oauth-toolkit/milestones>`_
   and assign issues, PRs, etc. to that milestone.
 - Review all commits since the last release and confirm that they are properly
-  documented in the CHANGELOG. (Unfortunately, this has not always been the case
-  so you may be stuck documenting things that should have been documented as part of their PRs.)
+  documented in the CHANGELOG. Reword entries as appropriate with links to docs
+  to make them meaningful to users.
 - Make a final PR for the release that updates:
 
   - CHANGELOG to show the release date.
-  - setup.cfg to set `version = ...`
-
-- Once the final PR is committed push the new release to pypi and rtfd.io.
+  - `oauth2_provider/__init__.py` to set `__version__ = "..."`
+
+- Once the final PR is merged, create and push a tag for the release. You'll shortly
+  get a notification from Jazzband of the availability of two pypi packages (source tgz
+  and wheel). Download these locally before releasing them.
+- Do a `tox -e build` and extract the downloaded and bullt wheel zip and tgz files into
+  temp directories and do a `diff -r` to make sure they have the same content.
+  (Unfortunately the checksums do not match due to timestamps in the metadata
+  so you need to compare all the files.)
+- Once happy that the above comparison checks out, approve the releases to Pypi.org.

oauth2_provider/locale/pt_BR/LC_MESSAGES/django.po

@@ -0,0 +1,202 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Eduardo Oliveira <eduardo_y05@outlook.com>, 2021.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-30 09:50-0300\n"
+"PO-Revision-Date: 2021-12-30 09:50-0300\n"
+"Last-Translator: Eduardo Oliveira <eduardo_y05@outlook.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: models.py:50
+msgid "Confidential"
+msgstr "Confidencial"
+
+#: models.py:51
+msgid "Public"
+msgstr "Público"
+
+#: models.py:60
+msgid "Authorization code"
+msgstr "Código de Autorização"
+
+#: models.py:61
+msgid "Implicit"
+msgstr "Implícito"
+
+#: models.py:62
+msgid "Resource owner password-based"
+msgstr "Baseado na senha do proprietário do recurso"
+
+#: models.py:63
+msgid "Client credentials"
+msgstr "Credenciais do cliente"
+
+#: models.py:64
+msgid "OpenID connect hybrid"
+msgstr "Híbrido de conexão OpenID"
+
+#: models.py:71
+msgid "No OIDC support"
+msgstr "Sem suporte a OIDC"
+
+#: models.py:72
+msgid "RSA with SHA-2 256"
+msgstr "RSA com SHA-2 256"
+
+#: models.py:73
+msgid "HMAC with SHA-2 256"
+msgstr "HMAC com SHA-2 256"
+
+#: models.py:88
+msgid "Allowed URIs list, space separated"
+msgstr "Lista de URLs permitidos, separados por espaço"
+
+#: models.py:155
+#, python-brace-format
+msgid "Unauthorized redirect scheme: {scheme}"
+msgstr "Esquema de redirecionamento não autorizado: {scheme}"
+
+#: models.py:159
+#, python-brace-format
+msgid "redirect_uris cannot be empty with grant_type {grant_type}"
+msgstr "redirect_uris não pode ser vázio com o grant_type {grant_type}"
+
+#: models.py:165
+msgid "You must set OIDC_RSA_PRIVATE_KEY to use RSA algorithm"
+msgstr "Você precisa definir OIDC_RSA_PRIVATE_KEY para usar o algoritmo RSA"
+
+#: models.py:174
+msgid "You cannot use HS256 with public grants or clients"
+msgstr "Você não pode usar HS256 com concessões publicas ou clientes"
+
+#: oauth2_validators.py:181
+msgid "The access token is invalid."
+msgstr "O token de acesso é inválido."
+
+#: oauth2_validators.py:188
+msgid "The access token has expired."
+msgstr "O token de acesso expirou."
+
+#: oauth2_validators.py:195
+msgid "The access token is valid but does not have enough scope."
+msgstr "O token de acesso é valido porém não tem o escopo necessário."
+
+#: templates/oauth2_provider/application_confirm_delete.html:6
+msgid "Are you sure to delete the application"
+msgstr "Tem certeza que deseja remover a aplicação?"
+
+#: templates/oauth2_provider/application_confirm_delete.html:12
+#: templates/oauth2_provider/authorize.html:29
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: templates/oauth2_provider/application_confirm_delete.html:13
+#: templates/oauth2_provider/application_detail.html:38
+#: templates/oauth2_provider/authorized-token-delete.html:7
+msgid "Delete"
+msgstr "Remover"
+
+#: templates/oauth2_provider/application_detail.html:10
+msgid "Client id"
+msgstr "ID do Cliente"
+
+#: templates/oauth2_provider/application_detail.html:15
+msgid "Client secret"
+msgstr "Palavra-Chave Secreta do Cliente"
+
+#: templates/oauth2_provider/application_detail.html:20
+msgid "Client type"
+msgstr "Tipo de Cliente"
+
+#: templates/oauth2_provider/application_detail.html:25
+msgid "Authorization Grant Type"
+msgstr "Tipo de concessão de autorização"
+
+#: templates/oauth2_provider/application_detail.html:30
+msgid "Redirect Uris"
+msgstr "URLs de redirecionamento"
+
+#: templates/oauth2_provider/application_detail.html:36
+#: templates/oauth2_provider/application_form.html:35
+msgid "Go Back"
+msgstr "Voltar"
+
+#: templates/oauth2_provider/application_detail.html:37
+msgid "Edit"
+msgstr "Editar"
+
+#: templates/oauth2_provider/application_form.html:9
+msgid "Edit application"
+msgstr "Editar Aplicação"
+
+#: templates/oauth2_provider/application_form.html:37
+msgid "Save"
+msgstr "Salvar"
+
+#: templates/oauth2_provider/application_list.html:6
+msgid "Your applications"
+msgstr "Suas Aplicações"
+
+#: templates/oauth2_provider/application_list.html:14
+msgid "New Application"
+msgstr "Nova Aplicação"
+
+#: templates/oauth2_provider/application_list.html:17
+msgid "No applications defined"
+msgstr "Não existem aplicações definidas"
+
+#: templates/oauth2_provider/application_list.html:17
+msgid "Click here"
+msgstr "Clicar aqui"
+
+#: templates/oauth2_provider/application_list.html:17
+msgid "if you want to register a new one"
+msgstr "se você deseja registrar uma nova"
+
+#: templates/oauth2_provider/application_registration_form.html:5
+msgid "Register a new application"
+msgstr "Registrar uma nova aplicação"
+
+#: templates/oauth2_provider/authorize.html:8
+#: templates/oauth2_provider/authorize.html:30
+msgid "Authorize"
+msgstr "Autorizar"
+
+#: templates/oauth2_provider/authorize.html:17
+msgid "Application requires the following permissions"
+msgstr "A Aplicação precisa das seguintes permissões"
+
+#: templates/oauth2_provider/authorized-oob.html:12
+msgid "Success"
+msgstr "Sucesso"
+
+#: templates/oauth2_provider/authorized-oob.html:14
+msgid "Please return to your application and enter this code:"
+msgstr "Por favor, retorne para a sua aplicação e insira o seguinte código:"
+
+#: templates/oauth2_provider/authorized-token-delete.html:6
+msgid "Are you sure you want to delete this token?"
+msgstr "Você tem certeza que deseja remover esse token?"
+
+#: templates/oauth2_provider/authorized-tokens.html:6
+msgid "Tokens"
+msgstr "Tokens"
+
+#: templates/oauth2_provider/authorized-tokens.html:11
+msgid "revoke"
+msgstr "Revogar"
+
+#: templates/oauth2_provider/authorized-tokens.html:19
+msgid "There are no authorized tokens yet."
+msgstr "Não existem tokens autorizados ainda."

tox.ini

@@ -82,17 +82,14 @@ deps =
     flake8-quotes
     flake8-black
 
-[testenv:install]
+[testenv:build]
 deps =
-    twine
     setuptools>=39.0
     wheel
 whitelist_externals = rm
 commands =
     rm -rf dist
     python setup.py sdist bdist_wheel
-    twine upload dist/*
-
 
 [coverage:run]
 source = oauth2_provider
@@ -103,7 +100,7 @@ show_missing = True
 
 [flake8]
 max-line-length = 110
-exclude = docs/, oauth2_provider/migrations/, tests/migrations/, .tox/
+exclude = docs/, oauth2_provider/migrations/, tests/migrations/, .tox/, build/, dist/
 application-import-names = oauth2_provider
 inline-quotes = double
 extend-ignore = E203, W503