[Bf-docboard-svn] bf-manual: [9290] Merge branch 'blender-3.2-release'

[Aaron Carlisle]

Revision: 9290
          https://developer.blender.org/rBM9290
Author:   Blendify
Date:     2022-05-19 05:26:08 +0200 (Thu, 19 May 2022)
Log Message:
-----------
Merge branch 'blender-3.2-release'

Modified Paths:
--------------
    trunk/blender_docs/manual/conf.py

Property Changed:
----------------
    trunk/blender_docs/

Index: trunk/blender_docs
===================================================================
--- trunk/blender_docs	2022-05-19 03:25:28 UTC (rev 9289)
+++ trunk/blender_docs	2022-05-19 03:26:08 UTC (rev 9290)

Property changes on: trunk/blender_docs
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/blender-2.93-release/blender_docs:7959-8113
 /branches/blender-3.0-release/blender_docs:8543-9034
 /branches/blender-3.1-release/blender_docs:8904-9230
-/branches/blender-3.2-release/blender_docs:9236-9287
\ No newline at end of property
+/branches/blender-3.2-release/blender_docs:9236-9289
\ No newline at end of property
Modified: trunk/blender_docs/manual/conf.py
===================================================================
--- trunk/blender_docs/manual/conf.py	2022-05-19 03:25:28 UTC (rev 9289)
+++ trunk/blender_docs/manual/conf.py	2022-05-19 03:26:08 UTC (rev 9290)
@@ -13,6 +13,9 @@
 
 import os
 import sys
+
+from sphinx import version_info as sphinx_version
+
 sys.path.insert(0, os.path.abspath(os.path.join('..', 'exts')))
 
 # Sphinx errors out on single threaded builds see T86621
@@ -452,8 +455,12 @@
     except ImportError:
         return
     CatalogInfo._write_mo_real = CatalogInfo.write_mo
-    CatalogInfo.write_mo = lambda self, locale: CatalogInfo._write_mo_real(
-        self, locale.replace('-', '_'))
+    if sphinx_version >= (4, 3, 0):
+        CatalogInfo.write_mo = lambda self, locale, use_fuzzy: CatalogInfo._write_mo_real(
+            self, locale.replace('-', '_'))
+    else:
+        CatalogInfo.write_mo = lambda self, locale: CatalogInfo._write_mo_real(
+            self, locale.replace('-', '_'))
 
 
 monkey_patch_babl_locale_dash()