diff --git a/Boyfriend/Boyfriend.cs b/Boyfriend/Boyfriend.cs index 837b962..cdbbe7d 100644 --- a/Boyfriend/Boyfriend.cs +++ b/Boyfriend/Boyfriend.cs @@ -21,12 +21,13 @@ public static class Boyfriend { }; private static readonly List> ActivityList = new() { - Tuple.Create(new Game("Masayoshi Minoshima (ft. nomico) - Bad Apple!!", ActivityType.Listening), new TimeSpan(0, 3, 40)), + Tuple.Create(new Game("Masayoshi Minoshima (ft. nomico) - Bad Apple!!", ActivityType.Listening), + new TimeSpan(0, 3, 40)), Tuple.Create(new Game("Xi - Blue Zenith", ActivityType.Listening), new TimeSpan(0, 4, 16)), Tuple.Create(new Game("Kurokotei - Scattered Faith", ActivityType.Listening), new TimeSpan(0, 8, 21)), Tuple.Create(new Game("Splatoon 3 - Candy-Coated Rocks", ActivityType.Listening), new TimeSpan(0, 2, 39)), Tuple.Create(new Game("RetroSpecter - Genocide", ActivityType.Listening), new TimeSpan(0, 5, 52)), - Tuple.Create(new Game("Dimrain47 - At the Speed of Light", ActivityType.Listening), new TimeSpan(0, 4, 10)) + Tuple.Create(new Game("beatMARIO - Night of Knights", ActivityType.Listening), new TimeSpan(0, 4, 10)) }; public static readonly DiscordSocketClient Client = new(Config); diff --git a/Boyfriend/Messages.Designer.cs b/Boyfriend/Messages.Designer.cs index 3c9b01c..9aea677 100644 --- a/Boyfriend/Messages.Designer.cs +++ b/Boyfriend/Messages.Designer.cs @@ -1,7 +1,6 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -376,7 +375,7 @@ namespace Boyfriend { } /// - /// Looks up a localized string similar to Event {0} has completed! Duration: {1}. + /// Looks up a localized string similar to Event {0} has completed! Duration:{1}. /// internal static string EventCompleted { get { diff --git a/Boyfriend/Messages.resx b/Boyfriend/Messages.resx index d6bcd39..56fea2d 100644 --- a/Boyfriend/Messages.resx +++ b/Boyfriend/Messages.resx @@ -274,7 +274,7 @@ Event {0} is cancelled!{1} - Event {0} has completed! Duration: {1} + Event {0} has completed! Duration:{1} ever diff --git a/Boyfriend/Messages.ru.resx b/Boyfriend/Messages.ru.resx index 25197b6..e6a8836 100644 --- a/Boyfriend/Messages.ru.resx +++ b/Boyfriend/Messages.ru.resx @@ -274,7 +274,7 @@ Событие {0} отменено!{1} - Событие {0} завершено! Продолжительность: {1} + Событие {0} завершено! Продолжительность:{1} всегда diff --git a/Boyfriend/Messages.tt-ru.resx b/Boyfriend/Messages.tt-ru.resx index 3439ed2..8d57c67 100644 --- a/Boyfriend/Messages.tt-ru.resx +++ b/Boyfriend/Messages.tt-ru.resx @@ -274,7 +274,7 @@ квест {0} отменен!{1} - квест {0} завершен! все это длилось {1} + квест {0} завершен! все это длилось{1} всегда diff --git a/Boyfriend/Utils.cs b/Boyfriend/Utils.cs index e9e34f0..b08eca3 100644 --- a/Boyfriend/Utils.cs +++ b/Boyfriend/Utils.cs @@ -119,7 +119,7 @@ public static partial class Utils { public static string GetHumanizedTimeOffset(TimeSpan span) { return span.TotalSeconds > 0 - ? $" {span.Humanize(2, minUnit: TimeUnit.Second, maxUnit: TimeUnit.Month, culture: Messages.Culture)}" + ? $" {span.Humanize(2, minUnit: TimeUnit.Second, maxUnit: TimeUnit.Month, culture: Messages.Culture.Name.Contains("RU") ? CultureInfoCache["ru"] : Messages.Culture)}" : Messages.Ever; }