* Modify language defined.
This commit is contained in:
@@ -33,7 +33,7 @@
|
||||
|
||||
$typeName = '';
|
||||
if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
|
||||
if($type == 'story') $typeName = $lang->my->auditMenu->audit->story;
|
||||
if($type == 'story') $typeName = $lang->my->featureBar['audit']['story'];
|
||||
if($review->type == 'projectreview') $typeName = $lang->project->common;
|
||||
if(isset($flows[$review->type])) $typeName = $flows[$review->type];
|
||||
|
||||
|
||||
@@ -968,7 +968,7 @@ EOF;
|
||||
$typeList = $this->my->getReviewingTypeList();
|
||||
if(!isset($typeList->$browseType)) $browseType = 'all';
|
||||
|
||||
$this->lang->my->auditMenu->audit = $typeList;
|
||||
$this->lang->my->featureBar['audit'] = (array)$typeList;
|
||||
$reviewList = $this->my->getReviewingList($browseType, $orderBy, $pager);
|
||||
}
|
||||
|
||||
|
||||
+3
-14
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup'] = '%s application for makeup:%s';
|
||||
$lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
|
||||
$lang->my->auditField->oaTitle['lieu'] = '%s application for lieu: %s';
|
||||
|
||||
$lang->my->auditMenu = new stdclass();
|
||||
$lang->my->auditMenu->audit = new stdclass();
|
||||
$lang->my->auditMenu->audit->all = 'All';
|
||||
$lang->my->auditMenu->audit->story = 'Story';
|
||||
$lang->my->auditMenu->audit->testcase = 'Case';
|
||||
if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
|
||||
if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
|
||||
if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
|
||||
|
||||
$lang->my->contributeMenu = new stdclass();
|
||||
$lang->my->contributeMenu->audit = new stdclass();
|
||||
$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
|
||||
$lang->my->contributeMenu->audit->createdbyme = 'CreatedByMe';
|
||||
|
||||
$lang->my->projectMenu = new stdclass();
|
||||
$lang->my->projectMenu->doing = 'Doing';
|
||||
$lang->my->projectMenu->wait = 'Waiting';
|
||||
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle'] = 'Recurrence';
|
||||
$lang->my->featureBar['audit']['all'] = 'All';
|
||||
$lang->my->featureBar['audit']['story'] = 'Story';
|
||||
$lang->my->featureBar['audit']['testcase'] = 'Test case';
|
||||
if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
|
||||
if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
|
||||
if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
|
||||
|
||||
$lang->my->featureBar['project']['doing'] = 'Doing';
|
||||
$lang->my->featureBar['project']['wait'] = 'Waiting';
|
||||
|
||||
+3
-14
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup'] = '%s application for makeup:%s';
|
||||
$lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
|
||||
$lang->my->auditField->oaTitle['lieu'] = '%s application for lieu: %s';
|
||||
|
||||
$lang->my->auditMenu = new stdclass();
|
||||
$lang->my->auditMenu->audit = new stdclass();
|
||||
$lang->my->auditMenu->audit->all = 'All';
|
||||
$lang->my->auditMenu->audit->story = 'Story';
|
||||
$lang->my->auditMenu->audit->testcase = 'Case';
|
||||
if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
|
||||
if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
|
||||
if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
|
||||
|
||||
$lang->my->contributeMenu = new stdclass();
|
||||
$lang->my->contributeMenu->audit = new stdclass();
|
||||
$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
|
||||
$lang->my->contributeMenu->audit->createdbyme = 'CreatedByMe';
|
||||
|
||||
$lang->my->projectMenu = new stdclass();
|
||||
$lang->my->projectMenu->doing = 'Doing';
|
||||
$lang->my->projectMenu->wait = 'Waiting';
|
||||
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle'] = 'Recurrence';
|
||||
$lang->my->featureBar['audit']['all'] = 'All';
|
||||
$lang->my->featureBar['audit']['story'] = 'Story';
|
||||
$lang->my->featureBar['audit']['testcase'] = 'Test case';
|
||||
if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
|
||||
if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
|
||||
if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
|
||||
|
||||
$lang->my->featureBar['project']['doing'] = 'Doing';
|
||||
$lang->my->featureBar['project']['wait'] = 'Waiting';
|
||||
|
||||
+3
-14
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup'] = '%s application for makeup:%s';
|
||||
$lang->my->auditField->oaTitle['overtime'] = '%s application for overtime: %s';
|
||||
$lang->my->auditField->oaTitle['lieu'] = '%s application for lieu: %s';
|
||||
|
||||
$lang->my->auditMenu = new stdclass();
|
||||
$lang->my->auditMenu->audit = new stdclass();
|
||||
$lang->my->auditMenu->audit->all = 'All';
|
||||
$lang->my->auditMenu->audit->story = 'Story';
|
||||
$lang->my->auditMenu->audit->testcase = 'Case';
|
||||
if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
|
||||
if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = 'Feedback';
|
||||
if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = 'OA';
|
||||
|
||||
$lang->my->contributeMenu = new stdclass();
|
||||
$lang->my->contributeMenu->audit = new stdclass();
|
||||
$lang->my->contributeMenu->audit->reviewedbyme = 'ReviewedByMe';
|
||||
$lang->my->contributeMenu->audit->createdbyme = 'CreatedByMe';
|
||||
|
||||
$lang->my->projectMenu = new stdclass();
|
||||
$lang->my->projectMenu->doing = 'Doing';
|
||||
$lang->my->projectMenu->wait = 'Waiting';
|
||||
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle'] = 'Récurrence';
|
||||
$lang->my->featureBar['audit']['all'] = 'All';
|
||||
$lang->my->featureBar['audit']['story'] = 'Story';
|
||||
$lang->my->featureBar['audit']['testcase'] = 'Test case';
|
||||
if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
|
||||
if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = 'Feedback';
|
||||
if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = 'OA';
|
||||
|
||||
$lang->my->featureBar['project']['doing'] = 'Doing';
|
||||
$lang->my->featureBar['project']['wait'] = 'Waiting';
|
||||
|
||||
@@ -94,20 +94,6 @@ $lang->my->auditField->oaTitle['makeup'] = '%s的补班申请:%s';
|
||||
$lang->my->auditField->oaTitle['overtime'] = '%s的加班申请:%s';
|
||||
$lang->my->auditField->oaTitle['lieu'] = '%s的调休申请:%s';
|
||||
|
||||
$lang->my->auditMenu = new stdclass();
|
||||
$lang->my->auditMenu->audit = new stdclass();
|
||||
$lang->my->auditMenu->audit->all = '所有';
|
||||
$lang->my->auditMenu->audit->story = '需求';
|
||||
$lang->my->auditMenu->audit->testcase = '用例';
|
||||
if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->auditMenu->audit->project = $lang->projectCommon;
|
||||
if($config->edition != 'open') $lang->my->auditMenu->audit->feedback = '反馈';
|
||||
if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->auditMenu->audit->oa = '办公';
|
||||
|
||||
$lang->my->contributeMenu = new stdclass();
|
||||
$lang->my->contributeMenu->audit = new stdclass();
|
||||
$lang->my->contributeMenu->audit->reviewedbyme = '由我评审';
|
||||
$lang->my->contributeMenu->audit->createdbyme = '由我发起';
|
||||
|
||||
$lang->my->projectMenu = new stdclass();
|
||||
$lang->my->projectMenu->doing = '进行中';
|
||||
$lang->my->projectMenu->wait = '未开始';
|
||||
@@ -169,6 +155,9 @@ $lang->my->featureBar['todo']['cycle'] = '周期';
|
||||
$lang->my->featureBar['audit']['all'] = '全部';
|
||||
$lang->my->featureBar['audit']['story'] = '需求';
|
||||
$lang->my->featureBar['audit']['testcase'] = '用例';
|
||||
if($config->edition == 'max' and (helper::hasFeature('waterfall') or helper::hasFeature('waterfallplus'))) $lang->my->featureBar['audit']['project'] = $lang->projectCommon;
|
||||
if($config->edition != 'open') $lang->my->featureBar['audit']['feedback'] = '反馈';
|
||||
if($config->edition != 'open' and helper::hasFeature('OA')) $lang->my->featureBar['audit']['oa'] = '办公';
|
||||
|
||||
$lang->my->featureBar['project']['doing'] = '进行中';
|
||||
$lang->my->featureBar['project']['wait'] = '未开始';
|
||||
|
||||
+1
-1
@@ -1017,7 +1017,7 @@ class myModel extends model
|
||||
|
||||
$flows = ($this->config->edition == 'open') ? array() : $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('module')->in($typeList)->andWhere('buildin')->eq(0)->fetchPairs('module', 'name');
|
||||
$menu = new stdclass();
|
||||
$menu->all = $this->lang->my->auditMenu->audit->all;
|
||||
$menu->all = $this->lang->my->featureBar['audit']['all'];
|
||||
foreach($typeList as $type)
|
||||
{
|
||||
$this->app->loadLang($type);
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
|
||||
$typeName = '';
|
||||
if(isset($lang->{$review->type}->common)) $typeName = $lang->{$review->type}->common;
|
||||
if($type == 'story') $typeName = $lang->my->auditMenu->audit->story;
|
||||
if($type == 'story') $typeName = $lang->my->featureBar['audit']['story'];
|
||||
if($review->type == 'projectreview') $typeName = $lang->project->common;
|
||||
if(isset($flows[$review->type])) $typeName = $flows[$review->type];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user