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

fix: cleanup a bit

Browse source 
fix: localize some strings
This commit is contained in:
ZavaruKitsu 2023-09-29 13:34:31 +03:00
parent 2dcc822e48
commit 163252b890
35 changed files with 62 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Telegram/Resources/langs/lang.strings
View file

@ -4278,6 +4278,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"ayu_ContextCopyCallbackData" = "Copy Callback Data"; "ayu_ContextCopyCallbackData" = "Copy Callback Data";
"ayu_LocalPremiumNotice" = "You're using **local** Telegram Premium.\nIt **won't** give you any benefits, except translator.\n**Enjoy the star near your nickname!**"; "ayu_LocalPremiumNotice" = "You're using **local** Telegram Premium.\nIt **won't** give you any benefits, except translator.\n**Enjoy the star near your nickname!**";
"ayu_SettingsWatermark" = "AyuGram developed and maintained by Radolyn Labs."; "ayu_SettingsWatermark" = "AyuGram developed and maintained by Radolyn Labs.";
"ayu_ConfirmationSticker" = "Do you want to send this sticker?";
"ayu_ConfirmationGIF" = "Do you want to send this GIF?";
"ayu_ConfirmationVoice" = "Do you want to send this voice message?";
"ayu_IntroAbout" = "Welcome to the AyuGram Desktop.\nIt's cool and looks less ugly."; "ayu_IntroAbout" = "Welcome to the AyuGram Desktop.\nIt's cool and looks less ugly.";
"ayu_AboutText1" = "Just a cool Telegram client based on {api_link}."; "ayu_AboutText1" = "Just a cool Telegram client based on {api_link}.";
"ayu_UpdateAyuGram" = "Update AyuGram"; "ayu_UpdateAyuGram" = "Update AyuGram";

1
Telegram/SourceFiles/apiwrap.cpp
View file

@ -3980,6 +3980,7 @@ void ApiWrap::sendMediaWithRandomId(
auto current = base::unixtime::now(); auto current = base::unixtime::now();
options.scheduled = current + 12; options.scheduled = current + 12;
} }
const auto history = item->history(); const auto history = item->history();
const auto replyTo = item->replyTo(); const auto replyTo = item->replyTo();

1
Telegram/SourceFiles/ayu/ayu_settings.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_settings.h" #include "ayu_settings.h"
#include "rpl/lifetime.h" #include "rpl/lifetime.h"

1
Telegram/SourceFiles/ayu/ayu_state.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_state.h" #include "ayu_state.h"
namespace AyuState namespace AyuState

1
Telegram/SourceFiles/ayu/database/ayu_database.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_database.h" #include "ayu_database.h"
#include "entities.h" #include "entities.h"

4
Telegram/SourceFiles/ayu/messages/ayu_messages_controller.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_messages_controller.h" #include "ayu_messages_controller.h"
#include "ayu/ayu_constants.h" #include "ayu/ayu_constants.h"
@ -59,7 +58,8 @@ void map(HistoryMessageEdition &edition, not_null<HistoryItem *> item, EditedMes
if (auto edited = item->Get<HistoryMessageEdited>()) { if (auto edited = item->Get<HistoryMessageEdited>()) {
message.editDate = edited->date; message.editDate = edited->date;
} else { }
else {
message.editDate = base::unixtime::now(); message.editDate = base::unixtime::now();
} }

1
Telegram/SourceFiles/ayu/sync/ayu_sync_controller.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_sync_controller.h" #include "ayu_sync_controller.h"
#include "ayu/libs/process.hpp" #include "ayu/libs/process.hpp"
#include "ayu/sync/models.h" #include "ayu/sync/models.h"

3
Telegram/SourceFiles/ayu/sync/utils/ayu_pipe_wrapper.cpp
View file

@ -4,10 +4,9 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_pipe_wrapper.h" #include "ayu_pipe_wrapper.h"
#include <sstream>
#include "ayu/libs/bit_converter.hpp" #include "ayu/libs/bit_converter.hpp"
#include <sstream>
using stringbuf = std::basic_stringbuf<unsigned char, std::char_traits<unsigned char>, std::allocator<unsigned char>>; using stringbuf = std::basic_stringbuf<unsigned char, std::char_traits<unsigned char>, std::allocator<unsigned char>>;

1
Telegram/SourceFiles/ayu/sync/utils/process_utils.hpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include <codecvt> #include <codecvt>
#include <iostream> #include <iostream>
#include <locale> #include <locale>

1
Telegram/SourceFiles/ayu/ui/ayu_assets.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_assets.h" #include "ayu_assets.h"
#include "ayu/ayu_settings.h" #include "ayu/ayu_settings.h"

1
Telegram/SourceFiles/ayu/ui/ayu_lottie.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_lottie.h" #include "ayu_lottie.h"
namespace AyuUi namespace AyuUi

3
Telegram/SourceFiles/ayu/ui/ayu_lottie.h
View file

@ -12,7 +12,8 @@
namespace AyuUi namespace AyuUi
{ {
class AyuLottieImpl : public AyuLottie { class AyuLottieImpl : public AyuLottie
{
std::unique_ptr<Lottie::Icon> getLottie(const QString &text) override; std::unique_ptr<Lottie::Icon> getLottie(const QString &text) override;
}; };

1
Telegram/SourceFiles/ayu/ui/boxes/confirmation_box.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "confirmation_box.h" #include "confirmation_box.h"
#include "lang_auto.h" #include "lang_auto.h"
#include "ayu/ayu_settings.h" #include "ayu/ayu_settings.h"

1
Telegram/SourceFiles/ayu/ui/boxes/edit_deleted_mark.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "edit_deleted_mark.h" #include "edit_deleted_mark.h"
#include "base/random.h" #include "base/random.h"

1
Telegram/SourceFiles/ayu/ui/boxes/edit_edited_mark.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "edit_edited_mark.h" #include "edit_edited_mark.h"
#include "base/random.h" #include "base/random.h"

1
Telegram/SourceFiles/ayu/ui/boxes/message_history_box.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "message_history_box.h" #include "message_history_box.h"
#include "ayu/ayu_settings.h" #include "ayu/ayu_settings.h"
#include "ayu/database/ayu_database.h" #include "ayu/database/ayu_database.h"

1
Telegram/SourceFiles/ayu/ui/boxes/voice_confirmation_box.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ui/boxes/confirm_box.h" #include "ui/boxes/confirm_box.h"
#include "voice_confirmation_box.h" #include "voice_confirmation_box.h"

6
Telegram/SourceFiles/ayu/ui/context_menu/context_menu.h
View file

@ -83,10 +83,10 @@
namespace AyuUi namespace AyuUi
{ {
void AddHistoryAction(not_null<Ui::PopupMenu *>menu, HistoryItem *item); void AddHistoryAction(not_null<Ui::PopupMenu *> menu, HistoryItem *item);
void AddHideMessageAction(not_null<Ui::PopupMenu *>menu, HistoryItem *item); void AddHideMessageAction(not_null<Ui::PopupMenu *> menu, HistoryItem *item);
void AddReadUntilAction(not_null<Ui::PopupMenu *>menu, HistoryItem *item); void AddReadUntilAction(not_null<Ui::PopupMenu *> menu, HistoryItem *item);
} }

13
Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.cpp
View file

@ -1,10 +1,9 @@
/* // This is the source code of AyuGram for Desktop.
This file is part of Telegram Desktop, //
the official desktop application for the Telegram messaging service. // We do not and cannot prevent the use of our code,
// but be respectful and credit the original author.
For license and copyright information please follow this link: //
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // Copyright @Radolyn, 2023
*/
#include "ayu/ui/sections/edited/edited_log_inner.h" #include "ayu/ui/sections/edited/edited_log_inner.h"
#include "history/history.h" #include "history/history.h"

13
Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_inner.h
View file

@ -1,10 +1,9 @@
/* // This is the source code of AyuGram for Desktop.
This file is part of Telegram Desktop, //
the official desktop application for the Telegram messaging service. // We do not and cannot prevent the use of our code,
// but be respectful and credit the original author.
For license and copyright information please follow this link: //
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // Copyright @Radolyn, 2023
*/
#pragma once #pragma once
#include "history/view/history_view_element.h" #include "history/view/history_view_element.h"

13
Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_item.cpp
View file

@ -1,10 +1,9 @@
/* // This is the source code of AyuGram for Desktop.
This file is part of Telegram Desktop, //
the official desktop application for the Telegram messaging service. // We do not and cannot prevent the use of our code,
// but be respectful and credit the original author.
For license and copyright information please follow this link: //
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // Copyright @Radolyn, 2023
*/
#include <ayu/database/entities.h> #include <ayu/database/entities.h>
#include "ayu/ui/sections/edited/edited_log_item.h" #include "ayu/ui/sections/edited/edited_log_item.h"

13
Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_item.h
View file

@ -1,10 +1,9 @@
/* // This is the source code of AyuGram for Desktop.
This file is part of Telegram Desktop, //
the official desktop application for the Telegram messaging service. // We do not and cannot prevent the use of our code,
// but be respectful and credit the original author.
For license and copyright information please follow this link: //
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // Copyright @Radolyn, 2023
*/
#pragma once #pragma once
#include "ayu/database/entities.h" #include "ayu/database/entities.h"

13
Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_section.cpp
View file

@ -1,10 +1,9 @@
/* // This is the source code of AyuGram for Desktop.
This file is part of Telegram Desktop, //
the official desktop application for the Telegram messaging service. // We do not and cannot prevent the use of our code,
// but be respectful and credit the original author.
For license and copyright information please follow this link: //
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // Copyright @Radolyn, 2023
*/
#include "ayu/ui/sections/edited/edited_log_section.h" #include "ayu/ui/sections/edited/edited_log_section.h"
#include "ayu/ui/sections/edited/edited_log_inner.h" #include "ayu/ui/sections/edited/edited_log_inner.h"

13
Telegram/SourceFiles/ayu/ui/sections/edited/edited_log_section.h
View file

@ -1,10 +1,9 @@
/* // This is the source code of AyuGram for Desktop.
This file is part of Telegram Desktop, //
the official desktop application for the Telegram messaging service. // We do not and cannot prevent the use of our code,
// but be respectful and credit the original author.
For license and copyright information please follow this link: //
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL // Copyright @Radolyn, 2023
*/
#pragma once #pragma once
#include "window/section_widget.h" #include "window/section_widget.h"

1
Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "settings_ayu.h" #include "settings_ayu.h"
#include "ayu/ayu_settings.h" #include "ayu/ayu_settings.h"
#include "ayu/sync/ayu_sync_controller.h" #include "ayu/sync/ayu_sync_controller.h"

2
Telegram/SourceFiles/ayu/ui/settings/settings_ayu.h
View file

@ -24,7 +24,7 @@ extern base::options::toggle StreamerMode;
namespace Settings namespace Settings
{ {
class Ayu: public Section<Ayu> class Ayu : public Section<Ayu>
{ {
public: public:
Ayu(QWidget *parent, not_null<Window::SessionController *> controller); Ayu(QWidget *parent, not_null<Window::SessionController *> controller);

1
Telegram/SourceFiles/ayu/ui/utils/ayu_profile_values.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_profile_values.h" #include "ayu_profile_values.h"
#include "ayu/ayu_settings.h" #include "ayu/ayu_settings.h"
#include "data/data_peer.h" #include "data/data_peer.h"

7
Telegram/SourceFiles/ayu/utils/ayu_mapper.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "ayu_mapper.h" #include "ayu_mapper.h"
#include "history/history_item.h" #include "history/history_item.h"
@ -15,11 +14,12 @@
namespace AyuMapper namespace AyuMapper
{ {
int mapItemFlagsToMTPFlags(not_null<HistoryItem *> item) { int mapItemFlagsToMTPFlags(not_null<HistoryItem *> item)
{
int flags = 0; int flags = 0;
const auto thread = item->topic() const auto thread = item->topic()
? (Data::Thread*)item->topic() ? (Data::Thread *)item->topic()
: item->history(); : item->history();
const auto unseen = item->unread(thread); const auto unseen = item->unread(thread);
if (unseen) { if (unseen) {
@ -80,7 +80,6 @@ int mapItemFlagsToMTPFlags(not_null<HistoryItem *> item) {
} }
return flags; return flags;
} }
} }

1
Telegram/SourceFiles/ayu/utils/telegram_helpers.cpp
View file

@ -4,7 +4,6 @@
// but be respectful and credit the original author. // but be respectful and credit the original author.
// //
// Copyright @Radolyn, 2023 // Copyright @Radolyn, 2023
#include "telegram_helpers.h" #include "telegram_helpers.h"
#include <functional> #include <functional>
#include <QTimer> #include <QTimer>

2
Telegram/SourceFiles/ayu/utils/telegram_helpers.h
View file

@ -22,4 +22,4 @@ ID getDialogIdFromPeer(not_null<PeerData *> peer);
std::pair<std::string, std::string> serializeTextWithEntities(not_null<HistoryItem *> item); std::pair<std::string, std::string> serializeTextWithEntities(not_null<HistoryItem *> item);
void MarkAsReadChatList(not_null<Dialogs::MainList *> list); void MarkAsReadChatList(not_null<Dialogs::MainList *> list);
void MarkAsReadThread(not_null<Data::Thread*> thread); void MarkAsReadThread(not_null<Data::Thread *> thread);

6
Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
View file

@ -480,11 +480,9 @@ void GifsListWidget::selectInlineResult(
if (forceSend if (forceSend
|| (media && media->image(PhotoSize::Thumbnail)) || (media && media->image(PhotoSize::Thumbnail))
|| (media && media->image(PhotoSize::Large))) { || (media && media->image(PhotoSize::Large))) {
// why photo type in GIF sender?
_photoChosen.fire({ _photoChosen.fire({
.photo = photo, .photo = photo,
.options = options }); .options = options });
} else if (!photo->loading(PhotoSize::Thumbnail)) { } else if (!photo->loading(PhotoSize::Thumbnail)) {
photo->load(PhotoSize::Thumbnail, Data::FileOrigin()); photo->load(PhotoSize::Thumbnail, Data::FileOrigin());
} }
@ -505,9 +503,9 @@ void GifsListWidget::selectInlineResult(
if (settings->gifConfirmation) if (settings->gifConfirmation)
{ {
Ui::show(Ui::MakeConfirmBox({ Ui::show(Ui::MakeConfirmBox({
.text = rpl::single(QString("Do you want to send this GIF?")), .text = tr::ayu_ConfirmationGIF(),
.confirmed = sendGIFCallback, .confirmed = sendGIFCallback,
.confirmText = rpl::single(QString("Send")), .confirmText = tr::lng_send_button()
})); }));
} }
else else

4
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View file

@ -1769,9 +1769,9 @@ void StickersListWidget::mouseReleaseEvent(QMouseEvent *e) {
}; };
Ui::show(Ui::MakeConfirmBox({ Ui::show(Ui::MakeConfirmBox({
.text = rpl::single(QString("Do you want to send this sticker?")), .text = tr::ayu_ConfirmationSticker(),
.confirmed = sendStickerCallback, .confirmed = sendStickerCallback,
.confirmText = rpl::single(QString("Send")), .confirmText = tr::lng_send_button()
})); }));
} }
else else

1
Telegram/SourceFiles/data/data_stories.cpp
View file

@ -1314,6 +1314,7 @@ void Stories::sendMarkAsReadRequest(
} }
checkQuitPreventFinished(); checkQuitPreventFinished();
}; };
const auto api = &_owner->session().api(); const auto api = &_owner->session().api();
api->request(MTPstories_ReadStories( api->request(MTPstories_ReadStories(
peer->input, peer->input,

8
Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
View file

@ -1509,9 +1509,9 @@ void VoiceRecordBar::stopRecording(StopType type) {
if (settings->voiceConfirmation) if (settings->voiceConfirmation)
{ {
Ui::show(AyuUi::MakeConfirmBox({ Ui::show(AyuUi::MakeConfirmBox({
.text = rpl::single(QString("Do you want to send voice message?")), .text = tr::ayu_ConfirmationVoice(),
.confirmed = sendVoiceCallback, .confirmed = sendVoiceCallback,
.confirmText = rpl::single(QString("Send")) .confirmText = tr::lng_send_button()
})); }));
} }
else else
@ -1602,9 +1602,9 @@ void VoiceRecordBar::requestToSendWithOptions(Api::SendOptions options) {
if (settings->voiceConfirmation) if (settings->voiceConfirmation)
{ {
Ui::show(AyuUi::MakeConfirmBox({ Ui::show(AyuUi::MakeConfirmBox({
.text = rpl::single(QString("Do you want to send voice message?")), .text = tr::ayu_ConfirmationVoice(),
.confirmed = sendVoiceCallback, .confirmed = sendVoiceCallback,
.confirmText = rpl::single(QString("Send")) .confirmText = tr::lng_send_button()
})); }));
} }
else else

3
crowdin.yml
View file

@ -1,3 +0,0 @@
files:
- source: /ayu-scripts/desktop-specific.json
translation: /ayu-scripts/translations/%two_letters_code%.json