Merge pull request #146 from jwallet/jwallet

1.1.1.1 time zone fix
MLBAMGames · Jan 3, 2018 · c5de520 · c5de520
2 parents 9529415 + 85f10cc
commit c5de520
Show file tree

Hide file tree

Showing 17 changed files with 287 additions and 4 deletions.
diff --git a/NHLGames/Controls/CalendarControl.Designer.vb b/NHLGames/Controls/CalendarControl.Designer.vb
diff --git a/NHLGames/Controls/CalendarControl.resx b/NHLGames/Controls/CalendarControl.resx
@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="tt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
diff --git a/NHLGames/Controls/CalendarControl.vb b/NHLGames/Controls/CalendarControl.vb
@@ -11,6 +11,10 @@ Namespace Controls
         Public Sub ReloadCal(ByVal ldate As Date, ByVal selected As Integer)
             _currentDate = ldate
             lnkToday.Text = NHLGamesMetro.RmText.GetString("lnkCalendarToday")
+            tt.SetToolTip(btnBeforeMonth, NHLGamesMetro.RmText.GetString("tipMonthLeft"))
+            tt.SetToolTip(_btnBeforeYear, NHLGamesMetro.RmText.GetString("tipYearUp"))
+            tt.SetToolTip(btnNextMonth, NHLGamesMetro.RmText.GetString("tipMonthRight"))
+            tt.SetToolTip(btnNextYear, NHLGamesMetro.RmText.GetString("tipYearDown"))
             Clearall()
             lblDate.Text = CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(ldate.Month) & $" " & ldate.Year.ToString
             Sun.Text = DateHelper.GetFormattedWeek(0)

diff --git a/NHLGames/Controls/GameControl.vb b/NHLGames/Controls/GameControl.vb
@@ -31,6 +31,7 @@ Namespace Controls
 
             If _game.IsLive Then
                 picLive.Visible = True
+                tt.SetToolTip(picLive, NHLGamesMetro.RmText.GetString("tipLiveGame"))
                 lblGameStatus.Visible = Not showLiveScores
                 lblHomeScore.Visible = showLiveScores
                 lblAwayScore.Visible = showLiveScores

diff --git a/NHLGames/English.Designer.vb b/NHLGames/English.Designer.vb
diff --git a/NHLGames/English.resx b/NHLGames/English.resx
@@ -785,4 +785,44 @@
     <value>NHLGames server not avaible!</value>
     <comment>Message</comment>
   </data>
+  <data name="tipCalendar" xml:space="preserve">
+    <value>Calendar</value>
+    <comment>Games tab</comment>
+  </data>
+  <data name="tipRefresh" xml:space="preserve">
+    <value>Refresh</value>
+    <comment>Games tab</comment>
+  </data>
+  <data name="tipDayRight" xml:space="preserve">
+    <value>Day after</value>
+    <comment>Games tab</comment>
+  </data>
+  <data name="tipDayLeft" xml:space="preserve">
+    <value>Day before</value>
+    <comment>Games tab</comment>
+  </data>
+  <data name="tipMonthLeft" xml:space="preserve">
+    <value>Month before</value>
+    <comment>Calendar</comment>
+  </data>
+  <data name="tipMonthRight" xml:space="preserve">
+    <value>Month after</value>
+    <comment>Calendar</comment>
+  </data>
+  <data name="tipYearDown" xml:space="preserve">
+    <value>Year before</value>
+    <comment>Calendar</comment>
+  </data>
+  <data name="tipYearUp" xml:space="preserve">
+    <value>Year after</value>
+    <comment>Calendar</comment>
+  </data>
+  <data name="tipHelp" xml:space="preserve">
+    <value>Documentation</value>
+    <comment>Main</comment>
+  </data>
+  <data name="tipLiveGame" xml:space="preserve">
+    <value>Live</value>
+    <comment>Game panel</comment>
+  </data>
 </root>
diff --git a/NHLGames/French.resx b/NHLGames/French.resx
@@ -573,4 +573,44 @@
     <value>NHLGames serveur non disponible!</value>
     <comment>Message</comment>
   </data>
+  <data name="tipCalendar" xml:space="preserve">
+    <value>Calendrier</value>
+    <comment>Games tab</comment>
+  </data>
+  <data name="tipRefresh" xml:space="preserve">
+    <value>Rafraîchir</value>
+    <comment>Games tab</comment>
+  </data>
+  <data name="tipDayRight" xml:space="preserve">
+    <value>Jour suivant</value>
+    <comment>Games tab</comment>
+  </data>
+  <data name="tipDayLeft" xml:space="preserve">
+    <value>Jour précédent</value>
+    <comment>Games tab</comment>
+  </data>
+  <data name="tipHelp" xml:space="preserve">
+    <value>Documentation</value>
+    <comment>Main</comment>
+  </data>
+  <data name="tipMonthLeft" xml:space="preserve">
+    <value>Mois précédent</value>
+    <comment>Calendar</comment>
+  </data>
+  <data name="tipMonthRight" xml:space="preserve">
+    <value>Mois suivant</value>
+    <comment>Calendar</comment>
+  </data>
+  <data name="tipYearDown" xml:space="preserve">
+    <value>Année précédente</value>
+    <comment>Calendar</comment>
+  </data>
+  <data name="tipYearUp" xml:space="preserve">
+    <value>Année suivante</value>
+    <comment>Calendar</comment>
+  </data>
+  <data name="tipLiveGame" xml:space="preserve">
+    <value>En direct</value>
+    <comment>Game panel</comment>
+  </data>
 </root>
diff --git a/NHLGames/French1.Designer.vb b/NHLGames/French1.Designer.vb
diff --git a/NHLGames/NHLGamesMetro.Designer.vb b/NHLGames/NHLGamesMetro.Designer.vb
diff --git a/NHLGames/Objects/GameStream.vb b/NHLGames/Objects/GameStream.vb
@@ -30,7 +30,7 @@ Namespace Objects
             PlayBackId = stream.Property("mediaPlaybackId").Value.ToString()
             Me.Type = type
             CdnParameter = ApplicationSettings.Read(Of GameWatchArguments)(SettingsEnum.DefaultWatchArgs, New GameWatchArguments).Cdn
-            GameUrl = String.Format("http://{0}/m3u8/{1}/{2}", NHLGamesMetro.HostName, Game.GameDate.ToLocalTime().ToString("yyyy-MM-dd"), PlayBackId)
+            GameUrl = String.Format("http://{0}/m3u8/{1}/{2}", NHLGamesMetro.HostName, DateHelper.GetPacificTime(Game.GameDate).ToString("yyyy-MM-dd"), PlayBackId)
             Title = $"{Game.AwayAbbrev} vs {Game.HomeAbbrev} on {Network}"
         End Sub