Browse Source

Fix format! in gettext occurences

merge-requests/1327/merge
Kai A. Hiller 5 years ago
parent
commit
9bcb0a5d1b
  1. 5
      src/login.rs
  2. 6
      src/session/room/room.rs
  3. 4
      src/session/room_list.rs

5
src/login.rs

@ -229,10 +229,7 @@ impl fmt::Display for LoginError {
LoginError::UserDeactivated => gettext("⚠ The user is deactivated."),
LoginError::LimitExceeded(retry_ms) => {
if let Some(ms) = retry_ms {
gettext(format!(
"⚠ Exceeded rate limit, retry in {} seconds.",
ms.as_secs()
))
gettext!("⚠ Exceeded rate limit, retry in {} seconds.", ms.as_secs())
} else {
gettext("⚠ Exceeded rate limit, try again later.")
}

6
src/session/room/room.rs

@ -368,7 +368,11 @@ impl Room {
let error = Error::new(
error,
clone!(@weak obj => @default-return None, move |_| {
let error_message = gettext(format!("Failed to move <widget> from {} to {}.", previous_category.to_string(), category.to_string()));
let error_message = gettext!(
"Failed to move <widget> from {} to {}.",
previous_category.to_string(),
category.to_string()
);
let room_pill = Pill::new();
room_pill.set_room(Some(obj.clone()));
let label = LabelWithWidgets::new(&error_message, vec![room_pill]);

4
src/session/room_list.rs

@ -335,7 +335,9 @@ impl RoomList {
let error = Error::new(
error,
clone!(@strong obj => move |_| {
let error_message = gettext(format!("Failed to join room {}. Try again later.", identifier));
let error_message = gettext!(
"Failed to join room {}. Try again later.", identifier
);
let error_label = gtk::LabelBuilder::new().label(&error_message).wrap(true).build();
Some(error_label.upcast())
}),

Loading…
Cancel
Save