Gé
$lang->product->noProduct = "No {$lang->productCommon} à ce jour. ";
$lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon;
-$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
-$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
-$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
-$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe;
-$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
-$lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe;
-$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory;
-$lang->product->featureBar['browse']['more'] = $lang->more;
+$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
+$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
+$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
+$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe;
+$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
+$lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe;
+$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory;
+$lang->product->featureBar['browse']['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->featureBar['browse']['more'] = $lang->more;
$lang->product->featureBar['all']['all'] = $lang->product->allProduct;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php
index 126ea41ec2..a69df13a80 100644
--- a/module/product/lang/vi.php
+++ b/module/product/lang/vi.php
@@ -115,19 +115,20 @@ $lang->product->iterationView = 'Chi tiết';
$lang->product->createdBy = 'Người tạo';
$lang->product->createdDate = 'Ngày tạo';
-$lang->product->searchStory = 'Tìm kiếm';
-$lang->product->assignedToMe = 'Giao cho bạn';
-$lang->product->openedByMe = 'Tạo bởi bạn';
-$lang->product->reviewedByMe = 'Duyệt bởi bạn';
-$lang->product->closedByMe = 'Đóng bởi bạn';
-$lang->product->draftStory = 'Nháp';
-$lang->product->activeStory = 'Đã kích hoạt';
-$lang->product->changedStory = 'Đã thay đổi';
-$lang->product->willClose = 'Đã đóng';
-$lang->product->closedStory = 'Đã đóng';
-$lang->product->unclosed = 'Mở';
-$lang->product->unplan = 'Chưa kế hoạch';
-$lang->product->viewByUser = 'Theo người dùng';
+$lang->product->searchStory = 'Tìm kiếm';
+$lang->product->assignedToMe = 'Giao cho bạn';
+$lang->product->openedByMe = 'Tạo bởi bạn';
+$lang->product->reviewedByMe = 'Duyệt bởi bạn';
+$lang->product->closedByMe = 'Đóng bởi bạn';
+$lang->product->draftStory = 'Nháp';
+$lang->product->activeStory = 'Đã kích hoạt';
+$lang->product->changingStory = 'Biến';
+$lang->product->reviewingStory = 'Đang xem xét';
+$lang->product->willClose = 'Đã đóng';
+$lang->product->closedStory = 'Đã đóng';
+$lang->product->unclosed = 'Mở';
+$lang->product->unplan = 'Chưa kế hoạch';
+$lang->product->viewByUser = 'Theo người dùng';
$lang->product->allStory = 'Tất cả ';
$lang->product->allProduct = 'Tất cả';
@@ -165,20 +166,21 @@ $lang->product->noModule = '
Chưa có Module.
Quản lý n
$lang->product->noProduct = "Không có {$lang->productCommon} nào.";
$lang->product->noMatched = '"%s" không thể tìm thấy ' . $lang->productCommon;
-$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
-$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
-$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
-$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe;
-$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
-$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory;
-$lang->product->featureBar['browse']['more'] = $lang->more;
+$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
+$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
+$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
+$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe;
+$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
+$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory;
+$lang->product->featureBar['browse']['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->featureBar['browse']['more'] = $lang->more;
$lang->product->featureBar['all']['all'] = $lang->product->allProduct;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index f13204cd93..85ee8e22e5 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -132,21 +132,22 @@ $lang->product->createdDate = '创建日期';
$lang->product->createdVersion = '创建版本';
$lang->product->mailto = '抄送给';
-$lang->product->searchStory = '搜索';
-$lang->product->assignedToMe = '指给我';
-$lang->product->openedByMe = '我创建';
-$lang->product->reviewedByMe = '我评审';
-$lang->product->reviewByMe = '待我评审';
-$lang->product->closedByMe = '我关闭';
-$lang->product->draftStory = '草稿';
-$lang->product->activeStory = '激活';
-$lang->product->changedStory = '已变更';
-$lang->product->willClose = '待关闭';
-$lang->product->closedStory = '已关闭';
-$lang->product->unclosed = '未关闭';
-$lang->product->unplan = "未计划";
-$lang->product->viewByUser = '按用户查看';
-$lang->product->assignedByMe = '我指派';
+$lang->product->searchStory = '搜索';
+$lang->product->assignedToMe = '指给我';
+$lang->product->openedByMe = '我创建';
+$lang->product->reviewedByMe = '我评审';
+$lang->product->reviewByMe = '待我评审';
+$lang->product->closedByMe = '我关闭';
+$lang->product->draftStory = '草稿';
+$lang->product->activeStory = '激活';
+$lang->product->changingStory = '变更中';
+$lang->product->reviewingStory = '评审中';
+$lang->product->willClose = '待关闭';
+$lang->product->closedStory = '已关闭';
+$lang->product->unclosed = '未关闭';
+$lang->product->unplan = "未计划";
+$lang->product->viewByUser = '按用户查看';
+$lang->product->assignedByMe = '我指派';
/* Product Kanban. */
$lang->product->myProduct = '我负责的' . $lang->productCommon;
@@ -204,22 +205,23 @@ $lang->product->noModule = "
您现在还没有模块信息
$lang->product->noProduct = "暂时没有{$lang->productCommon}。";
$lang->product->noMatched = '找不到包含"%s"的' . $lang->productCommon;
-$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
-$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
-$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
-$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe;
-$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
-$lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe;
-$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory;
-$lang->product->featureBar['browse']['more'] = $lang->more;
+$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
+$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
+$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
+$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe;
+$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
+$lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe;
+$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory;
+$lang->product->featureBar['browse']['reviewingstory'] = $lang->product->reviewingStory;
+$lang->product->featureBar['browse']['more'] = $lang->more;
$lang->product->featureBar['all']['all'] = '所有' . $lang->productCommon;
$lang->product->featureBar['all']['noclosed'] = $lang->product->unclosed;
$lang->product->featureBar['all']['closed'] = $lang->product->statusList['closed'];
-$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
-$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
-$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
-$lang->product->moreSelects['changedstory'] = $lang->product->changedStory;
-$lang->product->moreSelects['willclose'] = $lang->product->willClose;
-$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
+$lang->product->moreSelects['assignedbyme'] = $lang->product->assignedByMe;
+$lang->product->moreSelects['closedbyme'] = $lang->product->closedByMe;
+$lang->product->moreSelects['activestory'] = $lang->product->activeStory;
+$lang->product->moreSelects['changingstory'] = $lang->product->changingStory;
+$lang->product->moreSelects['willclose'] = $lang->product->willClose;
+$lang->product->moreSelects['closedstory'] = $lang->product->closedStory;
diff --git a/module/product/model.php b/module/product/model.php
index 89ebf0f571..707c946626 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1019,7 +1019,8 @@ class productModel extends model
if($browseType == 'closedbyme') $stories = $this->story->getByClosedBy($productID, $branch, $modules, $this->app->user->account, $type, $sort, $pager);
if($browseType == 'draftstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'draft', $type, $sort, $pager);
if($browseType == 'activestory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'active', $type, $sort, $pager);
- if($browseType == 'changedstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'changing', $type, $sort, $pager);
+ if($browseType == 'changingstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'changing', $type, $sort, $pager);
+ if($browseType == 'reviewingstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'reviewing', $type, $sort, $pager);
if($browseType == 'willclose') $stories = $this->story->get2BeClosed($productID, $branch, $modules, $type, $sort, $pager);
if($browseType == 'closedstory') $stories = $this->story->getByStatus($productID, $branch, $modules, 'closed', $type, $sort, $pager);
if($browseType == 'assignedbyme') $stories = $this->story->getByAssignedBy($productID, $branch, $modules, $this->app->user->account, $type, $sort, $pager);
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index 7819d294ac..4cfb5f7f0b 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -26,6 +26,7 @@ $lang->story->review = 'Prüfen';
$lang->story->submitReview = "Submit Review";
$lang->story->recall = 'Revoke';
$lang->story->recallChange = 'Undo Changes';
+$lang->story->recallAction = 'Undo';
$lang->story->needReview = 'Need Review';
$lang->story->batchReview = 'Mehere prüfen';
$lang->story->edit = "Bearbeiten";
@@ -462,3 +463,7 @@ $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be
$lang->story->featureBar['browse']['all'] = $lang->all;
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
+
+$lang->story->recallList = array();
+$lang->story->recallList['recallReview'] = $lang->story->recall;
+$lang->story->recallList['recallChange'] = $lang->story->recallChange;
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 8d286633ef..92cc28d5db 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -26,6 +26,7 @@ $lang->story->review = 'Review';
$lang->story->submitReview = "Submit Review";
$lang->story->recall = 'Revoke';
$lang->story->recallChange = 'Undo Changes';
+$lang->story->recallAction = 'Undo';
$lang->story->needReview = 'Need Review';
$lang->story->batchReview = 'Batch Review';
$lang->story->edit = "Edit Story";
@@ -462,3 +463,7 @@ $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be
$lang->story->featureBar['browse']['all'] = $lang->all;
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
+
+$lang->story->recallList = array();
+$lang->story->recallList['recallReview'] = $lang->story->recall;
+$lang->story->recallList['recallChange'] = $lang->story->recallChange;
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index bddd17bf19..4d5315f7df 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -26,6 +26,7 @@ $lang->story->review = 'Valider';
$lang->story->submitReview = "Submit Review";
$lang->story->recall = 'Revoke';
$lang->story->recallChange = 'Undo Changes';
+$lang->story->recallAction = 'Undo';
$lang->story->needReview = 'Validation requise';
$lang->story->batchReview = 'Validation par lot';
$lang->story->edit = "Editer Story";
@@ -189,8 +190,8 @@ $lang->story->needNotReviewList[1] = 'Need Not Review';
$lang->story->useList[0] = 'Oui';
$lang->story->useList[1] = 'Non';
-$lang->story->statusList[''] = '';
-$lang->story->statusList['draft'] = 'Brouillon';
+$lang->story->statusList[''] = '';
+$lang->story->statusList['draft'] = 'Brouillon';
$lang->story->statusList['reviewing'] = 'Examen en cours';
$lang->story->statusList['active'] = 'Active';
$lang->story->statusList['closed'] = 'Fermée';
@@ -462,3 +463,7 @@ $lang->story->subDivideTip['notActive'] = "Cette Story n'est pas active et ne pe
$lang->story->featureBar['browse']['all'] = $lang->all;
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
+
+$lang->story->recallList = array();
+$lang->story->recallList['recallReview'] = $lang->story->recall;
+$lang->story->recallList['recallChange'] = $lang->story->recallChange;
diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php
index e22c0280ff..f33f4c7067 100644
--- a/module/story/lang/vi.php
+++ b/module/story/lang/vi.php
@@ -25,7 +25,8 @@ $lang->story->assignTo = 'Giao cho';
$lang->story->review = 'Xét duyệt';
$lang->story->submitReview = "Submit Review";
$lang->story->recall = 'Revoke';
-$lang->story->recallChange = 'Undo Changes';
+$lang->story->recallChange = 'Undo Changes';
+$lang->story->recallAction = 'Undo';
$lang->story->needReview = 'Duyệt nhu cầu';
$lang->story->batchReview = 'Duyệt hàng loạt';
$lang->story->edit = "Sửa câu chuyện";
@@ -454,3 +455,7 @@ $lang->story->subDivideTip['notActive'] = 'The Story is not active and cannot be
$lang->story->featureBar['browse']['all'] = $lang->all;
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
+
+$lang->story->recallList = array();
+$lang->story->recallList['recallReview'] = $lang->story->recall;
+$lang->story->recallList['recallChange'] = $lang->story->recallChange;
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 0f76ee0468..f721078727 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -465,5 +465,5 @@ $lang->story->featureBar['browse']['all'] = $lang->all;
$lang->story->featureBar['browse']['unclosed'] = $lang->story->unclosed;
$lang->story->recallList = array();
-$lang->story->recallList['recallReview'] = '撤销评审';
-$lang->story->recallList['recallChange'] = '撤销变更';
+$lang->story->recallList['recallReview'] = $lang->story->recall;
+$lang->story->recallList['recallChange'] = $lang->story->recallChange;