Mesa (staging/22.1): docs: set language to english

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jun 23 16:19:36 UTC 2022


Module: Mesa
Branch: staging/22.1
Commit: 86811cc1786883de1ee71bc49861160d485b0e02
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=86811cc1786883de1ee71bc49861160d485b0e02

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Jun 21 10:40:28 2022 +0200

docs: set language to english

It seems recent versions of Sphinx has started issuing a warning when
language isn't set to a recognized value. Since we're building with
warnings as errors on CI, this causes issues for people.

We're writing English docs, so we should set this to English. I probably
confused this setting with the highlight_language setting or something
when I set this up initially.

Fixes: 00cd1346bf0 ("docs: use sphinx")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6711
Reviewed-by: David Heidelberg <david.heidelberg at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17159>
(cherry picked from commit ee9c3d2625428ac4cf4e15efb09741bb875ad7fe)

---

 .pick_status.json | 2 +-
 docs/conf.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2b6abcb794b..44208152aed 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1111,7 +1111,7 @@
         "description": "docs: set language to english",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "00cd1346bf056dfc0e7c7f75a9a4e64f3715930c"
     },
diff --git a/docs/conf.py b/docs/conf.py
index ab4c3380ef0..96399515576 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@ release = 'latest'
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.



More information about the mesa-commit mailing list