diff --git a/system/admin/admin.php b/system/admin/admin.php
index 00cc08d8..53785437 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -673,7 +673,6 @@ function get_feed($feed_url, $credit)
 // Get recent posts by user
 function get_user_posts()
 {
-    global $date_format;
 
     if (isset($_SESSION[config("site.url")]['user'])) {
         $posts = get_profile_posts($_SESSION[config("site.url")]['user'], 1, 5);
@@ -696,7 +695,7 @@ function get_user_posts()
                 $i++;
                 echo '<tr class="' . $class . '">';
                 echo '<td><a target="_blank" href="' . $p->url . '">' . $p->title . '</a></td>';
-                echo '<td>' . strftime($date_format, $p->date) . '</td>';
+                echo '<td>' . date('d F Y', $p->date) . '</td>';
                 if (config("views.counter") == "true")
                     echo '<td>' . $p->views . '</td>';
                 echo '<td>' . $p->tag . '</td>';
diff --git a/system/admin/views/popular-posts.html.php b/system/admin/views/popular-posts.html.php
index e2828c1a..1206aa1d 100644
--- a/system/admin/views/popular-posts.html.php
+++ b/system/admin/views/popular-posts.html.php
@@ -24,7 +24,7 @@
             ?>
             <tr class="<?php echo $class ?>">
                 <td><a target="_blank" href="<?php echo $p->url ?>"><?php echo $p->title ?></a></td>
-                <td><?php echo strftime($date_format, $p->date) ?></td>
+                <td><?php echo date('d F Y', $p->date) ?></td>
                 <?php if (config("views.counter") == "true"): ?>
                     <td><?php echo $p->views ?></td><?php endif; ?>
                 <td><a target="_blank" href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></td>
diff --git a/system/admin/views/posts-list.html.php b/system/admin/views/posts-list.html.php
index a7132ecd..71ffcdc6 100644
--- a/system/admin/views/posts-list.html.php
+++ b/system/admin/views/posts-list.html.php
@@ -24,7 +24,7 @@
             ?>
             <tr class="<?php echo $class ?>">
                 <td><a target="_blank" href="<?php echo $p->url ?>"><?php echo $p->title ?></a></td>
-                <td><?php echo strftime($date_format, $p->date) ?></td>
+                <td><?php echo date('d F Y', $p->date) ?></td>
                 <?php if (config("views.counter") == "true"): ?>
                     <td><?php echo $p->views ?></td><?php endif; ?>
                 <td><a target="_blank" href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></td>
diff --git a/system/admin/views/user-draft.html.php b/system/admin/views/user-draft.html.php
index 0ef1a541..c91eadc7 100644
--- a/system/admin/views/user-draft.html.php
+++ b/system/admin/views/user-draft.html.php
@@ -22,7 +22,7 @@
             ?>
             <tr class="<?php echo $class ?>">
                 <td><?php echo $p->title ?></td>
-                <td><?php echo strftime($date_format, $p->date) ?></td>
+                <td><?php echo date('d F Y', $p->date) ?></td>
                 <td><?php echo strip_tags($p->tag) ?></td>
                 <td><a href="<?php echo $p->url ?>/edit?destination=admin/draft"><?php echo i18n('Edit');?></a> <a href="<?php echo $p->url ?>/delete?destination=admin/draft"><?php echo i18n('Delete');?></a></td>
             </tr>
diff --git a/system/includes/functions.php b/system/includes/functions.php
index d9f1a856..12371115 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -3215,7 +3215,7 @@ function get_language()
         setlocale(LC_ALL, 'en_US'); // Change time format to English
     } else {	
         if (file_exists($langFile)) {
-            i18n('source', 'lang/' . $langID . '.ini');
+            i18n('source', $langFile);
             setlocale(LC_ALL, $local);
         } else {
             i18n('source', 'lang/en.ini'); // Load the English language file
@@ -3224,3 +3224,16 @@ function get_language()
     }
 
 }
+
+function format_date($date)
+{
+
+    $date_format = config('date.format');
+    
+    if (!isset($date_format) || empty($date_format)) {
+        return date('d F Y', $date);
+    } else {
+        return date($date_format, $date);	
+    }
+
+}
diff --git a/themes/twentyfifteen/profile.html.php b/themes/twentyfifteen/profile.html.php
index fa66c884..937e0030 100644
--- a/themes/twentyfifteen/profile.html.php
+++ b/themes/twentyfifteen/profile.html.php
@@ -19,7 +19,7 @@
                     $i++; ?>
                     <li class="<?php echo $class; ?>">
                         <span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
-                        <span><?php echo strftime($date_format, $p->date) ?></span> - <?php echo i18n('Posted_in');?> <span><?php echo $p->tag ?></span>
+                        <span><?php echo date('d F Y', $p->date) ?></span> - <?php echo i18n('Posted_in');?> <span><?php echo $p->tag ?></span>
                     </li>
                 <?php endforeach; ?>
             </ul>
diff --git a/themes/twentysixteen/main.html.php b/themes/twentysixteen/main.html.php
index bb1d4f1a..4e31d93d 100644
--- a/themes/twentysixteen/main.html.php
+++ b/themes/twentysixteen/main.html.php
@@ -50,7 +50,7 @@
 
     <footer class="entry-footer">
         <span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->author;?>" src="<?php echo site_url();?>themes/twentysixteen/img/avatar.png" class="avatar avatar-49 grav-hashed grav-hijack" height="49" width="49"></a><span class="screen-reader-text">Author </span> <a class="url fn n" href="<?php echo $p->authorUrl;?>"><?php echo $p->author;?></a></span></span>
-        <span class="posted-on"><span class="screen-reader-text"><?php echo i18n('Posted_on');?> </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php global $date_format; echo strftime($date_format, $p->date) ?></time></a></span>
+        <span class="posted-on"><span class="screen-reader-text"><?php echo i18n('Posted_on');?> </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php echo date('d F Y', $p->date) ?></time></a></span>
         <span class="cat-links"><span class="screen-reader-text"><?php echo i18n('Category');?> </span><?php echo $p->category;?></span>
         <span class="tags-links"><span class="screen-reader-text">Tags </span><?php echo $p->tag;?></span>
         <?php if (disqus_count()) { ?>
diff --git a/themes/twentysixteen/post.html.php b/themes/twentysixteen/post.html.php
index 132ac9af..6c86bf3c 100644
--- a/themes/twentysixteen/post.html.php
+++ b/themes/twentysixteen/post.html.php
@@ -54,7 +54,7 @@
     <footer class="entry-footer">
         <span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->author;?>" title="<?php echo $p->author;?>" src="<?php echo site_url();?>themes/twentysixteen/img/avatar.png" class="avatar avatar-49 grav-hashed grav-hijack" height="49" width="49"/></a><span class="screen-reader-text">Author </span> <a class="url fn n" href="<?php echo $p->authorUrl;?>"><?php echo $p->author;?></a></span></span>
 
-        <span class="posted-on"><span class="screen-reader-text">Posted on </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php echo strftime($date_format, $p->date) ?></time></a></span>
+        <span class="posted-on"><span class="screen-reader-text">Posted on </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php echo date('d F Y', $p->date) ?></time></a></span>
 
         <span class="cat-links"><span class="screen-reader-text"><?php echo i18n('Category');?> </span><?php echo $p->category;?></span>