ソースを参照

Ticket #3367 - Groups' language keys were used globally.

AntonLV 5 年 前
親
コミット
869d0e4e41

+ 7 - 7
modules/base/groups/classes/BxBaseModGroupsGridPricesManage.php

@@ -74,24 +74,24 @@ class BxBaseModGroupsGridPricesManage extends BxBaseModGroupsGridPrices
             $sPeriodUnit = $oForm->getCleanValue('period_unit');
 
             if(!empty($iPeriod) && empty($sPeriodUnit)) 
-                return echoJson(array('msg' => _t('_bx_groups_form_price_input_err_period_unit')));
+                return echoJson(array('msg' => _t($CNF['T']['err_period_unit'])));
 
             $aPrice = $this->_oModule->_oDb->getPrices(array('type' => 'by_prpp', 'profile_id' => $this->_iGroupProfileId, 'role_id' => $this->_iRoleId, 'period' => $iPeriod, 'period_unit' => $sPeriodUnit));
             if(!empty($aPrice) && is_array($aPrice))
-                return echoJson(array('msg' => _t('_bx_groups_err_price_duplicate')));
+                return echoJson(array('msg' => _t($CNF['T']['err_price_duplicate'])));
 
             $iId = (int)$oForm->insert(array('profile_id' => $this->_iGroupProfileId, 'order' => $this->_oModule->_oDb->getPriceOrderMax($this->_iRoleId) + 1));
             if($iId != 0)
                 $aRes = array('grid' => $this->getCode(false), 'blink' => $iId);
             else
-                $aRes = array('msg' => _t('_bx_groups_err_cannot_perform'));
+                $aRes = array('msg' => _t($CNF['T']['err_cannot_perform']));
 
             echoJson($aRes);
             return;
         }
 
         bx_import('BxTemplFunctions');
-        $sContent = BxTemplFunctions::getInstance()->popupBox($this->_oModule->_oConfig->getHtmlIds('popup_price'), _t('_bx_groups_popup_title_price_add'), $this->_oModule->_oTemplate->parseHtmlByName('popup_price.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($this->_oModule->_oConfig->getHtmlIds('popup_price'), _t($CNF['T']['popup_title_price_add']), $this->_oModule->_oTemplate->parseHtmlByName('popup_price.html', array(
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),
             'object' => $this->_sObject,
@@ -123,13 +123,13 @@ class BxBaseModGroupsGridPricesManage extends BxBaseModGroupsGridPrices
             if($oForm->update($aItem['id']) !== false)
                 $aRes = array('grid' => $this->getCode(false), 'blink' => $aItem['id']);
             else
-                $aRes = array('msg' => _t('_bx_groups_err_cannot_perform'));
+                $aRes = array('msg' => _t($CNF['T']['err_cannot_perform']));
 
             return echoJson($aRes);
         }
 
         bx_import('BxTemplFunctions');
-        $sContent = BxTemplFunctions::getInstance()->popupBox($this->_oModule->_oConfig->getHtmlIds('popup_price'), _t('_bx_groups_popup_title_price_edit'), $this->_oModule->_oTemplate->parseHtmlByName('popup_price.html', array(
+        $sContent = BxTemplFunctions::getInstance()->popupBox($this->_oModule->_oConfig->getHtmlIds('popup_price'), _t($CNF['T']['popup_title_price_edit']), $this->_oModule->_oTemplate->parseHtmlByName('popup_price.html', array(
             'form_id' => $oForm->aFormAttrs['id'],
             'form' => $oForm->getCode(true),
             'object' => $this->_sObject,
@@ -157,7 +157,7 @@ class BxBaseModGroupsGridPricesManage extends BxBaseModGroupsGridPrices
                 $iAffected++;
             }
 
-        return echoJson($iAffected ? array('grid' => $this->getCode(false), 'blink' => $aIdsAffected) : array('msg' => _t('_bx_groups_err_cannot_perform')));
+        return echoJson($iAffected ? array('grid' => $this->getCode(false), 'blink' => $aIdsAffected) : array('msg' => _t($CNF['T']['err_cannot_perform'])));
     }
 
     protected function _addJsCss()

+ 4 - 0
modules/boonex/courses/classes/BxCoursesConfig.php

@@ -228,6 +228,10 @@ class BxCoursesConfig extends BxBaseModGroupsConfig
                 'txt_cart_item_title' => '_bx_courses_txt_cart_item_title',
                 'txt_subscribe_title' => '_bx_courses_grid_action_title_subscribe_title',
                 'msg_performed' => '_bx_courses_msg_performed',
+                'popup_title_price_add' => '_bx_courses_popup_title_price_add',
+                'popup_title_price_edit' => '_bx_courses_popup_title_price_edit',
+                'err_period_unit' => '_bx_courses_form_price_input_err_period_unit',
+                'err_price_duplicate' => '_bx_courses_err_price_duplicate',
                 'err_cannot_perform' => '_bx_courses_err_cannot_perform',
             ),
 

+ 4 - 0
modules/boonex/events/classes/BxEventsConfig.php

@@ -246,7 +246,11 @@ class BxEventsConfig extends BxBaseModGroupsConfig
                 'txt_buy_title' => '_bx_events_grid_action_title_buy_title',
                 'txt_cart_item_title' => '_bx_events_txt_cart_item_title',
                 'txt_subscribe_title' => '_bx_events_grid_action_title_subscribe_title',
+                'popup_title_price_add' => '_bx_events_popup_title_price_add',
+                'popup_title_price_edit' => '_bx_events_popup_title_price_edit',
                 'msg_performed' => '_bx_events_msg_performed',
+                'err_period_unit' => '_bx_events_form_price_input_err_period_unit',
+                'err_price_duplicate' => '_bx_events_err_price_duplicate',
                 'err_cannot_perform' => '_bx_events_err_cannot_perform',
             ),
 

+ 4 - 0
modules/boonex/groups/classes/BxGroupsConfig.php

@@ -230,7 +230,11 @@ class BxGroupsConfig extends BxBaseModGroupsConfig
                 'txt_buy_title' => '_bx_groups_grid_action_title_buy_title',
                 'txt_cart_item_title' => '_bx_groups_txt_cart_item_title',
                 'txt_subscribe_title' => '_bx_groups_grid_action_title_subscribe_title',
+                'popup_title_price_add' => '_bx_groups_popup_title_price_add',
+                'popup_title_price_edit' => '_bx_groups_popup_title_price_edit',
                 'msg_performed' => '_bx_groups_msg_performed',
+                'err_period_unit' => '_bx_groups_form_price_input_err_period_unit',
+                'err_price_duplicate' => '_bx_groups_err_price_duplicate',
                 'err_cannot_perform' => '_bx_groups_err_cannot_perform',
             ),
 

+ 4 - 0
modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -272,7 +272,11 @@ class BxOrgsConfig extends BxBaseModGroupsConfig
                 'txt_buy_title' => '_bx_orgs_grid_action_title_buy_title',
                 'txt_cart_item_title' => '_bx_orgs_txt_cart_item_title',
                 'txt_subscribe_title' => '_bx_orgs_grid_action_title_subscribe_title',
+                'popup_title_price_add' => '_bx_orgs_popup_title_price_add',
+                'popup_title_price_edit' => '_bx_orgs_popup_title_price_edit',
                 'msg_performed' => '_bx_orgs_msg_performed',
+                'err_period_unit' => '_bx_orgs_form_price_input_err_period_unit',
+                'err_price_duplicate' => '_bx_orgs_err_price_duplicate',
                 'err_cannot_perform' => '_bx_orgs_err_cannot_perform',
             ),
         ));

+ 4 - 0
modules/boonex/spaces/classes/BxSpacesConfig.php

@@ -227,7 +227,11 @@ class BxSpacesConfig extends BxBaseModGroupsConfig
                 'txt_buy_title' => '_bx_spaces_grid_action_title_buy_title',
                 'txt_cart_item_title' => '_bx_spaces_txt_cart_item_title',
                 'txt_subscribe_title' => '_bx_spaces_grid_action_title_subscribe_title',
+                'popup_title_price_add' => '_bx_spaces_popup_title_price_add',
+                'popup_title_price_edit' => '_bx_spaces_popup_title_price_edit',
                 'msg_performed' => '_bx_spaces_msg_performed',
+                'err_period_unit' => '_bx_spaces_form_price_input_err_period_unit',
+                'err_price_duplicate' => '_bx_spaces_err_price_duplicate',
                 'err_cannot_perform' => '_bx_spaces_err_cannot_perform',
             ),