Skip to content

Commit 55c8ec9

Browse files
committed
Change indentation and comments
1 parent 396f1f6 commit 55c8ec9

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

src/GHOSTbackup/GHOSTbackup.Helpers/BackupHelper.vb

+11-5
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,18 @@ Public Class BackupHelper
312312
Dim SavegamesList As String() = Directory.GetFiles(BackupDir, "*.save")
313313
If SavegamesList.Length > 0 Then
314314
'If a subdirectory contains save files add it to the list and to the backup restore dialog's dropdown menu
315-
'Also append their creation date and time, and if a backup was created less than 1 hour ago display "Created X minutes ago" instead
316315
BackupDirs.Add(BackupDir)
317-
CustomMsgBox.BackupDirsDropdownCombo.Items.Add(BackupDir.Substring(BackupDir.LastIndexOf(Path.DirectorySeparatorChar) + 1) & Localization.GetString("msgbox_dropdown_backup_timestamp_created") &
318-
If(Directory.GetCreationTime(BackupDir) > Now.AddHours(-1),
319-
Regex.Replace(Now.Subtract(Directory.GetCreationTime(BackupDir)).ToString("mm") & Localization.GetString("msgbox_dropdown_backup_timestamp"), "^[0-9]{2}\ [a-z\ ]+$", Localization.GetString("msgbox_dropdown_backup_timestamp_00")),
320-
Directory.GetCreationTime(BackupDir).ToString("F", CultureInfo.CurrentUICulture)))
316+
'Append backup creation timestamp
317+
'If it's been created less than an hour ago, append "Created XX minutes ago" and if it's been created less than a minute ago replace "00 minutes ago" with "Less than a minute ago"
318+
CustomMsgBox.BackupDirsDropdownCombo.Items.Add(
319+
BackupDir.Substring(BackupDir.LastIndexOf(Path.DirectorySeparatorChar) + 1) &
320+
Localization.GetString("msgbox_dropdown_backup_timestamp_created") &
321+
If(
322+
Directory.GetCreationTime(BackupDir) > Now.AddHours(-1),
323+
Regex.Replace(Now.Subtract(Directory.GetCreationTime(BackupDir)).ToString("mm") & Localization.GetString("msgbox_dropdown_backup_timestamp"), "^[0-9]{2}\ [a-z\ ]+$", Localization.GetString("msgbox_dropdown_backup_timestamp_00")),
324+
Directory.GetCreationTime(BackupDir).ToString("F", CultureInfo.CurrentUICulture)
325+
)
326+
)
321327
End If
322328
Next
323329

src/GHOSTbackup/GHOSTbackup.Helpers/Settings.vb

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Public Class Settings
4141
'Create default settings
4242
Dim ConfigData As IniData = New IniData()
4343
'GHOST Buster
44-
ConfigData("GHOSTbackup")("Language") = "0" 'See Localization.SetLanguage() function
44+
ConfigData("GHOSTbackup")("Language") = "0" 'See Localization.GetLanguage() function
4545
ConfigData("GHOSTbackup")("ConfirmExit") = "True"
4646
ConfigData("GHOSTbackup")("ConfirmBackupInterruption") = "False"
4747
ConfigData("GHOSTbackup")("CheckForUpdates") = "False"

src/GHOSTbackup/GHOSTbackup.UI/Notification.vb

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Public Class Notification
3131
Notification.MessageLabel.Text = Message
3232

3333
'Display the notification
34+
'Use My.Forms.Show because msbuild complains
3435
My.Forms.Notification.Show()
3536
End Sub
3637

0 commit comments

Comments
 (0)