[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=0c5682d

The following commit has been merged in the master branch:
commit 0c5682d9c32dfdc163fdcc3e2f1688c305ef899f
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Apr 14 20:39:11 2014 +0200

    Couple specific Adium Header replacements for WoshiChat theme
---
 lib/adium-theme-view.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 0013bf9..793b4e6 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -677,6 +677,12 @@ QString AdiumThemeView::replaceHeaderKeywords(QString htmlTemplate, const AdiumT
     htmlTemplate.replace(QLatin1String("%conversationBegan%"), i18nc("Header at top of conversation view. %1 is the time format",
                                                                      "Conversation began %1", KGlobal::locale()->formatTime(info.timeOpened().time())));
 
+    //KTp-WoshiChat specific hack to make "Joined at" translatable
+    htmlTemplate.replace(QLatin1String("%conversationJoined%"), i18nc("Header at top of conversation view. %1 is the time format",
+                                                                      "Joined at %1", KGlobal::locale()->formatTime(info.timeOpened().time())));
+
+    htmlTemplate.replace(QLatin1String("%groupChatIcon%"), KIconLoader::global()->iconPath(QLatin1String("telepathy-kde"), -48));
+
     //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