I have made the following changes intended for : CE:MW:Shared / commhistory-daemon
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/8142 Thank You, yunta [This message was auto-generated] --- Request # 8142: Messages from BOSS: State: review at 2013-02-20T13:49:19 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:yunta:branches:CE:MW:Shared / commhistory-daemon -> CE:MW:Shared / commhistory-daemon changes files: -------------- --- commhistory-daemon.changes +++ commhistory-daemon.changes @@ -0,0 +1,4 @@ +* Wed Feb 20 2013 Maciej Blomberg <[email protected]> - 0.4.5 +- notifications translation fixed +- changed qm file installation path + old: ---- commhistory-daemon-0.4.4.tar.bz2 new: ---- commhistory-daemon-0.4.5.tar.bz2 spec files: ----------- --- commhistory-daemon.spec +++ commhistory-daemon.spec @@ -1,10 +1,10 @@ Name: commhistory-daemon Summary: Communications event history database daemon -Version: 0.4.4 +Version: 0.4.5 Release: 1 Group: Communications/Telephony and IM License: LGPL -URL: http://gitorious.org/commhistory/commhistory-daemon +URL: https://github.com/nemomobile/commhistory-daemon Source0: %{name}-%{version}.tar.bz2 BuildRequires: pkgconfig(QtCore) >= 4.7.0 BuildRequires: pkgconfig(QtContacts) @@ -38,18 +38,18 @@ unset LD_AS_NEEDED %qmake make %{?jobs:-j%jobs} - %install rm -rf %{buildroot} %qmake_install +rm %{buildroot}/usr/bin/commhistoryd.qm + %files %defattr(-,root,root,-) %{_bindir}/commhistoryd -%{_bindir}/commhistoryd.qm %{_datadir}/dbus-1/services/com.nokia.CommHistory.service %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.CommHistory.service -%{_datadir}/l10n/meegotouch/commhistoryd.qm +%{_datadir}/translations/commhistoryd.qm %{_datadir}/doc/commhistory-daemon-l10n-engineering-english/commhistoryd.ts %{_datadir}/lipstick/notificationcategories/* %{_datadir}/telepathy/clients/CommHistory.client other changes: -------------- ++++++ commhistory-daemon-0.4.4.tar.bz2 -> commhistory-daemon-0.4.5.tar.bz2 --- .gitignore +++ .gitignore @@ -1,27 +0,0 @@ -*.o -*~ -moc_* -commhistoryd -tests/commhistorytest -Makefile -*.pro.user* -.cproject -.project -*.pyc -build-stamp -builddir/ -configure-stamp -debian/commhistory-daemon-dbg/ -debian/commhistory-daemon-l10n-engineering-english/ -debian/commhistory-daemon-tests.substvars -debian/commhistory-daemon-tests/ -debian/commhistory-daemon.substvars -debian/commhistory-daemon/ -debian/files -debian/tmp/ -src/TpExtensions/.gen/ -tests/bin/ -translations/telephony/telephony.qm -translations/messaging/messaging.qm -translations/commhistoryd.qm -translations/commhistoryd.ts --- common-vars.pri +++ common-vars.pri @@ -33,7 +33,7 @@ # Project version # remember to update debian/* files if you changes this # ----------------------------------------------------------------------------- -PROJECT_VERSION = 0.4.4 +PROJECT_VERSION = 0.4.5 # ----------------------------------------------------------------------------- # Project's data directories --- data/notifications/x-nemo.call.missed.conf +++ data/notifications/x-nemo.call.missed.conf @@ -3,7 +3,7 @@ x-nemo-feedback=default persistent=true genericTextId=qtn_call_missed -genericTextCatalogue=telephony +genericTextCatalogue=commhistoryd priority=100 lowPowerModeIconId=icon-m-low-power-mode-missed-call statusAreaIconId=icon-s-status-notifier-call-missed --- src/locstrings.h +++ src/locstrings.h @@ -47,16 +47,16 @@ #include <MLocale> //% "%L1 new message(s)" -#define txt_qtn_msg_notification_new_message(NUM) qtTrId("qtn_msg_notification_new_message", NUM) +#define txt_qtn_msg_notification_new_message(NUM) qtTrId("qtn_msg_notification_new_message").arg(NUM) //% "Contact card" #define txt_qtn_msg_contact_card_label qtTrId("qtn_msg_contact_card_label") //% "%1 | %2" #define txt_qtn_msg_notification_new_vcard(STR) qtTrId("qtn_msg_received_contact_card").arg(txt_qtn_msg_contact_card_label).arg(STR) //% "%L1 missed call(s)" -#define txt_qtn_call_missed(NUM) qtTrId("qtn_call_missed", NUM) +#define txt_qtn_call_missed(NUM) qtTrId("qtn_call_missed").arg(NUM) //% "%L1 voicemail(s)" -#define txt_qtn_call_voicemail_notification(NUM) qtTrId("qtn_call_voicemail_notification", NUM) +#define txt_qtn_call_voicemail_notification(NUM) qtTrId("qtn_call_voicemail_notification").arg(NUM) //% "Private number" #define txt_qtn_call_type_private qtTrId("qtn_call_type_private") //% "Voicemail" --- src/main.cpp +++ src/main.cpp @@ -133,11 +133,13 @@ setupSigtermHandler(); ML10N::MLocale locale; + locale.addTranslationPath("/usr/share/translations/"); locale.installTrCatalog("messaging"); locale.installTrCatalog("telephony"); locale.installTrCatalog("mms"); locale.installTrCatalog("presence"); locale.installTrCatalog("recipientedit"); + locale.installTrCatalog("commhistoryd"); ML10N::MLocale::setDefault(locale); qDebug() << "Translation catalogs loaded"; --- translations/translations.pro +++ translations/translations.pro @@ -31,7 +31,7 @@ SOURCEPATHS = $${_PRO_FILE_PWD_}/../src # Installation paths: -QM_INSTALL_PATH = $${INSTALL_PREFIX}/share/l10n/meegotouch/ +QM_INSTALL_PATH = $${INSTALL_PREFIX}/share/translations/ TS_INSTALL_PATH = $${INSTALL_PREFIX}/share/doc/commhistory-daemon-l10n-engineering-english/ #-----------------------------------------------------------------------------
