From b0ba5edc209a8ff7e7246d13d788b0aea892b1b5 Mon Sep 17 00:00:00 2001
From: mctaylors <mctaylxrs@outlook.com>
Date: Thu, 26 Oct 2023 17:12:01 +0300
Subject: [PATCH] Add more info output to /delremind, 2nd lap
Signed-off-by: mctaylors <mctaylxrs@outlook.com>
---
locale/Messages.resx | 4 ++--
locale/Messages.ru.resx | 4 ++--
locale/Messages.tt-ru.resx | 4 ++--
src/Commands/RemindCommandGroup.cs | 11 +++++++++--
src/Messages.Designer.cs | 4 ++--
5 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/locale/Messages.resx b/locale/Messages.resx
index 31ed7b3..b0c2b7b 100644
--- a/locale/Messages.resx
+++ b/locale/Messages.resx
@@ -477,8 +477,8 @@
<data name="ReminderPosition" xml:space="preserve">
<value>Position in list: {0}</value>
</data>
- <data name="ReminderWillBeSentOn" xml:space="preserve">
- <value>The reminder will be sent on: {0}</value>
+ <data name="ReminderTime" xml:space="preserve">
+ <value>Reminder sending time: {0}</value>
</data>
<data name="ReminderText" xml:space="preserve">
<value>Reminder text: {0}</value>
diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx
index cb65749..2077c03 100644
--- a/locale/Messages.ru.resx
+++ b/locale/Messages.ru.resx
@@ -477,8 +477,8 @@
<data name="ReminderPosition" xml:space="preserve">
<value>Позиция в списке: {0}</value>
</data>
- <data name="ReminderWillBeSentOn" xml:space="preserve">
- <value>Напоминание будет отправлено: {0}</value>
+ <data name="ReminderTime" xml:space="preserve">
+ <value>Время отправления напоминания: {0}</value>
</data>
<data name="ReminderText" xml:space="preserve">
<value>Текст напоминания: {0}</value>
diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx
index b5f6ad1..9c5d487 100644
--- a/locale/Messages.tt-ru.resx
+++ b/locale/Messages.tt-ru.resx
@@ -477,8 +477,8 @@
<data name="ReminderPosition" xml:space="preserve">
<value>номер в списке: {0}</value>
</data>
- <data name="ReminderWillBeSentOn" xml:space="preserve">
- <value>я пну тебе это: {0}</value>
+ <data name="ReminderTime" xml:space="preserve">
+ <value>время отправки: {0}</value>
</data>
<data name="ReminderText" xml:space="preserve">
<value>че там в напоминалке: {0}</value>
diff --git a/src/Commands/RemindCommandGroup.cs b/src/Commands/RemindCommandGroup.cs
index 4a4f6a1..eb46d7c 100644
--- a/src/Commands/RemindCommandGroup.cs
+++ b/src/Commands/RemindCommandGroup.cs
@@ -92,7 +92,7 @@ public class RemindCommandGroup : CommandGroup
builder.Append("- ").AppendLine(string.Format(Messages.ReminderPosition, Markdown.InlineCode((i + 1).ToString())))
.Append(" - ").AppendLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
.Append(" - ")
- .AppendLine(string.Format(Messages.ReminderWillBeSentOn, Markdown.Timestamp(reminder.At)));
+ .AppendLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)));
}
var embed = new EmbedBuilder().WithSmallTitle(
@@ -155,7 +155,7 @@ public class RemindCommandGroup : CommandGroup
var builder = new StringBuilder().Append("- ").AppendLine(string.Format(
Messages.ReminderText, Markdown.InlineCode(text)))
- .Append("- ").Append(string.Format(Messages.ReminderWillBeSentOn, Markdown.Timestamp(remindAt)));
+ .Append("- ").Append(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt)));
var embed = new EmbedBuilder().WithSmallTitle(
string.Format(Messages.ReminderCreated, executor.GetTag()), executor)
@@ -210,9 +210,16 @@ public class RemindCommandGroup : CommandGroup
return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct);
}
+ var reminder = data.Reminders[index];
+
+ var description = new StringBuilder()
+ .Append("- ").AppendLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
+ .Append("- ").AppendLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)));
+
data.Reminders.RemoveAt(index);
var embed = new EmbedBuilder().WithSmallTitle(Messages.ReminderDeleted, bot)
+ .WithDescription(description.ToString())
.WithColour(ColorsList.Green)
.Build();
diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs
index 4a771d0..898528c 100644
--- a/src/Messages.Designer.cs
+++ b/src/Messages.Designer.cs
@@ -786,9 +786,9 @@ namespace Octobot {
}
}
- internal static string ReminderWillBeSentOn {
+ internal static string ReminderTime {
get {
- return ResourceManager.GetString("ReminderWillBeSentOn", resourceCulture);
+ return ResourceManager.GetString("ReminderTime", resourceCulture);
}
}