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

* Add saveSuccess to common lang files.

Browse Source
This commit is contained in:
liugang
2018-04-17 15:53:36 +08:00
parent b0e3ad7b52
commit e522b82a7e
23 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/control.php
+1 -1
View File
@@ -328,7 +328,7 @@ class admin extends control
$this->loadModel('setting')->setItem('system.admin.log.saveDays', $this->post->days);
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->send(array('result' => 'success', 'message' => $this->lang->admin->saveSuccess, 'locate' => 'reload'));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
}
$this->loadModel('message');
module/admin/lang/en.php
+4 -5
View File
@@ -21,11 +21,10 @@ $lang->admin->ztCompany = 'Verify your company';
$lang->admin->captcha = 'Verification Code';
$lang->admin->getCaptcha = 'Get Verification Code';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
$lang->admin->setting = 'Setting';
$lang->admin->days = 'Valid Days';
$lang->admin->saveSuccess = 'Saved.';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
$lang->admin->setting = 'Setting';
$lang->admin->days = 'Valid Days';
$lang->admin->info = new stdclass();
$lang->admin->info->version = 'Current Version is %s. ';
module/admin/lang/zh-cn.php
+4 -5
View File
@@ -21,11 +21,10 @@ $lang->admin->ztCompany = '认证公司';
$lang->admin->captcha = '验证码';
$lang->admin->getCaptcha = '获取验证码';
$lang->admin->api = '接口';
$lang->admin->log = '日志';
$lang->admin->setting = '设置';
$lang->admin->days = '日志保存天数';
$lang->admin->saveSuccess = '保存成功';
$lang->admin->api = '接口';
$lang->admin->log = '日志';
$lang->admin->setting = '设置';
$lang->admin->days = '日志保存天数';
$lang->admin->info = new stdclass();
$lang->admin->info->version = '当前系统的版本是%s，';
module/admin/lang/zh-tw.php
+4 -5
View File
@@ -21,11 +21,10 @@ $lang->admin->ztCompany = '認證公司';
$lang->admin->captcha = '驗證碼';
$lang->admin->getCaptcha = '獲取驗證碼';
$lang->admin->api = '介面';
$lang->admin->log = '日誌';
$lang->admin->setting = '設置';
$lang->admin->days = '日誌保存天數';
$lang->admin->saveSuccess = '保存成功';
$lang->admin->api = '介面';
$lang->admin->log = '日誌';
$lang->admin->setting = '設置';
$lang->admin->days = '日誌保存天數';
$lang->admin->info = new stdclass();
$lang->admin->info->version = '當前系統的版本是%s，';
module/common/lang/en.php
+1
View File
@@ -41,6 +41,7 @@ $lang->export = 'Export';
$lang->setFileName = 'File Name';
$lang->submitting = 'Saving...';
$lang->save = 'Save';
$lang->saveSuccess = 'Saved successfully';
$lang->confirm = 'Confirm';
$lang->preview = 'View';
$lang->goback = 'Back';
module/common/lang/zh-cn.php
+1
View File
@@ -41,6 +41,7 @@ $lang->export = '导出';
$lang->setFileName = '文件名：';
$lang->submitting = '稍候...';
$lang->save = '保存';
$lang->saveSuccess = '保存成功';
$lang->confirm = '确认';
$lang->preview = '查看';
$lang->goback = '返回';
module/common/lang/zh-tw.php
+1
View File
@@ -41,6 +41,7 @@ $lang->export = '導出';
$lang->setFileName = '檔案名：';
$lang->submitting = '稍候...';
$lang->save = '保存';
$lang->saveSuccess = '保存成功';
$lang->confirm = '確認';
$lang->preview = '查看';
$lang->goback = '返回';
module/common/model.php
+1 -1
View File
@@ -762,7 +762,7 @@ EOD;
if(strpos(',edit,copy,report,export,delete,', ",$method,") !== false) $module = 'common';
$class = "icon-$module-$method";
if(!$clickable) $class .= ' disabled';
if($icon) $class .= ' icon-' . $icon;
if($icon) $class .= ' icon-' . $icon;
/* Create the icon link. */
module/entry/control.php
+2 -2
View File
@@ -49,7 +49,7 @@ class entry extends control
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->loadModel('action')->create('entry', $id, 'created');
$this->send(array('result' => 'success', 'message' => $this->lang->entry->saveSuccess, 'locate' => inlink('browse')));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}
$this->view->title = $this->lang->entry->api . $this->lang->colon . $this->lang->entry->create;
@@ -78,7 +78,7 @@ class entry extends control
$actionID = $this->loadModel('action')->create('entry', $id, 'edited');
$this->action->logHistory($actionID, $changes);
}
$this->send(array('result' => 'success', 'message' => $this->lang->entry->saveSuccess, 'locate' => inlink('browse')));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}
$entry = $this->entry->getById($id);
module/entry/lang/en.php
-1
View File
@@ -25,7 +25,6 @@ $lang->entry->editedDate = 'Edited Date';
$lang->entry->date = 'Request Time';
$lang->entry->url = 'Request URL';
$lang->entry->saveSuccess = 'Save success.';
$lang->entry->confirmDelete = 'Are you sure delete this entry?';
$lang->entry->help = 'Help';
module/entry/lang/zh-cn.php
-1
View File
@@ -25,7 +25,6 @@ $lang->entry->editedDate = '编辑时间';
$lang->entry->date = '请求时间';
$lang->entry->url = '请求地址';
$lang->entry->saveSuccess = '保存成功';
$lang->entry->confirmDelete = '您确认要删除该应用吗？';
$lang->entry->help = '使用说明';
module/entry/lang/zh-tw.php
-1
View File
@@ -25,7 +25,6 @@ $lang->entry->editedDate = '編輯時間';
$lang->entry->date = '請求時間';
$lang->entry->url = '請求地址';
$lang->entry->saveSuccess = '保存成功';
$lang->entry->confirmDelete = '您確認要刪除該應用嗎？';
$lang->entry->help = '使用說明';
module/mail/lang/en.php
-1
View File
@@ -4,7 +4,6 @@ $lang->mail->index = 'Home';
$lang->mail->detect = 'Testing';
$lang->mail->edit = 'Edit Settings';
$lang->mail->save = 'Save';
$lang->mail->saveSuccess = 'Saved Successfully';
$lang->mail->test = 'Email Sending Test';
$lang->mail->reset = 'Reset';
$lang->mail->resend = 'Resend';
module/mail/lang/zh-cn.php
-1
View File
@@ -4,7 +4,6 @@ $lang->mail->index = '首页';
$lang->mail->detect = '检测';
$lang->mail->edit = '编辑配置';
$lang->mail->save = '保存';
$lang->mail->saveSuccess = '保存成功';
$lang->mail->test = '测试发信';
$lang->mail->reset = '重置';
$lang->mail->resend = '重发';
module/mail/lang/zh-tw.php
-1
View File
@@ -4,7 +4,6 @@ $lang->mail->index = '首頁';
$lang->mail->detect = '檢測';
$lang->mail->edit = '編輯配置';
$lang->mail->save = '保存';
$lang->mail->saveSuccess = '保存成功';
$lang->mail->test = '測試發信';
$lang->mail->reset = '重置';
$lang->mail->resend = '重發';
module/mail/view/save.html.php
+1 -1
View File
@@ -16,7 +16,7 @@
<div class='heading'>
<span class='prefix'><?php echo html::icon($lang->icons['mail']);?></span>
<strong><?php echo $lang->mail->common;?></strong>
<small class='text-success'> <?php echo $lang->mail->saveSuccess;?> <?php echo html::icon('ok-sign');?></small>
<small class='text-success'> <?php echo $lang->saveSuccess;?> <?php echo html::icon('ok-sign');?></small>
</div>
</div>
<div class='alert alert-block with-icon'>
module/product/control.php
+3 -3
View File
@@ -219,15 +219,15 @@ class product extends control
if(!empty($_POST))
{
$productID = $this->product->create();
if(dao::isError()) die(js::error(dao::getError()));
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->loadModel('action')->create('product', $productID, 'opened');
if(isset($this->config->global->flow) and $this->config->global->flow == 'onlyTest')
{
die(js::locate($this->createLink($this->moduleName, 'build', "productID=$productID"), 'parent'));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($this->moduleName, 'build', "productID=$productID")));
}
die(js::locate($this->createLink($this->moduleName, 'browse', "productID=$productID"), 'parent'));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink($this->moduleName, 'browse', "productID=$productID")));
}
$this->product->setMenu($this->products, key($this->products));
module/product/view/edit.html.php
+6 -1
View File
@@ -66,7 +66,12 @@
<th><?php echo $lang->product->whitelist;?></th>
<td colspan='2'><?php echo html::checkbox('whitelist', $groups, $product->whitelist);?></td>
</tr>
<tr><td></td><td colspan='2'><?php echo html::submitButton();?></td></tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::backButton('', '', 'btn btn-wide btn-gray');?>
</td>
</tr>
</tbody>
</table>
</form>
module/product/view/view.html.php
+5 -2
View File
@@ -215,8 +215,11 @@
if(!$product->deleted)
{
ob_start();
common::printIcon('product', 'close', "productID=$product->id", $product, 'button', '', '', 'iframe text-danger', true);
echo "<div class='divider'></div>";
if($product->status != 'closed')
{
common::printIcon('product', 'close', "productID=$product->id", $product, 'button', '', '', 'iframe text-danger', true);
echo "<div class='divider'></div>";
}
common::printIcon('product', 'edit', $params, $product);
common::printIcon('product', 'delete', $params, $product, 'button', '', 'hiddenwin');
module/webhook/control.php
+2 -2
View File
@@ -53,7 +53,7 @@ class webhook extends control
{
$this->webhook->create();
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->send(array('result' => 'success', 'message' => $this->lang->webhook->saveSuccess, 'locate' => inlink('browse')));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}
$this->app->loadLang('action');
@@ -80,7 +80,7 @@ class webhook extends control
{
$this->webhook->update($id);
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
$this->send(array('result' => 'success', 'message' => $this->lang->webhook->saveSuccess, 'locate' => inlink('browse')));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
}
$this->app->loadLang('action');
module/webhook/lang/en.php
-1
View File
@@ -48,7 +48,6 @@ $lang->webhook->paramsList['date'] = 'Date';
$lang->webhook->paramsList['comment'] = 'Comment';
$lang->webhook->paramsList['text'] = 'Action Desc';
$lang->webhook->saveSuccess = 'Save success.';
$lang->webhook->confirmDelete = 'Are your sure delete this hook?';
$lang->webhook->trimWords = '';
module/webhook/lang/zh-cn.php
-1
View File
@@ -48,7 +48,6 @@ $lang->webhook->paramsList['date'] = '操作日期';
$lang->webhook->paramsList['comment'] = '备注';
$lang->webhook->paramsList['text'] = '操作内容';
$lang->webhook->saveSuccess = '保存成功';
$lang->webhook->confirmDelete = '您确认要删除该webhook吗？';
$lang->webhook->trimWords = '了';
module/webhook/lang/zh-tw.php
-1
View File
@@ -48,7 +48,6 @@ $lang->webhook->paramsList['date'] = '操作日期';
$lang->webhook->paramsList['comment'] = '備註';
$lang->webhook->paramsList['text'] = '操作內容';
$lang->webhook->saveSuccess = '保存成功';
$lang->webhook->confirmDelete = '您確認要刪除該webhook嗎？';
$lang->webhook->trimWords = '了';