From 5a3f626e843663c1248afd057765d1764a1cb673 Mon Sep 17 00:00:00 2001 From: yangl777 Date: Thu, 29 Dec 2022 07:14:14 +0000 Subject: [PATCH] fix(config) Specify the translation encoding format as UTF-8 --- firewalld.spec | 9 +++- ...fy-the-translation-encoding-format-a.patch | 51 +++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 fix-config-Specify-the-translation-encoding-format-a.patch diff --git a/firewalld.spec b/firewalld.spec index 9f6968e..e9b4dd6 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,6 +1,6 @@ Name: firewalld Version: 0.6.6 -Release: 7 +Release: 8 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall License: GPLv2+ URL: http://www.firewalld.org @@ -10,6 +10,7 @@ Patch0: firewalld-0.2.6-MDNS-default.patch #backport from Eric Garver Patch1: 0001-fedora-patch-to-default-to-iptables-backend.patch Patch2: add-Restart-on-failure-on-firewalld.service.patch +Patch3: fix-config-Specify-the-translation-encoding-format-a.patch BuildArch: noarch BuildRequires: autoconf automake desktop-file-utils gettext intltool glib2 glib2-devel systemd-units docbook-style-xsl @@ -194,6 +195,12 @@ fi %changelog +* Thu Dec 29 2022 yanglu - 0.6.6-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Specify the translation encoding format as UTF-8 + * Tue Jan 25 2022 yanglu - 0.6.6-7 - Type:bugfix - ID:NA diff --git a/fix-config-Specify-the-translation-encoding-format-a.patch b/fix-config-Specify-the-translation-encoding-format-a.patch new file mode 100644 index 0000000..0a76054 --- /dev/null +++ b/fix-config-Specify-the-translation-encoding-format-a.patch @@ -0,0 +1,51 @@ +From 8e018f450b57f7ab1c0eec258d81816f75cd97de Mon Sep 17 00:00:00 2001 +From: luoqing +Date: Mon, 14 Nov 2022 16:21:25 +0800 +Subject: [PATCH] fix(config):Specify the translation encoding format as UTF-8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 指定翻译编码格式为UTF-8 +--- + src/firewall/config/__init__.py | 2 ++ + src/firewall/config/__init__.py.in | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/firewall/config/__init__.py b/src/firewall/config/__init__.py +index 1dc34d5..cf6b63c 100644 +--- a/src/firewall/config/__init__.py ++++ b/src/firewall/config/__init__.py +@@ -22,10 +22,12 @@ + import locale + try: + locale.setlocale(locale.LC_ALL, "") ++ locale.bind_textdomain_codeset("firewalld","UTF-8") + except locale.Error: + import os + os.environ['LC_ALL'] = 'C' + locale.setlocale(locale.LC_ALL, "") ++ locale.bind_textdomain_codeset("firewalld","UTF-8") + + DOMAIN = 'firewalld' + import gettext +diff --git a/src/firewall/config/__init__.py.in b/src/firewall/config/__init__.py.in +index 6322334..0b5804f 100644 +--- a/src/firewall/config/__init__.py.in ++++ b/src/firewall/config/__init__.py.in +@@ -22,10 +22,12 @@ + import locale + try: + locale.setlocale(locale.LC_ALL, "") ++ locale.bind_textdomain_codeset("firewalld","UTF-8") + except locale.Error: + import os + os.environ['LC_ALL'] = 'C' + locale.setlocale(locale.LC_ALL, "") ++ locale.bind_textdomain_codeset("firewalld","UTF-8") + + DOMAIN = 'firewalld' + import gettext +-- +2.33.0 + -- Gitee