anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improve call related wording

Browse source
This commit is contained in:
fiaxh 2021-09-25 16:04:13 +02:00
parent ce227f7189
commit 69a26ebcef
2 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
main/src/ui/conversation_content_view/call_widget.vala
View file

@ -83,26 +83,19 @@ namespace Dino.Ui {
image.set_from_icon_name("dino-phone-ring-symbolic", IconSize.LARGE_TOOLBAR); image.set_from_icon_name("dino-phone-ring-symbolic", IconSize.LARGE_TOOLBAR);
if (call.direction == Call.DIRECTION_INCOMING) { if (call.direction == Call.DIRECTION_INCOMING) {
bool video = stream_interactor.get_module(Calls.IDENTITY).should_we_send_video(call); bool video = stream_interactor.get_module(Calls.IDENTITY).should_we_send_video(call);
title_label.label = video ? _("Video call incoming") : _("Call incoming"); title_label.label = video ? _("Incoming video call") : _("Incoming call");
subtitle_label.label = "Ring ring…!"; subtitle_label.label = "Ring ring…!";
incoming_call_revealer.reveal_child = true; incoming_call_revealer.reveal_child = true;
incoming_call_revealer.get_style_context().add_class("incoming"); incoming_call_revealer.get_style_context().add_class("incoming");
} else { } else {
title_label.label = _("Establishing call"); title_label.label = _("Calling…");
subtitle_label.label = "Ring ring…?"; subtitle_label.label = "Ring ring…?";
} }
break; break;
case Call.State.ESTABLISHING: case Call.State.ESTABLISHING:
image.set_from_icon_name("dino-phone-ring-symbolic", IconSize.LARGE_TOOLBAR);
if (call.direction == Call.DIRECTION_INCOMING) {
bool video = stream_interactor.get_module(Calls.IDENTITY).should_we_send_video(call);
title_label.label = video ? _("Video call establishing") : _("Call establishing");
subtitle_label.label = "Connecting…";
}
break;
case Call.State.IN_PROGRESS: case Call.State.IN_PROGRESS:
image.set_from_icon_name("dino-phone-in-talk-symbolic", IconSize.LARGE_TOOLBAR); image.set_from_icon_name("dino-phone-in-talk-symbolic", IconSize.LARGE_TOOLBAR);
title_label.label = _("Call in progress…"); title_label.label = _("Call started");
string duration = get_duration_string((new DateTime.now_utc()).difference(call.local_time)); string duration = get_duration_string((new DateTime.now_utc()).difference(call.local_time));
subtitle_label.label = _("Started %s ago").printf(duration); subtitle_label.label = _("Started %s ago").printf(duration);
@ -127,29 +120,27 @@ namespace Dino.Ui {
string duration = get_duration_string(call.end_time.difference(call.local_time)); string duration = get_duration_string(call.end_time.difference(call.local_time));
subtitle_label.label = _("Ended at %s").printf(formated_end) + subtitle_label.label = _("Ended at %s").printf(formated_end) +
" · " + " · " +
_("Lasted for %s").printf(duration); _("Lasted %s").printf(duration);
break; break;
case Call.State.MISSED: case Call.State.MISSED:
image.set_from_icon_name("dino-phone-missed-symbolic", IconSize.LARGE_TOOLBAR); image.set_from_icon_name("dino-phone-missed-symbolic", IconSize.LARGE_TOOLBAR);
title_label.label = _("Call missed"); title_label.label = _("Call missed");
string who = null;
if (call.direction == Call.DIRECTION_INCOMING) { if (call.direction == Call.DIRECTION_INCOMING) {
who = "You"; subtitle_label.label = _("You missed this call");
} else { } else {
who = Util.get_participant_display_name(stream_interactor, conversation, call.to); string who = Util.get_participant_display_name(stream_interactor, conversation, call.to);
subtitle_label.label = _("%s missed this call").printf(who);
} }
subtitle_label.label = "%s missed this call".printf(who);
break; break;
case Call.State.DECLINED: case Call.State.DECLINED:
image.set_from_icon_name("dino-phone-hangup-symbolic", IconSize.LARGE_TOOLBAR); image.set_from_icon_name("dino-phone-hangup-symbolic", IconSize.LARGE_TOOLBAR);
title_label.label = _("Call declined"); title_label.label = _("Call declined");
string who = null;
if (call.direction == Call.DIRECTION_INCOMING) { if (call.direction == Call.DIRECTION_INCOMING) {
who = "You"; subtitle_label.label = _("You declined this call");
} else { } else {
who = Util.get_participant_display_name(stream_interactor, conversation, call.to); string who = Util.get_participant_display_name(stream_interactor, conversation, call.to);
subtitle_label.label = _("%s declined this call").printf(who);
} }
subtitle_label.label = "%s declined this call".printf(who);
break; break;
case Call.State.FAILED: case Call.State.FAILED:
image.set_from_icon_name("dino-phone-hangup-symbolic", IconSize.LARGE_TOOLBAR); image.set_from_icon_name("dino-phone-hangup-symbolic", IconSize.LARGE_TOOLBAR);
@ -189,7 +180,7 @@ namespace Dino.Ui {
return ret; return ret;
} }
return _("seconds"); return _("a few seconds");
} }
private int get_next_time_change() { private int get_next_time_change() {

4
main/src/ui/conversation_titlebar/call_entry.vala
View file

@ -34,8 +34,8 @@ namespace Dino.Ui {
private StreamInteractor stream_interactor; private StreamInteractor stream_interactor;
private Conversation conversation; private Conversation conversation;
private ModelButton audio_button = new ModelButton() { text="Audio call", visible=true }; private ModelButton audio_button = new ModelButton() { text=_("Audio call"), visible=true };
private ModelButton video_button = new ModelButton() { text="Video call", visible=true }; private ModelButton video_button = new ModelButton() { text=_("Video call"), visible=true };
public CallButton(StreamInteractor stream_interactor) { public CallButton(StreamInteractor stream_interactor) {
this.stream_interactor = stream_interactor; this.stream_interactor = stream_interactor;