diff --git a/EnvelopeGenerator.Form/frmSplashScreen.vb b/EnvelopeGenerator.Form/frmSplashScreen.vb index e3ec2748..ec2f3c3a 100644 --- a/EnvelopeGenerator.Form/frmSplashScreen.vb +++ b/EnvelopeGenerator.Form/frmSplashScreen.vb @@ -36,10 +36,10 @@ Public Class frmSplashScreen ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString ConfigManager.Save() - MsgBox(Resources.Envelope.Database_configured, MsgBoxStyle.Critical, Text) + MsgBox("Database configured ", MsgBoxStyle.Critical, Text) Application.Restart() Else - MsgBox(Resources.Envelope.No_database_configured, MsgBoxStyle.Critical, Text) + MsgBox("No database configured", MsgBoxStyle.Critical, Text) Application.Exit() End If End If @@ -54,7 +54,7 @@ Public Class frmSplashScreen }) Catch ex As Exception Logger.Error(ex) - MsgBox(Resources.Envelope.Error_during_initialization & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, MsgBoxStyle.Critical, Text) + MsgBox("Error during initialization" & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, MsgBoxStyle.Critical, Text) Application.Exit() End Try @@ -63,19 +63,19 @@ Public Class frmSplashScreen Private Sub Worker_DoWork(sender As Object, e As DoWorkEventArgs) Handles Worker.DoWork MyState = DirectCast(e.Argument, State) - Worker.ReportProgress(20, Resources.Envelope.Initializing_database) + Worker.ReportProgress(20, "Initializing database") Thread.Sleep(300) Dim oConnectionString = MSSQLServer.DecryptConnectionString(MyState.Config.ConnectionString) MyState.Database = New MSSQLServer(MyState.LogConfig, oConnectionString) If MyState.Database?.DBInitialized = False Then - Throw New ApplicationException(Resources.Envelope.Could_not_connect_to_database) + Throw New ApplicationException("Could not connect to database") Else DB_DD_ECM = MyState.Database End If - Worker.ReportProgress(40, Resources.Envelope.Initializing_Configuration) + Worker.ReportProgress(40, "Initializing Configuration") Thread.Sleep(300) Dim oSQl = "SELECT * FROM TBDD_SQL_COMMANDS" @@ -104,7 +104,7 @@ Public Class frmSplashScreen DEF_TF_ENABLED = MyState.DbConfig.Default_TFA_Enabled DEF_TF_ENABLED_WITH_PHONE = MyState.DbConfig.Default_TFA_WithPhone ' DOCUMENT_PATH_MOVE_AFTSEND = oState.DbConfig.DOCUMENT_PATH_MOVE_AFTSEND - Worker.ReportProgress(60, Resources.Envelope.Initializing_User) + Worker.ReportProgress(60, "Initializing User") Dim oKey = MyState.Database.GetScalarValue("SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' and ACTIVE = 1") Thread.Sleep(300) If oKey.ToString <> String.Empty Then @@ -115,7 +115,7 @@ Public Class frmSplashScreen Dim oUser = MyUserModel.SelectUser() - Worker.ReportProgress(80, Resources.Envelope.Initializing_Rights) + Worker.ReportProgress(80, "Initializing Rights") Thread.Sleep(300) ' This checks for module access and admin rights @@ -124,7 +124,7 @@ Public Class frmSplashScreen End If MYUSER = oUser - Worker.ReportProgress(100, Resources.Envelope.Starting_Application) + Worker.ReportProgress(100, "Starting Application") Thread.Sleep(300) MyState.User = oUser @@ -157,7 +157,7 @@ Public Class frmSplashScreen CultureInfo.DefaultThreadCurrentUICulture = oCultureInfo If oState.User.HasAccess = False Then - Dim msg As String = String.Format(Resources.Envelope.User_unknown, Environment.UserName) + Dim msg As String = String.Format("User {0} is unknown. Please contact your administrator. Application will close!", Environment.UserName) Throw New ApplicationException(msg) End If @@ -175,7 +175,7 @@ Public Class frmSplashScreen Close() Catch ex As Exception Logger.Error(ex) - MsgBox(Resources.Envelope.Error_during_initialization & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, MsgBoxStyle.Critical, Text) + MsgBox("Error during initialization" & ex.Message & vbNewLine & vbNewLine & ex.StackTrace, MsgBoxStyle.Critical, Text) Application.Exit() End Try End Sub