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

* change hasEdited to editedByOther in common lang.

Browse Source
This commit is contained in:
wangyidong
2016-03-14 10:48:42 +08:00
parent ae46e92be5
commit 516b1f0034
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+1 -1
View File
@@ -432,7 +432,7 @@ class bugModel extends model
$oldBug = $this->getById($bugID);
if($oldBug->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->hasEdited;
dao::$errors[] = $this->lang->error->editedByOther;
return false;
}
module/common/lang/en.php
+2 -2
View File
@@ -360,7 +360,7 @@ $lang->error->passwordrule = "Password should more than six letters.";
$lang->error->accessDenied = 'No purview';
$lang->error->pasteImg = 'Your browser does not support the paste image!';
$lang->error->noData = 'No data';
$lang->error->hasEdited = 'The record may have been changed. Please refresh and re edit!';
$lang->error->editedByOther = 'The record may have been changed. Please refresh and re edit!';
/* Pager. */
$lang->pager = new stdclass();
@@ -373,7 +373,7 @@ $lang->pager->next = "<i class='icon-play' title='Next'></i>";
$lang->pager->last = "<i class='icon-step-forward' title='Last'></i>";
$lang->pager->locate = "GO!";
$lang->proVersion = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' class='text-important'><i class='text-danger icon-pro-version'></i> PRO</a> &nbsp; ";
$lang->proVersion = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' class='text-important'>PRO <i class='text-danger icon-pro-version'></i></a> &nbsp; ";
$lang->downNotify = "Down notify";
$lang->suhosinInfo = "Warming:data is too large! Please enlarge the setting of <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> in php.ini. Otherwise partial data can't be saved.";
module/common/lang/zh-cn.php
+2 -2
View File
@@ -360,7 +360,7 @@ $lang->error->passwordrule = "密码应该符合规则，长度至少为六
$lang->error->accessDenied = '您没有访问权限';
$lang->error->pasteImg = '您的浏览器不支持粘贴图片！';
$lang->error->noData = '没有数据';
$lang->error->hasEdited = '该记录可能已经被改动。请刷新页面重新编辑！';
$lang->error->editedByOther = '该记录可能已经被改动。请刷新页面重新编辑！';
/* 分页信息。*/
$lang->pager = new stdclass();
@@ -373,7 +373,7 @@ $lang->pager->next = "<i class='icon-play' title='下一页'></i>";
$lang->pager->last = "<i class='icon-step-forward' title='末页'></i>";
$lang->pager->locate = "GO!";
$lang->proVersion = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'><i class='text-danger icon-pro-version'></i> 专业版！</a> &nbsp; ";
$lang->proVersion = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'>专业版 <i class='text-danger icon-pro-version'></i></a> &nbsp; ";
$lang->downNotify = "下载桌面提醒";
$lang->suhosinInfo = "警告：数据太多，请在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>（设置更大的数）。 保存并重新启动apache，否则会造成部分数据无法保存。";
module/story/model.php
+2 -2
View File
@@ -344,7 +344,7 @@ class storyModel extends model
$oldStory = $this->getById($storyID);
if($oldStory->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->hasEdited;
dao::$errors[] = $this->lang->error->editedByOther;
return false;
}
@@ -407,7 +407,7 @@ class storyModel extends model
$oldStory = $this->getById($storyID);
if($oldStory->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->hasEdited;
dao::$errors[] = $this->lang->error->editedByOther;
return false;
}
module/task/model.php
+1 -1
View File
@@ -189,7 +189,7 @@ class taskModel extends model
$oldTask = $this->getById($taskID);
if($oldTask->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->hasEdited;
dao::$errors[] = $this->lang->error->editedByOther;
return false;
}
module/testcase/model.php
+1 -1
View File
@@ -360,7 +360,7 @@ class testcaseModel extends model
$oldCase = $this->getById($caseID);
if($oldCase->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->hasEdited;
dao::$errors[] = $this->lang->error->editedByOther;
return false;
}