Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

Normalize regional French and Ukrainian language codes

Bingxi Zhao (Frank)9c2eea7446cc
diff --git a/deeptutor/services/config/launch_settings.py b/deeptutor/services/config/launch_settings.py
index 966d316cc..b4eba9751 100644
--- a/deeptutor/services/config/launch_settings.py
+++ b/deeptutor/services/config/launch_settings.py
@@ -50,14 +50,15 @@ def _coerce_port(value: Any) -> int | None:
def _normalize_language(value: Any) -> str | None:
if not isinstance(value, str):
return None
- language = value.strip().lower()
- if language in {"en", "english"} or language.startswith("en_"):
+ language = value.strip().lower().replace("_", "-")
+ base = language.split("-", 1)[0]
+ if language == "english" or base == "en":
return "en"
- if language in {"zh", "cn", "chinese"} or language.startswith("zh_"):
+ if language == "chinese" or base in {"zh", "cn"}:
return "zh"
- if language in {"fr", "french"} or language.startswith("fr_"):
+ if language == "french" or base == "fr":
return "fr"
- if language in {"uk", "ua", "ukrainian"} or language.startswith("uk_"):
+ if language == "ukrainian" or base in {"uk", "ua"}:
return "uk"
return None
diff --git a/deeptutor/services/settings/interface_settings.py b/deeptutor/services/settings/interface_settings.py
index 6ddb0951c..6adb462b2 100644
--- a/deeptutor/services/settings/interface_settings.py
+++ b/deeptutor/services/settings/interface_settings.py
@@ -74,14 +74,15 @@ def _normalize_language(language: Any, default: str = "en") -> str:
language = default
if isinstance(language, str):
- s = language.lower().strip()
- if s in {"en", "english"}:
+ s = language.lower().strip().replace("_", "-")
+ base = s.split("-", 1)[0]
+ if s == "english" or base == "en":
return "en"
- if s in {"zh", "chinese", "cn"}:
+ if s == "chinese" or base in {"zh", "cn"}:
return "zh"
- if s in {"fr", "french"}:
+ if s == "french" or base == "fr":
return "fr"
- if s in {"uk", "ukrainian", "ua"}:
+ if s == "ukrainian" or base in {"uk", "ua"}:
return "uk"
# Fall back to default
diff --git a/tests/services/config/test_launch_settings.py b/tests/services/config/test_launch_settings.py
index 8be84ccad..0f0a71e4e 100644
--- a/tests/services/config/test_launch_settings.py
+++ b/tests/services/config/test_launch_settings.py
@@ -46,7 +46,13 @@ def test_launch_settings_reads_ports_from_system_json_and_ignores_env_json(
@pytest.mark.parametrize(
("stored_language", "expected"),
- [("french", "fr"), ("ukrainian", "uk"), ("uk_UA", "uk")],
+ [
+ ("french", "fr"),
+ ("fr-FR", "fr"),
+ ("ukrainian", "uk"),
+ ("uk_UA", "uk"),
+ ("uk-UA", "uk"),
+ ],
)
def test_launch_settings_reads_supported_languages_from_interface_json(
monkeypatch, tmp_path: Path, stored_language: str, expected: str
diff --git a/web/tests/language-preferences.test.ts b/web/tests/language-preferences.test.ts
index 24eeb2a8c..f46578929 100644
--- a/web/tests/language-preferences.test.ts
+++ b/web/tests/language-preferences.test.ts
@@ -11,6 +11,7 @@ test("the locale registry accepts every supported language", () => {
for (const { code } of APP_LANGUAGES) assert.equal(isAppLanguage(code), true);
assert.equal(isAppLanguage("de"), false);
assert.equal(normalizeLanguage("uk-UA"), "uk");
+ assert.equal(normalizeLanguage("fr-FR"), "fr");
});
test("response language remains independent from the interface language", () => {