mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-22 02:07:24 +00:00
Code Issues Releases Wiki Activity

Use separate keys for add buttons.

Browse Source
This commit is contained in:
John Preston 2025-08-01 17:47:37 +04:00
parent 2ccdcf8a92
commit 45ebf7b5c6
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/langs/lang.strings
View File

@ -3789,6 +3789,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_gift_collection_empty_text" = "Add some of your gifts to this collection."; "lng_gift_collection_empty_text" = "Add some of your gifts to this collection.";
"lng_gift_collection_all" = "All Gifts"; "lng_gift_collection_all" = "All Gifts";
"lng_gift_collection_add_title" = "Add Gifts"; "lng_gift_collection_add_title" = "Add Gifts";
"lng_gift_collection_add_button" = "Add Gifts";
"lng_gift_collection_share" = "Share Collection"; "lng_gift_collection_share" = "Share Collection";
"lng_gift_collection_edit" = "Edit Name"; "lng_gift_collection_edit" = "Edit Name";
"lng_gift_collection_limit_title" = "Limit Reached"; "lng_gift_collection_limit_title" = "Limit Reached";
@ -6496,6 +6497,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_stories_album_empty_text" = "Add some of your stories to this album."; "lng_stories_album_empty_text" = "Add some of your stories to this album.";
"lng_stories_album_all" = "All Stories"; "lng_stories_album_all" = "All Stories";
"lng_stories_album_add_title" = "Add Stories"; "lng_stories_album_add_title" = "Add Stories";
"lng_stories_album_add_button" = "Add Stories";
"lng_stories_album_share" = "Share Album"; "lng_stories_album_share" = "Share Album";
"lng_stories_album_edit" = "Edit Name"; "lng_stories_album_edit" = "Edit Name";
"lng_stories_album_limit_title" = "Limit Reached"; "lng_stories_album_limit_title" = "Limit Reached";

10
Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
View File

@ -811,7 +811,7 @@ void InnerWidget::showMenuForCollection(int id) {
} }
_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons); _menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
const auto addAction = Ui::Menu::CreateAddActionCallback(_menu); const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
addAction(tr::lng_gift_collection_add_title(tr::now), [=] { addAction(tr::lng_gift_collection_add_button(tr::now), [=] {
editCollectionGifts(id); editCollectionGifts(id);
}, &st::menuIconGiftPremium); }, &st::menuIconGiftPremium);
if (const auto username = _peer->username(); !username.isEmpty()) { if (const auto username = _peer->username(); !username.isEmpty()) {
@ -1003,7 +1003,7 @@ void InnerWidget::refreshAbout() {
rpl::single(QString()), rpl::single(QString()),
st::collectionEmptyButton)), st::collectionEmptyButton)),
st::collectionEmptyAddMargin)->entity(); st::collectionEmptyAddMargin)->entity();
button->setText(tr::lng_gift_collection_add_title( button->setText(tr::lng_gift_collection_add_button(
) | rpl::map([](const QString &text) { ) | rpl::map([](const QString &text) {
return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text); return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
})); }));
@ -1108,7 +1108,7 @@ void InnerWidget::editCollectionGifts(int id) {
auto text = state->changes.value( auto text = state->changes.value(
) | rpl::map([=](const Data::GiftsUpdate &update) { ) | rpl::map([=](const Data::GiftsUpdate &update) {
return (!update.added.empty() && update.removed.empty()) return (!update.added.empty() && update.removed.empty())
? tr::lng_gift_collection_add_title() ? tr::lng_gift_collection_add_button()
: tr::lng_settings_save(); : tr::lng_settings_save();
}) | rpl::flatten_latest(); }) | rpl::flatten_latest();
box->addButton(std::move(text), [=] { box->addButton(std::move(text), [=] {
@ -1392,7 +1392,7 @@ void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
}, &st::menuIconAddToFolder); }, &st::menuIconAddToFolder);
} }
} else if (canManage) { } else if (canManage) {
addAction(tr::lng_gift_collection_add_title(tr::now), [=] { addAction(tr::lng_gift_collection_add_button(tr::now), [=] {
editCollectionGifts(collectionId); editCollectionGifts(collectionId);
}, &st::menuIconGiftPremium); }, &st::menuIconGiftPremium);
@ -1557,7 +1557,7 @@ void Widget::setupBottomButton(
rpl::single(QString()), rpl::single(QString()),
st::collectionEditBox.button); st::collectionEditBox.button);
button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform); button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
button->setText(tr::lng_gift_collection_add_title( button->setText(tr::lng_gift_collection_add_button(
) | rpl::map([](const QString &text) { ) | rpl::map([](const QString &text) {
return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text); return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
})); }));

6
Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
View File

@ -132,7 +132,7 @@ void EditAlbumBox::prepare() {
auto text = _changes.value( auto text = _changes.value(
) | rpl::map([=](const Data::StoryAlbumUpdate &update) { ) | rpl::map([=](const Data::StoryAlbumUpdate &update) {
return (!update.added.empty() && update.removed.empty()) return (!update.added.empty() && update.removed.empty())
? tr::lng_stories_album_add_title() ? tr::lng_stories_album_add_button()
: tr::lng_settings_save(); : tr::lng_settings_save();
}) | rpl::flatten_latest(); }) | rpl::flatten_latest();
addButton(std::move(text), [=] { addButton(std::move(text), [=] {
@ -607,7 +607,7 @@ void InnerWidget::refreshEmpty() {
rpl::single(QString()), rpl::single(QString()),
st::collectionEmptyButton)), st::collectionEmptyButton)),
st::collectionEmptyAddMargin)->entity(); st::collectionEmptyAddMargin)->entity();
button->setText(tr::lng_stories_album_add_title( button->setText(tr::lng_stories_album_add_button(
) | rpl::map([](const QString &text) { ) | rpl::map([](const QString &text) {
return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text); return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
})); }));
@ -738,7 +738,7 @@ void InnerWidget::showMenuForAlbum(int id) {
_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons); _menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
const auto addAction = Ui::Menu::CreateAddActionCallback(_menu); const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
if (_peer->canEditStories()) { if (_peer->canEditStories()) {
addAction(tr::lng_stories_album_add_title(tr::now), [=] { addAction(tr::lng_stories_album_add_button(tr::now), [=] {
editAlbumStories(id); editAlbumStories(id);
}, &st::menuIconStoriesSave); }, &st::menuIconStoriesSave);
} }