From 8217d8b873cbebba95472d932dd7e19f3d921fa3 Mon Sep 17 00:00:00 2001
From: Diego Najar <dignajar@gmail.com>
Date: Sun, 31 Dec 2017 17:35:05 +0100
Subject: [PATCH] Bug Fixed #532

---
 bl-kernel/helpers/date.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bl-kernel/helpers/date.class.php b/bl-kernel/helpers/date.class.php
index 3bbf0377..ff6d5914 100644
--- a/bl-kernel/helpers/date.class.php
+++ b/bl-kernel/helpers/date.class.php
@@ -13,8 +13,12 @@ class Date {
 			return $date;
 		}
 
+		// Get the array of dates from the language file
 		$dates = $Language->getDates();
-		return str_replace(array_keys($dates), array_values($dates), $date);
+		foreach ($dates as $english=>$anotherLang) {
+			$date = preg_replace('/\b'.$english.'\b/u', $anotherLang, $date);
+		}
+		return $date;
 	}
 
 	// Return current Unix timestamp, GMT+0