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

Use tr:: instead of lang().

Browse Source
This commit is contained in:
John Preston
2019-06-19 17:09:03 +02:00
parent d3ca6b96a1
commit 87fc066e67
168 changed files with 1905 additions and 1744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
Telegram/SourceFiles/boxes/connection_box.cpp
View File

@@ -308,13 +308,13 @@ void ProxyRow::paintEvent(QPaintEvent *e) {
lt_ping,
QString::number(_view.ping));
case State::Checking:
return lang(lng_proxy_checking);
return tr::lng_proxy_checking(tr::now);
case State::Connecting:
return lang(lng_proxy_connecting);
return tr::lng_proxy_connecting(tr::now);
case State::Online:
return lang(lng_proxy_online);
return tr::lng_proxy_online(tr::now);
case State::Unavailable:
return lang(lng_proxy_unavailable);
return tr::lng_proxy_unavailable(tr::now);
}
Unexpected("State in ProxyRow::paintEvent.");
}();
@@ -409,20 +409,20 @@ void ProxyRow::showMenu() {
Fn<void()> callback) {
return _menu->addAction(text, std::move(callback));
};
addAction(lang(lng_proxy_menu_edit), [=] {
addAction(tr::lng_proxy_menu_edit(tr::now), [=] {
_editClicks.fire({});
});
if (_view.supportsShare) {
addAction(lang(lng_proxy_edit_share), [=] {
addAction(tr::lng_proxy_edit_share(tr::now), [=] {
_shareClicks.fire({});
});
}
if (_view.deleted) {
addAction(lang(lng_proxy_menu_restore), [=] {
addAction(tr::lng_proxy_menu_restore(tr::now), [=] {
_restoreClicks.fire({});
});
} else {
addAction(lang(lng_proxy_menu_delete), [=] {
addAction(tr::lng_proxy_menu_delete(tr::now), [=] {
_deleteClicks.fire({});
});
}
@@ -483,7 +483,7 @@ void ProxiesBox::setupContent() {
_tryIPv6 = inner->add(
object_ptr<Ui::Checkbox>(
inner,
lang(lng_connection_try_ipv6),
tr::lng_connection_try_ipv6(tr::now),
Global::TryIPv6()),
st::proxyTryIPv6Padding);
_proxySettings
@@ -494,28 +494,28 @@ void ProxiesBox::setupContent() {
inner,
_proxySettings,
ProxyData::Settings::Disabled,
lang(lng_proxy_disable)),
tr::lng_proxy_disable(tr::now)),
st::proxyUsePadding);
inner->add(
object_ptr<Ui::Radioenum<ProxyData::Settings>>(
inner,
_proxySettings,
ProxyData::Settings::System,
lang(lng_proxy_use_system_settings)),
tr::lng_proxy_use_system_settings(tr::now)),
st::proxyUsePadding);
inner->add(
object_ptr<Ui::Radioenum<ProxyData::Settings>>(
inner,
_proxySettings,
ProxyData::Settings::Enabled,
lang(lng_proxy_use_custom)),
tr::lng_proxy_use_custom(tr::now)),
st::proxyUsePadding);
_proxyForCalls = inner->add(
object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
inner,
object_ptr<Ui::Checkbox>(
inner,
lang(lng_proxy_use_for_calls),
tr::lng_proxy_use_for_calls(tr::now),
Global::UseProxyForCalls()),
style::margins(
0,
@@ -533,7 +533,7 @@ void ProxiesBox::setupContent() {
inner,
object_ptr<Ui::FlatLabel>(
inner,
lang(lng_proxy_about),
tr::lng_proxy_about(tr::now),
st::boxDividerLabel),
st::proxyAboutPadding),
style::margins(0, 0, 0, st::proxyRowPadding.top()));
@@ -650,7 +650,7 @@ void ProxiesBox::createNoRowsLabel() {
_noRows->height());
const auto label = Ui::CreateChild<Ui::FlatLabel>(
_noRows.get(),
lang(lng_proxy_description),
tr::lng_proxy_description(tr::now),
st::proxyEmptyListLabel);
_noRows->widthValue(
) | rpl::start_with_next([=](int width) {
@@ -777,13 +777,13 @@ void ProxyBox::setupTypes() {
_content,
object_ptr<Ui::FlatLabel>(
_content,
lang(lng_proxy_sponsor_warning),
tr::lng_proxy_sponsor_warning(tr::now),
st::boxDividerLabel),
st::proxyAboutSponsorPadding)));
}
void ProxyBox::setupSocketAddress(const ProxyData &data) {
addLabel(_content, lang(lng_proxy_address_label));
addLabel(_content, tr::lng_proxy_address_label(tr::now));
const auto address = _content->add(
object_ptr<Ui::FixedHeightWidget>(
_content,
@@ -815,7 +815,7 @@ void ProxyBox::setupCredentials(const ProxyData &data) {
_content,
object_ptr<Ui::VerticalLayout>(_content)));
const auto credentials = _credentials->entity();
addLabel(credentials, lang(lng_proxy_credentials_optional));
addLabel(credentials, tr::lng_proxy_credentials_optional(tr::now));
_user = credentials->add(
object_ptr<Ui::InputField>(
credentials,
@@ -848,7 +848,7 @@ void ProxyBox::setupMtprotoCredentials(const ProxyData &data) {
_content,
object_ptr<Ui::VerticalLayout>(_content)));
const auto mtproto = _mtprotoCredentials->entity();
addLabel(mtproto, lang(lng_proxy_credentials));
addLabel(mtproto, tr::lng_proxy_credentials(tr::now));
auto secretWrap = object_ptr<Ui::RpWidget>(mtproto);
_secret = Ui::CreateChild<Ui::HexInput>(
@@ -958,9 +958,9 @@ void ProxiesBoxController::ShowApplyConfirmation(
lt_port,
QString::number(port))
+ (proxy.type == Type::Mtproto
? "\n\n" + lang(lng_proxy_sponsor_warning)
? "\n\n" + tr::lng_proxy_sponsor_warning(tr::now)
: QString());
*box = Ui::show(Box<ConfirmBox>(text, lang(lng_sure_enable), [=] {
*box = Ui::show(Box<ConfirmBox>(text, tr::lng_sure_enable(tr::now), [=] {
auto &proxies = Global::RefProxiesList();
if (ranges::find(proxies, proxy) == end(proxies)) {
proxies.push_back(proxy);
@@ -1372,7 +1372,7 @@ void ProxiesBoxController::share(const ProxyData &proxy) {
+ ((proxy.type == Type::Mtproto && !proxy.password.isEmpty())
? "&secret=" + proxy.password : "");
QApplication::clipboard()->setText(link);
Ui::Toast::Show(lang(lng_username_copied));
Ui::Toast::Show(tr::lng_username_copied(tr::now));
}
ProxiesBoxController::~ProxiesBoxController() {