Merge pull request #4 from yunta-mb/master

fixed translation of notifications
sailfishos · Mar 20, 2013 · 33df7bb · 33df7bb
2 parents e5dd341 + 9156aff
commit 33df7bb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/common-vars.pri b/common-vars.pri
@@ -33,7 +33,7 @@ PROJECT_NAME = commhistory-daemon
 # 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

diff --git a/data/notifications/x-nemo.call.missed.conf b/data/notifications/x-nemo.call.missed.conf
@@ -3,7 +3,7 @@ x-nemo-preview-icon=icon-s-status-call-missed
 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
diff --git a/src/locstrings.h b/src/locstrings.h
@@ -46,16 +46,16 @@
 
 #include <MLocale>
 
-//% "%L1 new message(s)"
+//% "%n new message(s)"
 #define txt_qtn_msg_notification_new_message(NUM) qtTrId("qtn_msg_notification_new_message", 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)"
+//% "%n missed call(s)"
 #define txt_qtn_call_missed(NUM) qtTrId("qtn_call_missed", NUM)
-//% "%L1 voicemail(s)"
+//% "%n voicemail(s)"
 #define txt_qtn_call_voicemail_notification(NUM) qtTrId("qtn_call_voicemail_notification", NUM)
 //% "Private number"
 #define txt_qtn_call_type_private qtTrId("qtn_call_type_private")

diff --git a/src/main.cpp b/src/main.cpp
@@ -135,11 +135,13 @@ int main(int argc, char **argv)
     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";

diff --git a/translations/translations.pro b/translations/translations.pro
@@ -31,7 +31,7 @@ CATALOGNAME = commhistoryd
 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/
 
 #-----------------------------------------------------------------------------