Revert "Disable localisation when SOURCE_DATE_EPOCH is set (#10949)"
#11306
Conversation
This reverts commit 2c83af0.
…x-doc#10949)" This reverts commit f82c3c9.
…annotations in sphinx.locale')
jayaddison
force-pushed
the
issue-9778-revert/remove-source_date_epoch-null-translation
branch
from
dde3e9f
to
78a7c61
Compare
|
From further investigation: I do now believe that #10949 was unnecessary; see commentary at #9778 (comment) for details. |
| @@ -203,7 +203,12 @@ def setup(app): | |||
| .. versionadded:: 1.8 | |||
| """ | |||
| def gettext(message: str) -> str: | |||
| return _TranslationProxy(catalog, namespace, message) # type: ignore[return-value] | |||
There was a problem hiding this comment.
This seemed like a nice cleanup -- and unlocks other simplifications -- so if it's possible to re-apply later in a separate change, then I'd like to do that.
There was a problem hiding this comment.
Which bit were you talking about here? Open to keeping it if my partial revert didn't.
A
There was a problem hiding this comment.
In particular: switching everything over to lazy-loading (so that the gettext method doesn't require any conditional logic) - and as a side-effect, allowing content to be localised into more than one language during a unit test.
Referring back to some previous notes:
Attempting to write a test case to build the same application in two different languages was not initially possible -- the first-loaded translation catalog (as found in the sphinx.locale.translators global variable) -- would remain in-use for subsequent application builds under different locales
This can wait until after 6.2.x, unless you're particularly keen to dig into it. I'd plan to take another look at it fresh in a few days' time.
jayaddison
deleted the
issue-9778-revert/remove-source_date_epoch-null-translation
branch
Reverts pull request #10949 and follow-up commit 2c83af0.
(post-merge of that PR, I haven't been able to re-confirm the before-and-after behaviour of the fix, and I'd prefer not to risk it being included in a
sphinxrelease and causing issues for users until we're fairly-highly confident that it fixes the problem, only the problem, and doesn't introduce unintended side-effects)