From 693d1d90a1eaf6af6ac90eb68fe992c408f5a98a Mon Sep 17 00:00:00 2001 From: Denis Dolzhenko Date: Tue, 4 Oct 2016 12:15:07 +0300 Subject: [PATCH] TSAM-8398 Display wrong Messages size , Missing Subject and display wrong Expired when receive messages Change-Id: I05e76d7b4f084048b57a20f6eff1d4bee582dc8c Signed-off-by: Denis Dolzhenko --- res/po/ar.po | 3 +++ res/po/az.po | 3 +++ res/po/bg.po | 3 +++ res/po/ca.po | 3 +++ res/po/cs.po | 3 +++ res/po/da.po | 3 +++ res/po/de.po | 3 +++ res/po/el_GR.po | 3 +++ res/po/en.po | 3 +++ res/po/en_PH.po | 3 +++ res/po/en_US.po | 3 +++ res/po/es_ES.po | 3 +++ res/po/es_US.po | 3 +++ res/po/et.po | 3 +++ res/po/eu.po | 3 +++ res/po/fi.po | 3 +++ res/po/fr.po | 3 +++ res/po/fr_CA.po | 3 +++ res/po/ga.po | 3 +++ res/po/gl.po | 3 +++ res/po/hr.po | 3 +++ res/po/hu.po | 3 +++ res/po/hy.po | 3 +++ res/po/is.po | 3 +++ res/po/it_IT.po | 3 +++ res/po/ja_JP.po | 3 +++ res/po/ka.po | 3 +++ res/po/kk.po | 3 +++ res/po/ko_KR.po | 5 ++++- res/po/lt.po | 3 +++ res/po/lv.po | 3 +++ res/po/mk.po | 3 +++ res/po/nb.po | 3 +++ res/po/nl.po | 3 +++ res/po/pl.po | 3 +++ res/po/pt_BR.po | 3 +++ res/po/pt_PT.po | 3 +++ res/po/ro.po | 3 +++ res/po/ru_RU.po | 3 +++ res/po/sk.po | 3 +++ res/po/sl.po | 3 +++ res/po/sr.po | 3 +++ res/po/sv.po | 3 +++ res/po/tr_TR.po | 3 +++ res/po/uk.po | 3 +++ res/po/uz.po | 3 +++ res/po/zh_CN.po | 3 +++ res/po/zh_HK.po | 3 +++ res/po/zh_TW.po | 3 +++ .../src/private/MessageMmsPrivate.cpp | 7 +++++++ .../MsgEngine/src/private/MessageMmsPrivate.h | 3 ++- src/Common/Utils/inc/TimeUtils.h | 1 + src/Common/Utils/src/TimeUtils.cpp | 7 +++++++ .../Utils/inc/MessageDetailContent.h | 1 + .../Utils/src/MessageDetailContent.cpp | 18 +++++------------- 55 files changed, 171 insertions(+), 15 deletions(-) diff --git a/res/po/ar.po b/res/po/ar.po index 57c9aecc..71c94423 100644 --- a/res/po/ar.po +++ b/res/po/ar.po @@ -685,6 +685,9 @@ msgstr "مذكرة" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "فشل الإرسال" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "تاريخ الانتهاء:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "إدخال نص" diff --git a/res/po/az.po b/res/po/az.po index 4fbd5730..1430e97c 100644 --- a/res/po/az.po +++ b/res/po/az.po @@ -685,6 +685,9 @@ msgstr "Yaddaş" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Alınmadı" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Bitmə vaxtı:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Mətni daxil edin" diff --git a/res/po/bg.po b/res/po/bg.po index d616490f..10d8419d 100644 --- a/res/po/bg.po +++ b/res/po/bg.po @@ -685,6 +685,9 @@ msgstr "Записка" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Неуспешно" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Изтича на:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Въведете текст" diff --git a/res/po/ca.po b/res/po/ca.po index df268229..79373cc7 100644 --- a/res/po/ca.po +++ b/res/po/ca.po @@ -685,6 +685,9 @@ msgstr "Memoràndum" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Error" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Caduca el:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Introduir text" diff --git a/res/po/cs.po b/res/po/cs.po index f99d4086..8cdc16d2 100644 --- a/res/po/cs.po +++ b/res/po/cs.po @@ -685,6 +685,9 @@ msgstr "Poznámka" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Chyba" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Platnost do:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Zadejte text" diff --git a/res/po/da.po b/res/po/da.po index 326e06bf..992a5bc2 100644 --- a/res/po/da.po +++ b/res/po/da.po @@ -685,6 +685,9 @@ msgstr "Notat" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Mislyk." +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Udløber den:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Indtast tekst" diff --git a/res/po/de.po b/res/po/de.po index 884c63b2..6a4ac502 100644 --- a/res/po/de.po +++ b/res/po/de.po @@ -685,6 +685,9 @@ msgstr "Memo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Fehler" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Läuft ab am:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Text eingeben" diff --git a/res/po/el_GR.po b/res/po/el_GR.po index b53e4a66..e7305f08 100644 --- a/res/po/el_GR.po +++ b/res/po/el_GR.po @@ -685,6 +685,9 @@ msgstr "Σημείωση" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Απέτυχε" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Ημερομηνία λήξης:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Εισαγωγή κειμένου" diff --git a/res/po/en.po b/res/po/en.po index 65d1933a..f4458580 100644 --- a/res/po/en.po +++ b/res/po/en.po @@ -685,6 +685,9 @@ msgstr "Memo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Failed" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Expires on:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Enter text" diff --git a/res/po/en_PH.po b/res/po/en_PH.po index 14dcdca0..00a4f933 100644 --- a/res/po/en_PH.po +++ b/res/po/en_PH.po @@ -685,6 +685,9 @@ msgstr "Memo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Failed" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Expires on:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Enter text" diff --git a/res/po/en_US.po b/res/po/en_US.po index c0ccc601..c3cdb98b 100644 --- a/res/po/en_US.po +++ b/res/po/en_US.po @@ -685,6 +685,9 @@ msgstr "Memo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Failed" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Expires on:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Enter text" diff --git a/res/po/es_ES.po b/res/po/es_ES.po index ac47ca40..4822ee01 100644 --- a/res/po/es_ES.po +++ b/res/po/es_ES.po @@ -685,6 +685,9 @@ msgstr "Nota" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Error" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Caduca el:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Introducir texto" diff --git a/res/po/es_US.po b/res/po/es_US.po index 3a2d1f5e..8046f216 100644 --- a/res/po/es_US.po +++ b/res/po/es_US.po @@ -685,6 +685,9 @@ msgstr "Nota" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Error" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Caduca el:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Introducir texto" diff --git a/res/po/et.po b/res/po/et.po index 80baa51a..a1118e89 100644 --- a/res/po/et.po +++ b/res/po/et.po @@ -685,6 +685,9 @@ msgstr "Memo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Nurjus" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Aegumise kuupäev:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Sisestage tekst" diff --git a/res/po/eu.po b/res/po/eu.po index c42ac424..1c33175b 100644 --- a/res/po/eu.po +++ b/res/po/eu.po @@ -685,6 +685,9 @@ msgstr "Memoranduma" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Hutsa" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Egun honetan iraungiko da:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Adierazi testua" diff --git a/res/po/fi.po b/res/po/fi.po index cc441bc0..28e1cf61 100644 --- a/res/po/fi.po +++ b/res/po/fi.po @@ -685,6 +685,9 @@ msgstr "Muistio" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Epäonn." +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Vanhentuu:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Anna teksti" diff --git a/res/po/fr.po b/res/po/fr.po index a0be8335..65b800d7 100644 --- a/res/po/fr.po +++ b/res/po/fr.po @@ -685,6 +685,9 @@ msgstr "Mémo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Échec" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Expire le :" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Entrez du texte" diff --git a/res/po/fr_CA.po b/res/po/fr_CA.po index d7d40773..1052f58d 100644 --- a/res/po/fr_CA.po +++ b/res/po/fr_CA.po @@ -685,6 +685,9 @@ msgstr "Mémo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Échec" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Expire le :" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Entrez du texte" diff --git a/res/po/ga.po b/res/po/ga.po index 4c2e0c23..dbad12f3 100644 --- a/res/po/ga.po +++ b/res/po/ga.po @@ -685,6 +685,9 @@ msgstr "Meabhrán" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Theip air" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "As feidhm:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Iontráil téacs" diff --git a/res/po/gl.po b/res/po/gl.po index a531b0cd..19acf53c 100644 --- a/res/po/gl.po +++ b/res/po/gl.po @@ -685,6 +685,9 @@ msgstr "Memo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Erro" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Data de caducidade:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Inserir texto" diff --git a/res/po/hr.po b/res/po/hr.po index a75d2639..2a82a292 100644 --- a/res/po/hr.po +++ b/res/po/hr.po @@ -685,6 +685,9 @@ msgstr "Zapis" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Pogreška" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Datum isteka:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Upišite tekst" diff --git a/res/po/hu.po b/res/po/hu.po index 9443bd0e..816fa0d6 100644 --- a/res/po/hu.po +++ b/res/po/hu.po @@ -685,6 +685,9 @@ msgstr "Jegyzet" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Hiba" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Lejárat dátuma:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Szöveg bevitele" diff --git a/res/po/hy.po b/res/po/hy.po index f1c7a1e5..f85d37ad 100644 --- a/res/po/hy.po +++ b/res/po/hy.po @@ -685,6 +685,9 @@ msgstr "Հուշագիր" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Չհաջողվեց" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Ժամկետի ավարտման թվականը՝" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Մուտքագրել տեքստ" diff --git a/res/po/is.po b/res/po/is.po index 1748bd5b..d11366e7 100644 --- a/res/po/is.po +++ b/res/po/is.po @@ -685,6 +685,9 @@ msgstr "Minnisatriði" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Mistókst" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Gildir til:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Sláðu inn texta" diff --git a/res/po/it_IT.po b/res/po/it_IT.po index 8531518f..fa945fb5 100644 --- a/res/po/it_IT.po +++ b/res/po/it_IT.po @@ -685,6 +685,9 @@ msgstr "Memo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Errore" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Scade il:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Inserite il testo" diff --git a/res/po/ja_JP.po b/res/po/ja_JP.po index e45b63bc..306fbbff 100644 --- a/res/po/ja_JP.po +++ b/res/po/ja_JP.po @@ -685,6 +685,9 @@ msgstr "メモ" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "送信失敗" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "有効期限:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "テキストを入力" diff --git a/res/po/ka.po b/res/po/ka.po index a56c1200..695d08dc 100644 --- a/res/po/ka.po +++ b/res/po/ka.po @@ -685,6 +685,9 @@ msgstr "სამახსოვრო" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "ჩაიშალა" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "ძალაშია:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "შეიყვანეთ ტექსტი" diff --git a/res/po/kk.po b/res/po/kk.po index 7adbb905..39f4dd22 100644 --- a/res/po/kk.po +++ b/res/po/kk.po @@ -685,6 +685,9 @@ msgstr "Ескерту" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Сәтсіз" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Мерзімі бітетін күн:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Мәтінді енгізу" diff --git a/res/po/ko_KR.po b/res/po/ko_KR.po index a456a7e3..c15effa5 100644 --- a/res/po/ko_KR.po +++ b/res/po/ko_KR.po @@ -104,7 +104,7 @@ msgid "IDS_MSGC_BODY_MAXIMUM_NUMBER_OF_RECIPIENTS_HPD_REACHED" msgstr "최대 받는 사람 수 %d명에 도달하였습니다." msgid "IDS_MSGC_BODY_DUPLICATED_RECIPIENT" -msgstr "받는 사람이 중복됩니다." +msgstr "받는 사람에 이미 추가된 연락처입니다." msgid "IDS_MSGF_SK_FORWARD_LITE" msgstr "전달" @@ -685,6 +685,9 @@ msgstr "메모" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "보내기 안 됨" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "만료일:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "글자 입력" diff --git a/res/po/lt.po b/res/po/lt.po index 472738da..26fbd55b 100644 --- a/res/po/lt.po +++ b/res/po/lt.po @@ -685,6 +685,9 @@ msgstr "Įrašas" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Nepavyko" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Galiojimas baigiasi:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Įvesti tekstą" diff --git a/res/po/lv.po b/res/po/lv.po index 6ddd010d..b8a7a479 100644 --- a/res/po/lv.po +++ b/res/po/lv.po @@ -685,6 +685,9 @@ msgstr "Piezīme" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Neizdevās" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Derīguma termiņš beidzas:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Ievadiet tekstu" diff --git a/res/po/mk.po b/res/po/mk.po index 5e6ed2ac..c1b12f4b 100644 --- a/res/po/mk.po +++ b/res/po/mk.po @@ -685,6 +685,9 @@ msgstr "Белешка" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Неуспешно" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Застарува на:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Внесете текст" diff --git a/res/po/nb.po b/res/po/nb.po index 63c510c2..237695ac 100644 --- a/res/po/nb.po +++ b/res/po/nb.po @@ -685,6 +685,9 @@ msgstr "Notat" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Mislykket" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Utløper den:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Skriv inn tekst" diff --git a/res/po/nl.po b/res/po/nl.po index a794aec7..154e7f38 100644 --- a/res/po/nl.po +++ b/res/po/nl.po @@ -685,6 +685,9 @@ msgstr "Notitie" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Mislukt" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Verloopt op:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Tekst invoeren" diff --git a/res/po/pl.po b/res/po/pl.po index 7889fa2f..bd81d3b8 100644 --- a/res/po/pl.po +++ b/res/po/pl.po @@ -685,6 +685,9 @@ msgstr "Notatka" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Błąd" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Data wygaśnięcia:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Wprowadź tekst" diff --git a/res/po/pt_BR.po b/res/po/pt_BR.po index e863c46a..7ced8a3e 100644 --- a/res/po/pt_BR.po +++ b/res/po/pt_BR.po @@ -685,6 +685,9 @@ msgstr "Notas" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Falhou" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Expira em:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Inserir texto" diff --git a/res/po/pt_PT.po b/res/po/pt_PT.po index e3ef6bdc..487c5106 100644 --- a/res/po/pt_PT.po +++ b/res/po/pt_PT.po @@ -685,6 +685,9 @@ msgstr "Memorando" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Falhou" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Expira a:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Introduzir texto" diff --git a/res/po/ro.po b/res/po/ro.po index c410483f..dc642380 100644 --- a/res/po/ro.po +++ b/res/po/ro.po @@ -685,6 +685,9 @@ msgstr "Notă" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Nereușit" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Expiră pe:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Introducere text" diff --git a/res/po/ru_RU.po b/res/po/ru_RU.po index 5577ac7d..fbf8c854 100644 --- a/res/po/ru_RU.po +++ b/res/po/ru_RU.po @@ -685,6 +685,9 @@ msgstr "Заметки" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Сбой" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Срок действия:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Введите текст" diff --git a/res/po/sk.po b/res/po/sk.po index 9be86e46..bee825c0 100644 --- a/res/po/sk.po +++ b/res/po/sk.po @@ -685,6 +685,9 @@ msgstr "Poznámka" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Zlyhanie" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Platnosť skončí dňa:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Zadajte text" diff --git a/res/po/sl.po b/res/po/sl.po index f60a3f82..3f91120c 100644 --- a/res/po/sl.po +++ b/res/po/sl.po @@ -685,6 +685,9 @@ msgstr "Beležka" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Ni uspelo" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Poteče dne:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Vnesite besedilo" diff --git a/res/po/sr.po b/res/po/sr.po index fb16b5b2..42e8f8ab 100644 --- a/res/po/sr.po +++ b/res/po/sr.po @@ -685,6 +685,9 @@ msgstr "Beleška" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Neuspešno" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Ističe:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Unesi tekst" diff --git a/res/po/sv.po b/res/po/sv.po index d370d44f..cecea830 100644 --- a/res/po/sv.po +++ b/res/po/sv.po @@ -685,6 +685,9 @@ msgstr "Memo" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Misslyck." +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Upphör den:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Skriv in text" diff --git a/res/po/tr_TR.po b/res/po/tr_TR.po index c04ae44b..6a73d7c5 100644 --- a/res/po/tr_TR.po +++ b/res/po/tr_TR.po @@ -685,6 +685,9 @@ msgstr "Not" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Başarısız" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Süre dolum tarihi:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Metin girin" diff --git a/res/po/uk.po b/res/po/uk.po index aaa4c0a4..66e1eb3b 100644 --- a/res/po/uk.po +++ b/res/po/uk.po @@ -685,6 +685,9 @@ msgstr "Нагаду-\nвання" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Збій" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Спливає:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Введіть текст" diff --git a/res/po/uz.po b/res/po/uz.po index dea84940..d8188cae 100644 --- a/res/po/uz.po +++ b/res/po/uz.po @@ -685,6 +685,9 @@ msgstr "Yozuv" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "Xato" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "Amal qilish muddati:" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "Matn kiriting" diff --git a/res/po/zh_CN.po b/res/po/zh_CN.po index c83d0948..d21ce33a 100644 --- a/res/po/zh_CN.po +++ b/res/po/zh_CN.po @@ -685,6 +685,9 @@ msgstr "备忘录" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "失败" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "过期日期：" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "输入文本" diff --git a/res/po/zh_HK.po b/res/po/zh_HK.po index 5ee0a1e8..218fd9a3 100644 --- a/res/po/zh_HK.po +++ b/res/po/zh_HK.po @@ -685,6 +685,9 @@ msgstr "備忘錄" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "失敗" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "到期時間：" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "輸入文字" diff --git a/res/po/zh_TW.po b/res/po/zh_TW.po index 377a6d0a..ee5ef83e 100644 --- a/res/po/zh_TW.po +++ b/res/po/zh_TW.po @@ -685,6 +685,9 @@ msgstr "備忘錄" msgid "IDS_MSG_BODY_FAILED_M_STATUS_ABB2" msgstr "失敗" +msgid "IDS_MSG_BODY_EXPIRES_ON_C" +msgstr "到期日：" + msgid "IDS_MSG_BODY_ENTER_TEXT_M_NOUN" msgstr "輸入文字" diff --git a/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp b/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp index 06fb4674..468620ca 100644 --- a/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp +++ b/src/Common/MsgEngine/src/private/MessageMmsPrivate.cpp @@ -164,3 +164,10 @@ time_t MessageMmsPrivate::getExpired() const msg_get_int_value(m_MmsStruct, MSG_MMS_HEADER_EXPIRY_TIME_INT, &msgExpiry); return msgExpiry; } + +int MessageMmsPrivate::getSize() const +{ + int msgSize = 0; + msg_get_int_value(m_MmsStruct, MSG_MMS_HEADER_SIZE_INT, &msgSize); // Size in bytes + return msgSize; +} diff --git a/src/Common/MsgEngine/src/private/MessageMmsPrivate.h b/src/Common/MsgEngine/src/private/MessageMmsPrivate.h index de354cec..d90babcf 100644 --- a/src/Common/MsgEngine/src/private/MessageMmsPrivate.h +++ b/src/Common/MsgEngine/src/private/MessageMmsPrivate.h @@ -34,8 +34,8 @@ namespace Msg virtual void setText(const std::string &text); virtual std::string getText() const; - int getMediaCount() const; virtual Type getType() const; + virtual int getSize() const; virtual const MsgPageListHandlePrivate &getPageList() const; virtual MsgPagePrivate &addPage(); @@ -45,6 +45,7 @@ namespace Msg virtual time_t getExpired() const; virtual void commit(); + int getMediaCount() const; void set(msg_struct_t msgStruct); msg_struct_t getMmsStruct() const; diff --git a/src/Common/Utils/inc/TimeUtils.h b/src/Common/Utils/inc/TimeUtils.h index e2b3d44f..07592fa1 100644 --- a/src/Common/Utils/inc/TimeUtils.h +++ b/src/Common/Utils/inc/TimeUtils.h @@ -37,6 +37,7 @@ namespace Msg static std::string makeBubbleTimeString(time_t msgTime); static std::string makeBubbleDateLineString(time_t msgTime); static std::string makeDateTimeString(time_t msgTime); + static std::string makeDateString(time_t msgTime); static std::string makeSmsReportTimeString(time_t msgTime); static std::string makeMmsReportTimeString(time_t msgTime); static std::string makeCalEventString(time_t time); diff --git a/src/Common/Utils/src/TimeUtils.cpp b/src/Common/Utils/src/TimeUtils.cpp index 1d66bb32..e044d2af 100644 --- a/src/Common/Utils/src/TimeUtils.cpp +++ b/src/Common/Utils/src/TimeUtils.cpp @@ -90,6 +90,12 @@ std::string TimeUtils::makeBubbleDateLineString(time_t msgTime) return getFormattedDate(locale, getDateBestPattern(locale, dateYear), msgTime); } +std::string TimeUtils::makeDateString(time_t msgTime) +{ + const std::string &locale = getDefaultLocale(); + return getFormattedDate(locale, getDateBestPattern(locale, dateTimeSceleton), msgTime); +} + std::string TimeUtils::makeDateTimeString(time_t msgTime) //the same for Sim Message List { const std::string &locale = getDefaultLocale(); @@ -101,6 +107,7 @@ std::string TimeUtils::makeDateTimeString(time_t msgTime) //the same for Sim Mes return res; } + std::string TimeUtils::makeSmsReportTimeString(time_t msgTime) { const std::string &locale = getDefaultLocale(); diff --git a/src/Conversation/Utils/inc/MessageDetailContent.h b/src/Conversation/Utils/inc/MessageDetailContent.h index 9f0f21de..ab424efb 100644 --- a/src/Conversation/Utils/inc/MessageDetailContent.h +++ b/src/Conversation/Utils/inc/MessageDetailContent.h @@ -30,6 +30,7 @@ namespace Msg static std::string getMmsNotiConvListItemContent(App &app, MsgId msgId); private: + // TODO: Ineffective use of Msg service (get message property by message Id) // Create Content of Popup for View Details static std::string createMsgDetailsPopupText(App &app, MsgId msgId); static std::string getMessageType(Message::Type msgType); diff --git a/src/Conversation/Utils/src/MessageDetailContent.cpp b/src/Conversation/Utils/src/MessageDetailContent.cpp index 3347a3ca..7b8a6535 100644 --- a/src/Conversation/Utils/src/MessageDetailContent.cpp +++ b/src/Conversation/Utils/src/MessageDetailContent.cpp @@ -27,6 +27,8 @@ using namespace Msg; +extern std::string makeKbStr(long long bytes); + std::string MessageDetailContent::getMsgDetailsPopupContent(App &app, MsgId msgId) { return createMsgDetailsPopupText(app, msgId); @@ -307,30 +309,20 @@ std::string MessageDetailContent::getMmsMessageSize(App &app, MsgId msgId) { std::string msgDetails = msg("IDS_MSGF_BODY_MESSAGE_SIZE"); msgDetails.append(": "); - int msgSize = app.getMsgEngine().getStorage().getMessage(msgId)->getSize(); - if(msgSize < 1024)/*checking if the MMS size is less than 1 KB. In this case, we need to show it as 1KB.*/ - msgSize = 1; - else if(msgSize%1024 != 0)/*For the case of msgSize > 1024 bytes, else part is called to check if rounding off is required or not.*/ - msgSize = round(msgSize / 1024); - - msgDetails.append(std::to_string(msgSize)); - msgDetails.append(msg("IDS_MSGF_BODY_MSGSIZE_KB")); - + msgDetails.append(makeKbStr(msgSize)); msgDetails.append("
"); return msgDetails; } std::string MessageDetailContent::getMmsMessageExpired(App &app, MsgId msgId) { - std::string msgDetails = msg("IDS_MSGF_BODY_EXPIRED"); - msgDetails.append(": "); - + std::string msgDetails = msg("IDS_MSG_BODY_EXPIRES_ON_C"); MessageMmsRef mms = std::dynamic_pointer_cast(app.getMsgEngine().getStorage().getMessage(msgId)); if(mms) { time_t msgExpired = mms->getExpired(); - msgDetails.append(TimeUtils::makeDateTimeString(msgExpired)); + msgDetails.append(TimeUtils::makeDateString(msgExpired)); msgDetails.append("
"); } return msgDetails; -- 2.34.1