TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00
Code Issues Wiki Activity

Use Messages.DescriptionActionExpiresAt

Browse source
This commit is contained in:
Macintxsh 2023-09-28 01:00:02 +03:00
parent 62b6ae736a
commit a246b94241
Signed by: mctaylors
GPG key ID: 361D326747B61E65
5 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
locale/Messages.resx
View file

@ -636,7 +636,4 @@
<data name="ShowInfoMutedWithMuteRole" xml:space="preserve"> <data name="ShowInfoMutedWithMuteRole" xml:space="preserve">
<value>Muted with a mute role</value> <value>Muted with a mute role</value>
</data> </data>
<data name="ShowInfoUntil" xml:space="preserve">
<value>Until</value>
</data>
</root> </root>

3
locale/Messages.ru.resx
View file

@ -636,7 +636,4 @@
<data name="ShowInfoMutedWithMuteRole" xml:space="preserve"> <data name="ShowInfoMutedWithMuteRole" xml:space="preserve">
<value>Заглушен с помощью мут роли</value> <value>Заглушен с помощью мут роли</value>
</data> </data>
<data name="ShowInfoUntil" xml:space="preserve">
<value>До</value>
</data>
</root> </root>

3
locale/Messages.tt-ru.resx
View file

@ -636,7 +636,4 @@
<data name="ShowInfoMutedWithMuteRole" xml:space="preserve"> <data name="ShowInfoMutedWithMuteRole" xml:space="preserve">
<value>замучен ролькой</value> <value>замучен ролькой</value>
</data> </data>
<data name="ShowInfoUntil" xml:space="preserve">
<value>до</value>
</data>
</root> </root>

12
src/Commands/ToolsCommandGroup.cs
View file

@ -144,8 +144,8 @@ public class ToolsCommandGroup : CommandGroup
if (memberData.BannedUntil < DateTimeOffset.MaxValue) if (memberData.BannedUntil < DateTimeOffset.MaxValue)
{ {
builder.Append("- ").AppendLine(Messages.ShowInfoBanned) builder.Append("- ").AppendLine(Messages.ShowInfoBanned)
.Append(" - ").Append(Messages.ShowInfoUntil).Append(' ') .Append(" - ").AppendLine(string.Format(
.AppendLine(Markdown.Timestamp(memberData.BannedUntil.Value)); Messages.DescriptionActionExpiresAt, Markdown.Timestamp(memberData.BannedUntil.Value)));
} }
if (memberData.BannedUntil >= DateTimeOffset.MaxValue) if (memberData.BannedUntil >= DateTimeOffset.MaxValue)
@ -161,15 +161,15 @@ public class ToolsCommandGroup : CommandGroup
if (memberData.MutedUntil is not null && DateTimeOffset.UtcNow <= memberData.MutedUntil) if (memberData.MutedUntil is not null && DateTimeOffset.UtcNow <= memberData.MutedUntil)
{ {
builder.Append(" - ").AppendLine(Messages.ShowInfoMutedWithMuteRole) builder.Append(" - ").AppendLine(Messages.ShowInfoMutedWithMuteRole)
.Append(" - ").Append(Messages.ShowInfoUntil).Append(' ') .Append(" - ").Append(" - ").AppendLine(string.Format(
.AppendLine(Markdown.Timestamp(memberData.MutedUntil.Value)); Messages.DescriptionActionExpiresAt, Markdown.Timestamp(memberData.MutedUntil.Value)));
} }
if (guildMember is not null && guildMember.CommunicationDisabledUntil.IsDefined()) if (guildMember is not null && guildMember.CommunicationDisabledUntil.IsDefined())
{ {
builder.Append(" - ").AppendLine(Messages.ShowInfoMutedWithTimeout) builder.Append(" - ").AppendLine(Messages.ShowInfoMutedWithTimeout)
.Append(" - ").Append(Messages.ShowInfoUntil).Append(' ') .Append(" - ").Append(" - ").AppendLine(string.Format(
.AppendLine(Markdown.Timestamp(guildMember.CommunicationDisabledUntil.Value.Value)); Messages.DescriptionActionExpiresAt, Markdown.Timestamp(guildMember.CommunicationDisabledUntil.Value.Value)));
} }
} }
} }

6
src/Messages.Designer.cs generated
View file

@ -1085,11 +1085,5 @@ namespace Boyfriend {
return ResourceManager.GetString("ShowInfoMutedWithMuteRole", resourceCulture); return ResourceManager.GetString("ShowInfoMutedWithMuteRole", resourceCulture);
} }
} }
internal static string ShowInfoUntil {
get {
return ResourceManager.GetString("ShowInfoUntil", resourceCulture);
}
}
} }
} }