diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index ebe3a90..b46b3bb 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -668,7 +668,7 @@ proc {rsv construct} {event type} { set args(nsttime) [$event get start] set args(nduration) [$event get duration] set args(usevtid) [$event get event_id] - set args(szevtname) "\025[$event get name]" + set args(szevtname) "\025[xconv [$event get name]]" set args(eReady) 30 lassign [system padding] args(ulPreOffset) args(ulPostOffset) diff --git a/webif/lib/system.class b/webif/lib/system.class index a5adc64..45072e6 100644 --- a/webif/lib/system.class +++ b/webif/lib/system.class @@ -656,13 +656,13 @@ proc {system nuggeted} {} { proc {system strip} {str} { if {[string range $str 1 2] eq "i7"} { # ISO6937, convert to UTF-8 - set str [xconv [string range $str 3 end]] + return [xconv [string range $str 3 end]] } if {[string first "\025" $str] == 0} { # UTF-8 - set str [string range $str 1 end] + return [string range $str 1 end] } - return $str + return [xconv $str] } proc {system usbdisks} {{full 0}} {