From 25466d0eadfc5a60a40b33ff80571070dd99c82c Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Tue, 24 May 2005 10:57:27 +0000 Subject: [PATCH] last glitches git-archimport-id: opensource@polytechnique.org--2005/banana--mainline--1.0--patch-25 --- banana/banana.inc.php.in | 2 +- banana/post.inc.php | 2 +- po/banana.pot | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/banana/banana.inc.php.in b/banana/banana.inc.php.in index 287bb66..bfaa934 100644 --- a/banana/banana.inc.php.in +++ b/banana/banana.inc.php.in @@ -219,7 +219,7 @@ class Banana $this->_newPost($id); if ($this->post) { $subject = preg_replace("/^re\s*:\s*/i", 'Re: ', $this->post->headers['subject']); - $body = $this->post->name." "._b_("a écrit")." :\n".wrap($this->post->body, "> "); + $body = utf8_encode($this->post->name." "._b_("a écrit"))." :\n".wrap($this->post->body, "> "); $target = isset($this->post->headers['followup-to']) ? $this->post->headers['followup-to'] : $this->post->headers['newsgroups']; } } diff --git a/banana/post.inc.php b/banana/post.inc.php index ae71489..7f4e9cd 100644 --- a/banana/post.inc.php +++ b/banana/post.inc.php @@ -44,7 +44,7 @@ class BananaPost } if (preg_match('!charset=([^;]*)\s*(;|$)!', $this->headers['content-type'], $matches)) { - $this->body = iconv($matches[1], 'utf-8', $this->body) + $this->body = iconv($matches[1], 'utf-8', $this->body); } } diff --git a/po/banana.pot b/po/banana.pot index 7cd3e86..a6dbb65 100644 --- a/po/banana.pot +++ b/po/banana.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-05-24 12:48+0200\n" +"POT-Creation-Date: 2005-05-24 12:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- 2.1.4