Merge b20739a into d0614df

beqabeqa473 · web-flow · commit 1d3c0cc9e752 · 2023-10-22T22:27:19.000+10:00
diff --git a/source/addonHandler/__init__.py b/source/addonHandler/__init__.py
@@ -751,17 +751,23 @@ def getCodeAddon(obj=None, frameDist=1):
 	# Not found!
 	raise AddonError("Code does not belong to an addon")
 
+
+_TRANSLATION_FUNCTIONS = ["_", "ngettext", "pgettext", "npgettext"]
+
+
 def initTranslation():
 	addon = getCodeAddon(frameDist=2)
 	translations = addon.getTranslationsInstance()
 	# Point _ to the translation object in the globals namespace of the caller frame
-	# FIXME: should we retrieve the caller module object explicitly?
 	try:
 		callerFrame = inspect.currentframe().f_back
-		callerFrame.f_globals['_'] = translations.gettext
-		# Install pgettext and npgettext function.
-		callerFrame.f_globals['pgettext'] = translations.pgettext
-		callerFrame.f_globals['npgettext'] = translations.npgettext
+		module = inspect.getmodule(callerFrame)
+		[
+			setattr(
+				module, func, getattr(translations, "gettext" if func == "_" else func)
+			)
+			for func in _TRANSLATION_FUNCTIONS
+		]
 	finally:
 		del callerFrame # Avoid reference problems with frames (per python docs)
 
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -43,6 +43,7 @@ Please refer to [the developer guide https://www.nvaccess.org/files/nvda/documen
 - Note: this is an Add-on API compatibility breaking release.
 Add-ons will need to be re-tested and have their manifest updated.
 - Added extension point: ``treeInterceptorHandler.post_browseModeStateChange``. (#14969, @nvdaes)
+- It is now possible to use plural forms in addon's translations. (#15661, @beqabeqa473)
 -
 
 === API Breaking Changes ===

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ Please refer to [the developer guide https://www.nvaccess.org/files/nvda/documen`
`43`	`43`	`- Note: this is an Add-on API compatibility breaking release.`
`44`	`44`	`Add-ons will need to be re-tested and have their manifest updated.`
`45`	`45`	- Added extension point: ``treeInterceptorHandler.post_browseModeStateChange``. (#14969, @nvdaes)
	`46`	`+- It is now possible to use plural forms in addon's translations. (#15661, @beqabeqa473)`
`46`	`47`	`-`
`47`	`48`
`48`	`49`	`=== API Breaking Changes ===`