From d821a5b1947ac27fe60ef2faac40f3216f80faa9 Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Tue, 21 Jun 2016 16:45:21 +0900 Subject: [PATCH] Fix wrong toast message display issue - IDS string should be located locale folder - Previous issue is fixed by notification fw https://review.tizen.org/gerrit/#/c/65464/2 Change-Id: I2407c31c0916354fe1df9502dedf6c5cf471d5f1 --- callmgr-popup/CMakeLists.txt | 2 +- callmgr-popup/res/po/CMakeLists.txt | 2 +- module/src/callmgr-contact.c | 4 ++-- packaging/call-manager.spec | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/callmgr-popup/CMakeLists.txt b/callmgr-popup/CMakeLists.txt index e716daa..ce0b3cf 100644 --- a/callmgr-popup/CMakeLists.txt +++ b/callmgr-popup/CMakeLists.txt @@ -46,7 +46,7 @@ SET(PREFIX "${TZ_SYS_RO_APP}/org.tizen.callmgr-popup/") SET(BINDIR "${PREFIX}/bin") SET(RESDIR "${PREFIX}/res") SET(EDJDIR "${RESDIR}/edje") -SET(SHARED_DIR "${PREFIX}/shared/res/locale") +SET(LOCALEDIR "${RESDIR}/locale") SET(PKG_NAME "org.tizen.callmgr-popup") FOREACH(flag ${callmgr_popup_pkgs_CFLAGS}) diff --git a/callmgr-popup/res/po/CMakeLists.txt b/callmgr-popup/res/po/CMakeLists.txt index 347bb35..74c267a 100644 --- a/callmgr-popup/res/po/CMakeLists.txt +++ b/callmgr-popup/res/po/CMakeLists.txt @@ -77,7 +77,7 @@ FOREACH(pofile ${POFILES}) DEPENDS ${absPofile} ) INSTALL(FILES ${moFile} - DESTINATION ${SHARED_DIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo) + DESTINATION ${LOCALEDIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo) SET(moFiles ${moFiles} ${moFile}) ENDFOREACH(pofile) diff --git a/module/src/callmgr-contact.c b/module/src/callmgr-contact.c index be32a17..3a1c66d 100644 --- a/module/src/callmgr-contact.c +++ b/module/src/callmgr-contact.c @@ -651,7 +651,7 @@ static void __callmgr_ct_add_notification(int missed_cnt) err("Fail to notification_set_tag : %d", noti_err); } - noti_err = notification_set_text_domain(noti, "callmgr-popup", tzplatform_mkpath(TZ_SYS_RO_APP, "org.tizen.callmgr-popup/shared/res/locale")); + noti_err = notification_set_text_domain(noti, "callmgr-popup", tzplatform_mkpath(TZ_SYS_RO_APP, "org.tizen.callmgr-popup/res/locale")); if (noti_err != NOTIFICATION_ERROR_NONE) { warn("Fail to notification_set_text_domain"); } @@ -1059,7 +1059,7 @@ static void __callmgr_ct_add_rec_reject_notification(char *number, int person_id err("Fail to notification_set_tag : %d", noti_err); } - noti_err = notification_set_text_domain(noti, "callmgr-popup", tzplatform_mkpath(TZ_SYS_RO_APP, "org.tizen.callmgr-popup/shared/res/locale")); + noti_err = notification_set_text_domain(noti, "callmgr-popup", tzplatform_mkpath(TZ_SYS_RO_APP, "org.tizen.callmgr-popup/res/locale")); if (noti_err != NOTIFICATION_ERROR_NONE) { warn("Fail to notification_set_text_domain"); } diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec index 492a4cb..69172d7 100644 --- a/packaging/call-manager.spec +++ b/packaging/call-manager.spec @@ -1,6 +1,6 @@ %define major 0 %define minor 1 -%define patchlevel 70 +%define patchlevel 71 %define ext_feature 0 Name: call-manager @@ -123,4 +123,4 @@ cp LICENSE %{buildroot}/usr/share/license/call-manager /usr/apps/org.tizen.callmgr-popup/bin/callmgr-popup /usr/share/packages/org.tizen.callmgr-popup.xml /usr/apps/org.tizen.callmgr-popup/res/edje/popup_custom.edj -/usr/apps/org.tizen.callmgr-popup/shared/res/locale/*/*/callmgr-popup.mo +/usr/apps/org.tizen.callmgr-popup/res/locale/*/*/callmgr-popup.mo -- 2.7.4