Skip to content

Commit

Permalink
updated languages alt naming
Browse files Browse the repository at this point in the history
  • Loading branch information
Shin0by committed Aug 24, 2022
1 parent 2f538e3 commit f5c0730
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 10 deletions.
3 changes: 3 additions & 0 deletions StarCitizen Helper/Controls/WL_Modification.resx
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@
<metadata name="List_AltSubLocal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="List_AltSubLocal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="List_SubLocal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Expand Down
18 changes: 17 additions & 1 deletion StarCitizen Helper/Controls/WL_Pack.vb
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Public Class WL_Pack
Private sPath_Folder_Meta As String = Nothing
Private sName_File_Meta As String = Nothing
Private sPath_File_Meta As String = Nothing
Private sPath_File_AltLocal As String = Nothing

Private hashGitList As String = Nothing
Private hashCurrentList As String = Nothing
Expand Down Expand Up @@ -129,6 +130,17 @@ Public Class WL_Pack
End Set
End Property

Public Property Property_FilePath_AltLocal() As String
Get
Return Me.sPath_File_AltLocal
End Get
Set(ByVal Value As String)
Me.sPath_File_AltLocal = Value
End Set
End Property



Public Property Property_LocalizationList() As List(Of String)
Get
Return Me.lLocal_LangList
Expand Down Expand Up @@ -700,8 +712,12 @@ Fin: RaiseEvent _Event_ListGit_List_Change_After()
If Me.Property_FilePath_Config Is Nothing Then Exit Sub

Dim _SYSTEM As New Class_INI
Dim _ALTLANG As New Class_INI
_SYSTEM.SkipInvalidLines = True
_ALTLANG.SkipInvalidLines = True

_SYSTEM._FSO = Me.Property_FilePath_Config
_ALTLANG._FSO = Me.Property_FilePath_AltLocal

Me.Property_LocalizationDefault = _SYSTEM._GET_VALUE(Nothing, "g_language", Nothing, _VARS.utf8NoBom).Value.Trim
If Len(Me.Property_LocalizationDefault) > 0 Then
Expand All @@ -710,7 +726,7 @@ Fin: RaiseEvent _Event_ListGit_List_Change_After()
For Each elem As String In Split(_SYSTEM._GET_VALUE(Nothing, "sys_languages", Me.Property_LocalizationDefault, _VARS.utf8NoBom).Value, ",")
Dim temp As String = Trim(elem)
LocalList.Add(temp)
AltLocalList.Add(_SYSTEM._GET_VALUE(Nothing, temp, temp, _VARS.utf8NoBom).Value)
AltLocalList.Add(_ALTLANG._GET_VALUE(Nothing, temp, temp, _VARS.utf8NoBom).Value)
Next
Me.Property_AltLocalizationList = AltLocalList
Me.Property_LocalizationList = LocalList
Expand Down
29 changes: 23 additions & 6 deletions StarCitizen Helper/Modules/Module_INI.vb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Imports IniParser
Imports IniParser.Parser
Imports SC.Class_FSO



Module Module_INI
Expand All @@ -12,11 +14,15 @@ Module Module_INI
Public Key As String
Public Value As String
Public SkipInvalidLines As Boolean
Public NewLineStr As String = Nothing

End Class
Class Class_INI
Private Config = New FileIniDataParser()
Private Config As FileIniDataParser = New FileIniDataParser()
Private FilePath As String = Nothing
Public SkipInvalidLines As Boolean = False
Public NewLineStr = vbCrLf
Public FSO As New Class_FSO

Public WriteOnly Property _FSO() As String
Set(ByVal Value As String)
Expand Down Expand Up @@ -64,14 +70,25 @@ Module Module_INI
result.Key = Key
result.Value = DefaultValue
result.SkipInvalidLines = Me.SkipInvalidLines
result.NewLineStr = Me.NewLineStr
result.ErrDescription = _LANG._Get("File_MSG_SectionNotFound", Section, _APP.configFullPath)

Me.Config.parser.configuration.skipinvalidlines = Me.SkipInvalidLines
Dim Data As IniParser.Model.IniData = Me.Config.ReadFile(Me.FilePath)
Data = Me.Config.ReadFile(Me.FilePath, Encoding)
Data.Configuration.SkipInvalidLines = Me.SkipInvalidLines

Try
Me.Config.Parser.Configuration.SkipInvalidLines = Me.SkipInvalidLines
Me.Config.Parser.Configuration.NewLineStr = Me.NewLineStr


Dim fileData As String = FSO._ReadTextFile(Me.FilePath, Encoding)
fileData = Replace(fileData, vbCrLf, vbLf)
fileData = Replace(fileData, vbCr, vbLf)
fileData = Replace(fileData, vbLf, vbCrLf)
Dim Data As IniParser.Model.IniData = Me.Config.Parser.Parse(fileData)

'Dim Data As IniParser.Model.IniData = Me.Config.ReadFile(Me.FilePath, Encoding)
Data.Configuration.NewLineStr = Me.NewLineStr
Data.Configuration.SkipInvalidLines = Me.SkipInvalidLines


If Section IsNot Nothing Then
If Data.Sections.Count > 0 Then
Dim DataSection As IniParser.Model.SectionDataCollection = Data.Sections
Expand Down
1 change: 1 addition & 0 deletions StarCitizen Helper/Modules/Module_MAIN.vb
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ Module Module_MAIN
MAIN_THREAD.WL_Mod._Update(2)

'Build list and select localization in Mod Tab
MAIN_THREAD.WL_Pack.Property_FilePath_AltLocal = _FSO._CombinePath(MAIN_THREAD.WL_Mod.Property_GameRootFolderPath, MAIN_THREAD.WL_Mod.Property_GameModFolderName, "languages.ini")
MAIN_THREAD.WL_Pack.GetLocals()
LoadUserCfgFile()

Expand Down
4 changes: 2 additions & 2 deletions StarCitizen Helper/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("1.8.21.124")>
<Assembly: AssemblyFileVersion("1.8.21.124")>
<Assembly: AssemblyVersion("1.8.21.125")>
<Assembly: AssemblyFileVersion("1.8.21.125")>
Binary file modified install/package/Input/StarCitizen Helper.exe
Binary file not shown.
Binary file modified install/package/Output/mysetup.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion install/package/install.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[Setup]
AppVersion=1.8.21.124
AppVersion=1.8.21.125
AppName=StarCitizen Helper
DefaultDirName={userappdata}\StarCitizen Helper
DefaultGroupName=StarCitizen Helper
Expand Down
Binary file modified install/setup.exe
Binary file not shown.

0 comments on commit f5c0730

Please sign in to comment.