Philipp Hörist pushed to branch master at gajim / gajim
Commits:
00459a54 by Philipp Hörist at 2025-08-15T23:28:46+02:00
fix: Stream: Don’t set invalid xml:lang attribute
Fixes #12432
- - - - -
6 changed files:
- gajim/common/client.py
- gajim/common/helpers.py
- gajim/common/i18n.py
- + gajim/common/util/standards.py
- gajim/gtk/groupchat_join.py
- gajim/gtk/start_chat.py
Changes:
=====================================
gajim/common/client.py
=====================================
@@ -41,13 +41,13 @@
from gajim.common.helpers import Observable
from gajim.common.helpers import warn_about_plain_connection
from gajim.common.i18n import _
-from gajim.common.i18n import get_rfc5646_lang
from gajim.common.idle import IdleMonitorManager
from gajim.common.idle import Monitor
from gajim.common.modules.contacts import BareContact
from gajim.common.modules.message import build_message_stanza
from gajim.common.structs import OutgoingMessage
from gajim.common.util.http import create_http_session
+from gajim.common.util.standards import get_rfc5646_lang
from gajim.common.util.status import get_idle_status_message
from gajim.common.util.text import to_one_line
=====================================
gajim/common/helpers.py
=====================================
@@ -54,7 +54,7 @@
from gajim.common import app
from gajim.common import configpaths
from gajim.common import types
-from gajim.common.i18n import get_rfc5646_lang
+from gajim.common.util.standards import get_rfc5646_lang
from gajim.common.util.text import get_random_string
if TYPE_CHECKING:
=====================================
gajim/common/i18n.py
=====================================
@@ -31,12 +31,6 @@ def get_default_lang() -> str:
return _trans.get_default_lang()
-def get_rfc5646_lang(lang: str | None = None) -> str:
- if lang is None:
- lang = _trans.get_default_lang()
- return lang.replace('_', '-')
-
-
def get_short_lang_code(lang: str | None = None) -> str:
if lang is None:
lang = _trans.get_default_lang()
=====================================
gajim/common/util/standards.py
=====================================
@@ -0,0 +1,14 @@
+# This file is part of Gajim.
+#
+# SPDX-License-Identifier: GPL-3.0-only
+
+from __future__ import annotations
+
+from gajim.common.const import RFC5646_LANGUAGE_TAGS
+from gajim.common.i18n import get_default_lang
+
+
+def get_rfc5646_lang() -> str:
+ lang = get_default_lang()
+ lang = lang.replace('_', '-')
+ return lang if lang in RFC5646_LANGUAGE_TAGS else "en"
=====================================
gajim/gtk/groupchat_join.py
=====================================
@@ -17,8 +17,8 @@
from gajim.common.const import MUC_DISCO_ERRORS
from gajim.common.helpers import to_user_string
from gajim.common.i18n import _
-from gajim.common.i18n import get_rfc5646_lang
from gajim.common.util.muc import get_group_chat_nick
+from gajim.common.util.standards import get_rfc5646_lang
from gajim.gtk.groupchat_info import GroupChatInfoScrolled
from gajim.gtk.groupchat_nick import NickChooser
=====================================
gajim/gtk/start_chat.py
=====================================
@@ -38,12 +38,12 @@
from gajim.common.const import RFC5646_LANGUAGE_TAGS
from gajim.common.helpers import to_user_string
from gajim.common.i18n import _
-from gajim.common.i18n import get_rfc5646_lang
from gajim.common.modules.contacts import BareContact
from gajim.common.modules.contacts import GroupchatContact
from gajim.common.modules.util import as_task
from gajim.common.util.jid import validate_jid
from gajim.common.util.muc import get_group_chat_nick
+from gajim.common.util.standards import get_rfc5646_lang
from gajim.common.util.status import compare_show
from gajim.common.util.text import to_one_line
from gajim.common.util.uri import parse_uri
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/00459a544cca8266ce54d32005ec11a6cab852ca
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/00459a544cca8266ce54d32005ec11a6cab852ca
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
