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

* [task#133109,start,1h] add language item and print managedTeam diff.

Browse Source
This commit is contained in:
liumengyi
2024-12-03 13:25:42 +08:00
committed by 田淑杰
parent 21c5b12c78
commit 4e5443c7f7
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/de.php
+3
View File
@@ -236,6 +236,8 @@ $lang->action->desc->verified = '$date, überprüft von <strong>$act
$lang->action->desc->diff1 = '<strong><i>%s</i></strong> wurde geändert. Es war "%s" und ist jetzt "%s".<br />' . "\n";
$lang->action->desc->diff2 = '<strong><i>%s</i></strong> wurde geändert. Die Differenz ist ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = 'Dateiname %s wurde geändert zu %s .' . "\n";
$lang->action->desc->addDiff = 'Added "%s"。' . "\n";
$lang->action->desc->removeDiff = 'Removed "%s"。' . "\n";
$lang->action->desc->linked2bug = '$date Verknüpft mit <strong>$extra</strong> von <strong>$actor</strong>';
$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
$lang->action->desc->unlinkedfromtesttask = '$date, unlinked from <strong>$extra</strong> by <strong>$actor</strong>';
@@ -284,6 +286,7 @@ $lang->action->desc->linkhost = '$date, the host is linked by <stron
$lang->action->desc->createrepobranch = '$date, <strong>$actor</strong> created code branch <strong>$extra</strong>。' . "\n";
$lang->action->desc->unlinkrepobranch = '$date, <strong>$actor</strong> unlinked code branch <strong>$extra</strong>.' . "\n";
$lang->action->desc->changedprogram = '$date, <strong>$actor</strong> adjust the program <strong>$extra</strong>.' . "\n";
$lang->action->desc->managedteam = '$date, by <strong>$actor</strong> managed team.' . "\n";
/* Used to describe the history of operations related to parent-child tasks. */
$lang->action->desc->createchildren = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
module/action/lang/en.php
+3
View File
@@ -236,6 +236,8 @@ $lang->action->desc->verified = '$date, verified by <strong>$actor</
$lang->action->desc->diff1 = '<strong><i>%s</i></strong> is changed. It was "%s" and it is "%s".<br />' . "\n";
$lang->action->desc->diff2 = '<strong><i>%s</i></strong> is changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n";
$lang->action->desc->addDiff = 'Added "%s"。' . "\n";
$lang->action->desc->removeDiff = 'Removed "%s"。' . "\n";
$lang->action->desc->linked2bug = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
$lang->action->desc->unlinkedfromtesttask = '$date, unlinked from <strong>$extra</strong> by <strong>$actor</strong>';
@@ -284,6 +286,7 @@ $lang->action->desc->linkhost = '$date, the host is linked by <stron
$lang->action->desc->createrepobranch = '$date, <strong>$actor</strong> created code branch <strong>$extra</strong>.' . "\n";
$lang->action->desc->unlinkrepobranch = '$date, <strong>$actor</strong> unlinked code branch <strong>$extra</strong>.' . "\n";
$lang->action->desc->changedprogram = '$date, <strong>$actor</strong> adjust the program <strong>$extra</strong>.' . "\n";
$lang->action->desc->managedteam = '$date, by <strong>$actor</strong> managed team.' . "\n";
/* Used to describe the history of operations related to parent-child tasks. */
$lang->action->desc->createchildren = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
module/action/lang/fr.php
+3
View File
@@ -236,6 +236,8 @@ $lang->action->desc->verified = '$date, verifié par <strong>$actor<
$lang->action->desc->diff1 = '<strong><i>%s</i></strong> a changé. Il est passé de "%s" à "%s".<br />' . "\n";
$lang->action->desc->diff2 = '<strong><i>%s</i></strong> a changé. La différence est ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = 'Le nom du fichier %s a changé pour %s .' . "\n";
$lang->action->desc->addDiff = 'Added "%s"。' . "\n";
$lang->action->desc->removeDiff = 'Removed "%s"。' . "\n";
$lang->action->desc->linked2bug = '$date, affecté à <strong>$extra</strong> par <strong>$actor</strong>';
$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
$lang->action->desc->unlinkedfromtesttask = '$date, unlinked from <strong>$extra</strong> by <strong>$actor</strong>';
@@ -284,6 +286,7 @@ $lang->action->desc->linkhost = '$date, the host is linked by <stron
$lang->action->desc->createrepobranch = '$date, <strong>$actor</strong> created code branch <strong>$extra</strong>.' . "\n";
$lang->action->desc->unlinkrepobranch = '$date, <strong>$actor</strong> unlinked code branch <strong>$extra</strong>.' . "\n";
$lang->action->desc->changedprogram = '$date, <strong>$actor</strong> adjust the program <strong>$extra</strong>.' . "\n";
$lang->action->desc->managedteam = '$date, by <strong>$actor</strong> managed team.' . "\n";
/* Used to describe the history of operations related to parent-child tasks. */
$lang->action->desc->createchildren = '$date, <strong>$actor</strong> a créé un sous-tâche <strong>$extra</strong>。' . "\n";
module/action/lang/zh-cn.php
+4 -1
View File
@@ -236,7 +236,9 @@ $lang->action->desc->verified = '$date, 由 <strong>$actor</strong>
$lang->action->desc->diff1 = '修改了 <strong><i>%s</i></strong>，旧值为 "%s"，新值为 "%s"。<br />' . "\n";
$lang->action->desc->diff2 = '修改了 <strong><i>%s</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = '将文件名 %s 改为 %s 。' . "\n";
$lang->action->desc->linked2bug = '$date 由 <strong>$actor</strong> 关联到构建 <strong>$extra</strong>';
$lang->action->desc->addDiff = '添加了 "%s"。' . "\n";
$lang->action->desc->removeDiff = '移除了 "%s"。' . "\n";
$lang->action->desc->linked2bug = '$date 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>';
$lang->action->desc->linked2testtask = '$date 由 <strong>$actor</strong> 关联到测试单 <strong>$extra</strong>';
$lang->action->desc->unlinkedfromtesttask = '$date 由 <strong>$actor</strong> 从测试单 <strong>$extra</strong> 中移除';
$lang->action->desc->resolved = '$date, 由 <strong>$actor</strong> 解决。' . "\n";
@@ -284,6 +286,7 @@ $lang->action->desc->linkhost = '$date, 由 <strong>$actor</strong>
$lang->action->desc->createrepobranch = '$date, 由 <strong>$actor</strong> 创建了代码分支 <strong>$extra</strong>。' . "\n";
$lang->action->desc->unlinkrepobranch = '$date, 由 <strong>$actor</strong> 取消关联了代码分支 <strong>$extra</strong>。' . "\n";
$lang->action->desc->changedprogram = '$date, 由 <strong>$actor</strong> 调整了所属项目集。' . "\n";
$lang->action->desc->managedteam = '$date, 由 <strong>$actor</strong> 维护团队。' . "\n";
/* 用来描述和父子任务相关的操作历史记录。*/
$lang->action->desc->createchildren = '$date, 由 <strong>$actor</strong> 创建子任务 <strong>$extra</strong>。' . "\n";
module/action/model.php
+5 -1
View File
@@ -1406,7 +1406,11 @@ class actionModel extends model
foreach($histories as $history)
{
$history->fieldLabel = str_pad($history->fieldLabel, $maxLength, $this->lang->action->label->space);
if($history->diff != '')
if(strpos(',project,execution,', ",{$objectType},") !== false && strpos(',addDiff,removeDiff,', ",{$history->field},") !== false)
{
$content .= sprintf($this->lang->action->desc->{$history->field}, $history->diff) . '<br/>';
}
elseif($history->diff != '')
{
$history->diff = str_replace(array('<ins>', '</ins>', '<del>', '</del>'), array('[ins]', '[/ins]', '[del]', '[/del]'), $history->diff);
$history->diff = $history->field != 'subversion' && $history->field != 'git' ? htmlSpecialString($history->diff) : $history->diff; // Keep the diff link.