diff --git a/module/bug/model.php b/module/bug/model.php index b11f1f654f..bd4860ad2d 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -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; } diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 6ae6d73992..a7ab3ca876 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -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 = ""; $lang->pager->last = ""; $lang->pager->locate = "GO!"; -$lang->proVersion = " PRO   "; +$lang->proVersion = "PRO   "; $lang->downNotify = "Down notify"; $lang->suhosinInfo = "Warming:data is too large! Please enlarge the setting of sohusin.post.max_vars and sohusin.request.max_vars in php.ini. Otherwise partial data can't be saved."; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 145cc925ea..cc9fc079a3 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -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 = ""; $lang->pager->last = ""; $lang->pager->locate = "GO!"; -$lang->proVersion = " 专业版!   "; +$lang->proVersion = "专业版   "; $lang->downNotify = "下载桌面提醒"; $lang->suhosinInfo = "警告:数据太多,请在php.ini中修改sohusin.post.max_vars和sohusin.request.max_vars(设置更大的数)。 保存并重新启动apache,否则会造成部分数据无法保存。"; diff --git a/module/story/model.php b/module/story/model.php index c84415fd91..6503044d16 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -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; } diff --git a/module/task/model.php b/module/task/model.php index cb3bef6aa3..95e40ed869 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -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; } diff --git a/module/testcase/model.php b/module/testcase/model.php index eef679779d..eaede0088a 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -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; }