diff --git a/NHLGames/Controls/GameControl.vb b/NHLGames/Controls/GameControl.vb index 3f83e84..715daa7 100644 --- a/NHLGames/Controls/GameControl.vb +++ b/NHLGames/Controls/GameControl.vb @@ -74,10 +74,6 @@ Namespace Controls NHLGamesMetro.RmText.GetString($"enum{_game.GameState.ToString().ToLower()}").ToUpper()) End If - If (Not showLiveScores OrElse Not showSeriesRecord) And _game.GameType.Equals(GameTypeEnum.Series) Then - lblNotInSeason.Text = NHLGamesMetro.RmText.GetString("lblPlayoffs").ToUpper() - End If - ElseIf _game.IsOffTheAir Then lblHomeScore.Visible = showScores lblAwayScore.Visible = showScores diff --git a/NHLGames/English.Designer.vb b/NHLGames/English1.Designer.vb similarity index 95% rename from NHLGames/English.Designer.vb rename to NHLGames/English1.Designer.vb index c4613cc..1a5e777 100644 --- a/NHLGames/English.Designer.vb +++ b/NHLGames/English1.Designer.vb @@ -82,6 +82,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to English. + ''' + Friend Shared ReadOnly Property cbEnglish() As String + Get + Return ResourceManager.GetString("cbEnglish", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Français. + ''' + Friend Shared ReadOnly Property cbFrench() As String + Get + Return ResourceManager.GetString("cbFrench", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Add the NHL.tv authentication bypass line to Hosts file. ''' @@ -136,6 +154,33 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to At the beginning of the stream. + ''' + Friend Shared ReadOnly Property cbLiveReplayFeedStart() As String + Get + Return ResourceManager.GetString("cbLiveReplayFeedStart", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to When the event starts (game time). + ''' + Friend Shared ReadOnly Property cbLiveReplayGameTime() As String + Get + Return ResourceManager.GetString("cbLiveReplayGameTime", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to When the game starts (drops the puck). + ''' + Friend Shared ReadOnly Property cbLiveReplayPuckDrop() As String + Get + Return ResourceManager.GetString("cbLiveReplayPuckDrop", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Live - Today's games follow the live stream (Default). ''' @@ -488,7 +533,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Warning: Starting stream failed. Make sure your player and streamer are set or try to use a different quality in settings, so it will try another stream.. + ''' Looks up a localized string similar to Warning: Starting stream failed. Try to use a different quality in settings, so it will try another stream.. ''' Friend Shared ReadOnly Property errorStreamFailedCantRead() As String Get @@ -541,6 +586,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Intermission. + ''' + Friend Shared ReadOnly Property gameIntermission() As String + Get + Return ResourceManager.GetString("gameIntermission", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to 1st. ''' @@ -676,15 +730,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to English. - ''' - Friend Shared ReadOnly Property lblEnglish() As String - Get - Return ResourceManager.GetString("lblEnglish", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to {0}, {1} {2}, {3}. ''' @@ -694,15 +739,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to Français. - ''' - Friend Shared ReadOnly Property lblFrench() As String - Get - Return ResourceManager.GetString("lblFrench", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to French Canadian stream. ''' @@ -785,7 +821,16 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Rewind (live stream). + ''' Looks up a localized string similar to Live Replay. + ''' + Friend Shared ReadOnly Property lblLiveReplay() As String + Get + Return ResourceManager.GetString("lblLiveReplay", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Live Rewind. ''' Friend Shared ReadOnly Property lblLiveRewind() As String Get @@ -794,7 +839,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to {0} minutes behind live stream. + ''' Looks up a localized string similar to {0} minutes behind live stream ({1}). ''' Friend Shared ReadOnly Property lblLiveRewindDetails() As String Get @@ -821,7 +866,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to MPC Path. + ''' Looks up a localized string similar to MPC-HC Path. ''' Friend Shared ReadOnly Property lblMpcPath() As String Get @@ -1000,6 +1045,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Live remaining time. + ''' + Friend Shared ReadOnly Property lblShowLiveTime() As String + Get + Return ResourceManager.GetString("lblShowLiveTime", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Series record. ''' @@ -1019,7 +1073,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Live games first. + ''' Looks up a localized string similar to Order by live games first. ''' Friend Shared ReadOnly Property lblShowTodayLiveGamesFirst() As String Get @@ -1063,6 +1117,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Stream. + ''' + Friend Shared ReadOnly Property lblStream() As String + Get + Return ResourceManager.GetString("lblStream", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Streams available at game time. ''' @@ -1090,6 +1153,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Time. + ''' + Friend Shared ReadOnly Property lblTime() As String + Get + Return ResourceManager.GetString("lblTime", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to VLC Path. ''' @@ -1531,15 +1603,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to Test ability to write to this directory. - ''' - Friend Shared ReadOnly Property msgTestTxtContent() As String - Get - Return ResourceManager.GetString("msgTestTxtContent", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to {0} enable. ''' @@ -1586,7 +1649,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to NHLGames server not avaible!. + ''' Looks up a localized string similar to NHLGames server not available!. ''' Friend Shared ReadOnly Property noAppServer() As String Get @@ -1703,7 +1766,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Download MPC. + ''' Looks up a localized string similar to Download MPC-HC. ''' Friend Shared ReadOnly Property tipGetMpc() As String Get diff --git a/NHLGames/French.resx b/NHLGames/French.resx index 9e07d4a..0e434fb 100644 --- a/NHLGames/French.resx +++ b/NHLGames/French.resx @@ -153,14 +153,6 @@ Caméra zone {0} Game panel - - English - Settings tab - - - Français - Settings tab - Stream canadien français Game panel @@ -693,18 +685,6 @@ Heure Set record panel - - Au tout début du stream - Settings tab - - - Quand l'évènement débute (heure du match) - Settings tab - - - Quand le match commence (puck en jeu) - Settings tab - Rejoue en direct Settings tab @@ -717,4 +697,24 @@ Temps restant en direct Game panel + + English + Settings tab + + + Français + Settings tab + + + Au tout début du stream + Settings tab + + + Quand l'évènement débute (heure du match) + Settings tab + + + Quand le match commence (puck en jeu) + Settings tab + \ No newline at end of file diff --git a/NHLGames/NHLGames.vbproj b/NHLGames/NHLGames.vbproj index a80d952..c7d95d1 100644 --- a/NHLGames/NHLGames.vbproj +++ b/NHLGames/NHLGames.vbproj @@ -199,7 +199,7 @@ UserControl - + True True English.resx diff --git a/NHLGames/Utilities/GameFetcher.vb b/NHLGames/Utilities/GameFetcher.vb index e329f06..a5964ef 100644 --- a/NHLGames/Utilities/GameFetcher.vb +++ b/NHLGames/Utilities/GameFetcher.vb @@ -101,7 +101,7 @@ Namespace Utilities Private Shared Function SortGames(games As Game()) As List(Of Game) If NHLGamesMetro.TodayLiveGamesFirst Then Return games.OrderBy (Of Boolean)(Function(val) val.IsUnplayable). - ThenBy (Of Boolean)(Function(val) val.IsFinal). + ThenBy (Of Boolean)(Function(val) val.IsOffTheAir). ThenBy (Of Long)(Function(val) val.GameDate.Ticks).ToList() Else Return games.OrderBy (Of Boolean)(Function(val) val.IsUnplayable). diff --git a/NHLGames/res/AssemblyInfo.vb b/NHLGames/res/AssemblyInfo.vb index efbb21a..28d99ff 100644 --- a/NHLGames/res/AssemblyInfo.vb +++ b/NHLGames/res/AssemblyInfo.vb @@ -31,6 +31,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + +