diff --git a/module/action/lang/de.php b/module/action/lang/de.php index 2a5414168d..e5d9b9426e 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -236,8 +236,8 @@ $lang->action->desc->verified = '$date, überprüft von $act $lang->action->desc->diff1 = '%s wurde geändert. Es war "%s" und ist jetzt "%s".
' . "\n"; $lang->action->desc->diff2 = '%s wurde geändert. Die Differenz ist ' . "\n" . "
%s
" . "\n
%s
"; $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->addDiff = 'Added %s"%s"。' . "\n"; +$lang->action->desc->removeDiff = 'Removed %s"%s"。' . "\n"; $lang->action->desc->linked2bug = '$date Verknüpft mit $extra von $actor'; $lang->action->desc->linked2testtask = '$date, linked to $extra by $actor'; $lang->action->desc->unlinkedfromtesttask = '$date, unlinked from $extra by $actor'; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index eb049c6a37..468984454e 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -236,8 +236,8 @@ $lang->action->desc->verified = '$date, verified by $actoraction->desc->diff1 = '%s is changed. It was "%s" and it is "%s".
' . "\n"; $lang->action->desc->diff2 = '%s is changed. The difference is ' . "\n" . "
%s
" . "\n
%s
"; $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->addDiff = 'Added %s"%s"。' . "\n"; +$lang->action->desc->removeDiff = 'Removed %s"%s"。' . "\n"; $lang->action->desc->linked2bug = '$date, linked to $extra by $actor'; $lang->action->desc->linked2testtask = '$date, linked to $extra by $actor'; $lang->action->desc->unlinkedfromtesttask = '$date, unlinked from $extra by $actor'; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index c3e669adf7..0051ab11f8 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -236,8 +236,8 @@ $lang->action->desc->verified = '$date, verifié par $actor< $lang->action->desc->diff1 = '%s a changé. Il est passé de "%s" à "%s".
' . "\n"; $lang->action->desc->diff2 = '%s a changé. La différence est ' . "\n" . "
%s
" . "\n
%s
"; $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->addDiff = 'Added %s"%s"。' . "\n"; +$lang->action->desc->removeDiff = 'Removed %s"%s"。' . "\n"; $lang->action->desc->linked2bug = '$date, affecté à $extra par $actor'; $lang->action->desc->linked2testtask = '$date, linked to $extra by $actor'; $lang->action->desc->unlinkedfromtesttask = '$date, unlinked from $extra by $actor'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index b669c2e42c..1ecc04e11b 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -236,8 +236,8 @@ $lang->action->desc->verified = '$date, 由 $actor $lang->action->desc->diff1 = '修改了 %s,旧值为 "%s",新值为 "%s"。
' . "\n"; $lang->action->desc->diff2 = '修改了 %s,区别为:' . "\n" . "
%s
" . "\n
%s
"; $lang->action->desc->diff3 = '将文件名 %s 改为 %s 。' . "\n"; -$lang->action->desc->addDiff = '添加了 "%s"。' . "\n"; -$lang->action->desc->removeDiff = '移除了 "%s"。' . "\n"; +$lang->action->desc->addDiff = '添加了 %s"%s"。' . "\n"; +$lang->action->desc->removeDiff = '移除了 %s"%s"。' . "\n"; $lang->action->desc->linked2bug = '$date 由 $actor 关联到构建 $extra'; $lang->action->desc->linked2testtask = '$date 由 $actor 关联到测试单 $extra'; $lang->action->desc->unlinkedfromtesttask = '$date 由 $actor 从测试单 $extra 中移除'; diff --git a/module/action/model.php b/module/action/model.php index 16847b112a..799c73e439 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1413,9 +1413,10 @@ class actionModel extends model foreach($histories as $history) { $history->fieldLabel = str_pad($history->fieldLabel, $maxLength, $this->lang->action->label->space); - if(strpos(',project,execution,', ",{$objectType},") !== false && strpos(',addDiff,removeDiff,', ",{$history->field},") !== false) + if(strpos(',addDiff,removeDiff,', ",{$history->field},") !== false) { - $content .= sprintf($this->lang->action->desc->{$history->field}, $history->diff) . '
'; + $fileLabel = isset($this->lang->file->common) ? $this->lang->file->common . ' ' : ''; + $content .= sprintf($this->lang->action->desc->{$history->field}, strpos(',project,execution,', ",{$objectType},") !== false ? '' : $fileLabel, $history->diff) . '
'; } elseif($history->diff != '') { diff --git a/module/common/model.php b/module/common/model.php index 37fbdba23a..bcc5a38ed1 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -895,6 +895,19 @@ class commonModel extends model $changes = array(); foreach($new as $key => $value) { + if($key == 'addedFiles') + { + foreach($value as $addedFile) $changes[] = array('field' => 'addDiff', 'old' => '', 'new' => '', 'diff' => $addedFile); + } + elseif($key == 'deleteFiles') + { + foreach($value as $deleteFile) $changes[] = array('field' => 'removeDiff', 'old' => '', 'new' => '', 'diff' => $deleteFile); + } + elseif($key == 'renameFiles') + { + foreach($value as $renameFile) $changes[] = array('field' => 'fileName', 'old' => $renameFile['old'], 'new' => $renameFile['new'], 'diff' => ''); + } + if(is_object($value) || is_array($value)) continue; $check = strtolower($key);