Ticket #983

inc/classes/BxDolLanguages.php

@@ -101,7 +101,7 @@ class BxDolLanguages extends BxDolFactory implements iBxDolSingleton
         if (!$sLang)
             $sLang = $this->getCurrentLanguage();
 
-        return $this->oDb->getLanguageDirection($sLang);
+        return strtoupper($this->oDb->getLanguageDirection($sLang));
     }
 
     function getDefaultLangName()
@@ -383,4 +383,9 @@ function bx_lang_name()
     return BxDolLanguages::getInstance()->getCurrentLanguage();
 }
 
+function bx_lang_direction($sLanguage = '')
+{
+    return BxDolLanguages::getInstance()->getLangDirection($sLanguage);
+}
+
 /** @} */

inc/classes/BxDolTemplate.php

@@ -1321,6 +1321,9 @@ class BxDolTemplate extends BxDolFactory implements iBxDolSingleton
             case 'lang':
                 $sRet = bx_lang_name();
                 break;
+            case 'lang_direction':
+                $sRet = bx_lang_direction();
+                break;
             case 'main_logo':
                 $sRet = BxTemplFunctions::getInstance()->getMainLogo();
                 break;

install/sql/system.sql

@@ -1208,7 +1208,6 @@ CREATE TABLE `sys_injections` (
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 INSERT INTO `sys_injections`(`name`, `page_index`, `key`, `type`, `data`, `replace`, `active`) VALUES
-('sys_language_direction', 0, 'injection_body', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:13:"add_direction";s:6:"params";a:0:{}s:5:"class";s:22:"TemplLanguagesServices";}', 0, 1),
 ('sys_popup_alert', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"add_popup_alert";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
 ('sys_popup_confirm', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:17:"add_popup_confirm";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
 ('sys_popup_prompt', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"add_popup_prompt";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
@@ -1234,7 +1233,6 @@ CREATE TABLE `sys_injections_admin` (
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
 INSERT INTO `sys_injections_admin`(`name`, `page_index`, `key`, `type`, `data`, `replace`, `active`) VALUES
-('sys_language_direction', 0, 'injection_body', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:13:"add_direction";s:6:"params";a:0:{}s:5:"class";s:22:"TemplLanguagesServices";}', 0, 1),
 ('sys_popup_alert', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"add_popup_alert";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
 ('sys_popup_confirm', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:17:"add_popup_confirm";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1),
 ('sys_popup_prompt', 0, 'injection_footer', 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:16:"add_popup_prompt";s:6:"params";a:0:{}s:5:"class";s:13:"TemplServices";}', 0, 1);

template/_header.html

@@ -35,5 +35,5 @@
 
 </head>
 
-<body class="bx-def-font bx-def-color-bg-page" <bx_injection:injection_body /> >
+<body class="bx-def-font bx-def-color-bg-page" dir="__lang_direction__" <bx_injection:injection_body /> >
     <bx_injection:injection_header />

template/page_150.html

@@ -21,7 +21,7 @@
 
     <bx_injection:injection_head />
 </head>
-<body class="bx-def-font bx-def-color-bg-page" <bx_injection:injection_body /> >
+<body class="bx-def-font bx-def-color-bg-page" dir="__lang_direction__" <bx_injection:injection_body /> >
 
     __page_main_code__
 

template/page_2.html

@@ -20,7 +20,7 @@
 
 	    <bx_injection:injection_head />
 	</head>
-	<body class="bx-def-font bx-def-color-bg-page" <bx_injection:injection_body /> >
+	<body class="bx-def-font bx-def-color-bg-page" dir="__lang_direction__" <bx_injection:injection_body /> >
 	    <bx_injection:injection_header />
 	    __page_main_code__
 	</body>

template/page_44.html

@@ -29,7 +29,7 @@
 
 </head>
 
-<body class="bx-def-font bx-def-color-bg-page" <bx_injection:injection_body /> >
+<body class="bx-def-font bx-def-color-bg-page" dir="__lang_direction__" <bx_injection:injection_body /> >
     <bx_injection:injection_header />
 
     <div class="bx-def-padding-sec">

template/scripts/BxBaseLanguagesServices.php

@@ -17,15 +17,6 @@ class BxBaseLanguagesServices extends BxDol
         parent::__construct();
     }
 
-    public function serviceAddDirection($sLanguage = '')
-    {
-        $sDirection = strtoupper(BxDolLanguages::getInstance()->getLangDirection($sLanguage));
-        if(empty($sDirection))
-            $sDirection = 'LTR';
-
-        return ' dir="' . $sDirection . '" ';
-    }
-
     public function serviceGetLanguages($bIdAsKey = false, $bActiveOnly = false)
     {
         $aValues = BxDolLanguages::getInstance()->getLanguages($bIdAsKey, $bActiveOnly);