AntonLV 9 лет назад
Родитель
Сommit
a1e19167aa

+ 1 - 0
modules/boonex/accounts/install/langs/en.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
 	<string name="_bx_accnt"><![CDATA[Accounts]]></string>
+	<string name="_bx_accounts"><![CDATA[Accounts]]></string>
 
 	<string name="_bx_accounts_form_display_account_settings_email_popup"><![CDATA[Edit Email]]></string>
 	<string name="_bx_accounts_form_display_account_settings_password_popup"><![CDATA[Reset Password]]></string>

+ 1 - 0
modules/boonex/convos/install/langs/en.xml

@@ -2,6 +2,7 @@
 <resources name="en" flag="gb" title="English">
 
 	<string name="_bx_cnv"><![CDATA[Conversations]]></string>
+	<string name="_bx_convos"><![CDATA[Conversations]]></string>
 
 	<string name="_bx_cnv_option_preview_messages_num"><![CDATA[Number of preview messages]]></string>
 

+ 2 - 0
modules/boonex/developer/install/langs/en.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
+    <string name="_bx_developer"><![CDATA[Developer]]></string>
+
     <string name="_bx_dev_adm_wgt_cpt"><![CDATA[Developer]]></string>
     <string name="_bx_dev_adm_page_cpt"><![CDATA[Developer]]></string>
     

+ 1 - 0
modules/boonex/notifications/install/langs/en.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="en" flag="gb" title="English">
 	<string name="_bx_ntfs"><![CDATA[Notifications]]></string>
+	<string name="_bx_notifications"><![CDATA[Notifications]]></string>
 
 	<string name="_bx_ntfs_page_title_system_view"><![CDATA[Notifications]]></string>
 	<string name="_bx_ntfs_page_title_view"><![CDATA[Notifications]]></string>

+ 1 - 0
modules/boonex/russian/data/langs/bx_accounts/ru.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
 	<string name="_bx_accnt"><![CDATA[Аккаунты]]></string>
+	<string name="_bx_accounts"><![CDATA[Аккаунты]]></string>
 
     <string name="_bx_accounts_form_display_account_settings_email_popup"><![CDATA[Изменить имейл]]></string>
     <string name="_bx_accounts_form_display_account_settings_password_popup"><![CDATA[Сбросить пароль]]></string>

+ 1 - 0
modules/boonex/russian/data/langs/bx_convos/ru.xml

@@ -2,6 +2,7 @@
 <resources name="ru" flag="ru" title="Russian">
 
 	<string name="_bx_cnv"><![CDATA[Переписка]]></string>
+	<string name="_bx_convos"><![CDATA[Переписка]]></string>
 
 	<string name="_bx_cnv_option_preview_messages_num"><![CDATA[Количество сообщений для предпросмотра]]></string>
 

+ 2 - 0
modules/boonex/russian/data/langs/bx_developer/ru.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
+    <string name="_bx_developer"><![CDATA[Разработчик]]></string>
+
     <string name="_bx_dev_adm_wgt_cpt"><![CDATA[Разработчик]]></string>
     <string name="_bx_dev_adm_page_cpt"><![CDATA[Разработчик]]></string>
     

+ 1 - 0
modules/boonex/russian/data/langs/bx_notifications/ru.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources name="ru" flag="ru" title="Russian">
 	<string name="_bx_ntfs"><![CDATA[Уведомления]]></string>
+	<string name="_bx_notifications"><![CDATA[Уведомления]]></string>
 
 	<string name="_bx_ntfs_page_title_system_view"><![CDATA[Уведомления]]></string>
 	<string name="_bx_ntfs_page_title_view"><![CDATA[Уведомления]]></string>

+ 11 - 6
studio/classes/BxDolStudioUtils.php

@@ -105,16 +105,21 @@ class BxDolStudioUtils extends BxDol
 
     public static function getModuleTitle($sName)
     {
-        $sPrefix = '_adm_txt_module_';
+        $sTitle = '_adm_txt_module_' . strtolower($sName);
 
         if(in_array($sName, array(BX_DOL_STUDIO_MODULE_SYSTEM, BX_DOL_STUDIO_MODULE_CUSTOM)))
-            return _t($sPrefix . $sName);
+            return _t($sTitle);
 
         $aModule = BxDolModuleQuery::getInstance()->getModuleByName($sName);
-        if(!empty($aModule))
-            return $aModule['title'];
-
-        return _t($sPrefix . strtolower($sName));
+        if(empty($aModule) || !is_array($aModule))
+            return _t($sTitle);
+        
+        $sTitle = '_' . $aModule['name'];
+        $$sTitle = _t($sTitle);
+        if(strcmp($sTitle, $$sTitle) !== 0)
+            return $$sTitle;
+
+        return $aModule['title'];
     }
 
     public static function getModules($bShowCustom = true, $bShowSystem = true)

+ 2 - 0
studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -132,6 +132,8 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
             else
                 $aMenuItems[$sName] = $aModuleDb;
 
+            $aMenuItems[$sName]['title'] = BxDolStudioUtils::getModuleTitle($sName);
+
 			if(empty($aMenuItems[$sName]['icon']))
 				$aMenuItems[$sName]['icon'] = BxDolStudioUtils::getModuleIcon($aModuleDb, 'menu', false); 
         }