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

Skip to content

Commit a6fcd89

Browse files
committed
Let's not translate the changelog (and no fuzzy for whatsnew/).
1 parent 996b789 commit a6fcd89

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ merge: $(VENV)/bin/sphinx-build
6969
ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
7070
$(error "You're merging from a different branch")
7171
endif
72+
(cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)
7273
(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)
7374
find $(CPYTHON_CLONE)/pot/ -name '*.pot' |\
7475
while read -r POT;\
@@ -77,7 +78,10 @@ endif
7778
mkdir -p "$$(dirname "$$PO")";\
7879
if [ -f "$$PO" ];\
7980
then\
80-
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\
8185
else\
8286
msgcat -o "$$PO" "$$POT";\
8387
fi\

0 commit comments

Comments
 (0)