From 16b97af26fb4617bf10a31afd29ea2bbe6a528ea Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Wed, 19 Jun 2013 01:05:11 +0000
Subject: [PATCH]  * code for task#1377.

---
 module/product/lang/en.php               |  3 ++-
 module/product/lang/zh-cn.php            |  3 ++-
 module/product/view/searchitems.html.php |  1 +
 module/project/lang/en.php               | 33 ++++++++++++------------
 module/project/lang/zh-cn.php            | 33 ++++++++++++------------
 module/project/view/searchitems.html.php |  1 +
 6 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index e7c44f971c..5127661da9 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -83,4 +83,5 @@ $lang->product->aclList['open']    = 'Default(Having product module prividge, ca
 $lang->product->aclList['private'] = 'Private(Only project team members can visit)';
 $lang->product->aclList['custom']  = 'Whitelist(Project team members and who belongs to the whilelist groups can visit)';
 
-$lang->product->storySummary = "Total <strong>%s</strong> stories in this page, estimate <strong>%s</strong> hours.";
+$lang->product->storySummary     = "Total <strong>%s</strong> stories in this page, estimate <strong>%s</strong> hours.";
+$lang->product->noMatchedProduct = 'No matched product including "%s"';
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 523cfe8069..8d8c009a6b 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -83,4 +83,5 @@ $lang->product->aclList['open']    = '默认设置(有产品视图权限，即
 $lang->product->aclList['private'] = '私有产品(只有项目团队成员才能访问)';
 $lang->product->aclList['custom']  = '自定义白名单(团队成员和白名单的成员可以访问)';
 
-$lang->product->storySummary = "本页共 <strong>%s</strong> 个需求，预计 <strong>%s</strong> 个工时。";
+$lang->product->storySummary     = "本页共 <strong>%s</strong> 个需求，预计 <strong>%s</strong> 个工时。";
+$lang->product->noMatchedProduct = '找不到与"%s"相关的产品';
diff --git a/module/product/view/searchitems.html.php b/module/product/view/searchitems.html.php
index a139219d0b..3987aff84f 100644
--- a/module/product/view/searchitems.html.php
+++ b/module/product/view/searchitems.html.php
@@ -1,3 +1,4 @@
+<?php if(!$products) echo sprintf($lang->product->noMatchedProduct, $keywords);?>
 <ul>
 <?php
 foreach($products as $product)
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 99c1b42f2f..24f5df4b6d 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -160,22 +160,23 @@ $lang->project->aboveAllProduct = 'Above all products';
 $lang->project->aboveAllProject = 'Above all projects';
 
 /* Notcie. */
-$lang->project->selectProject   = "Select project";
-$lang->project->beginAndEnd     = 'Begin and end';
-$lang->project->lblStats        = 'Stats';
-$lang->project->stats           = 'Total work hours is 『%s』hours, <br />Total estimate is『%s』hours,<br />Total confused is『%s』hours<br />Total left is『%s』hours';
-$lang->project->oneLineStats    = "Project『%s』, code is『%s』, products is『%s』,begin from『%s』to 『%s』,total estimate『%s』hours,consumed『%s』hours,left『%s』hours.";
-$lang->project->taskSummary     = "<strong>%s</strong> tasks in this page. Pending: <strong>%s</strong>. doing: <strong>%s</strong>. Est: <strong>%s</strong> h. Consumed: <strong>%s</strong> h. Left: <strong>%s</strong>.";
-$lang->project->memberHours     = "%s has <strong>%s</strong> workhours, ";
-$lang->project->groupSummary    = "<strong>%s</strong> tasks in this group, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
-$lang->project->wbs             = "WBS";
-$lang->project->batchWBS        = "Batch WBS";
-$lang->project->largeBurnChart  = 'View large';
-$lang->project->howToUpdateBurn = "<a href='http://www.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank'>How?</a>";
-$lang->project->whyNoStories    = "There no active stories to added to this project. Please check the linked product.";
-$lang->project->doneProjects    = 'Done';
-$lang->project->unDoneProjects  = 'Undone';
-$lang->project->copyTeam        = 'Copy a team';
+$lang->project->selectProject    = "Select project";
+$lang->project->beginAndEnd      = 'Begin and end';
+$lang->project->lblStats         = 'Stats';
+$lang->project->stats            = 'Total work hours is 『%s』hours, <br />Total estimate is『%s』hours,<br />Total confused is『%s』hours<br />Total left is『%s』hours';
+$lang->project->oneLineStats     = "Project『%s』, code is『%s』, products is『%s』,begin from『%s』to 『%s』,total estimate『%s』hours,consumed『%s』hours,left『%s』hours.";
+$lang->project->taskSummary      = "<strong>%s</strong> tasks in this page. Pending: <strong>%s</strong>. doing: <strong>%s</strong>. Est: <strong>%s</strong> h. Consumed: <strong>%s</strong> h. Left: <strong>%s</strong>.";
+$lang->project->memberHours      = "%s has <strong>%s</strong> workhours, ";
+$lang->project->groupSummary     = "<strong>%s</strong> tasks in this group, wait:<strong>%s</strong>, doing:<strong>%s</strong>, estimate <strong>%s</strong>, consumed <strong>%s</strong>, left <strong>%s</strong> hours.";
+$lang->project->wbs              = "WBS";
+$lang->project->batchWBS         = "Batch WBS";
+$lang->project->largeBurnChart   = 'View large';
+$lang->project->howToUpdateBurn  = "<a href='http://www.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank'>How?</a>";
+$lang->project->whyNoStories     = "There no active stories to added to this project. Please check the linked product.";
+$lang->project->doneProjects     = 'Done';
+$lang->project->unDoneProjects   = 'Undone';
+$lang->project->copyTeam         = 'Copy a team';
+$lang->product->noMatchedProject = 'No matched project including "%s"';
 
 /* Confirm. */
 $lang->project->confirmDelete         = 'Are you sure to delete project [%s]?';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 6bc55b7cf2..4eba7bd685 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -160,22 +160,23 @@ $lang->project->aboveAllProduct = '以上所有产品';
 $lang->project->aboveAllProject = '以上所有项目';
 
 /* 页面提示。*/
-$lang->project->selectProject   = "请选择项目";
-$lang->project->beginAndEnd     = '起止时间';
-$lang->project->lblStats        = '工时统计';
-$lang->project->stats           = '可用工时<strong>%s</strong>工时<br />总共预计<strong>%s</strong>工时<br />已经消耗<strong>%s</strong>工时<br />预计剩余<strong>%s</strong>工时';
-$lang->project->oneLineStats    = "项目<strong>%s</strong>, 代号为<strong>%s</strong>, 相关产品为<strong>%s</strong>，<strong>%s</strong>开始，<strong>%s</strong>结束，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，预计剩余<strong>%s</strong>工时。";
-$lang->project->taskSummary     = "本页共 <strong>%s</strong> 个任务，未开始<strong>%s</strong>，进行中<strong>%s</strong>，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，剩余<strong>%s</strong>工时。";
-$lang->project->memberHours     = "%s共有 <strong>%s</strong> 个可用工时，";
-$lang->project->groupSummary    = "本组共 <strong>%s</strong> 个任务，未开始<strong>%s</strong>，进行中<strong>%s</strong>，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，剩余<strong>%s</strong>工时。";
-$lang->project->wbs             = "分解任务";
-$lang->project->batchWBS        = "批量分解";
-$lang->project->largeBurnChart  = '点击查看大图';
-$lang->project->howToUpdateBurn = "<a href='http://www.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank'>如何更新?</a>";
-$lang->project->whyNoStories    = "看起来没有需求可以关联。请检查下项目关联的产品中有没有需求，而且要确保它们已经审核通过。";
-$lang->project->doneProjects    = '已结束';
-$lang->project->unDoneProjects  = '未结束';
-$lang->project->copyTeam        = '复制团队';
+$lang->project->selectProject    = "请选择项目";
+$lang->project->beginAndEnd      = '起止时间';
+$lang->project->lblStats         = '工时统计';
+$lang->project->stats            = '可用工时<strong>%s</strong>工时<br />总共预计<strong>%s</strong>工时<br />已经消耗<strong>%s</strong>工时<br />预计剩余<strong>%s</strong>工时';
+$lang->project->oneLineStats     = "项目<strong>%s</strong>, 代号为<strong>%s</strong>, 相关产品为<strong>%s</strong>，<strong>%s</strong>开始，<strong>%s</strong>结束，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，预计剩余<strong>%s</strong>工时。";
+$lang->project->taskSummary      = "本页共 <strong>%s</strong> 个任务，未开始<strong>%s</strong>，进行中<strong>%s</strong>，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，剩余<strong>%s</strong>工时。";
+$lang->project->memberHours      = "%s共有 <strong>%s</strong> 个可用工时，";
+$lang->project->groupSummary     = "本组共 <strong>%s</strong> 个任务，未开始<strong>%s</strong>，进行中<strong>%s</strong>，总预计<strong>%s</strong>工时，已消耗<strong>%s</strong>工时，剩余<strong>%s</strong>工时。";
+$lang->project->wbs              = "分解任务";
+$lang->project->batchWBS         = "批量分解";
+$lang->project->largeBurnChart   = '点击查看大图';
+$lang->project->howToUpdateBurn  = "<a href='http://www.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank'>如何更新?</a>";
+$lang->project->whyNoStories     = "看起来没有需求可以关联。请检查下项目关联的产品中有没有需求，而且要确保它们已经审核通过。";
+$lang->project->doneProjects     = '已结束';
+$lang->project->unDoneProjects   = '未结束';
+$lang->project->copyTeam         = '复制团队';
+$lang->product->noMatchedProject = '找不到与"%s"相关的项目';
 
 /* 交互提示。*/
 $lang->project->confirmDelete         = '您确定删除项目[%s]吗？';
diff --git a/module/project/view/searchitems.html.php b/module/project/view/searchitems.html.php
index 420c6698db..79bf1afea1 100644
--- a/module/project/view/searchitems.html.php
+++ b/module/project/view/searchitems.html.php
@@ -1,3 +1,4 @@
+<?php if(!$projects) echo sprintf($lang->product->noMatchedProject, $keywords);?>
 <ul>
 <?php
 foreach($projects as $project)