Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 05efd6b

Browse files
authored
Merge pull request #1 from python/3.7
Update fork
2 parents 28d08a3 + ff291f9 commit 05efd6b

File tree

164 files changed

+13141
-11259
lines changed

Some content is hidden

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

164 files changed

+13141
-11259
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
*.mo
22
.tx/**/*.po
3+
venv/
4+
.idea/

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ install:
88
- pospell --version
99
script:
1010
- pospell -p dict -l fr_FR **/*.po
11-
- make CPYTHON_CLONE=/tmp/cpython/ COMMIT=d4ed8809dd
11+
- make CPYTHON_CLONE=/tmp/cpython/ COMMIT=1659c08d5d

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SPHINX_CONF := $(CPYTHON_CLONE)/Doc/conf.py
1818
LANGUAGE := fr
1919
VENV := ~/.venvs/python-docs-i18n/
2020
PYTHON := $(shell which python3)
21-
MODE := autobuild-dev-html
21+
MODE := html
2222
BRANCH = 3.7
2323
COMMIT =
2424
JOBS = auto
@@ -31,12 +31,12 @@ ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all
3131
endif
3232
mkdir -p $(CPYTHON_CLONE)/locales/$(LANGUAGE)/
3333
ln -nfs $(shell $(PYTHON) -c 'import os; print(os.path.realpath("."))') $(CPYTHON_CLONE)/locales/$(LANGUAGE)/LC_MESSAGES
34-
$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) SPHINXOPTS='-qaEW -j$(JOBS) -D locale_dirs=../locales -D language=$(LANGUAGE) -D gettext_compact=0 -D latex_engine=xelatex -D latex_elements.inputenc= -D latex_elements.fontenc=' $(MODE)
34+
$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) SPHINXOPTS='-qW -j$(JOBS) -D locale_dirs=../locales -D language=$(LANGUAGE) -D gettext_compact=0 -D latex_engine=xelatex -D latex_elements.inputenc= -D latex_elements.fontenc=' $(MODE)
3535

3636

3737
$(SPHINX_CONF):
3838
git clone --depth 1 --branch $(BRANCH) https://github.com/python/cpython.git $(CPYTHON_CLONE)
39-
[ -n "$(COMMIT)" ] && i=1; while ! $$(git -C $(CPYTHON_CLONE) checkout $(COMMIT)); do i=$$((i * 2)); git -C $(CPYTHON_CLONE) fetch --depth $$i; done
39+
[ -n "$(COMMIT)" ] && (i=1; while ! $$(git -C $(CPYTHON_CLONE) checkout $(COMMIT)); do i=$$((i * 2)); git -C $(CPYTHON_CLONE) fetch --depth $$i; done) || true
4040

4141

4242
.PHONY: upgrade_venv
@@ -57,7 +57,7 @@ progress:
5757

5858
.PHONY: todo
5959
todo:
60-
for file in *.po */*.po; do echo $$(msgattrib --untranslated $$file | grep ^msgid | sed 1d | wc -l ) $$file; done | grep -v ^0 | sort -gr
60+
python3 scripts/todo.py
6161

6262

6363
.PHONY: merge

README.rst

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ French Translation of the Python Documentation
44
.. image:: https://travis-ci.org/python/python-docs-fr.svg?branch=3.7
55
:target: https://travis-ci.org/python/python-docs-fr
66

7-
**Translated: 33%**
7+
**Translated: 35%**
88

99
Documentation Contribution Agreement
1010
------------------------------------
@@ -77,7 +77,7 @@ Step by step:
7777
All the translations must be made on the latest release.
7878
We never translate on an oldest version, by example, the latest python release
7979
is python 3.7, we don't want to translate directly on the python 3.5 release.
80-
If needed translations would be backported on the oldest versions by the
80+
If needed translations would be backported on the oldest versions by the
8181
`documentation team <https://www.python.org/dev/peps/pep-8015/#documentation-team>`.
8282

8383
Now you're ready to start a work session, each time you'll start a new task, start here:
@@ -93,22 +93,6 @@ Now you're ready to start a work session, each time you'll start a new task, sta
9393
# You can now work on the file, typically using poedit,
9494
poedit directory/file.po
9595
96-
# After writing your changes to disk, check for correctness:
97-
make
98-
99-
# Sphinx will tell you if there is any syntax error in the files
100-
# you modified. Note that in the French Translation, we try to keep Sphinx
101-
# warnings to zero.
102-
103-
# you may want to check if there are semantic errors.
104-
# Open the translated file in your browser to check how it renders.
105-
# Don't forget to verify the typography. The French conventions are not
106-
# the English ones, especially for punctuation.
107-
# Also, Grammalecte, a browser plugin avaliable in your browser store,
108-
# is your friend even if, because of the technical words that appear
109-
# everywhere in the documentation, it points out many false positive.
110-
exo-open ../cpython/Doc/build/html/directory/file.html
111-
11296
# When everything is clear (syntax errors from Sphinx, html rendering,
11397
# semantics, typography),
11498
# you can commit your work with a nice explicit message:
@@ -121,7 +105,8 @@ Now you're ready to start a work session, each time you'll start a new task, sta
121105
# it's nice as it's exactly what we want:
122106
git push origin HEAD
123107
124-
# Now you can open the pull request on github, just go to
108+
# The previous command will print you a link to open a PR on github.
109+
# If you missed it, just go to
125110
# https://github.com/python/python-docs-fr/ and a nice "Compare & pull request"
126111
# button should appear after a few seconds telling you can ask for a pull request.
127112
@@ -251,6 +236,7 @@ e.g. e.g. (pour *exempli gratia*)
251236
garbage collector ramasse-miettes
252237
identifier identifiant
253238
immutable immuable
239+
installer installateur
254240
interpreter interpréteur
255241
library bibliothèque
256242
list comprehension liste en compréhension (liste en intension est
@@ -316,7 +302,7 @@ Maintenance
316302
317303
All those snippets are to run from the root of a ``python-docs-fr``
318304
clone, and some expect to find an up-to-date CPython clone near to it,
319-
like::
305+
like:
320306
321307
.. code-block:: bash
322308
@@ -361,7 +347,7 @@ Run a test build locally
361347
Synchronize translation with Transifex
362348
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
363349
364-
You'll need the ``transifex-client`` and ``poindent``
350+
You'll need the ``transifex-client`` and ``powrap``
365351
from Pypi.
366352
367353
You'll need to configure ``tx`` via ``tx init`` if not already done.
@@ -374,6 +360,6 @@ You'll need to configure ``tx`` via ``tx init`` if not already done.
374360
pomerge --from-files **/*.po
375361
git checkout -- .
376362
pomerge --to-files **/*.po
377-
poindent --modified
363+
powrap --modified
378364
git commit -m "tx pull"
379365
tx push -t -f

TRANSLATORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ Mohamed Kiouaz
77
Hervé Sousset
88
Mickaël Bergem
99
Vincent Poulailleau
10+
Jules Lasne

c-api/conversion.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2017-04-02 22:11+0200\n"
8+
"POT-Creation-Date: 2018-11-29 16:06+0100\n"
99
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -104,9 +104,9 @@ msgstr ""
104104

105105
#: ../Doc/c-api/conversion.rst:62
106106
msgid ""
107-
"If ``endptr`` is ``NULL``, convert the whole string. Raise ValueError and "
108-
"return ``-1.0`` if the string is not a valid representation of a floating-"
109-
"point number."
107+
"If ``endptr`` is ``NULL``, convert the whole string. Raise :exc:"
108+
"`ValueError` and return ``-1.0`` if the string is not a valid representation "
109+
"of a floating-point number."
110110
msgstr ""
111111

112112
#: ../Doc/c-api/conversion.rst:66

0 commit comments

Comments
 (0)