AppStd/ClipboardWatcher
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Cultures not applying, remove LIB_STANDARD dependency

Browse Source
This commit is contained in:
Jonathan Jenne
2023-05-15 16:34:08 +02:00
parent 227f514afa
commit 9a7ea86f2e
16 changed files with 10325 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/DD_Clipboard_Searcher/frmMain.vb
View File

@@ -31,23 +31,24 @@ Public Class frmMain
Dim splash As New frmSplash()
splash.ShowDialog()
Try
If USER_LANGUAGE <> "" Then
Dim cultureInfo As New System.Globalization.CultureInfo(USER_LANGUAGE)
cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
Thread.CurrentThread.CurrentCulture = cultureInfo
Thread.CurrentThread.CurrentUICulture = cultureInfo
CultureInfo.DefaultThreadCurrentCulture = cultureInfo
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
End If
Catch ex As Exception
Logger.Error(ex)
End Try
' === Language is set in ClassInit ===
'Try
' If USER_LANGUAGE <> "" Then
' Dim cultureInfo As New CultureInfo(USER_LANGUAGE)
' cultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
' Thread.CurrentThread.CurrentCulture = cultureInfo
' Thread.CurrentThread.CurrentUICulture = cultureInfo
' CultureInfo.DefaultThreadCurrentCulture = cultureInfo
' CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
' End If
'Catch ex As Exception
' Logger.Error(ex)
'End Try
' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent()
_DataASorDB = New ClassDataASorDB(modCurrent.LogConfig)
_DataASorDB = New ClassDataASorDB(LogConfig)
End Sub
Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -57,24 +58,35 @@ Public Class frmMain
End If
lblUser.Caption = USER_USERNAME
If ERROR_INIT <> "INVALID USER" Then
' === Language is set in ClassInit ===
'If ERROR_INIT <> "INVALID USER" Then
'Dim Culture = CultureInfo.CreateSpecificCulture(USER_LANGUAGE)
Dim Culture As New CultureInfo(USER_LANGUAGE)
Culture.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
' Try
' Logger.Debug("Setting thread Culture..")
' The following line provides localization for data formats.
Thread.CurrentThread.CurrentCulture = Culture
' The following line provides localization for the application's user interface.
Thread.CurrentThread.CurrentUICulture = Culture
' 'Dim Culture = CultureInfo.CreateSpecificCulture(USER_LANGUAGE)
' Dim Culture As New CultureInfo(USER_LANGUAGE)
' Culture.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
' Set this culture as the default culture for all threads in this application.
' Note: The following properties are supported in the .NET Framework 4.5+
CultureInfo.DefaultThreadCurrentCulture = Culture
CultureInfo.DefaultThreadCurrentUICulture = Culture
' Logger.Debug("Culture object for language [{0}] created")
' ' The following line provides localization for data formats.
' Thread.CurrentThread.CurrentCulture = Culture
' ' The following line provides localization for the application's user interface.
' Thread.CurrentThread.CurrentUICulture = Culture
End If
' ' Set this culture as the default culture for all threads in this application.
' ' Note: The following properties are supported in the .NET Framework 4.5+
' CultureInfo.DefaultThreadCurrentCulture = Culture
' CultureInfo.DefaultThreadCurrentUICulture = Culture
' Logger.Debug("Thread Culture set to [{0}]", Culture.Name)
' Catch ex As Exception
' Logger.Warn("Could not set Thread Culture!")
' Logger.Error(ex)
' End Try
'End If
If Database.DBInitialized = True Then
If ERROR_INIT <> "" Then
@@ -494,13 +506,13 @@ Public Class frmMain
tsmiChangeState.Image = My.Resources.control_start_blue
tsmiChangeState.Text = S.Clipboard_Watcher_starten
MONITORING_ACTIVE = False
NotifyIconMain.ShowBalloonTip(30000, "Search Flow", S.Clipboard_Watcher_wurde_deaktiviert_, ToolTipIcon.Info)
NotifyIconMain.ShowBalloonTip(30000, "EasyFlow", S.Clipboard_Watcher_wurde_deaktiviert_, ToolTipIcon.Info)
Else
tsmiChangeState.Image = My.Resources.StatusAnnotations_Stop_16xLG
tsmiChangeState.Tag = "stop"
tsmiChangeState.Text = S.Clipboard_Watcher_stoppen
MONITORING_ACTIVE = True
NotifyIconMain.ShowBalloonTip(30000, "Search Flow", S.Clipboard_Watcher_wurde_wieder_aktiviert_, ToolTipIcon.Info)
NotifyIconMain.ShowBalloonTip(30000, "EasyFlow", S.Clipboard_Watcher_wurde_wieder_aktiviert_, ToolTipIcon.Info)
End If
End Sub