* adjust for common lang.

This commit is contained in:
wangyidong
2023-02-24 08:44:20 +08:00
parent 09cb62b6eb
commit aee71d2228
3 changed files with 26 additions and 8 deletions
+3
View File
@@ -254,3 +254,6 @@ if($config->vision == 'lite')
$config->dev->projectMenus = array('project', 'kanbanProject');
$config->dev->hideMainMenu = array('execution', 'kanban', 'admin');
}
global $lang;
$config->dev->commonLang = array('$URCOMMON' => $lang->URCommon, '$SRCOMMON' => $lang->SRCommon, '$PRODUCTCOMMON' => $lang->productCommon, '$PROJECTCOMMON' => $lang->projectCommon, '$EXECUTIONCOMMON' => $lang->executionCommon);
+5 -5
View File
@@ -513,11 +513,11 @@ class devModel extends model
if(empty($langFilesToLoad)) return false;
$lang = $module == 'common' ? new language() : $this->defaultLang;
$lang->URCommon = $this->lang->URCommon;
$lang->SRCommon = $this->lang->SRCommon;
$lang->productCommon = $this->lang->productCommon;
$lang->projectCommon = $this->lang->projectCommon;
$lang->executionCommon = $this->lang->executionCommon;
$lang->URCommon = '$URCOMMON';
$lang->SRCommon = '$SRCOMMON';
$lang->productCommon = '$PRODUCTCOMMON';
$lang->projectCommon = '$PROJECTCOMMON';
$lang->executionCommon = '$EXECUTIONCOMMON';
$lang->hourCommon = $this->lang->hourCommon;
if(!isset($lang->common)) $lang->common = new stdclass();
+18 -3
View File
@@ -56,15 +56,30 @@
<div class="title"><?php echo $lang->dev->modifyValue?></div>
</div>
<div class="form-item-content">
<?php $isCurrentLang = str_replace('-', '_', $this->app->getClientLang()) == $language;?>
<?php foreach($originalLangs as $langKey => $originalLang):?>
<?php
$defaultValue = $originalLang;
$defaultValueBox = $originalLang;
foreach($config->dev->commonLang as $commonKey => $commonLang)
{
if(strpos($originalLang, $commonKey) !== false)
{
$defaultValue = str_replace($commonKey, '', $defaultValue);
$defaultValueBox = str_replace($commonKey, "<span class='input-group-addon'>{$commonLang}</span>", $defaultValueBox);
$originalLang = str_replace($commonKey, $commonLang, $originalLang);
}
}
$defaultValueBox = str_replace($defaultValue, '%s', $defaultValueBox);
?>
<div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="form-item flex">
<?php if(str_replace('-', '_', $this->app->getClientLang()) != $language):?>
<?php if(!$isCurrentLang):?>
<div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
<?php endif;?>
<div data-id="<?php echo "{$moduleName}_{$langKey}"?>" class="input-label h-full"><?php echo $originalLang?></div>
<i class="icon icon-angle-right text-primary"></i>
<div class="input-control">
<?php echo html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$originalLang}'");?>
<div class="input-group">
<?php printf($defaultValueBox, html::input("{$moduleName}_{$langKey}", zget($customedLangs, $langKey, ''), "class='form-control shadow-primary-hover' placeholder='{$defaultValue}'"));?>
</div>
</div>
<?php endforeach;?>