Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager
This commit is contained in:
commit
0665672626
7
.gitignore
vendored
7
.gitignore
vendored
@ -154,8 +154,5 @@ $RECYCLE.BIN/
|
||||
|
||||
# Mac desktop service store files
|
||||
.DS_Store
|
||||
/app/.vs/DD_PM_WINDREAM/v15/Server/sqlite3
|
||||
/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3/storage.ide-wal
|
||||
/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3/storage.ide-shm
|
||||
/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3/storage.ide
|
||||
/app/.vs/DD_PM_WINDREAM/v16/Server/sqlite3/db.lock
|
||||
|
||||
.vs
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1320,8 +1320,7 @@ Public Class frmMain
|
||||
End Try
|
||||
Try
|
||||
If USER_LANGUAGE <> "" Then
|
||||
Dim cultureInfo As System.Globalization.CultureInfo
|
||||
cultureInfo = New System.Globalization.CultureInfo(USER_LANGUAGE)
|
||||
Dim cultureInfo As New System.Globalization.CultureInfo(USER_LANGUAGE)
|
||||
cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
|
||||
Thread.CurrentThread.CurrentCulture = cultureInfo
|
||||
Thread.CurrentThread.CurrentUICulture = cultureInfo
|
||||
@ -1329,7 +1328,7 @@ Public Class frmMain
|
||||
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
|
||||
End If
|
||||
Catch ex As Exception
|
||||
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
Try
|
||||
InitializeComponent()
|
||||
@ -1339,8 +1338,6 @@ Public Class frmMain
|
||||
LOGGER.Error(ex)
|
||||
LOGGER.Info($"Error in InitializeComponent: {ex.Message}")
|
||||
End Try
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub TimerReminder_Tick(sender As Object, e As EventArgs) Handles TimerReminder.Tick
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user