Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit71bdbf8

Browse files
authored
Merge branch '3.10' into correccion_formato
2 parents27fab2e +25455dc commit71bdbf8

File tree

237 files changed

+4317
-7082
lines changed

Some content is hidden

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

237 files changed

+4317
-7082
lines changed

‎.github/workflows/main.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@ jobs:
2222
-name:Instalar dependencias
2323
run:|
2424
sudo apt-get update
25-
sudo apt-get install -y hunspell hunspell-es gettext
25+
sudo apt-get install -y hunspell hunspell-es gettext language-pack-es
2626
python -m pip install -r requirements.txt
2727
pip list
2828
pospell --version
2929
powrap --version
30+
-name:TRANSLATORS
31+
run:|
32+
diff -Naur TRANSLATORS <(LANG=es python scripts/sort.py < TRANSLATORS)
3033
-name:Powrap
3134
run:powrap --check --quiet **/*.po
3235
-name:Pospell

‎.overrides/CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ realizado para no traducir dos veces lo mismo. El proceso para traducir un
114114
archivo es el siguiente:
115115

116116

117-
#. Eligecualquier de los que *no están asignados* a otra persona.
117+
#. Eligecualquiera de los issues que *no están asignados* a otra persona.
118118
#. Deja un comentario en el issue diciendo que quieres trabajar en él.
119119
#. Espera a que un administrador te asigne el issue.
120120
#. ¡Empieza a traducir!

‎.overrides/logo/README.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
README
2+
======
3+
4+
Introducción
5+
------------
6+
7+
Este README describe la técnica utilizada en Inkscape para generar
8+
el logo de python-docs-es con el nombre de todos los traductores.
9+
10+
La tecnica se llama a veces "Text portrait" y consiste simplemente
11+
en utilizar una imagen como mascara para un texto. Muchos tutoriales
12+
en línea explican el proceso de forma mas o menos completa.
13+
14+
Los archivos`ready-centered.svg` y`ready-fullpage.svg` ya tienen
15+
la tecnica aplicada sobre la imágen de una letra "ñ".
16+
17+
La lista de todos los traductores está en el archivo`./TRANSLATORS`.
18+
Lo ideal es transformar los`\n` en espacios poder copiar y pegar.
19+
Por ejemplo:`$ cat TRANSLATORS | tr '\n' ' '`
20+
21+
22+
Modificar la lista de traductores
23+
---------------------------------
24+
25+
Si sólo se quiere modificar la lista de traductores:
26+
27+
0. En Inkscape abrir uno de los archivos SVG (`ready-centered.svg` o`ready-fullpage.svg`)
28+
1. Abrir el panel de objetos (`Object`/`Objects...`).
29+
2. Seleccionar el objeto`text`
30+
3. Abrir el panel de texto (`Text`/`Text and fonts...` o`Shift`+`Ctrl`+`T`)
31+
4. Elegir el tabs`Text` del panel de texto
32+
5. Remplazar el contenido y cliquear`Apply`
33+
34+
Si el texto es mas corto o mas largo, para que el texto ocupe toda la imágen
35+
puede que haya que adaptar la fuente utilizada (fuente, tamaño, espaciado, ...).
36+
37+
38+
Modificar la imágen
39+
-------------------
40+
41+
Si se quiere modificar la imágen utilizada:
42+
43+
0. En Inkscape abrir uno de los archivos SVG (`ready-centered.svg` o`ready-fullpage.svg`)
44+
1. Abrir el panel de objetos (`Object`/`Objects...`)
45+
2. Seleccionar el objeto`text`
46+
3. Elegir la opción`Object`/`Mask`/`Release` para "soltar" la máscara utilizada
47+
4. En el panel de objetos, aparece un grupo (`gXXXXX`) con la la ñ y un fondo gris
48+
5. Eliminar u ocultar el grupo
49+
6. Agregar la nueva imágen a utilizar (via Drag and Drop o`File`/`Import...`)
50+
7. Aseguarse que la imágen tiene el mismo tamaño que el texto:
51+
a. Seleccionar el objeto texto ->`Ctrl`+`C`
52+
b. Seleccionar la imágen agregada ->`Edit`/`Paste Size`/`Paste Size`
53+
8. Centrar la imágen sobre la página (panel`Object`/`Align and Distribute`)
54+
9. En el panel de objetos, seleccionar la imágen y luego el texto
55+
10. Setear la máscara con`Object`/`Mask`/`Set`
56+
57+
En las partes oscuras de la imágen aparece el texto claro y viceversa.
58+
Puede que sea necesario ajustar la imágen para obtener un buen resultado.

‎.overrides/logo/ready-centered.svg

Lines changed: 526 additions & 0 deletions
Loading

‎.overrides/logo/ready-fullpage.svg

Lines changed: 526 additions & 0 deletions
Loading

‎.overrides/upgrade-python-version.rst

Lines changed: 61 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,93 @@
11
:orphan:
22

3-
=======================================
4-
How to update to a new Python version
5-
=======================================
3+
How to update to a new Python version
4+
=====================================
65

7-
We are currently in branch 3.7, and we want to update the strings from 3.8.
6+
We are currently in branch 3.10, and we want to update the strings from 3.11.
87

98

10-
#. Fetch the `lastet commit of 3.8 branch<https://github.com/python/cpython/commit/70fe95cdc9ac1b00d4f86b7525dca80caf7003e1>`_::
9+
#. Make sure you are in a clean state of the branch 3.10
10+
11+
#. Create a new branch
12+
13+
#. Fetch the `latest commit of 3.10 branch<https://github.com/python/cpython/commit/69b6b56d857440183e227ca0b10c84bca4239985>`_::
1114

1215
cd cpython/
13-
git fetch --depth 1 origin 70fe95cdc9ac1b00d4f86b7525dca80caf7003e1
16+
git fetch --depth 1 origin 69b6b56d857440183e227ca0b10c84bca4239985
17+
18+
.. note:: you could also base the hash on the 'git tag' from the desired
19+
version: `git checkout tags/v3.11.0 -b 3.11` considering that
20+
`3.11` doesn't exist locally.
1421

1522
#. Checkout that commit locally::
1623

17-
git checkout 70fe95cdc9ac1b00d4f86b7525dca80caf7003e1
24+
git checkout 69b6b56d857440183e227ca0b10c84bca4239985
25+
26+
#. Update the branch on the `Makefile` and check the `requirements.txt` from
27+
the cpython repository, to see if upgrades on the modules like sphinx is
28+
needed.
29+
30+
#. Verify that the docs build with the new versions you changed from
31+
`requirements.txt` mainly the sphinx version.
32+
33+
#. Commit the update of the submodule change::
34+
35+
git add cpython
36+
git commit -m "Update the cpython submodule"
37+
38+
.. note:: This is important, so the later `make build` step will not reset
39+
the cpython submodule to the previous hash on the old branch.
1840

1941
#. Clean possible garbage (form previous builds)::
2042

2143
rm -rf _build ../python-docs-es-pot cpython/Doc/CONTRIBUTING.rst cpython/Doc/upgrade-python-version.rst
2244

45+
.. note: the 'python-docs-es-pot' is a temporary directory that is created
46+
in the next step. It's included here because it might be a leftover
47+
from previous attempts on your machine.
48+
49+
#. Create a virtual environment and install the dependencies of the project::
50+
51+
python -m venv env
52+
source env/bin/activate # Windows: env\Scripts\activate.bat
53+
pip install -r requirements.txt
54+
55+
2356
#. Create the .po files from the new source code. This will generate all the .po files for version 3.8::
2457

2558
SPHINX_GETTEXT=True sphinx-build -j auto -b gettext -d _build/doctrees . ../python-docs-es-pot
2659

2760
.. note::
2861

29-
In `../python-docs-es-pot` directory, we will have the new .pot files with new strings from 3.8 branch.
30-
All these strings will be *unstranslated* at this point.
62+
In `../python-docs-es-pot` directory, we will have the new .pot files with new strings from 3.11 branch.
63+
All these strings will be *untranslated* at this point.
3164

3265
#. Now, we update our translated files form the source language (English) with new strings::
3366

3467
sphinx-intl update --language es --pot-dir ../python-docs-es-pot --locale-dir cpython/locales/
3568

36-
#. Remove `python-docs-cpython/` prefix added by `sphinx-build` to avoid clazy diffs::
69+
#. At this point, all the `.po` files will have a different comment on each translation phrase,
70+
for example::
71+
72+
-#: ../Doc/whatsnew/3.9.rst:3
73+
+#: ../python-docs-es/cpython/Doc/whatsnew/3.9.rst:3
74+
75+
As you can see, it added the path of the local repository, but you can
76+
remove it from it with this regular expression::
3777

3878
sed -i **/*.po -e "s|python-docs-es/cpython/||g"
3979

80+
..note:: if you have your local repository cloned with a different name,
81+
please make sure to adapt the expression.
82+
4083
#. Pass `powrap` to make the column widths consistent::
4184

4285
powrap --modified
86+
87+
#. Prepare for fireworks! Now it's time for an initial build::
88+
89+
make build
90+
91+
you will find many warnings that needs to be fixed before the push
92+
of the new branch is done. So prepare a cup of any hot beverage
93+
and fix them.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp