From 0fdb709c2dd6423764d61d3db3ab2b2eade18021 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Mon, 12 Jul 2021 13:33:08 +0900 Subject: [PATCH] po: change mo file name to dali-toolkit-legacy The dali2-toolkit is using same mo file neme dali-toolkit.mo. So there was a conflict while creating image. This patch is solving the conflict problem by changing mo file name. Change-Id: I0aaa77826e12b9b49da7bf08df69f9477149efea --- .../internal/controls/text-controls/text-selection-popup-impl.cpp | 2 +- packaging/dali-toolkit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index 8aa3438..c3f58b3 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -56,7 +56,7 @@ namespace Internal namespace { #if defined(__GLIBC__) -#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit", string) +#define GET_LOCALE_TEXT(string) dgettext("dali-toolkit-legacy", string) #endif const std::string TEXT_SELECTION_POPUP_BUTTON_STYLE_NAME( "TextSelectionPopupButton" ); diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index ba76dd8..3dea856 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -156,7 +156,7 @@ for language in *.mo do language=${language%.mo} mkdir -p %{buildroot}/%{_datadir}/locale/${language}/LC_MESSAGES/ - cp ${language}.mo %{buildroot}/%{_datadir}/locale/${language}/LC_MESSAGES/dali-toolkit.mo + cp ${language}.mo %{buildroot}/%{_datadir}/locale/${language}/LC_MESSAGES/dali-toolkit-legacy.mo done } &> /dev/null popd -- 2.7.4