!189 ceph mgr dashboard support multi-language
From: @Tom_zc Reviewed-by: @liuqinfei, @rosinL Signed-off-by: @liuqinfei
This commit is contained in:
commit
d4b10ad669
31321
0016-fix-mgr-dashboard-frontend-build-depend.patch
Normal file
31321
0016-fix-mgr-dashboard-frontend-build-depend.patch
Normal file
File diff suppressed because it is too large
Load Diff
39
0017-mgr-dashboard-support-multi-language.patch
Normal file
39
0017-mgr-dashboard-support-multi-language.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From f6b6eca9238265bf48e573a57e50da3113a6df49 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Tom_zc <tom_toworld@163.com>
|
||||||
|
Date: Tue, 23 May 2023 17:17:58 +0800
|
||||||
|
Subject: [PATCH] mgr-dashboard-support-multi-language
|
||||||
|
|
||||||
|
category: feature
|
||||||
|
|
||||||
|
--------------------------------
|
||||||
|
|
||||||
|
Fix bug about using the zh-CN language
|
||||||
|
|
||||||
|
Signed-off-by: Tom_zc <tom_toworld@163.com>
|
||||||
|
---
|
||||||
|
.../mgr/dashboard/frontend/src/locale/messages.zh-CN.xlf | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/pybind/mgr/dashboard/frontend/src/locale/messages.zh-CN.xlf b/src/pybind/mgr/dashboard/frontend/src/locale/messages.zh-CN.xlf
|
||||||
|
index 26c61727b..562d71a9a 100644
|
||||||
|
--- a/src/pybind/mgr/dashboard/frontend/src/locale/messages.zh-CN.xlf
|
||||||
|
+++ b/src/pybind/mgr/dashboard/frontend/src/locale/messages.zh-CN.xlf
|
||||||
|
@@ -26,7 +26,7 @@
|
||||||
|
<x id="PH" equiv-text="request.name"/>
|
||||||
|
</source>
|
||||||
|
<target>已更新配置选项
|
||||||
|
- <x id="INTERPOLATION" equiv-text="{{name}}"/>
|
||||||
|
+ <x id="PH" equiv-text="{{name}}"/>
|
||||||
|
</target>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="cff1428d10d59d14e45edec3c735a27b5482db59" datatype="html">
|
||||||
|
@@ -6792,4 +6792,4 @@
|
||||||
|
</trans-unit>
|
||||||
|
</body>
|
||||||
|
</file>
|
||||||
|
-</xliff>
|
||||||
|
\ No newline at end of file
|
||||||
|
+</xliff>
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
28
ceph.spec
28
ceph.spec
@ -24,6 +24,10 @@
|
|||||||
%bcond_with zbd
|
%bcond_with zbd
|
||||||
%bcond_with cmake_verbose_logging
|
%bcond_with cmake_verbose_logging
|
||||||
%bcond_without ceph_test_package
|
%bcond_without ceph_test_package
|
||||||
|
%bcond_without mgr_dashboard_frontend_support_multi_language
|
||||||
|
%if 0%{?openEuler}
|
||||||
|
%bcond_without mgr_dashboard_frontend_build_depend
|
||||||
|
%endif
|
||||||
%ifarch s390
|
%ifarch s390
|
||||||
%bcond_with tcmalloc
|
%bcond_with tcmalloc
|
||||||
%else
|
%else
|
||||||
@ -125,7 +129,7 @@
|
|||||||
#################################################################################
|
#################################################################################
|
||||||
Name: ceph
|
Name: ceph
|
||||||
Version: 16.2.7
|
Version: 16.2.7
|
||||||
Release: 19
|
Release: 20
|
||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
|
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
%endif
|
%endif
|
||||||
@ -158,6 +162,8 @@ Patch12: 0012-add-missing-includes-when-compiling-with-boost-1.75.patch
|
|||||||
Patch13: 0013-add-atomic-library-for-loongarch64.patch
|
Patch13: 0013-add-atomic-library-for-loongarch64.patch
|
||||||
Patch14: 0014-fix-CVE-2022-3854.patch
|
Patch14: 0014-fix-CVE-2022-3854.patch
|
||||||
Patch15: 0015-ceph-volume-add-judgment-for-ceph-volume-lvm-activat.patch
|
Patch15: 0015-ceph-volume-add-judgment-for-ceph-volume-lvm-activat.patch
|
||||||
|
Patch16: 0016-fix-mgr-dashboard-frontend-build-depend.patch
|
||||||
|
Patch17: 0017-mgr-dashboard-support-multi-language.patch
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
# _insert_obs_source_lines_here
|
# _insert_obs_source_lines_here
|
||||||
ExclusiveArch: x86_64 aarch64 ppc64le s390x
|
ExclusiveArch: x86_64 aarch64 ppc64le s390x
|
||||||
@ -415,6 +421,10 @@ BuildRequires: boost-random
|
|||||||
BuildRequires: libatomic
|
BuildRequires: libatomic
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{with mgr_dashboard_frontend_support_multi_language}
|
||||||
|
BuildRequires: npm
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Ceph is a massively scalable, open-source, distributed storage system that runs
|
Ceph is a massively scalable, open-source, distributed storage system that runs
|
||||||
on commodity hardware and delivers object, block and file system storage.
|
on commodity hardware and delivers object, block and file system storage.
|
||||||
@ -1223,6 +1233,10 @@ This package provides Ceph default alerts for Prometheus.
|
|||||||
%patch8 -R -p1
|
%patch8 -R -p1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{without mgr_dashboard_frontend_build_depend}
|
||||||
|
%patch16 -R -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# LTO can be enabled as soon as the following GCC bug is fixed:
|
# LTO can be enabled as soon as the following GCC bug is fixed:
|
||||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200
|
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=48200
|
||||||
@ -1295,7 +1309,16 @@ ${CMAKE} .. \
|
|||||||
-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=%{_unitdir} \
|
-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=%{_unitdir} \
|
||||||
-DWITH_MANPAGE=ON \
|
-DWITH_MANPAGE=ON \
|
||||||
-DWITH_PYTHON3=%{python3_version} \
|
-DWITH_PYTHON3=%{python3_version} \
|
||||||
|
%if 0%{with mgr_dashboard_frontend_support_multi_language}
|
||||||
|
-DDASHBOARD_FRONTEND_LANGS="cs,de,es,fr,id,it,ja,ko,pl,zh-Hans,zh-Hant,pt" \
|
||||||
|
-DWITH_MGR_DASHBOARD_FRONTEND=ON \
|
||||||
|
-DWITH_SYSTEM_NPM=ON \
|
||||||
|
%if 0%{with mgr_dashboard_frontend_build_depend}
|
||||||
|
-DWITH_SYSTEM_NPM_BUILD_DEPEND=ON \
|
||||||
|
%endif
|
||||||
|
%else
|
||||||
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
|
-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
|
||||||
|
%endif
|
||||||
%if 0%{without ceph_test_package}
|
%if 0%{without ceph_test_package}
|
||||||
-DWITH_TESTS=OFF \
|
-DWITH_TESTS=OFF \
|
||||||
%endif
|
%endif
|
||||||
@ -2505,6 +2528,9 @@ exit 0
|
|||||||
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
|
%config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 30 2023 zhuchao <chaotomzhu@gmail.com> - 2:16.2.7-20
|
||||||
|
- mgr dashboard support multi-language
|
||||||
|
|
||||||
* Mon Apr 10 2023 yangxiaoliang <yangxiaoliang07@163.com> - 2:16.2.7-19
|
* Mon Apr 10 2023 yangxiaoliang <yangxiaoliang07@163.com> - 2:16.2.7-19
|
||||||
- add judgment for ceph-volume lvm activate
|
- add judgment for ceph-volume lvm activate
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user