Skip to content

Commit f5e62e3

Browse files
cacrespocacrespo
authored
Merge branch '3.12' into traduccion-compound_stmts.po
2 parents 507d9d4 + 8d4cbf4 commit f5e62e3

File tree

141 files changed

+5867
-4478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+5867
-4478
lines changed

‎.github/workflows/main.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Obtiene la lista de archivos .po con cambios (sólo en PRs)
5353
if: github.event_name == 'pull_request'
5454
id: changed-po-files
55-
uses: tj-actions/changed-files@v40
55+
uses: tj-actions/changed-files@v45
5656
with:
5757
files: |
5858
**/*.po
@@ -77,7 +77,7 @@ jobs:
7777
diff -Naur TRANSLATORS <(LANG=es python scripts/sort.py < TRANSLATORS)
7878
- name: Powrap
7979
if: steps.po-files-to-check.outputs.any_po_files_to_check == 'true'
80-
run: powrap --check --quiet ${{ steps.po-files-to-check.outputs.po_files_to_check }}
80+
run: powrap --diff --check --quiet ${{ steps.po-files-to-check.outputs.po_files_to_check }}
8181
- name: Sphinx lint
8282
if: steps.po-files-to-check.outputs.any_po_files_to_check == 'true'
8383
run: sphinx-lint ${{ steps.po-files-to-check.outputs.po_files_to_check }}
@@ -88,13 +88,5 @@ jobs:
8888
# Construcción de la documentación
8989
- name: Construir documentación
9090
run: |
91-
# FIXME: Relative paths for includes in 'cpython'
92-
sed -i -e 's|.. include:: ../includes/wasm-notavail.rst|.. include:: ../../../../includes/wasm-notavail.rst|g' cpython/Doc/**/*.rst
93-
sed -i -e 's|.. include:: ../distutils/_setuptools_disclaimer.rst|.. include:: ../../../../distutils/_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
94-
sed -i -e 's|.. include:: ./_setuptools_disclaimer.rst|.. include:: ../../../_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
95-
sed -i -e 's|.. include:: token-list.inc|.. include:: ../../../token-list.inc|g' cpython/Doc/**/*.rst
96-
sed -i -e 's|.. include:: ../../using/venv-create.inc|.. include:: ../using/venv-create.inc|g' cpython/Doc/**/*.rst
97-
sed -i -e 's|.. include:: ../../../using/venv-create.inc|.. include:: ../../using/venv-create.inc|g' cpython/Doc/**/*.rst
98-
sed -i -e 's|.. include:: /using/venv-create.inc|.. include:: ../../../../using/venv-create.inc|g' cpython/Doc/**/*.rst
9991
# Normal build
10092
PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning sphinx-build -j auto -W --keep-going -b html -d cpython/Doc/_build/doctree -D language=es . cpython/Doc/_build/html

‎.github/workflows/pr-comment.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
python -m pip install -r base-branch/requirements.txt
3838
- name: Obtiene lista de archivos con cambios
3939
id: changed-files
40-
uses: tj-actions/changed-files@v40
40+
uses: tj-actions/changed-files@v45
4141
with:
4242
files: |
4343
**/*.po
@@ -62,7 +62,7 @@ jobs:
6262
pull-requests: write
6363
steps:
6464
- name: Agregar comentario con entradas faltantes
65-
uses: thollander/actions-comment-pull-request@v2
65+
uses: thollander/actions-comment-pull-request@v3
6666
with:
6767
message: ${{ needs.define-comment.outputs.comment }}
68-
comment_tag: missing-entries
68+
comment-tag: missing-entries

‎.overrides/faq.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ repositorio principal de la traducción). Se hace de la siguiente manera::
204204

205205
Luego nos vamos a nuestra rama local, confirmamos e impactamos esos cambios::
206206

207-
git checkout 3.11
208-
git merge upstream/3.11
209-
git push origin 3.11
207+
git checkout 3.12
208+
git merge upstream/3.12
209+
git push origin 3.12
210210

211211
¡Eso es todo!
212212

‎.overrides/progress.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ y otras estadísticas.
1010

1111
.. note::
1212

13-
Estas listas se actualiza automáticamente cuando Pull Requests se *mergean* a la rama ``3.11``.
13+
Estas listas se actualiza automáticamente cuando Pull Requests se *mergean* a la rama ``3.12``.
1414

1515

1616
En progreso

‎.overrides/translation-memory.rst

+7
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@ Dividimos esta sección en dos partes, los términos que se traducen y los que m
123123
docstring
124124
docstring. ``library/idle.po``
125125

126+
floor division
127+
división entera a la baja
128+
En este `issue`_ más información al respecto.
129+
126130
key
127131
clave
128132

@@ -318,3 +322,6 @@ Estas son las reglas de estilo que hemos convenido hasta el momento:
318322
extranjerismos.
319323

320324
Referencia: https://www.fundeu.es/recomendacion/locuciones-latinas-latinismos-errores-frecuentes-621/
325+
326+
327+
.. _issue: https://github.com/python/python-docs-es/issues/2754

‎.overrides/upgrade-python-version.rst

+18-12
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
3939
.. note:: This is important, so the later ``make build`` step will not reset
4040
the cpython submodule to the previous hash on the old branch.
4141

42+
#. Create a virtual environment and install the dependencies of the project::
43+
44+
python -m venv env
45+
source env/bin/activate # Windows: env\Scripts\activate.bat
46+
pip install -r requirements.txt
47+
4248
#. Verify that the docs build with the new versions you changed from
4349
``requirements.txt`` mainly the sphinx version::
4450

@@ -53,21 +59,14 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
5359

5460
#. Clean possible garbage (form previous builds)::
5561

56-
rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst
62+
rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst reviewers-guide.rst
5763

5864
.. note::
5965

6066
The 'python-docs-es-pot' is a temporary directory that is created
6167
in the next step. It's included here because it might be a leftover
6268
from previous attempts on your machine.
6369

64-
#. Create a virtual environment and install the dependencies of the project::
65-
66-
python -m venv env
67-
source env/bin/activate # Windows: env\Scripts\activate.bat
68-
pip install -r requirements.txt
69-
70-
7170
#. Create the .po files from the new source code. This will generate all the .po files for version 3.11::
7271

7372
SPHINX_GETTEXT=True sphinx-build -j auto -b gettext -d _build/doctrees . ../python-docs-es-pot
@@ -114,9 +113,16 @@ We are currently in branch 3.11, and we want to update the strings from 3.12.
114113
of the new branch is done. So prepare a cup of any hot beverage
115114
and fix them.
116115

117-
Once the process is completely and you are happy with the results,
118-
there are a few extra steps to finish the process::
116+
**Once the process is completely and you are happy with the results,
117+
there are a few extra steps to finish the process**
118+
119+
#. Upgrade GitHub Actions to use Python 3.12, by updating Python version to 3.12 in the ``.github/workflows/main.yml`` file.
119120

120-
#. Upgrade GitHub Actions to use Python 3.12
121+
#. Update the *Read the Docs* project to use 3.12 in the build and also as default branch/version.
122+
123+
#. Commit all the newly created files locally.
124+
125+
#. Create branch 3.12 in the repository in order to merge changes there.
126+
127+
#. Inside the github project settings, set 3.12 branch as the default branch for the repository.
121128

122-
#. Update Read the Docs project to use 3.12 in the build and also as default branch/version

‎.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
2-
- repo: https://github.com/JulienPalard/powrap
3-
rev: v0.4.0
2+
- repo: https://git.afpy.org/AFPy/powrap
3+
rev: v1.0.2
44
hooks:
55
- id: powrap
66
- repo: local

‎Makefile

+6-12
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ OUTPUT_DOCTREE := $(CPYTHON_WORKDIR)/Doc/build/doctree
2020
OUTPUT_HTML := $(CPYTHON_WORKDIR)/Doc/build/html
2121
LOCALE_DIR := $(CPYTHON_WORKDIR)/locale
2222
POSPELL_TMP_DIR := .pospell
23+
SPHINX_JOBS := auto
2324

2425

2526
.PHONY: help
@@ -38,22 +39,15 @@ help:
3839
# before this. If passing SPHINXERRORHANDLING='', warnings will not be
3940
# treated as errors, which is good to skip simple Sphinx syntax mistakes.
4041
.PHONY: build
41-
build: setup
42-
# FIXME: Relative paths for includes in 'cpython'
43-
# See more about this at https://github.com/python/python-docs-es/issues/1844
44-
sed -i -e 's|.. include:: ../includes/wasm-notavail.rst|.. include:: ../../../../includes/wasm-notavail.rst|g' cpython/Doc/**/*.rst
45-
sed -i -e 's|.. include:: ../distutils/_setuptools_disclaimer.rst|.. include:: ../../../../distutils/_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
46-
sed -i -e 's|.. include:: ./_setuptools_disclaimer.rst|.. include:: ../../../_setuptools_disclaimer.rst|g' cpython/Doc/**/*.rst
47-
sed -i -e 's|.. include:: token-list.inc|.. include:: ../../../token-list.inc|g' cpython/Doc/**/*.rst
48-
sed -i -e 's|.. include:: ../../using/venv-create.inc|.. include:: ../using/venv-create.inc|g' cpython/Doc/**/*.rst
49-
sed -i -e 's|.. include:: ../../../using/venv-create.inc|.. include:: ../../using/venv-create.inc|g' cpython/Doc/**/*.rst
50-
sed -i -e 's|.. include:: /using/venv-create.inc|.. include:: ../../../../using/venv-create.inc|g' cpython/Doc/**/*.rst
42+
build: setup do_build
43+
44+
.PHONY: do_build
45+
do_build:
5146
# Normal build
52-
PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning $(VENV)/bin/sphinx-build -j auto -W --keep-going -b html -d $(OUTPUT_DOCTREE) -D language=$(LANGUAGE) . $(OUTPUT_HTML) && \
47+
PYTHONWARNINGS=ignore::FutureWarning,ignore::RuntimeWarning $(VENV)/bin/sphinx-build -j $(SPHINX_JOBS) -W --keep-going -b html -d $(OUTPUT_DOCTREE) -D language=$(LANGUAGE) . $(OUTPUT_HTML) && \
5348
echo "Success! Open file://`pwd`/$(OUTPUT_HTML)/index.html, " \
5449
"or run 'make serve' to see them in http://localhost:8000";
5550

56-
5751
# setup: After running "venv" target, prepare that virtual environment with
5852
# a local clone of cpython repository and the translation files.
5953
# If the directories exists, only update the cpython repository and

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Traducción al Español de la Documentación de Python
2-
![Build Status](https://github.com/python/python-docs-es/actions/workflows/main.yml/badge.svg?branch=3.11 "Build Status")
3-
![Documentation Status](https://readthedocs.org/projects/python-docs-es/badge/?version=3.11 "Documentation Status")
2+
![Build Status](https://github.com/python/python-docs-es/actions/workflows/main.yml/badge.svg?branch=3.12 "Build Status")
3+
![Documentation Status](https://readthedocs.org/projects/python-docs-es/badge/?version=3.12 "Documentation Status")
44
## ¿Cómo contribuir?
55

66
Tenemos una guía que te ayudará a contribuir. Por favor

‎TRANSLATORS

+8-3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Carlos Bernad (@carlos-bernad)
4343
Carlos Enrique Carrasco Varas (@KrlitosForever)
4444
Carlos Joel Delgado Pizarro (@c0x6a)
4545
Carlos Martel Lamas (@Letram)
46+
Carlos Mena Pérez (@carlosm00)
4647
Catalina Arrey Amunátegui (@CatalinaArrey)
4748
Claudia Millán Nebot (@clacri @cheshireminima)
4849
Constanza Areal (@geekcoty)
@@ -124,8 +125,8 @@ José Carlos Álvarez González (@jcaalzago)
124125
José Daniel Gonzalez (@jdgc14)
125126
Jose Ignacio Riaño Chico
126127
José Luis Cantilo (@jcantilo)
127-
José Luis Salgado Banda (@josephLSalgado)
128128
José Miguel Hernández Cabrera (@miguelheca)
129+
Joseph Salgado (@xooseph)
129130
Juan Alegría (@zejiran)
130131
Juan Antonio Lagos (@alochimpasplum)
131132
Juan Biondi (@yeyeto2788)
@@ -158,6 +159,7 @@ Lis
158159
Lucas Miranda
159160
Luciano Bovio (@lbovio)
160161
Luis A. Gonzalez (@sublian)
162+
Luis Enriquez Torres (@lenriquezt)
161163
Luis Llave (@llaveluis)
162164
Luis Sánchez (@LuisAISanchez)
163165
Maia
@@ -178,6 +180,7 @@ María José Molina Contreras (@mjmolina)
178180
María Saiz Muñoz (@mariasm87)
179181
Martín Gaitán (@mgaitan)
180182
Martín Ramírez (@tinchoram)
183+
Mateo Cámara (@MateoCamara)
181184
Matias Bordese (@matiasb)
182185
Melissa Escobar Gutiérrez (@MelissaEscobar)
183186
Miguel Ángel
@@ -216,6 +219,7 @@ Samantha Valdez A. (@samvaldez)
216219
Santiago E Fraire Willemoes (@Woile)
217220
Santiago Piccinini (@spiccinini)
218221
Screpnik Claudia Raquel
222+
Sebastian Melo (@CarpioWeen1)
219223
Sergio Delgado Quintero (@sdelquin)
220224
Sergio Infante (@neosergio)
221225
Silvina Tamburini (@silvinabt87)
@@ -226,7 +230,7 @@ Sumit Kashyap
226230
Summerok
227231
Tatiana Delgadillo (@Tai543)
228232
Tony-Rome
229-
Ulises Alexander Argüelles Monjaraz (@UlisesAlexanderAM)
233+
Ulises Alexander Arguelles Monjaraz (@UlisesAlexanderAM)
230234
Victor Carlos (@tuxtitlan)
231235
Víctor Yelicich
232236
Victoria Perez Mola (@victoriapm)
@@ -238,4 +242,5 @@ Xavi Francisco (@srxavi)
238242
Xavi Rambla Centellas (@xavirambla)
239243
Yennifer Paola Herrera Ariza (@Yenniferh)
240244
Yohanna Padrino (@Yo-hanaPR)
241-
zejiran
245+
zejiran
246+
Zodac (@zodacdev)

‎c-api/apiabiversion.po

+8-5
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-10-31 21:13-0300\n"
14+
"PO-Revision-Date: 2024-10-31 01:00-0400\n"
1515
"Last-Translator: \n"
16-
"Language: es\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.5\n"
2324

2425
#: ../Doc/c-api/apiabiversion.rst:7
2526
msgid "API and ABI Versioning"
@@ -182,12 +183,14 @@ msgstr ""
182183
#: ../Doc/c-api/apiabiversion.rst:61
183184
msgid "Use this for numeric comparisons, e.g. ``#if PY_VERSION_HEX >= ...``."
184185
msgstr ""
186+
"Use esto para comparaciones numéricas, por ejemplo ``#if PY_VERSION_HEX "
187+
">= ...``."
185188

186189
#: ../Doc/c-api/apiabiversion.rst:63
187-
#, fuzzy
188190
msgid "This version is also available via the symbol :c:var:`Py_Version`."
189191
msgstr ""
190-
"Esta versión también está disponible a través del símbolo :data:`Py_Version`."
192+
"Esta versión también está disponible a través del símbolo :c:var:"
193+
"`Py_Version`."
191194

192195
#: ../Doc/c-api/apiabiversion.rst:67
193196
msgid ""

‎c-api/bytearray.po

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ msgstr ""
1111
"Project-Id-Version: Python 3.8\n"
1212
"Report-Msgid-Bugs-To: \n"
1313
"POT-Creation-Date: 2023-10-12 19:43+0200\n"
14-
"PO-Revision-Date: 2022-11-05 12:32-0300\n"
14+
"PO-Revision-Date: 2024-10-29 21:11-0400\n"
1515
"Last-Translator: Sofía Denner <sofi.denner@gmail.com>\n"
16-
"Language: es\n"
1716
"Language-Team: python-doc-es\n"
18-
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17+
"Language: es\n"
1918
"MIME-Version: 1.0\n"
2019
"Content-Type: text/plain; charset=utf-8\n"
2120
"Content-Transfer-Encoding: 8bit\n"
21+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
2222
"Generated-By: Babel 2.13.0\n"
23+
"X-Generator: Poedit 3.5\n"
2324

2425
#: ../Doc/c-api/bytearray.rst:6
2526
msgid "Byte Array Objects"
@@ -128,9 +129,8 @@ msgstr ""
128129

129130
#: ../Doc/c-api/bytearray.rst:8
130131
msgid "object"
131-
msgstr ""
132+
msgstr "object"
132133

133134
#: ../Doc/c-api/bytearray.rst:8
134-
#, fuzzy
135135
msgid "bytearray"
136-
msgstr "Objetos de arreglos de bytes (*bytearrays*)"
136+
msgstr "bytearray"

0 commit comments

Comments
 (0)