Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/183_zhouxudong_trans47958' into 'master'

Browse Source 
*Finish task #47958.

See merge request easycorp/zentaopms!1497
This commit is contained in:
朱金勇
2022-01-19 06:51:01 +00:00
parent e535b6a423 a7fa427b91
commit 4cb8d68e80
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/custom/lang/en.php
+1 -1
View File
@@ -55,7 +55,7 @@ if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->exec
$lang->custom->unitList['efficiency'] = 'Working Hours/';
$lang->custom->unitList['manhour'] = 'Man-hour/';
$lang->custom->unitList['cost'] = 'Yuan/Hour';
$lang->custom->unitList['cost'] = 'USD/Hour';
$lang->custom->unitList['hours'] = 'Hours';
$lang->custom->unitList['days'] = 'Days';
$lang->custom->unitList['loc'] = 'KLOC';
module/execution/view/all.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
<?php echo html::a($this->createLink($this->app->rawModule, $this->app->rawMethod, "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), "<span class='text'>{$label}</span>", '', "class='btn btn-link' id='{$key}Tab' data-app='$from'");?>
<?php endforeach;?>
<?php if($from == 'execution' and $this->config->systemMode == 'new'):?>
<div class='input-control w-150px'>
<div class='input-control w-180px'>
<?php echo html::select('project', $projects, $projectID, "class='form-control chosen' data-placeholder='{$lang->execution->selectProject}'");?>
</div>
<?php endif;?>
module/project/lang/en.php
+17 -17
View File
@@ -184,23 +184,23 @@ $lang->project->unlinkExecutionMembers = "The team members you are removing are
$lang->project->tenThousand = '';
$lang->project->unitList['CNY'] = 'Chinese Yuan';
$lang->project->unitList['USD'] = 'United States Dollar';
$lang->project->unitList['HKD'] = 'Hong Kong Dollar';
$lang->project->unitList['NTD'] = 'New Taiwan Dollar';
$lang->project->unitList['EUR'] = 'European Currency Unit';
$lang->project->unitList['DEM'] = 'German Mark';
$lang->project->unitList['CHF'] = 'Swiss Franc';
$lang->project->unitList['FRF'] = 'French Franc';
$lang->project->unitList['GBP'] = 'Great Britain Pound';
$lang->project->unitList['NLG'] = 'NetherLandish Guilder';
$lang->project->unitList['CAD'] = 'Canadian Dollar';
$lang->project->unitList['RUR'] = 'Russian Rouble';
$lang->project->unitList['INR'] = 'Indian Rupee';
$lang->project->unitList['AUD'] = 'Australian Dollar';
$lang->project->unitList['NZD'] = 'New Zealand Dollar';
$lang->project->unitList['THB'] = 'Thailand Baht';
$lang->project->unitList['SGD'] = 'Singapore Dollar';
$lang->project->unitList['CNY'] = 'RMB';
$lang->project->unitList['USD'] = 'USD';
$lang->project->unitList['HKD'] = 'HKD';
$lang->project->unitList['NTD'] = 'NTW';
$lang->project->unitList['EUR'] = 'EUR';
$lang->project->unitList['DEM'] = 'DEM';
$lang->project->unitList['CHF'] = 'CHF';
$lang->project->unitList['FRF'] = 'FRF';
$lang->project->unitList['GBP'] = 'GPR';
$lang->project->unitList['NLG'] = 'NLG';
$lang->project->unitList['CAD'] = 'CAD';
$lang->project->unitList['RUR'] = 'RUB';
$lang->project->unitList['INR'] = 'IDR';
$lang->project->unitList['AUD'] = 'AUD';
$lang->project->unitList['NZD'] = 'NZD';
$lang->project->unitList['THB'] = 'THB';
$lang->project->unitList['SGD'] = 'SGD';
$lang->project->currencySymbol['CNY'] = '¥';
$lang->project->currencySymbol['USD'] = '$';