From 0bf04601f0e7f31496c84f755c395c189371cae7 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 9 Sep 2015 10:03:23 +0800
Subject: [PATCH]  * adjust lang for sso and mail.

---
 module/admin/view/sso.html.php       | 1 +
 module/build/view/linkstory.html.php | 1 -
 module/mail/lang/en.php              | 1 +
 module/mail/lang/zh-cn.php           | 1 +
 module/sso/lang/en.php               | 6 ++++++
 module/sso/lang/zh-cn.php            | 6 ++++++
 6 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/module/admin/view/sso.html.php b/module/admin/view/sso.html.php
index ca5adf0feb..d2b7690e02 100644
--- a/module/admin/view/sso.html.php
+++ b/module/admin/view/sso.html.php
@@ -43,5 +43,6 @@
        </tr>
     </table>
   </form>
+  <div class='alert alert-info'><?php echo $lang->sso->help?></div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 197f12e817..fa5626da34 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -28,7 +28,6 @@
         </tr>
       </thead>
       <tbody>
-      <?php echo $build?>
       <?php foreach($allStories as $story):?>
       <?php if(strpos(",{$build->stories},", ",{$story->id},") !== false) continue; ?>
       <tr>
diff --git a/module/mail/lang/en.php b/module/mail/lang/en.php
index e694d09b42..b7e742b53c 100755
--- a/module/mail/lang/en.php
+++ b/module/mail/lang/en.php
@@ -70,4 +70,5 @@ $lang->mail->noOpenssl      = 'Please open the extension of openssl when use tls
 $lang->mail->sendCloudHelp  = <<<EOD
 <p>SendCloud Notice is SendCloud's team notification service. Can view to <a href="http://notice.sendcloud.net/" target="_blank">notice.sendcloud.net</a></p>
 <p>accessKey and secretKey can go to the "Settings" page view after login. The sender name and address is also provided in the "Settings" page.</p>
+<p>Letter, ZenTao account must be SendCloud contacts inside the same nickname. You may not succeed in sending.</p>
 EOD;
diff --git a/module/mail/lang/zh-cn.php b/module/mail/lang/zh-cn.php
index c84445a26e..44ee6c29ec 100755
--- a/module/mail/lang/zh-cn.php
+++ b/module/mail/lang/zh-cn.php
@@ -70,4 +70,5 @@ $lang->mail->noOpenssl      = 'ssl和tls加密，请打开openssl扩展。 保
 $lang->mail->sendCloudHelp  = <<<EOD
 <p>Notice SendCloud是SendCloud的团队通知服务。具体可以到<a href="http://notice.sendcloud.net/" target="_blank">notice.sendcloud.net</a>查看</p>
 <p>accessKey和secretKey可以到登陆后的"设置"页面查看。发信人地址和名称也在"设置"页面设置。</p>
+<p>发信时，禅道的用户名必须与Notice SendCloud联系人里面的昵称一致。否则可能无法成功发信。</p>
 EOD;
diff --git a/module/sso/lang/en.php b/module/sso/lang/en.php
index 17e8475eb5..a5ba336c14 100644
--- a/module/sso/lang/en.php
+++ b/module/sso/lang/en.php
@@ -20,3 +20,9 @@ $lang->sso->addrNotice = 'Example: http://www.ranzhi.com/sys/sso-check.html';
 $lang->sso->turnonList = array();
 $lang->sso->turnonList[1] = 'on';
 $lang->sso->turnonList[0] = 'off';
+
+$lang->sso->help = <<<EOD
+<p>1. Fill in Address, PATH_INFO ：http://ranzhi site/sys/sso-check.html, GET：http://ranzhi site/sys/index.php?m=sso&f=check</p>
+<p>2. Code and Key must be the same of setting of RanZhi.</p>
+<p>3. The account of RanZhi must be consistent with the ZenTao, otherwise you can not correlation log in ZenTao from RanZhi </p>
+EOD;
diff --git a/module/sso/lang/zh-cn.php b/module/sso/lang/zh-cn.php
index a5d4d15c6d..8338991959 100644
--- a/module/sso/lang/zh-cn.php
+++ b/module/sso/lang/zh-cn.php
@@ -20,3 +20,9 @@ $lang->sso->addrNotice = '比如：http://www.ranzhi.com/sys/sso-check.html';
 $lang->sso->turnonList = array();
 $lang->sso->turnonList[1] = '打开';
 $lang->sso->turnonList[0] = '关闭';
+
+$lang->sso->help = <<<EOD
+<p>1、接口地址的填写，如果是PATH_INFO ：http://然之网址/sys/sso-check.html，如果是GET：http://然之网址/sys/index.php?m=sso&f=check</p>
+<p>2、代号和密钥必须与然之后台设置的一致。</p>
+<p>3、然之的用户名必须和禅道里面的一致，否则无法从然之关联登录禅道</p>
+EOD;