From owner-svn-src-user@FreeBSD.ORG  Fri Mar  1 20:48:54 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 15DA5EE2;
 Fri,  1 Mar 2013 20:48:54 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id F32491755;
 Fri,  1 Mar 2013 20:48:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r21KmrJ2085426;
 Fri, 1 Mar 2013 20:48:53 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r21Kmrd8085423;
 Fri, 1 Mar 2013 20:48:53 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201303012048.r21Kmrd8085423@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 1 Mar 2013 20:48:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r247577 - in user/des/fbce/lib: . FBCE/View
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Mar 2013 20:48:54 -0000

Author: des
Date: Fri Mar  1 20:48:53 2013
New Revision: 247577
URL: http://svnweb.freebsd.org/changeset/base/247577

Log:
  Switch from Catalyst::Plugin::Unicode (which tries and sometimes fails to
  guess the correct encoding) to Catalyst::Plugin::Unicode::Encoding (which
  doesn't).  Explicitly tell Template::Toolkit that our templates are utf-8.

Modified:
  user/des/fbce/lib/FBCE.pm
  user/des/fbce/lib/FBCE/View/HTML.pm

Modified: user/des/fbce/lib/FBCE.pm
==============================================================================
--- user/des/fbce/lib/FBCE.pm	Fri Mar  1 20:48:53 2013	(r247576)
+++ user/des/fbce/lib/FBCE.pm	Fri Mar  1 20:48:53 2013	(r247577)
@@ -13,7 +13,7 @@ use Catalyst qw/
     Session::State::Cookie
     Session::Store::FastMmap
     Static::Simple
-    Unicode
+    Unicode::Encoding
 /;
 
 extends 'Catalyst';

Modified: user/des/fbce/lib/FBCE/View/HTML.pm
==============================================================================
--- user/des/fbce/lib/FBCE/View/HTML.pm	Fri Mar  1 20:48:53 2013	(r247576)
+++ user/des/fbce/lib/FBCE/View/HTML.pm	Fri Mar  1 20:48:53 2013	(r247577)
@@ -7,6 +7,7 @@ use base 'Catalyst::View::TT';
 
 __PACKAGE__->config(
     TEMPLATE_EXTENSION => '.tt',
+    ENCODING => 'utf-8',
     render_die => 1,
 );