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

Skip to content

Commit 0d1b74b

Browse files
p13773p13773
committed
Merge branch '3.6' into library/shelve
2 parents 69555f5 + a316903 commit 0d1b74b

File tree

270 files changed

+24210
-35731
lines changed

Some content is hidden

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

270 files changed

+24210
-35731
lines changed

‎.tx/config

Lines changed: 466 additions & 466 deletions
Large diffs are not rendered by default.

‎Makefile

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# - make merge # To merge pot from upstream
88
# - make fuzzy # To find fuzzy strings
99
# - make progress # To compute current progression
10+
# - make upgrade_venv # To upgrade the venv that compiles the doc
1011
#
1112
# Modes are: autobuild-stable, autobuild-dev, and autobuild-html,
1213
# documented in gen/src/3.6/Doc/Makefile as we're only delegating the
@@ -19,13 +20,14 @@ VENV := ~/.venvs/python-docs-i18n/
1920
PYTHON := $(shell which python3)
2021
MODE := autobuild-dev-html
2122
BRANCH = $(shell git describe --contains --all HEAD)
23+
JOBS = 1
2224

2325

2426
.PHONY: all
2527
all: $(VENV)/bin/sphinx-build $(VENV)/bin/blurb $(SPHINX_CONF)
2628
mkdir -p $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/
2729
ln -nfs $(shell readlink -f .) $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/LC_MESSAGES
28-
. $(VENV)/bin/activate; $(MAKE) -C $(CPYTHON_CLONE)/Doc/ SPHINXOPTS='-D locale_dirs=locales -D language=$(LANGUAGE) -D gettext_compact=0' $(MODE)
30+
. $(VENV)/bin/activate; $(MAKE) -C $(CPYTHON_CLONE)/Doc/ SPHINXOPTS='-j$(JOBS) -D locale_dirs=locales -D language=$(LANGUAGE) -D gettext_compact=0' $(MODE)
2931

3032

3133
$(SPHINX_CONF):
@@ -45,6 +47,11 @@ $(VENV)/bin/blurb: $(VENV)/bin/activate
4547
. $(VENV)/bin/activate; python3 -m pip install blurb
4648

4749

50+
.PHONY: upgrade_venv
51+
upgrade_venv: $(VENV)/bin/activate
52+
. $(VENV)/bin/activate; python3 -m pip install --upgrade sphinx blurb
53+
54+
4855
.PHONY: progress
4956
progress:
5057
@python3 -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))' \
@@ -58,10 +65,11 @@ todo:
5865

5966

6067
.PHONY: merge
61-
merge: $(VENV)/bin/sphinx-build
68+
merge: upgrade_venv
6269
ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
6370
$(error "You're merging from a different branch")
6471
endif
72+
(cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)
6573
(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)
6674
find $(CPYTHON_CLONE)/pot/ -name '*.pot' |\
6775
while read -r POT;\
@@ -70,7 +78,10 @@ endif
7078
mkdir -p "$$(dirname "$$PO")";\
7179
if [ -f "$$PO" ];\
7280
then\
73-
msgmerge --backup=off --force-po -U "$$PO" "$$POT";\
81+
case "$$POT" in\
82+
*whatsnew*) msgmerge --backup=off --force-po --no-fuzzy-matching -U "$$PO" "$$POT" ;;\
83+
*) msgmerge --backup=off --force-po -U "$$PO" "$$POT" ;;\
84+
esac\
7485
else\
7586
msgcat -o "$$PO" "$$POT";\
7687
fi\
@@ -79,4 +90,4 @@ endif
7990

8091
.PHONY: fuzzy
8192
fuzzy:
82-
for file in *.po */*.po; do echo $$(msgattrib --only-fuzzy --no-obsolete "$$file" | grep -c ^msgid) $$file; done | grep -v ^0 | sort -gr
93+
for file in *.po */*.po; do echo $$(msgattrib --only-fuzzy --no-obsolete "$$file" | grep -c '#, fuzzy') $$file; done | grep -v ^0 | sort -gr

‎README.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
French Translation of the Python Documentation
22
==============================================
33

4-
**Translated: 28.0%**
4+
**Translated: 29%**
55

6-
See the `README.rst file on master
7-
<https://github.com/python/python-docs-fr/blob/master/README.rst>`_
8-
for more informations.
6+
This is the 3.6 branch, we're no longer translating on it, see the 3.7
7+
branch.
98

109

1110
Documentation Contribution Agreement

‎TRANSLATORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ RobinPetit
44
Valentin Lorentz
55
Antoine Rozo
66
Mohamed Kiouaz
7+
Hervé Sousset

‎bugs.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: Python 3.6\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2017-09-21 09:15+0200\n"
11-
"PO-Revision-Date: 2017-09-24 23:03+0200\n"
11+
"PO-Revision-Date: 2018-02-15 00:28+0100\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
1414
"Language: fr\n"
@@ -19,7 +19,7 @@ msgstr ""
1919

2020
#: ../Doc/bugs.rst:5
2121
msgid "Dealing with Bugs"
22-
msgstr "S'attaquer aux Bugs"
22+
msgstr "S'attaquer aux bugs"
2323

2424
#: ../Doc/bugs.rst:7
2525
msgid ""

‎c-api/abstract.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgstr ""
99
"Project-Id-Version: Python 3.6\n"
1010
"Report-Msgid-Bugs-To: \n"
1111
"POT-Creation-Date: 2017-04-02 22:11+0200\n"
12-
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12+
"PO-Revision-Date: 2018-02-15 00:28+0100\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
1515
"Language: fr\n"
@@ -19,7 +19,7 @@ msgstr ""
1919

2020
#: ../Doc/c-api/abstract.rst:7
2121
msgid "Abstract Objects Layer"
22-
msgstr "Couche d'Abstraction des Objets"
22+
msgstr "Couche d'abstraction des objets"
2323

2424
#: ../Doc/c-api/abstract.rst:9
2525
msgid ""

0 commit comments

Comments
 (0)