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

- 指定翻译编码格式为UTF-8
This commit is contained in:
luoqing 2022-11-15 09:47:21 +08:00
parent 4b5dd3d399
commit 39de895591
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.2.1
Release: 1
Release: 2
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
License: GPLv2+
URL: http://www.firewalld.org
@ -9,6 +9,7 @@ Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/
Patch0: firewalld-0.2.6-MDNS-default.patch
Patch1: repair-test-cases.patch
Patch2: add-Restart-on-failure-on-firewalld.service.patch
Patch3: 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
@ -230,6 +231,12 @@ fi
%{_datadir}/firewalld/testsuite/python/firewalld_test.py
%changelog
* Tue Nov 15 2022 luoqing <luoqing@kylinsec.com.cn> - 1.2.1-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:specify the translation encoding format as UTF-8
* Mon Nov 14 2022 yanglu <yanglu72@h-partners.com> - 1.2.1-1
- Type:requirement
- ID:NA