From 009543b7e476d3bcaca3dd8576a47631c06de1e7 Mon Sep 17 00:00:00 2001
From: Deniz Turgut <dturgut@gmail.com>
Date: Thu, 26 Jun 2014 00:51:45 -0400
Subject: [PATCH] Fix test errors on OSX

On OSX, if LC_TIME and LC_CTYPE differs the output of strftime is not properly decoded
in Python 3. This makes sure that the 'utils.DateFormatter' and the related Jinja filter
'strftime' set the same value for LC_TIME and LC_CTYPE while formatting.

Also, '%a' is removed from DEFAULT_DATE_FORMAT in 'custom_locale' tests. OSX and *nix have
different conversions for '%a' ('Jeu' vs 'jeu.') and there is not a feasible way to handle
the difference for tests.
---
 docs/contribute.rst                           |  2 +-
 .../tests/output/custom_locale/archives.html  | 20 +++++++++----------
 .../author/alexis-metaireau.html              |  8 ++++----
 .../author/alexis-metaireau2.html             | 10 +++++-----
 .../author/alexis-metaireau3.html             |  4 ++--
 .../output/custom_locale/category/bar.html    |  2 +-
 .../output/custom_locale/category/cat1.html   |  8 ++++----
 .../output/custom_locale/category/misc.html   |  8 ++++----
 .../output/custom_locale/category/yeah.html   |  4 ++--
 .../custom_locale/drafts/a-draft-article.html |  2 +-
 pelican/tests/output/custom_locale/index.html |  8 ++++----
 .../tests/output/custom_locale/index2.html    | 10 +++++-----
 .../tests/output/custom_locale/index3.html    |  4 ++--
 .../output/custom_locale/oh-yeah-fr.html      |  2 +-
 .../02/this-is-a-super-article/index.html     |  4 ++--
 .../2010/octobre/15/unbelievable/index.html   |  2 +-
 .../posts/2010/octobre/20/oh-yeah/index.html  |  2 +-
 .../20/a-markdown-powered-article/index.html  |  2 +-
 .../2011/février/17/article-1/index.html      |  2 +-
 .../2011/février/17/article-2/index.html      |  2 +-
 .../2011/février/17/article-3/index.html      |  2 +-
 .../2012/février/29/second-article/index.html |  2 +-
 .../30/filename_metadata-example/index.html   |  2 +-
 .../custom_locale/second-article-fr.html      |  2 +-
 .../tests/output/custom_locale/tag/bar.html   |  8 ++++----
 .../tests/output/custom_locale/tag/baz.html   |  2 +-
 .../tests/output/custom_locale/tag/foo.html   |  6 +++---
 .../output/custom_locale/tag/foobar.html      |  4 ++--
 .../tests/output/custom_locale/tag/yeah.html  |  2 +-
 pelican/tests/test_pelican.py                 |  2 +-
 pelican/utils.py                              | 10 ++++++++--
 ...{pelican_FR.conf.py => pelican.conf_FR.py} |  1 +
 32 files changed, 78 insertions(+), 71 deletions(-)
 rename samples/{pelican_FR.conf.py => pelican.conf_FR.py} (98%)

diff --git a/docs/contribute.rst b/docs/contribute.rst
index 044ef924..19604da0 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -91,7 +91,7 @@ functional tests. To do so, you can use the following two commands::
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/custom/ \
         -s samples/pelican.conf.py samples/content/
     $ LC_ALL=fr_FR.utf8 pelican -o pelican/tests/output/custom_locale/ \
-        -s samples/pelican_FR.conf.py samples/content/
+        -s samples/pelican.conf_FR.py samples/content/
     $ LC_ALL=en_US.utf8 pelican -o pelican/tests/output/basic/ \
         samples/content/
 
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index a7b96336..1336b487 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -32,25 +32,25 @@
 <h1>Archives for Alexis' log</h1>
 
 <dl>
-    <dt>ven. 30 novembre 2012</dt>
+    <dt>30 novembre 2012</dt>
     <dd><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></dd>
-    <dt>mer. 29 février 2012</dt>
+    <dt>29 février 2012</dt>
     <dd><a href="./posts/2012/février/29/second-article/">Second article</a></dd>
-    <dt>mer. 20 avril 2011</dt>
+    <dt>20 avril 2011</dt>
     <dd><a href="./posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></dd>
-    <dt>jeu. 17 février 2011</dt>
+    <dt>17 février 2011</dt>
     <dd><a href="./posts/2011/février/17/article-1/">Article 1</a></dd>
-    <dt>jeu. 17 février 2011</dt>
+    <dt>17 février 2011</dt>
     <dd><a href="./posts/2011/février/17/article-2/">Article 2</a></dd>
-    <dt>jeu. 17 février 2011</dt>
+    <dt>17 février 2011</dt>
     <dd><a href="./posts/2011/février/17/article-3/">Article 3</a></dd>
-    <dt>jeu. 02 décembre 2010</dt>
+    <dt>02 décembre 2010</dt>
     <dd><a href="./posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></dd>
-    <dt>mer. 20 octobre 2010</dt>
+    <dt>20 octobre 2010</dt>
     <dd><a href="./posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></dd>
-    <dt>ven. 15 octobre 2010</dt>
+    <dt>15 octobre 2010</dt>
     <dd><a href="./posts/2010/octobre/15/unbelievable/">Unbelievable !</a></dd>
-    <dt>dim. 14 mars 2010</dt>
+    <dt>14 mars 2010</dt>
     <dd><a href="./tag/baz.html">The baz tag</a></dd>
 </dl>
 </section>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index b54446c8..7c2fa448 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Published: ven. 30 novembre 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +59,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +84,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Published: mer. 20 avril 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -108,7 +108,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 07020512..9ba313da 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -40,7 +40,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -63,7 +63,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -86,11 +86,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -114,7 +114,7 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 9578e3d6..5104b7b0 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -40,7 +40,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Published: ven. 15 octobre 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -73,7 +73,7 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Published: dim. 14 mars 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index d9fc6acb..c693d3f5 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 1b09acfe..c332f817 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2011/avril/20/a-markdown-powered-article/">A markdown powered article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Published: mer. 20 avril 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -60,7 +60,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -83,7 +83,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -106,7 +106,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index bcaec248..02562525 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Published: ven. 30 novembre 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +59,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +84,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Published: ven. 15 octobre 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -117,7 +117,7 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Published: dim. 14 mars 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index 7f881612..6427095b 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -34,11 +34,11 @@
                     <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index 82fb057b..16ff22cd 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
-                Published: ven. 02 mars 2012
+                Published: 02 mars 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index fd9a82b4..5898c5b5 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="./posts/2012/novembre/30/filename_metadata-example/">FILENAME_METADATA example</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Published: ven. 30 novembre 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
@@ -59,7 +59,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -84,7 +84,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Published: mer. 20 avril 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
@@ -108,7 +108,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index f02ba27c..f1ed6b46 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -40,7 +40,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -63,7 +63,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
@@ -86,11 +86,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -114,7 +114,7 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 9c7416b6..7f7a905f 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -40,7 +40,7 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Published: ven. 15 octobre 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
@@ -73,7 +73,7 @@ pelican.conf, it ...</p></div>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Published: dim. 14 mars 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index cdda855d..72c8b62d 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
-                Published: ven. 02 mars 2012
+                Published: 02 mars 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
index ec1007f3..0dd0e3da 100644
--- a/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/décembre/02/this-is-a-super-article/index.html
@@ -39,11 +39,11 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index cb8ccef5..6cdb4bb1 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
-                Published: ven. 15 octobre 2010
+                Published: 15 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index c42bce5d..233df239 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 49cc6078..aa4d254f 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
-                Published: mer. 20 avril 2011
+                Published: 20 avril 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
index 8029e585..e9c86a97 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-1/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
index ca6aaaf3..8724d7c2 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-2/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
index 4f255f4f..c14b537d 100644
--- a/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/février/17/article-3/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
-                Published: jeu. 17 février 2011
+                Published: 17 février 2011
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
index 46b07717..598bf797 100644
--- a/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/février/29/second-article/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 0d021cde..66339175 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
-                Published: ven. 30 novembre 2012
+                Published: 30 novembre 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 2798c94b..eb2225d9 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index 8a65a834..a8e3bd7a 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -61,11 +61,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
@@ -89,7 +89,7 @@ as well as <strong>inline markup</strong>.</p>
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 52467abb..77e09faf 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -39,7 +39,7 @@
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-03-14T00:00:00">
-                Published: dim. 14 mars 2010
+                Published: 14 mars 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index 87cb4ec5..3c238811 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2012/février/29/second-article/">Second article</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
-                Published: mer. 29 février 2012
+                Published: 29 février 2012
         </abbr>
 
         <address class="vcard author">
@@ -61,11 +61,11 @@
                 <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index 0e5414b0..e30c4906 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -34,11 +34,11 @@
                     <h1 class="entry-title"><a href="../posts/2010/décembre/02/this-is-a-super-article/">This is a super article !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
-                Published: jeu. 02 décembre 2010
+                Published: 02 décembre 2010
         </abbr>
 		<br />
         <abbr class="modified" title="2013-11-17T23:29:00">
-                Updated: dim. 17 novembre 2013
+                Updated: 17 novembre 2013
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index a8fe6f51..6754ecf6 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -34,7 +34,7 @@
                     <h1 class="entry-title"><a href="../posts/2010/octobre/20/oh-yeah/">Oh yeah !</a></h1>
 <footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
-                Published: mer. 20 octobre 2010
+                Published: 20 octobre 2010
         </abbr>
 
         <address class="vcard author">
diff --git a/pelican/tests/test_pelican.py b/pelican/tests/test_pelican.py
index cfae594a..bad73569 100644
--- a/pelican/tests/test_pelican.py
+++ b/pelican/tests/test_pelican.py
@@ -20,7 +20,7 @@ OUTPUT_PATH = os.path.abspath(os.path.join(CURRENT_DIR, 'output'))
 
 INPUT_PATH = os.path.join(SAMPLES_PATH, "content")
 SAMPLE_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf.py")
-SAMPLE_FR_CONFIG = os.path.join(SAMPLES_PATH, "pelican_FR.conf.py")
+SAMPLE_FR_CONFIG = os.path.join(SAMPLES_PATH, "pelican.conf_FR.py")
 
 
 def recursiveDiff(dcmp):
diff --git a/pelican/utils.py b/pelican/utils.py
index 586d85ff..5e4822ba 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -94,12 +94,18 @@ class DateFormatter(object):
         self.locale = locale.setlocale(locale.LC_TIME)
 
     def __call__(self, date, date_format):
-        old_locale = locale.setlocale(locale.LC_TIME)
+        old_lc_time = locale.setlocale(locale.LC_TIME)
+        old_lc_ctype = locale.setlocale(locale.LC_CTYPE)
+
         locale.setlocale(locale.LC_TIME, self.locale)
+        # on OSX, encoding from LC_CTYPE determines the unicode output in PY3
+        # make sure it's same as LC_TIME
+        locale.setlocale(locale.LC_CTYPE, self.locale)
 
         formatted = strftime(date, date_format)
 
-        locale.setlocale(locale.LC_TIME, old_locale)
+        locale.setlocale(locale.LC_TIME, old_lc_time)
+        locale.setlocale(locale.LC_CTYPE, old_lc_ctype)
         return formatted
 
 
diff --git a/samples/pelican_FR.conf.py b/samples/pelican.conf_FR.py
similarity index 98%
rename from samples/pelican_FR.conf.py
rename to samples/pelican.conf_FR.py
index 1f6aaaa1..0c4ec60d 100644
--- a/samples/pelican_FR.conf.py
+++ b/samples/pelican.conf_FR.py
@@ -16,6 +16,7 @@ REVERSE_CATEGORY_ORDER = True
 LOCALE = "fr_FR.UTF-8"
 DEFAULT_PAGINATION = 4
 DEFAULT_DATE = (2012, 3, 2, 14, 1, 1)
+DEFAULT_DATE_FORMAT = '%d %B %Y'
 
 ARTICLE_URL = 'posts/{date:%Y}/{date:%B}/{date:%d}/{slug}/'
 ARTICLE_SAVE_AS = ARTICLE_URL + 'index.html'