feat(i18n): separate state by domain

Author: MHajoha

examples/i18n/locale/de.po

@@ -8,17 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @local/i18n 0.1.0\n"
 "Report-Msgid-Bugs-To: Jane Doe <[email protected]>\n"
-"POT-Creation-Date: 2025-01-27 14:01+0100\n"
+"POT-Creation-Date: 2025-02-19 14:57+0100\n"
 "PO-Revision-Date: 2025-01-27 14:07+0100\n"
 "Last-Translator: \n"
-"Language-Team: de <[email protected]>\n"
 "Language: de\n"
+"Language-Team: de <[email protected]>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Generated-By: Babel 2.16.0\n"
-"X-Generator: Poedit 3.5\n"
 
 #. This comment will be shown in the .pot file.
 #: python/local/i18n/__init__.py:17
@@ -30,9 +29,13 @@ msgid ""
 "If you or a loved one has been diagnosed with mesothelioma, you may be "
 "entitled to financial compensation."
 msgstr ""
-"Falls Sie oder eine Ihnen nahestehende Person eine Mesotheliom-"
-"Diagnose erhalten haben, könnten Sie für finanzielle Entschädigung in "
-"Frage kommen."
+"Falls Sie oder eine Ihnen nahestehende Person eine Mesotheliom-Diagnose "
+"erhalten haben, könnten Sie für finanzielle Entschädigung in Frage "
+"kommen."
+
+#: python/local/i18n/__init__.py:32
+msgid "It's all wrong!"
+msgstr "Es ist alles falsch!"
 
 #. This comment will be shown in the .pot file.
 #: templates/formulation.xhtml.j2:4

examples/i18n/locale/en.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @local/i18n 0.1.0\n"
 "Report-Msgid-Bugs-To: Jane Doe <[email protected]>\n"
-"POT-Creation-Date: 2025-01-27 14:01+0100\n"
+"POT-Creation-Date: 2025-02-19 14:57+0100\n"
 "PO-Revision-Date: 2025-01-27 14:01+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -30,8 +30,11 @@ msgid ""
 "entitled to financial compensation."
 msgstr ""
 
+#: python/local/i18n/__init__.py:32
+msgid "It's all wrong!"
+msgstr ""
+
 #. This comment will be shown in the .pot file.
 #: templates/formulation.xhtml.j2:4
 msgid "This string should be localized!"
 msgstr ""
-

examples/i18n/locale/local.i18n.pot

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @local/i18n 0.1.0\n"
 "Report-Msgid-Bugs-To: Jane Doe <[email protected]>\n"
-"POT-Creation-Date: 2025-01-27 14:01+0100\n"
+"POT-Creation-Date: 2025-02-19 14:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -29,6 +29,10 @@ msgid ""
 "entitled to financial compensation."
 msgstr ""
 
+#: python/local/i18n/__init__.py:32
+msgid "It's all wrong!"
+msgstr ""
+
 #. This comment will be shown in the .pot file.
 #: templates/formulation.xhtml.j2:4
 msgid "This string should be localized!"

examples/i18n/python/local/i18n/__init__.py

@@ -1,17 +1,17 @@
 #  This file is part of the QuestionPy SDK. (https://questionpy.org)
 #  The QuestionPy SDK is free software released under terms of the MIT license. See LICENSE.md.
 #  (c) Technische Universität Berlin, innoCampus <[email protected]>
-from questionpy import Attempt, NeedsManualScoringError, Question, make_question_type_init
+from questionpy import Attempt, NeedsManualScoringError, Question, i18n, make_question_type_init
 from questionpy.form import FormModel, static_text
-from questionpy.i18n import gettext as _
 from questionpy_common.elements import StaticTextElement
 
-
-def _(a):
-    return a
+_, _N = i18n.get_for(__package__)
 
 
 class I18NModel(FormModel):
+    # TODO: Implement deferred translation.
+    _ = lambda x: x  # noqa: E731
+
     txt: StaticTextElement = static_text(
         # TRANSLATORS: This comment will be shown in the .pot file.
         _("Important Notice"),
@@ -27,6 +27,10 @@ def _compute_score(self) -> float:
     def formulation(self) -> str:
         return self.jinja2.get_template("formulation.xhtml.j2").render()
 
+    @property
+    def general_feedback(self) -> str | None:
+        return "<div>" + _("It's all wrong!") + "</div>"
+
 
 class I18NQuestion(Question):
     attempt_class = I18NAttempt

poetry.lock

@@ -28,7 +28,7 @@ python = "^3.11"
 aiohttp = "^3.9.3"
 pydantic = "^2.6.4"
 PyYAML = "^6.0.1"
-questionpy-server = { git = "https://github.com/questionpy-org/questionpy-server.git", rev = "aca709b1dd8cef935ac4bf4bb47471959aac6779" }
+questionpy-server = { git = "https://github.com/questionpy-org/questionpy-server.git", rev = "a7d5229524bc95005c7bc409b94a349c095c97b3" }
 jinja2 = "^3.1.3"
 aiohttp-jinja2 = "^1.6"
 lxml = "~5.1.0"

pyproject.toml

@@ -89,6 +89,7 @@
     "WorkerResourceLimits",
     "create_jinja2_environment",
     "get_qpy_environment",
+    "i18n",
     "make_question_type_init",
     "set_qpy_environment",
 ]
@@ -97,8 +98,7 @@
 def make_question_type_init(
     question_class: type[Question], *, wrap_question: Callable[[Question], QuestionInterface] = QuestionWrapper
 ) -> PackageInitFunction:
-    def init(package: Package, env: Environment) -> QuestionTypeWrapper:
-        i18n.initialize(package, env)
+    def init(package: Package) -> QuestionTypeWrapper:
         return QuestionTypeWrapper(question_class, package, wrap_question=wrap_question)
 
     return init

questionpy/__init__.py

@@ -102,9 +102,9 @@ def create_jinja2_environment(attempt: "Attempt", question: "Question") -> jinja
         "question_type": type(question),
     })
 
-    if i18n.is_initialized():
+    translations = i18n.get_translations_of_package(package)
+    if translations:
         env.add_extension("jinja2.ext.i18n")
-        _, translations = i18n.get_state()
-        env.install_gettext_translations(translations, newstyle=True)
+        env.install_gettext_translations(translations, newstyle=True)  # type: ignore[attr-defined]
 
     return env