SVN r1105
SVN-Revision: r1105
This commit is contained in:
@@ -444,7 +444,7 @@ namespace Lskj.Main
|
||||
string userName = lueUserName.Text.Trim();
|
||||
string password = txtPassword.Text.Trim();
|
||||
string LoginAccount = string.Empty;
|
||||
string ErrorLogText= string.Empty;//日志记录信息
|
||||
string ErrorLogText = string.Empty;//日志记录信息
|
||||
// 设置登录用户信息
|
||||
bool isConstraint = chkLogin.Checked;
|
||||
if (string.IsNullOrWhiteSpace(userName))
|
||||
@@ -678,7 +678,11 @@ namespace Lskj.Main
|
||||
|
||||
ERPInfo.Instance.LanguageName = this.language.Text;
|
||||
LanguageTranslation.GetLanguageComparisonTable();//获取翻译表数据
|
||||
if (!string.IsNullOrWhiteSpace(ERPInfo.Instance.LanguageName)&& !ERPInfo.Instance.LanguageName.Equals("中文"))Localizer.Active = new XtraLocalizer();
|
||||
if (!string.IsNullOrWhiteSpace(ERPInfo.Instance.LanguageName) && !ERPInfo.Instance.LanguageName.Equals("中文"))
|
||||
{
|
||||
Localizer.Active = new XtraLocalizer();
|
||||
DevExpress.XtraGrid.Localization.GridLocalizer.Active = new XtraGridLocalizer();
|
||||
}
|
||||
|
||||
|
||||
this.SetDelphiDllParams(); // 设置调用delphi参数
|
||||
@@ -694,6 +698,9 @@ namespace Lskj.Main
|
||||
DialogResult result = frmPassword.ShowDialog();
|
||||
isStartMain = result == DialogResult.OK;
|
||||
}
|
||||
//清空临时文件
|
||||
PubUtil.ClearFilesInDirectory(PubUtil.ImageDownloadPath);
|
||||
|
||||
if (isStartMain)
|
||||
{
|
||||
// 检查自动升级
|
||||
|
||||
Reference in New Issue
Block a user