[*] LO: Make Prestashop RTL readey!

stratboy · Mar 14, 2014 · 7d55311 · 7d55311
1 parent fa8ac2c
commit 7d55311
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/classes/Media.php b/classes/Media.php
@@ -221,10 +221,10 @@ public static function getJSPath($js_uri)
 	 */
 	public static function getCSSPath($css_uri, $css_media_type = 'all', $need_rtl = true)
 	{
-		// RTL Ready: search and load rtl css file if it's not originally rtl or not needed
+		// RTL Ready: search and load rtl css file if it's not originally rtl
 		if($need_rtl && Context::getContext()->language->is_rtl)
 		{
-			$css_uri_rtl = Tools::str_replace_once('.css', '_rtl.css', $css_uri);
+			$css_uri_rtl = preg_replace('/(^[^.].*)(\.css)$/', '$1_rtl.css', $css_uri);
 			$rtl_media = Media::getMediaPath($css_uri_rtl, $css_media_type);
 			if($rtl_media != false)
 				return $rtl_media;

diff --git a/classes/pdf/PDFGenerator.php b/classes/pdf/PDFGenerator.php
@@ -74,8 +74,8 @@ class PDFGeneratorCore extends TCPDF
 
 	public function __construct($use_cache = false)
 	{
-		$this->setRTL(Context::getContext()->language->is_rtl);
 		parent::__construct('P', 'mm', 'A4', true, 'UTF-8', $use_cache, false);
+		$this->setRTL(Context::getContext()->language->is_rtl);
 	}
 
 	/**