Use package_dir in sphinx.locale

AA-Turner · AA-Turner · commit 8b23ca0a7600 · 2025-02-23T20:37:37.000Z
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
@@ -38,14 +38,14 @@
 
     try:
         if ret := subprocess.run(
-            ['git', 'rev-parse', '--short', 'HEAD'],  # NoQA: S607
+            ('git', 'rev-parse', '--short', 'HEAD'),
             cwd=package_dir,
-            capture_output=True,
             check=False,
-            encoding='ascii',
+            encoding='utf-8',
             errors='surrogateescape',
+            stdout=True,
         ).stdout:
-            __display_version__ += '+/' + ret.strip()
+            __display_version__ += f'+/{ret.strip()}'
         del ret
     finally:
         del subprocess
diff --git a/sphinx/locale/__init__.py b/sphinx/locale/__init__.py
@@ -8,11 +8,15 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from sphinx import package_dir
+
 if TYPE_CHECKING:
     import os
     from collections.abc import Callable, Iterable
     from typing import Any
 
+_LOCALE_DIR = Path(package_dir, 'locale')
+
 
 class _TranslationProxy:
     """The proxy implementation attempts to be as complete as possible, so that
@@ -140,9 +144,6 @@ def init(
     return translator, has_translation
 
 
-_LOCALE_DIR = Path(__file__).resolve().parent
-
-
 def init_console(
     locale_dir: str | os.PathLike[str] | None = None,
     catalog: str = 'sphinx',
