void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Support markup in TranslateBox.

Browse source 
Server will translate with markup for premium users.
This commit is contained in:
John Preston 2023-02-07 20:06:16 +04:00
parent 663e89662b
commit 2f1c674401
2 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Telegram/SourceFiles/boxes/translate_box.cpp
View file

@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "boxes/translate_box.h" #include "boxes/translate_box.h"
#include "api/api_text_entities.h" // Api::EntitiesToMTP / EntitiesFromMTP.
#include "core/application.h" #include "core/application.h"
#include "core/core_settings.h" #include "core/core_settings.h"
#include "core/ui_integration.h" #include "core/ui_integration.h"
@ -22,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "ui/boxes/choose_language_box.h" #include "ui/boxes/choose_language_box.h"
#include "ui/effects/loading_element.h" #include "ui/effects/loading_element.h"
#include "ui/layers/generic_box.h" #include "ui/layers/generic_box.h"
#include "ui/text/text_utilities.h"
#include "ui/toasts/common_toasts.h" #include "ui/toasts/common_toasts.h"
#include "ui/painter.h" #include "ui/painter.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
@ -111,12 +113,6 @@ void TranslateBox(
const auto state = box->lifetime().make_state<State>(&peer->session()); const auto state = box->lifetime().make_state<State>(&peer->session());
state->to = ChooseTranslateTo(peer->owner().history(peer)); state->to = ChooseTranslateTo(peer->owner().history(peer));
text.entities = ranges::views::all(
text.entities
) | ranges::views::filter([](const EntityInText &e) {
return e.type() != EntityType::Spoiler;
}) | ranges::to<EntitiesInText>();
if (!IsServerMsgId(msgId)) { if (!IsServerMsgId(msgId)) {
msgId = 0; msgId = 0;
} }
@ -212,8 +208,14 @@ void TranslateBox(
return id.locale().textDirection() == Qt::RightToLeft; return id.locale().textDirection() == Qt::RightToLeft;
})))); }))));
const auto showText = [=](const QString &text) { const auto showText = [=](TextWithEntities text) {
translated->entity()->setText(text); const auto label = translated->entity();
label->setMarkedText(
text,
Core::MarkedTextContext{
.session = &peer->session(),
.customEmojiRepaint = [=] { label->update(); },
});
translated->show(anim::type::instant); translated->show(anim::type::instant);
loading->hide(anim::type::instant); loading->hide(anim::type::instant);
}; };
@ -231,16 +233,28 @@ void TranslateBox(
? MTPVector<MTPTextWithEntities>() ? MTPVector<MTPTextWithEntities>()
: MTP_vector<MTPTextWithEntities>(1, MTP_textWithEntities( : MTP_vector<MTPTextWithEntities>(1, MTP_textWithEntities(
MTP_string(text.text), MTP_string(text.text),
MTP_vector<MTPMessageEntity>()))), Api::EntitiesToMTP(
&peer->session(),
text.entities,
Api::ConvertOption::SkipLocal)))),
MTP_string(to.twoLetterCode()) MTP_string(to.twoLetterCode())
)).done([=](const MTPmessages_TranslatedText &result) { )).done([=](const MTPmessages_TranslatedText &result) {
const auto &data = result.data(); const auto &data = result.data();
const auto &list = data.vresult().v; const auto &list = data.vresult().v;
showText(list.isEmpty() if (list.isEmpty()) {
? tr::lng_translate_box_error(tr::now) showText(
: qs(list.front().data().vtext())); Ui::Text::Italic(tr::lng_translate_box_error(tr::now)));
} else {
showText(TextWithEntities{
.text = qs(list.front().data().vtext()),
.entities = Api::EntitiesFromMTP(
&peer->session(),
list.front().data().ventities().v),
});
}
}).fail([=](const MTP::Error &error) { }).fail([=](const MTP::Error &error) {
showText(tr::lng_translate_box_error(tr::now)); showText(
Ui::Text::Italic(tr::lng_translate_box_error(tr::now)));
}).send(); }).send();
}; };
state->to.value() | rpl::start_with_next(send, box->lifetime()); state->to.value() | rpl::start_with_next(send, box->lifetime());

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit e053e04607653c8a304c72ff901a8e628dd94dbf Subproject commit 1b9b1739649ddf942937a6b9a1a22933070e5ecc