!40 fix(config):Specify the translation encoding format as UTF-8

From: @luoqing_kylinsec 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2022-11-19 06:27:58 +00:00 committed by Gitee
commit 49eee60801
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 59 additions and 1 deletions

View File

@ -0,0 +1,51 @@
From 8e018f450b57f7ab1c0eec258d81816f75cd97de Mon Sep 17 00:00:00 2001
From: luoqing <luoqing@kylinsec.com.cn>
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

View File

@ -1,6 +1,6 @@
Name: firewalld
Version: 1.0.2
Release: 4
Release: 5
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
License: GPLv2+
URL: http://www.firewalld.org
@ -15,6 +15,7 @@ Patch4: backport-fix-fw_icmptype-don-t-alter-ipvs-in-io_object.patch
Patch5: backport-fix-check-config-use-the-dictionary-variants.patch
Patch6: backport-fix-functions-check-config-fails-if-direct.xml-exists.patch
Patch7: backport-fix-service-adding-includes-to-a-built-in-service.patch
Patch8: 0001-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
@ -236,6 +237,12 @@ fi
%{_datadir}/firewalld/testsuite/python/firewalld_test.py
%changelog
* Mon Nov 14 2022 luoqing <luoqing@kylinsec.com.cn> - 1.0.2-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Specify the translation encoding format as UTF-8
* Thu Sep 01 2022 xinghe <xinghe2@h-partnres.com> - 1.0.2-4
- Type:bugfix
- ID:NA