changeset 121:bec98a9f8695

Convert the title encoding when outputting to channel.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 15 Oct 2011 18:11:12 +0300
parents 4a23635479c3
children 7e4f2e93b564
files urllog.tcl
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/urllog.tcl	Thu Oct 13 20:14:48 2011 +0300
+++ b/urllog.tcl	Sat Oct 15 18:11:12 2011 +0300
@@ -271,6 +271,12 @@
   return $uencoding
 }
 
+proc urllog_clean_title {utitle} {
+  if {[catch {set utitle [encoding convertto "iso8859-15" $utitle]} cerrmsg]} {
+    putlog "Could not convert title encoding: $cerrmsg"
+  }
+  return $utitle
+}
 
 #-------------------------------------------------------------------------
 proc urllog_get_short {utime} {
@@ -313,7 +319,7 @@
     }
     append qstr "($uuser/$uchan@[urllog_ctime $utime])"
     if {[string length $utitle] > 0} {
-      set qstr "$urlmsg_alreadyknown - '$utitle' $qstr"
+      set qstr "$urlmsg_alreadyknown - '[urllog_clean_title $utitle]' $qstr"
     } else {
       set qstr "$urlmsg_alreadyknown $qstr"
     }
@@ -349,7 +355,7 @@
     set qstr ""
   }
   if {[string length $urlTitle] > 0} {
-    urllog_verb_msg $urlNick $urlChan "'$urlTitle' ([urllog_chop_url $urlStr]) $qstr"
+    urllog_verb_msg $urlNick $urlChan "'[urllog_clean_title $urlTitle]' ([urllog_chop_url $urlStr]) $qstr"
   } else {
     urllog_verb_msg $urlNick $urlChan "[urllog_chop_url $urlStr] $qstr"
   }