Skip to content

Commit 45e444f

Browse files
committed
Merge branch '3.8' into pr-756
2 parents 23fa1ed + 77c4db3 commit 45e444f

27 files changed

+1023
-218
lines changed

.github/workflows/main.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Test
2+
3+
on:
4+
push:
5+
branches:
6+
- 3.*
7+
pull_request:
8+
9+
jobs:
10+
test:
11+
name: Test
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v2
15+
- name: Preparar Python v3.8
16+
uses: actions/setup-python@v2
17+
with:
18+
python-version: 3.8
19+
- name: Sincronizar con CPython
20+
run: |
21+
git submodule sync
22+
git submodule update --init --force cpython
23+
- name: Instalar dependencias
24+
run: |
25+
sudo apt-get update
26+
sudo apt-get install -y hunspell hunspell-es gettext
27+
python -m pip install -r requirements.txt
28+
pip list
29+
pospell --version
30+
powrap --version
31+
- name: Powrap
32+
run: powrap --check --quiet **/*.po
33+
- name: Pospell
34+
run: |
35+
python scripts/create_dict.py
36+
pospell -p dict.txt -l es_ES **/*.po
37+
- name: Construir documentación
38+
run: PYTHONWARNINGS=ignore::FutureWarning sphinx-build -j auto -W --keep-going -b html -d cpython/Doc/_build/doctree -D language=es . cpython/Doc/_build/html

.overrides/faq.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pospell. Pospell puede ser instalada en tu entorno de Python empleando pip
2626
Una vez instalado, para chequear el fichero .po sobre el que estás trabajando,
2727
ejecuta desde el directorio principal del repo::
2828

29-
awk 1 dict dictionaries/*.txt > dict.txt
30-
pospell -p dict.txt -l es_AR -l es_ES path/tu_fichero.po
29+
python scripts/create_dict.py # para crear el archivo 'dict.txt'
30+
pospell -p dict.txt -l es_ES path/tu_fichero.po
3131

3232
pospell emplea la herramienta de diccionarios hunspell. Si pospell falla dando
3333
como error que no tiene hunspell instalado, lo puedes instalar así:

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ repos:
77
hooks:
88
- id: merge-dicts
99
name: merge-dicts
10-
entry: ./scripts/merge-dicts.sh
11-
language: script
10+
entry: python ./scripts/create_dict.py
11+
language: python
1212
# This one requires package ``hunspell-es_es`` in Archlinux
1313
- repo: https://github.com/JulienPalard/pospell
1414
rev: v1.0.5
1515
hooks:
1616
- id: pospell
17-
args: ['--personal-dict', 'dict.txt', '--modified', '--language', 'es_ES', '--language', 'es_AR']
17+
args: ['--personal-dict', 'dict.txt', '--modified', '--language', 'es_ES']

.travis.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ progress: venv
8989

9090
.PHONY: spell
9191
spell: venv
92-
# 'cat' tenia el problema que algunos archivos no tenían una nueva línea al final
93-
# 'awk 1' agregará una nueva línea en caso que falte.
94-
awk 1 dict dictionaries/*.txt > dict.txt
92+
$(VENV)/bin/python scripts/create_dict.py
9593
$(VENV)/bin/pospell -p dict.txt -l es_ES **/*.po
9694

9795

TRANSLATORS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ Javier Artiga Garijo (@jartigag)
109109
Ayose Figuera (@ayosefiguera)
110110
Alvaro Cárdenas (@alvaruz)
111111
Daniel Vera Nieto (@dveni)
112+
Beatriz Cabrero Saiz (@Xhiel23)
112113
Andros Fenollosa Hurtado (@tanrax)
113114
María Saiz Muñoz (@mariasm87)
114115
Sofia Carballo (@sofiacarballo)
@@ -121,3 +122,6 @@ Enrique Zárate (@enrique-zarate)
121122
Jaume Montané (@jaumemy)
122123
Endika Gil (@endikagil)
123124
Federico Zuccolo (@fzuccolo)
125+
Gibran Herrera (@gibranhl)
126+
Ulises Alexander Argüelles Monjaraz (@UlisesAlexanderAM)
127+
Victor Carlos (@tuxtitlan)

conf.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,15 @@
4747

4848
if not os.environ.get('SPHINX_GETTEXT') == 'True':
4949
# Override all the files from ``.overrides`` directory
50-
import glob
51-
for root, dirs, files in os.walk('.overrides'):
52-
for fname in files:
53-
if fname == 'README.rst' and root == '.overrides':
54-
continue
55-
destroot = root.replace('.overrides', '').lstrip('/')
56-
outputdir = os.path.join(
57-
'cpython',
58-
'Doc',
59-
destroot,
60-
fname,
61-
)
62-
os.system(f'ln -nfs `pwd`/{root}/{fname} {outputdir}')
50+
from pathlib import Path
51+
overrides_paths = Path('.overrides')
52+
53+
for path in overrides_paths.glob('**/*.*'):
54+
if path.name == 'README.rst' and path.parent == '.overrides':
55+
continue
56+
destroot = str(path.parent).replace('.overrides', '').lstrip('/')
57+
outputdir = Path('cpython/Doc') / destroot / path.name
58+
os.system(f'ln -nfs `pwd`/{path.parent}/{path.name} {outputdir}')
6359

6460
gettext_compact = False
6561
locale_dirs = ['../locales', 'cpython/locales'] # relative to the sourcedir

dictionaries/library_msilib.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Database
2+
View
3+
Summary
4+
Information
5+
Record
6+
Directory

dictionaries/tutorial_classes.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
sorpresivo
2+
necesitás
3+
Notá
4+
Hacé
5+
Debés
6+
Observá
7+
Fijate
8+
llamás
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Considerá
2+
usás
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
ingresás
2+
Frená
3+
recordá
4+
esperás
5+
mostrás
6+
redondeás
7+
probá

dictionaries/tutorial_inputoutput.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Mirá
2+
mirá
3+
querés
4+
tenés
5+
Asegurate
6+
consultá

distutils/_setuptools_disclaimer.po

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,29 @@
44
# package.
55
# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
66
#
7-
#, fuzzy
87
msgid ""
98
msgstr ""
10-
"Project-Id-Version: Python en Español 3.7\n"
9+
"Project-Id-Version: Python en Español 3.8\n"
1110
"Report-Msgid-Bugs-To: \n"
1211
"POT-Creation-Date: 2020-05-05 12:54+0200\n"
13-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14-
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15-
"Language-Team: LANGUAGE <LL@li.org>\n"
12+
"PO-Revision-Date: 2020-11-27 17:49-0600\n"
1613
"MIME-Version: 1.0\n"
17-
"Content-Type: text/plain; charset=utf-8\n"
14+
"Content-Type: text/plain; charset=UTF-8\n"
1815
"Content-Transfer-Encoding: 8bit\n"
1916
"Generated-By: Babel 2.8.0\n"
17+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18+
"Last-Translator: \n"
19+
"Language-Team: \n"
20+
"Language: es\n"
21+
"X-Generator: Poedit 2.4.1\n"
2022

2123
#: ../Doc/distutils/_setuptools_disclaimer.rst:3
2224
msgid ""
2325
"This document is being retained solely until the ``setuptools`` "
2426
"documentation at https://setuptools.readthedocs.io/en/latest/setuptools.html "
2527
"independently covers all of the relevant information currently included here."
2628
msgstr ""
29+
"Este documento se conserva únicamente hasta que la documentación de "
30+
"``setuptools`` en https://setuptools.readthedocs.io/en/latest/setuptools."
31+
"html cubra de forma independiente toda la información relevante incluida "
32+
"actualmente aquí."

distutils/index.po

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,54 +6,60 @@
66
# Check https://github.com/python/python-docs-es/blob/3.8/TRANSLATORS to
77
# get the list of volunteers
88
#
9-
#, fuzzy
109
msgid ""
1110
msgstr ""
1211
"Project-Id-Version: Python 3.8\n"
1312
"Report-Msgid-Bugs-To: \n"
1413
"POT-Creation-Date: 2020-05-05 12:54+0200\n"
15-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
16-
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14+
"PO-Revision-Date: 2020-11-21 17:08-0500\n"
1715
"Language-Team: python-doc-es\n"
1816
"MIME-Version: 1.0\n"
19-
"Content-Type: text/plain; charset=utf-8\n"
17+
"Content-Type: text/plain; charset=UTF-8\n"
2018
"Content-Transfer-Encoding: 8bit\n"
2119
"Generated-By: Babel 2.8.0\n"
20+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
21+
"Last-Translator: \n"
22+
"Language: es\n"
23+
"X-Generator: Poedit 2.4.1\n"
2224

2325
#: ../Doc/distutils/index.rst:5
2426
msgid "Distributing Python Modules (Legacy version)"
25-
msgstr ""
27+
msgstr "Distribución de módulos de Python (versión heredada)"
2628

2729
#: ../Doc/distutils/index.rst
2830
msgid "Authors"
29-
msgstr ""
31+
msgstr "Autores"
3032

3133
#: ../Doc/distutils/index.rst:7
3234
msgid "Greg Ward, Anthony Baxter"
33-
msgstr ""
35+
msgstr "Greg Ward, Anthony Baxter"
3436

3537
#: ../Doc/distutils/index.rst
3638
msgid "Email"
37-
msgstr ""
39+
msgstr "Email"
3840

3941
#: ../Doc/distutils/index.rst:8
4042
msgid "distutils-sig@python.org"
41-
msgstr ""
43+
msgstr "distutils-sig@python.org"
4244

4345
#: ../Doc/distutils/index.rst:12
4446
msgid ":ref:`distributing-index`"
45-
msgstr ""
47+
msgstr ":ref:`distributing-index`"
4648

4749
#: ../Doc/distutils/index.rst:13
4850
msgid "The up to date module distribution documentations"
49-
msgstr ""
51+
msgstr "La documentación de distribución de módulos actualizada"
5052

5153
#: ../Doc/distutils/_setuptools_disclaimer.rst:3
5254
msgid ""
5355
"This document is being retained solely until the ``setuptools`` "
5456
"documentation at https://setuptools.readthedocs.io/en/latest/setuptools.html "
5557
"independently covers all of the relevant information currently included here."
5658
msgstr ""
59+
"Este documento se conserva únicamente hasta que la documentación de "
60+
"``setuptools`` en https://setuptools.readthedocs.io/en/latest/setuptools."
61+
"html cubra de forma independiente toda la información relevante que se "
62+
"incluye actualmente aquí."
5763

5864
#: ../Doc/distutils/index.rst:19
5965
msgid ""
@@ -63,6 +69,12 @@ msgid ""
6369
"recommendations section <https://packaging.python.org/guides/tool-"
6470
"recommendations/>`__ in the Python Packaging User Guide for more information."
6571
msgstr ""
72+
"Esta guía solo cubre las herramientas básicas para compilar y distribuir "
73+
"extensiones que se proporcionan como parte de esta versión de Python. Las "
74+
"herramientas de terceros ofrecen alternativas más seguras y más fáciles de "
75+
"usar. Consulte la `sección de recomendaciones rápidas <https://packaging."
76+
"python.org/guides/tool-recommendations/>`__ en la Guía del usuario de Python "
77+
"Packaging para obtener más información."
6678

6779
#: ../Doc/distutils/index.rst:25
6880
msgid ""
@@ -71,3 +83,8 @@ msgid ""
7183
"capabilities that ``setuptools`` builds on to allow Python developers to "
7284
"make Python modules and extensions readily available to a wider audience."
7385
msgstr ""
86+
"Este documento describe las utilidades de distribución de Python (\"Distutils"
87+
"\") desde el punto de vista del desarrollador del módulo, describiendo las "
88+
"capacidades subyacentes sobre las que se basan las ``setuptools`` para "
89+
"permitir que los desarrolladores de Python hagan que los módulos y "
90+
"extensiones de Python estén disponibles para una audiencia más amplia."

distutils/uploading.po

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,30 @@
66
# Check https://github.com/python/python-docs-es/blob/3.8/TRANSLATORS to
77
# get the list of volunteers
88
#
9-
#, fuzzy
109
msgid ""
1110
msgstr ""
1211
"Project-Id-Version: Python 3.8\n"
1312
"Report-Msgid-Bugs-To: \n"
1413
"POT-Creation-Date: 2020-05-05 12:54+0200\n"
15-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
16-
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14+
"PO-Revision-Date: 2020-12-06 20:23-0300\n"
1715
"Language-Team: python-doc-es\n"
1816
"MIME-Version: 1.0\n"
19-
"Content-Type: text/plain; charset=utf-8\n"
17+
"Content-Type: text/plain; charset=UTF-8\n"
2018
"Content-Transfer-Encoding: 8bit\n"
2119
"Generated-By: Babel 2.8.0\n"
20+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
21+
"Last-Translator: \n"
22+
"Language: es\n"
23+
"X-Generator: Poedit 2.4.2\n"
2224

2325
#: ../Doc/distutils/uploading.rst:5
2426
msgid "Uploading Packages to the Package Index"
25-
msgstr ""
27+
msgstr "Subir paquetes al índice de paquetes"
2628

2729
#: ../Doc/distutils/uploading.rst:7
2830
msgid ""
2931
"References to up to date PyPI documentation can be found at :ref:`publishing-"
3032
"python-packages`."
3133
msgstr ""
34+
"Referencias a la documentación actualizada de PyPI pueden encontrarse en :"
35+
"ref:`publishing-python-packages`."

0 commit comments

Comments
 (0)