Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix handling language packs for pseudo language #456

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Fix handling language packs for pseudo language #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b8b94d
Fixes to support pseudo-language
fcollonval Jul 14, 2024
5a32839
Fix bugs to ensure the selected language menu is consistent
fcollonval Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions jupyterlab_server/settings_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@
from jupyter_server.services.config.manager import ConfigManager, recursive_update
from tornado import web

from .translation_utils import DEFAULT_LOCALE, L10N_SCHEMA_NAME, SYS_LOCALE, is_valid_locale
from .translation_utils import (
DEFAULT_LOCALE,
L10N_SCHEMA_NAME,
PSEUDO_LANGUAGE,
SYS_LOCALE,
is_valid_locale,
)

# The JupyterLab settings file extension.
SETTINGS_EXTENSION = ".jupyterlab-settings"
Expand Down Expand Up @@ -497,7 +503,7 @@ def get_current_locale(self) -> str:
current_locale = settings.get("settings", {}).get("locale") or SYS_LOCALE
if current_locale == "default":
current_locale = SYS_LOCALE
if not is_valid_locale(current_locale):
if not is_valid_locale(current_locale) and current_locale != PSEUDO_LANGUAGE:
current_locale = DEFAULT_LOCALE

return current_locale
46 changes: 38 additions & 8 deletions jupyterlab_server/translation_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Localization utilities to find available language packs and packages with
localization data.
"""

from __future__ import annotations

import gettext
Expand Down Expand Up @@ -40,6 +41,9 @@
L10N_SCHEMA_NAME = "@jupyterlab/translation-extension:plugin"
PY37_OR_LOWER = sys.version_info[:2] <= (3, 7)

# Pseudo language locale for in-context translation
PSEUDO_LANGUAGE = "ach_UG"

_default_schema_context = "schema"
_default_settings_context = "settings"
_lab_i18n_config = "jupyter.lab.internationalization"
Expand Down Expand Up @@ -151,7 +155,9 @@ def is_valid_locale(locale_: str) -> bool:
- Brazilian German: "de_BR"
"""
# Add exception for Norwegian
if locale_ == "no_NO":
if locale_ in {
"no_NO",
}:
return True

valid = False
Expand Down Expand Up @@ -183,8 +189,11 @@ def get_display_name(locale_: str, display_locale: str = DEFAULT_LOCALE) -> str:
"""
locale_ = locale_ if is_valid_locale(locale_) else DEFAULT_LOCALE
display_locale = display_locale if is_valid_locale(display_locale) else DEFAULT_LOCALE
loc = babel.Locale.parse(locale_)
display_name = loc.get_display_name(display_locale)
try:
loc = babel.Locale.parse(locale_)
display_name = loc.get_display_name(display_locale)
except babel.UnknownLocaleError:
display_name = display_locale
if display_name:
display_name = display_name[0].upper() + display_name[1:]
return display_name # type:ignore[return-value]
Expand Down Expand Up @@ -312,21 +321,38 @@ def get_language_packs(display_locale: str = DEFAULT_LOCALE) -> tuple[dict, str]
else:
invalid_locales.append(locale_)

display_locale = display_locale if display_locale in valid_locales else DEFAULT_LOCALE
display_locale_ = display_locale if display_locale in valid_locales else DEFAULT_LOCALE
locales = {
DEFAULT_LOCALE: {
"displayName": get_display_name(DEFAULT_LOCALE, display_locale),
"displayName": (
get_display_name(DEFAULT_LOCALE, display_locale_)
if display_locale != PSEUDO_LANGUAGE
else "Default"
),
"nativeName": get_display_name(DEFAULT_LOCALE, DEFAULT_LOCALE),
}
}
for locale_ in valid_locales:
locales[locale_] = {
"displayName": get_display_name(locale_, display_locale),
"displayName": get_display_name(locale_, display_locale_),
"nativeName": get_display_name(locale_, locale_),
}

if invalid_locales:
messages.append(f"The following locales are invalid: {invalid_locales}!")
if PSEUDO_LANGUAGE in invalid_locales:
invalid_locales.remove(PSEUDO_LANGUAGE)
locales[PSEUDO_LANGUAGE] = {
"displayName": "Pseudo-language",
# Trick to ensure the proper language is selected in the language menu
"nativeName": (
"to translate the UI"
if display_locale != PSEUDO_LANGUAGE
else "Pseudo-language"
),
}
# Check again as the pseudo-language was maybe the only invalid locale
if invalid_locales:
messages.append(f"The following locales are invalid: {invalid_locales}!")

return locales, "\n".join(messages)

Expand All @@ -351,7 +377,11 @@ def get_language_pack(locale_: str) -> tuple:
found_packages_locales, message = get_installed_packages_locale(locale_)
locale_data = {}
messages = message.split("\n")
if not message and is_valid_locale(locale_) and locale_ in found_locales:
if (
not message
and (locale_ == PSEUDO_LANGUAGE or is_valid_locale(locale_))
and locale_ in found_locales
):
path = found_locales[locale_]
for root, __, files in os.walk(path, topdown=False):
for name in files:
Expand Down
Loading