Merge lp:~jelmer/bzr/fix-en-use-guide into lp:bzr

Proposed by Jelmer Vernooij on 2016-04-03
Status: Merged
Approved by: Richard Wilbur on 2016-04-05
Approved revision: no longer in the revision history of the source branch.
Merged at revision: 6617
Proposed branch: lp:~jelmer/bzr/fix-en-use-guide
Merge into: lp:bzr
Diff against target: 26 lines (+5/-1)
2 files modified
Makefile (+1/-1)
doc/en/release-notes/bzr-2.8.txt (+4/-0)
To merge this branch: bzr merge lp:~jelmer/bzr/fix-en-use-guide
Reviewer Review Type Date Requested Status
Richard Wilbur Approve on 2016-04-05
Vincent Ladeuil 2016-04-03 Approve on 2016-04-04
Review via email: mp+290831@code.launchpad.net

Commit message

Ensure build of English use guide always uses English text even when user's locale specifies a different language.

Description of the change

Simple fix to prevent French text from leaking into English user reference.

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

Nice catch !

review: Approve
Richard Wilbur (richard-wilbur) wrote :

Thanks, Jelmer, for finding the bug and the concise fix!
+1

review: Approve
Richard Wilbur (richard-wilbur) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2016-02-01 18:09:33 +0000
3+++ Makefile 2016-04-03 16:44:55 +0000
4@@ -148,7 +148,7 @@
5 NEWS_FILES = $(wildcard doc/en/release-notes/bzr-*.txt)
6
7 doc/en/user-reference/index.txt: $(MAN_DEPENDENCIES)
8- $(PYTHON) tools/generate_docs.py -o $@ rstx
9+ LANGUAGE=C $(PYTHON) tools/generate_docs.py -o $@ rstx
10
11 doc/en/release-notes/index.txt: $(NEWS_FILES) tools/generate_release_notes.py
12 $(PYTHON) tools/generate_release_notes.py $@ $(NEWS_FILES)
13
14=== modified file 'doc/en/release-notes/bzr-2.8.txt'
15--- doc/en/release-notes/bzr-2.8.txt 2016-02-01 19:26:41 +0000
16+++ doc/en/release-notes/bzr-2.8.txt 2016-04-03 16:44:55 +0000
17@@ -32,6 +32,10 @@
18 .. Fixes for situations where bzr would previously crash or give incorrect
19 or undesirable results.
20
21+ * When generating documentation with a custom locale set, make sure
22+ doc/en/user-reference only contains English documentation.
23+ (Jelmer Vernooij, #1565503)
24+
25 Documentation
26 *************
27