[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:23:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=3711047
The following commit has been merged in the master branch:
commit 37110472f3c840204231aac48310865f91117f53
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Mon May 20 13:36:45 2013 +0100
Translate phrase "Conversation began" in Renkoo theme
BUG: 284417
FIXED-IN: 0.7.0
Reviewed-by: Dan Vratil
---
data/styles/renkoo.AdiumMessageStyle/Contents/Resources/Header.html | 2 +-
lib/adium-theme-view.cpp | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/data/styles/renkoo.AdiumMessageStyle/Contents/Resources/Header.html b/data/styles/renkoo.AdiumMessageStyle/Contents/Resources/Header.html
index c789e83..ce0a1dc 100644
--- a/data/styles/renkoo.AdiumMessageStyle/Contents/Resources/Header.html
+++ b/data/styles/renkoo.AdiumMessageStyle/Contents/Resources/Header.html
@@ -4,5 +4,5 @@
<div id="x-heading">
<div class="x-conversationIncomingIcon"><img src="%incomingIconPath%" /></div>
<div class="x-conversationWith">%chatName%</div>
- <div class="x-conversationTime">Conversation began %timeOpened%</div>
+ <div class="x-conversationTime">%conversationBegan%</div>
</div>
diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index d539259..c8692ee 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -605,6 +605,10 @@ QString AdiumThemeView::replaceHeaderKeywords(QString htmlTemplate, const AdiumT
htmlTemplate.replace(QLatin1String("%timeOpened%"), KGlobal::locale()->formatTime(info.timeOpened().time()));
htmlTemplate.replace(QLatin1String("%dateOpened%"), KGlobal::locale()->formatDate(info.timeOpened().date(), KLocale::LongDate));
+ //KTp-Renkoo specific hack to make "Conversation Began" translatable
+ htmlTemplate.replace(QLatin1String("%conversationBegan%"), i18nc("Header at top of conversation view. %1 is the time format",
+ "Conversation began %1").arg(KGlobal::locale()->formatTime(info.timeOpened().time())));
+
//FIXME time fields - remember to do both, steal the complicated one from Kopete code.
// Look for %timeOpened{X}%
QRegExp timeRegExp(QLatin1String("%timeOpened\{([^}]*)\}%"));
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list