mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Remove pseudo-HTML from langpacks and Ui::Text::String.

Browse Source
This commit is contained in:
John Preston
2019-06-12 22:11:41 +02:00
parent 9066acd2dd
commit ca7c50fbcd
53 changed files with 253 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/SourceFiles/boxes/confirm_box.cpp
View File

@@ -392,7 +392,7 @@ PinMessageBox::PinMessageBox(
MsgId msgId)
: _peer(peer)
, _msgId(msgId)
, _text(this, lang(lng_pinned_pin_sure), Ui::FlatLabel::InitType::Simple, st::boxLabel) {
, _text(this, lang(lng_pinned_pin_sure), st::boxLabel) {
}
void PinMessageBox::prepare() {
@@ -649,11 +649,11 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
boldName.entities.push_back(
{ EntityType::Bold, 0, boldName.text.size() });
if (canRevokeOutgoingCount == 1) {
result.description = lng_selected_unsend_about_user_one__generic<TextWithEntities>(
result.description = lng_selected_unsend_about_user_one__rich(
lt_user,
boldName);
} else {
result.description = lng_selected_unsend_about_user__generic<TextWithEntities>(
result.description = lng_selected_unsend_about_user__rich(
lt_count,
canRevokeOutgoingCount,
lt_user,
@@ -911,12 +911,12 @@ ConfirmInviteBox::~ConfirmInviteBox() = default;
ConfirmDontWarnBox::ConfirmDontWarnBox(
QWidget*,
const QString &text,
rpl::producer<TextWithEntities> text,
const QString &checkbox,
const QString &confirm,
FnMut<void(bool)> callback)
: _confirm(confirm)
, _content(setupContent(text, checkbox, std::move(callback))) {
, _content(setupContent(std::move(text), checkbox, std::move(callback))) {
}
void ConfirmDontWarnBox::prepare() {
@@ -926,15 +926,14 @@ void ConfirmDontWarnBox::prepare() {
}
not_null<Ui::RpWidget*> ConfirmDontWarnBox::setupContent(
const QString &text,
rpl::producer<TextWithEntities> text,
const QString &checkbox,
FnMut<void(bool)> callback) {
const auto result = Ui::CreateChild<Ui::VerticalLayout>(this);
result->add(
object_ptr<Ui::FlatLabel>(
result,
text,
Ui::FlatLabel::InitType::Rich,
std::move(text),
st::boxLabel),
st::boxPadding);
const auto control = result->add(