diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 607d83829..47c9a5c40 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -216,6 +216,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_code_desc" = "We have sent you a message with activation\ncode to your phone. Please enter it below."; "lng_code_from_telegram" = "Please enter the code you've just received\nin your previous **Telegram** app."; "lng_code_no_telegram" = "Send code via SMS"; +"lng_code_register_phone" = "If you already signed up for Telegram, please enter the code which was sent to your mobile app.\n\nIf you haven’t signed up yet, please register from your phone or tablet first."; "lng_code_call" = "Telegram will call you in {minutes}:{seconds}"; "lng_code_calling" = "Requesting a call from Telegram..."; "lng_code_called" = "Telegram dialed your number"; @@ -1898,7 +1899,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_payments_password_description" = "Your card {card} is on file. To pay with this card, please enter your 2-Step-Verification password."; "lng_payments_password_submit" = "Pay"; "lng_payments_tips_label" = "Tip (Optional)"; -"lng_payments_tips_add" = "Add Tip"; "lng_payments_tips_box_title" = "Add Tip"; "lng_payments_tips_max" = "Max possible tip amount: {amount}"; diff --git a/Telegram/SourceFiles/intro/intro_code.cpp b/Telegram/SourceFiles/intro/intro_code.cpp index 5fe6a35de..ab5a82531 100644 --- a/Telegram/SourceFiles/intro/intro_code.cpp +++ b/Telegram/SourceFiles/intro/intro_code.cpp @@ -397,17 +397,18 @@ void CodeWidget::submit() { } void CodeWidget::noTelegramCode() { - if (_noTelegramCodeRequestId) { - return; - } - _noTelegramCodeRequestId = api().request(MTPauth_ResendCode( - MTP_string(getData()->phone), - MTP_bytes(getData()->phoneHash) - )).done([=](const MTPauth_SentCode &result) { - noTelegramCodeDone(result); - }).fail([=](const MTP::Error &error) { - noTelegramCodeFail(error); - }).handleFloodErrors().send(); + Ui::show(Box(tr::lng_code_register_phone(tr::now))); + //if (_noTelegramCodeRequestId) { + // return; + //} + //_noTelegramCodeRequestId = api().request(MTPauth_ResendCode( + // MTP_string(getData()->phone), + // MTP_bytes(getData()->phoneHash) + //)).done([=](const MTPauth_SentCode &result) { + // noTelegramCodeDone(result); + //}).fail([=](const MTP::Error &error) { + // noTelegramCodeFail(error); + //}).handleFloodErrors().send(); } void CodeWidget::noTelegramCodeDone(const MTPauth_SentCode &result) {