Merge 4b872d8 into 63be1fd

CyrilleB79 · web-flow · commit 3eddf8d7b845 · 2025-04-08T13:44:07.000Z
diff --git a/source/documentationUtils.py b/source/documentationUtils.py
@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2025 NV Access Limited, Łukasz Golonka
+# Copyright (C) 2006-2025 NV Access Limited, Łukasz Golonka, Cyrille Bougot
 # This file may be used under the terms of the GNU General Public License, version 2 or later.
 # For more details see: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -42,12 +42,9 @@ def getDocFilePath(fileName: str, localized: bool = True) -> str | None:
 			if not os.path.isdir(tryDir):
 				continue
 
-			# Some out of date translations might include .txt files which are now .html files in newer translations.
-			# Therefore, ignore the extension and try both .html and .txt.
-			for tryExt in ("html", "txt"):
-				tryPath = os.path.join(tryDir, f"{fileName}.{tryExt}")
-				if os.path.isfile(tryPath):
-					return tryPath
+			tryPath = os.path.join(tryDir, f"{fileName}.html")
+			if os.path.isfile(tryPath):
+				return tryPath
 		return None
 	else:
 		# Not localized.
diff --git a/source/installer.py b/source/installer.py
@@ -140,12 +140,9 @@ def getDocFilePath(fileName, installDir):
 		tryDir = os.path.join(rootPath, tryLang)
 		if not os.path.isdir(tryDir):
 			continue
-		# Some out of date translations might include .txt files which are now .html files in newer translations.
-		# Therefore, ignore the extension and try both .html and .txt.
-		for tryExt in ("html", "txt"):
-			tryPath = os.path.join(tryDir, "%s.%s" % (fileName, tryExt))
-			if os.path.isfile(tryPath):
-				return tryPath
+		tryPath = os.path.join(tryDir, f"{fileName}.html"
+		if os.path.isfile(tryPath):
+			return tryPath
 
 
 def copyProgramFiles(destPath):
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -279,6 +279,7 @@ Instead, a `callback` property has been added, which returns a function that per
   * Added `TypingEcho` enum in `config.configFlags` to represent these modes, 0=Off, 1=Only in edit controls, 2=Always.
   * `gui.settingsDialogs.KeyboardSettingsPanel.wordsCheckBox` and `gui.settingsDialogs.KeyboardSettingsPanel.charsCheckBox` has been removed.
 * The `winUser.paint` has been renamed from `painStruct` to `paintStruct`, fixing a bug where passing in a `PAINTSTRUCT` would raise an exception. (#17744)
+* `documentationUtils.getDocFilePath` and `installer.getDocFilePath` no longer look for `.txt` files in locale documentation folders. (#17911, @CyrilleB79)
 
 #### Deprecations
 
