Compare commits

..

No commits in common. "a10989fe105140a79b8b50421a8c3a49237f7269" and "83ac57b416e8091011bf0597957fcd0a97001ee1" have entirely different histories.

4 changed files with 16 additions and 82 deletions

View File

@ -1,25 +0,0 @@
From 728b7228074f292c4a2f400146cf4de6b1879229 Mon Sep 17 00:00:00 2001
From: liaowei <liaowei@kylinos.com.cn>
Date: Thu, 6 Aug 2020 02:17:02 -0400
Subject: [PATCH] add chinese translation
---
po/zh_CN.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 96066fa..eed8ec1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -503,7 +503,7 @@ msgstr ""
#: ../data/pluma.desktop.in.in.h:1
msgid "Pluma"
-msgstr "Pluma"
+msgstr "文本编辑器"
#: ../data/pluma.desktop.in.in.h:2 ../pluma/pluma-print-job.c:760
msgid "Text Editor"
--
2.18.1

View File

@ -1,38 +0,0 @@
From a96a0a3207f0ff36d13f30a1c1b83edf420b3a23 Mon Sep 17 00:00:00 2001
From: luoqing <luoqing@kylinsec.com.cn>
Date: Thu, 20 Jul 2023 10:58:23 +0800
Subject: [PATCH] fix(pluma-utils):Fixed garbled toolTips path in tab page with
GB18030 encoding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修复在GB18030编码下tab页中toolTips的路径乱码
Related #7248
---
pluma/pluma-utils.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/pluma/pluma-utils.c b/pluma/pluma-utils.c
index a721695..334ef7b 100644
--- a/pluma/pluma-utils.c
+++ b/pluma/pluma-utils.c
@@ -1351,9 +1351,12 @@ pluma_utils_uri_for_display (const gchar *uri)
{
GFile *gfile;
gchar *parse_name;
-
+ gchar *get_path;
gfile = g_file_new_for_uri (uri);
- parse_name = g_file_get_parse_name (gfile);
+ // parse_name = g_file_get_parse_name (gfile);
+
+ get_path = g_file_get_path(gfile);
+ parse_name = g_locale_to_utf8(get_path, -1, NULL, NULL, NULL);
g_object_unref (gfile);
return parse_name;
--
2.27.0

View File

@ -15,15 +15,19 @@
Summary: Text editor for the MATE desktop Summary: Text editor for the MATE desktop
Name: pluma Name: pluma
Version: %{branch}.2 Version: %{branch}.2
Release: 4 %if 0%{?rel_build}
Release: 1
%else
Release: 0.7%{?git_rel}
%endif
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
URL: http://mate-desktop.org URL: http://mate-desktop.org
# for downloading the tarball use 'spectool -g -R pluma.spec' # for downloading the tarball use 'spectool -g -R pluma.spec'
# Source for release-builds. # Source for release-builds.
Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz %{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz}
# Source for snapshot-builds.
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
# https://github.com/mate-desktop/pluma/commit/e88a2ea # https://github.com/mate-desktop/pluma/commit/e88a2ea
Patch1: pluma_0001-Reindent-all-Python-sources-to-ts-4.-Strip-trailing-1.22.patch Patch1: pluma_0001-Reindent-all-Python-sources-to-ts-4.-Strip-trailing-1.22.patch
@ -37,8 +41,6 @@ Patch4: pluma_0001-externaltools-plugin-change-code-for-Python-2-3-comp.p
Patch5: pluma_0001-snippets-plugin-change-code-for-Python-2-3-compatibi.patch Patch5: pluma_0001-snippets-plugin-change-code-for-Python-2-3-compatibi.patch
# https://github.com/mate-desktop/pluma/pull/437 # https://github.com/mate-desktop/pluma/pull/437
Patch6: pluma_0001-Switch-to-Python-3.patch Patch6: pluma_0001-Switch-to-Python-3.patch
Patch7: 0001-add-chinese-translation.patch
Patch8: 0001-fix-pluma-utils-Fixed-garbled-toolTips-path-in-tab-p.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: enchant-devel BuildRequires: enchant-devel
@ -58,6 +60,10 @@ Requires: mate-desktop-libs
# Requires: caja-schemas # Requires: caja-schemas
# the run-command plugin uses zenity # the run-command plugin uses zenity
Requires: zenity Requires: zenity
# libpeas isn't splited in rhel7
%if 0%{?fedora} && 0%{?fedora} <= 29
Requires: libpeas-loader-python3
%endif
%description %description
pluma is a small, but powerful text editor designed specifically for pluma is a small, but powerful text editor designed specifically for
@ -89,7 +95,11 @@ Development files for pluma
%prep %prep
%if 0%{?rel_build}
%autosetup -p1 %autosetup -p1
%else
%autosetup -n %{name}-%{commit} -p1
%endif
%if 0%{?rel_build} %if 0%{?rel_build}
# for releases # for releases
@ -159,14 +169,5 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
%changelog %changelog
* Thu Jul 20 2023 longcheng <longcheng@kylinos.com.cn> - 1.22.2-4
- fix(pluma-utils):Fixed garbled toolTips path in tab page with GB18030 encoding chinese translation
* Thu Jul 28 2022 longcheng <longcheng@kylinos.com.cn> - 1.22.2-3
- Add chinese translation
* Fri Dec 11 2020 douyan <douyan@kylinos.cn> - 1.22.2-2
- modify spec file
* Fri Dec 11 2020 douyan <douyan@kylinos.cn> - 1.22.2-1 * Fri Dec 11 2020 douyan <douyan@kylinos.cn> - 1.22.2-1
- package init for openEuler - package init for openEuler

View File

@ -1,4 +0,0 @@
version_control: github
src_repo: mate-desktop/pluma
tag_prefix: "^v"
separator: "."