diff --git a/src/session/model/room/mod.rs b/src/session/model/room/mod.rs index db5f0fed..c2e966cf 100644 --- a/src/session/model/room/mod.rs +++ b/src/session/model/room/mod.rs @@ -1307,11 +1307,11 @@ impl Room { } } - pub async fn reject_invite(&self) -> MatrixResult<()> { + pub async fn decline_invite(&self) -> MatrixResult<()> { let matrix_room = self.matrix_room(); if matrix_room.state() != RoomState::Invited { - error!("Can’t reject invite, because this room isn’t an invited room"); + error!("Cannot decline invite, because this room is not an invited room"); return Ok(()); } @@ -1319,7 +1319,7 @@ impl Room { match handle.await.unwrap() { Ok(_) => Ok(()), Err(error) => { - error!("Rejecting invitation failed: {error}"); + error!("Declining invitation failed: {error}"); Err(error) } diff --git a/src/session/view/content/invite.rs b/src/session/view/content/invite.rs index 2ca0aee7..99546db0 100644 --- a/src/session/view/content/invite.rs +++ b/src/session/view/content/invite.rs @@ -25,7 +25,7 @@ mod imp { pub compact: Cell, pub room: RefCell>, pub accept_requests: RefCell>, - pub reject_requests: RefCell>, + pub decline_requests: RefCell>, pub category_handler: RefCell>, #[template_child] pub headerbar: TemplateChild, @@ -36,7 +36,7 @@ mod imp { #[template_child] pub accept_button: TemplateChild, #[template_child] - pub reject_button: TemplateChild, + pub decline_button: TemplateChild, } #[glib::object_subclass] @@ -51,8 +51,8 @@ mod imp { Self::bind_template(klass); klass.set_accessible_role(gtk::AccessibleRole::Group); - klass.install_action("invite.reject", None, move |widget, _, _| { - widget.reject(); + klass.install_action("invite.decline", None, move |widget, _, _| { + widget.decline(); }); klass.install_action("invite.accept", None, move |widget, _, _| { widget.accept(); @@ -154,13 +154,13 @@ impl Invite { match room { Some(ref room) if imp.accept_requests.borrow().contains(room) => { self.action_set_enabled("invite.accept", false); - self.action_set_enabled("invite.reject", false); + self.action_set_enabled("invite.decline", false); imp.accept_button.set_loading(true); } - Some(ref room) if imp.reject_requests.borrow().contains(room) => { + Some(ref room) if imp.decline_requests.borrow().contains(room) => { self.action_set_enabled("invite.accept", false); - self.action_set_enabled("invite.reject", false); - imp.reject_button.set_loading(true); + self.action_set_enabled("invite.decline", false); + imp.decline_button.set_loading(true); } _ => self.reset(), } @@ -178,7 +178,7 @@ impl Invite { let category = room.category(); if category == RoomType::Left { - // We rejected the invite or the invite was retracted, we should close the room + // We declined the invite or the invite was retracted, we should close the room // if it is opened. let session = room.session(); let selection = session.sidebar_list_model().selection_model(); @@ -191,7 +191,7 @@ impl Invite { if category != RoomType::Invited { let imp = obj.imp(); - imp.reject_requests.borrow_mut().remove(room); + imp.decline_requests.borrow_mut().remove(room); imp.accept_requests.borrow_mut().remove(room); obj.reset(); if let Some(category_handler) = imp.category_handler.take() { @@ -216,9 +216,9 @@ impl Invite { fn reset(&self) { let imp = self.imp(); imp.accept_button.set_loading(false); - imp.reject_button.set_loading(false); + imp.decline_button.set_loading(false); self.action_set_enabled("invite.accept", true); - self.action_set_enabled("invite.reject", true); + self.action_set_enabled("invite.decline", true); } /// Accept the invite. @@ -229,7 +229,7 @@ impl Invite { let imp = self.imp(); self.action_set_enabled("invite.accept", false); - self.action_set_enabled("invite.reject", false); + self.action_set_enabled("invite.decline", false); imp.accept_button.set_loading(true); imp.accept_requests.borrow_mut().insert(room.clone()); @@ -252,32 +252,32 @@ impl Invite { })); } - /// Reject the invite. - fn reject(&self) { + /// Decline the invite. + fn decline(&self) { let Some(room) = self.room() else { return; }; let imp = self.imp(); self.action_set_enabled("invite.accept", false); - self.action_set_enabled("invite.reject", false); - imp.reject_button.set_loading(true); - imp.reject_requests.borrow_mut().insert(room.clone()); + self.action_set_enabled("invite.decline", false); + imp.decline_button.set_loading(true); + imp.decline_requests.borrow_mut().insert(room.clone()); spawn!(clone!(@weak self as obj, @strong room => async move { - let result = room.reject_invite().await; + let result = room.decline_invite().await; if result.is_err() { toast!( obj, gettext( // Translators: Do NOT translate the content between '{' and '}', this // is a variable name. - "Failed to reject invitation for {room}. Try again later.", + "Failed to decline invitation for {room}. Try again later.", ), @room, ); - obj.imp().reject_requests.borrow_mut().remove(&room); + obj.imp().decline_requests.borrow_mut().remove(&room); obj.reset(); } })); diff --git a/src/session/view/content/invite.ui b/src/session/view/content/invite.ui index 738a0aaf..c2231e60 100644 --- a/src/session/view/content/invite.ui +++ b/src/session/view/content/invite.ui @@ -107,9 +107,9 @@ 24 24 - - _Reject - invite.reject + + _Decline + invite.decline