Update rust-i18n major version

This commit is contained in:
2024-02-11 10:45:12 +01:00
parent 383cedac2d
commit 7d026341bc
5 changed files with 46 additions and 16 deletions

View File

@@ -253,7 +253,7 @@ async fn set_reminders(bot: Throttle<Bot>, msg: Message, db: Database) -> Result
.intersperse("\n".to_string())
.collect::<String>();
let text = t!("messages.reminders_set", locale = &chat.locale) + &reminders_text;
let text = t!("messages.reminders_set", locale = &chat.locale).into_owned() + &reminders_text;
bot.send_message(msg.chat.id, text)
.reply_to_message_id(msg.id)

View File

@@ -63,11 +63,8 @@ impl Reminder {
delta = self.delta.num_hours();
};
let pluralization = if delta == 1 { "one" } else { "other" };
let delta_string = t!(
&format!("reminders.{}.{}", delta_mode, pluralization),
locale = locale.as_ref(),
delta = delta,
);
let delta_key = format!("reminders.{}.{}", delta_mode, pluralization);
let delta_string = t!(&delta_key, locale = locale.as_ref(), delta = delta,);
let message_key = if self.delta.num_hours() > 0 {
"reminders.delta"
} else {
@@ -77,7 +74,8 @@ impl Reminder {
message_key,
locale = locale.as_ref(),
delta_text = &delta_string,
);
)
.into_owned();
if let Some(time) = self.time {
result += &t!(
"reminders.time",

View File

@@ -172,7 +172,7 @@ async fn check_task(bot: &Throttle<Bot>, db: &Database) -> Result<()> {
if now >= appointment.start {
reminder = Some(ReminderMessage {
time: appointment.start,
text: t!("messages.starting_now", locale = &chat_info.locale),
text: t!("messages.starting_now", locale = &chat_info.locale).into_owned(),
});
} else {
let most_recent_active_reminder = chat_info
@@ -226,7 +226,7 @@ async fn check_task(bot: &Throttle<Bot>, db: &Database) -> Result<()> {
);
reminder = Some(ReminderMessage {
time: reminder_date_time,
text: reminder_text,
text: reminder_text.into_owned(),
});
}
}