Improve languages box and language local storing.

Use current language native name instead of lng_language_name value.

Telegram/Resources/langs/lang.strings

@@ -292,7 +292,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_section_general" = "General";
 "lng_settings_change_lang" = "Change language";
 "lng_languages" = "Languages";
-"lng_languages_unofficial" = "Unofficial languages";
 "lng_sure_save_language" = "Telegram will restart in order to change language";
 "lng_settings_update_automatically" = "Update automatically";
 "lng_settings_install_beta" = "Install beta versions";
@@ -1790,7 +1789,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_export_about_left_chats" = "Below are the supergroups and channels from this export that you've left or where you were banned.\n\nNote that when you leave a channel or supergroup you've created, you have the option to either delete it, or simply leave (in case you want to rejoin later, or keep the community alive despite not being a member).";
 
 "lng_language_switch_title" = "Change language?";
-"lng_language_switch_about" = "You are about to apply a custom language pack {lang_name} that is {percent}% complete.\n\nThis will translate the entire interface. You can suggest corrections in the {link}.\n\nYou can change your language back at any time in Settings.";
+"lng_language_switch_about_official" = "You are about to apply a language pack {lang_name} that is {percent}% complete.\n\nThis will translate the entire interface. You can suggest corrections in the {link}.\n\nYou can change your language back at any time in Settings.";
+"lng_language_switch_about_unofficial" = "You are about to apply a custom language pack {lang_name} that is {percent}% complete.\n\nThis will translate the entire interface. You can suggest corrections in the {link}.\n\nYou can change your language back at any time in Settings.";
 "lng_language_switch_link" = "translation panel";
 "lng_language_switch_apply" = "Change";
 "lng_language_not_found" = "Sorry, this language pack doesn't exist.";

Telegram/SourceFiles/boxes/language_box.cpp

@@ -51,6 +51,7 @@ public:
 	int selected() const;
 	void setSelected(int selected);
 	rpl::producer<bool> hasSelection() const;
+	rpl::producer<bool> isEmpty() const;
 
 	void activateSelected();
 	rpl::producer<Language> activations() const;
@@ -155,6 +156,7 @@ private:
 
 	rpl::event_stream<bool> _hasSelection;
 	rpl::event_stream<Language> _activations;
+	rpl::event_stream<bool> _isEmpty;
 
 };
 
@@ -162,8 +164,8 @@ class Content : public Ui::RpWidget {
 public:
 	Content(
 		QWidget *parent,
-		const Languages &official,
+		const Languages &recent,
-		const Languages &unofficial);
+		const Languages &official);
 
 	Ui::ScrollToRequest jump(int rows);
 	void filter(const QString &query);
@@ -172,8 +174,8 @@ public:
 
 private:
 	void setupContent(
-		const Languages &official,
+		const Languages &recent,
-		const Languages &unofficial);
+		const Languages &official);
 
 	Fn<Ui::ScrollToRequest(int rows)> _jump;
 	Fn<void(const QString &query)> _filter;
@@ -182,6 +184,50 @@ private:
 
 };
 
+std::pair<Languages, Languages> PrepareLists() {
+	const auto projId = [](const Language &language) {
+		return language.id;
+	};
+	const auto current = Lang::LanguageIdOrDefault(Lang::Current().id());
+	auto official = Lang::CurrentCloudManager().languageList();
+	auto recent = Local::readRecentLanguages();
+	ranges::stable_partition(recent, [&](const Language &language) {
+		return (language.id == current);
+	});
+	if (recent.empty() || recent.front().id != current) {
+		if (ranges::find(official, current, projId) == end(official)) {
+			const auto generate = [&] {
+				const auto name = (current == "#custom")
+					? "Custom lang pack"
+					: Lang::Current().name();
+				return Language{
+					current,
+					QString(),
+					QString(),
+					name,
+					Lang::Current().nativeName()
+				};
+			};
+			const auto i = ranges::find(official, current, projId);
+			recent.insert(begin(recent), generate());
+		}
+	}
+	auto i = begin(official), e = end(official);
+	const auto remover = [&](const Language &language) {
+		auto k = ranges::find(i, e, language.id, projId);
+		if (k == e) {
+			return false;
+		}
+		for (; k != i; --k) {
+			std::swap(*k, *(k - 1));
+		}
+		++i;
+		return true;
+	};
+	recent.erase(ranges::remove_if(recent, remover), end(recent));
+	return { std::move(recent), std::move(official) };
+}
+
 Rows::Rows(
 	QWidget *parent,
 	const Languages &data,
@@ -273,7 +319,8 @@ void Rows::mouseMoveEvent(QMouseEvent *e) {
 
 void Rows::mousePressEvent(QMouseEvent *e) {
 	updatePressed(_selected);
-	if (_pressed.has_value()) {
+	if (_pressed.has_value()
+		&& !rowBySelection(_pressed).menuToggleForceRippled) {
 		addRipple(_pressed, e->pos());
 	}
 }
@@ -310,7 +357,7 @@ void Rows::ensureRippleBySelection(Selection selected) {
 }
 
 void Rows::ensureRippleBySelection(not_null<Row*> row, Selection selected) {
-	auto &ripple = rippleBySelection(row, _pressed);
+	auto &ripple = rippleBySelection(row, selected);
 	if (ripple) {
 		return;
 	}
@@ -326,6 +373,13 @@ void Rows::ensureRippleBySelection(not_null<Row*> row, Selection selected) {
 }
 
 void Rows::mouseReleaseEvent(QMouseEvent *e) {
+	if (_menu && e->button() == Qt::LeftButton) {
+		if (_menu->isHiding()) {
+			_menu->otherEnter();
+		} else {
+			_menu->otherLeave();
+		}
+	}
 	const auto pressed = _pressed;
 	updatePressed({});
 	if (pressed == _selected) {
@@ -526,6 +580,8 @@ void Rows::filter(const QString &query) {
 
 	resizeToWidth(width());
 	Ui::SendPendingMoveResizeEvents(this);
+
+	_isEmpty.fire(count() == 0);
 }
 
 int Rows::count() const {
@@ -571,6 +627,12 @@ rpl::producer<bool> Rows::hasSelection() const {
 	return _hasSelection.events();
 }
 
+rpl::producer<bool> Rows::isEmpty() const {
+	return _isEmpty.events_starting_with(
+		count() == 0
+	) | rpl::distinct_until_changed();
+}
+
 void Rows::repaint(Selection selected) {
 	selected.match([](std::nullopt_t) {
 	}, [&](const auto &data) {
@@ -607,8 +669,10 @@ void Rows::updateSelected(Selection selected) {
 
 void Rows::updatePressed(Selection pressed) {
 	if (_pressed.has_value()) {
-		if (const auto ripple = rippleBySelection(_pressed).get()) {
+		if (!rowBySelection(_pressed).menuToggleForceRippled) {
-			ripple->lastStop();
+			if (const auto ripple = rippleBySelection(_pressed).get()) {
+				ripple->lastStop();
+			}
 		}
 	}
 	_pressed = pressed;
@@ -779,84 +843,61 @@ void Rows::paintEvent(QPaintEvent *e) {
 
 Content::Content(
 	QWidget *parent,
-	const Languages &official,
+	const Languages &recent,
-	const Languages &unofficial)
+	const Languages &official)
 : RpWidget(parent) {
-	setupContent(official, unofficial);
+	setupContent(recent, official);
 }
 
 void Content::setupContent(
-		const Languages &official,
+		const Languages &recent,
-		const Languages &unofficial) {
+		const Languages &official) {
+	using namespace rpl::mappers;
+
 	const auto current = Lang::LanguageIdOrDefault(Lang::Current().id());
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
-	const auto primary = content->add(
+	const auto add = [&](const Languages &list, bool areOfficial) {
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+		if (list.empty()) {
-			content,
+			return (Rows*)nullptr;
-			object_ptr<Ui::VerticalLayout>(content)));
+		}
-	const auto container = primary->entity();
+		const auto wrap = content->add(
-	container->add(object_ptr<Ui::FixedHeightWidget>(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-		container,
+				content,
-		st::boxVerticalMargin));
+				object_ptr<Ui::VerticalLayout>(content)));
-	const auto main = container->add(object_ptr<Rows>(
+		const auto inner = wrap->entity();
-		container,
-		official,
-		current,
-		true));
-	container->add(object_ptr<Ui::FixedHeightWidget>(
-		container,
-		st::boxVerticalMargin));
-	const auto additional = !unofficial.empty()
-		? content->add(object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			content,
-			object_ptr<Ui::VerticalLayout>(content)))
-		: nullptr;
-	const auto inner = additional ? additional->entity() : nullptr;
-	const auto divider = inner
-		? inner->add(object_ptr<Ui::SlideWrap<BoxContentDivider>>(
-			inner,
-			object_ptr<BoxContentDivider>(inner)))
-		: nullptr;
-	const auto label = inner
-		? inner->add(
-			object_ptr<Ui::FlatLabel>(
-				inner,
-				Lang::Viewer(lng_languages_unofficial),
-				st::passportFormHeader),
-			st::passportFormHeaderPadding)
-		: nullptr;
-	const auto other = inner
-		? inner->add(object_ptr<Rows>(inner, unofficial, current, false))
-		: nullptr;
-	if (inner) {
 		inner->add(object_ptr<Ui::FixedHeightWidget>(
 			inner,
 			st::boxVerticalMargin));
-	}
+		const auto rows = inner->add(object_ptr<Rows>(
+			inner,
+			list,
+			current,
+			areOfficial));
+		inner->add(object_ptr<Ui::FixedHeightWidget>(
+			inner,
+			st::boxVerticalMargin));
+
+		rows->isEmpty() | rpl::start_with_next([=](bool empty) {
+			wrap->toggle(!empty, anim::type::instant);
+		}, rows->lifetime());
+
+		return rows;
+	};
+	const auto main = add(recent, false);
+	const auto divider = content->add(
+		object_ptr<Ui::SlideWrap<BoxContentDivider>>(
+			content,
+			object_ptr<BoxContentDivider>(content)));
+	const auto other = add(official, true);
 	Ui::ResizeFitChild(this, content);
 
-	using namespace rpl::mappers;
+	if (main && other) {
-	auto nonempty = [](Rows *rows) {
-		return rows->heightValue(
-		) | rpl::map(
-			_1 > 0
-		) | rpl::distinct_until_changed(
-		);
-	};
-	nonempty(main) | rpl::start_with_next([=](bool nonempty) {
-		primary->toggle(nonempty, anim::type::instant);
-	}, main->lifetime());
-	if (other) {
-		nonempty(other) | rpl::start_with_next([=](bool nonempty) {
-			additional->toggle(nonempty, anim::type::instant);
-		}, other->lifetime());
-
 		rpl::combine(
-			nonempty(main),
+			main->isEmpty(),
-			nonempty(other),
+			other->isEmpty(),
-			_1 && _2
+			_1 || _2
-		) | rpl::start_with_next([=](bool nonempty) {
+		) | rpl::start_with_next([=](bool empty) {
-			divider->toggle(nonempty, anim::type::instant);
+			divider->toggle(!empty, anim::type::instant);
 		}, divider->lifetime());
 
 		const auto excludeSelections = [](Rows *a, Rows *b) {
@@ -869,27 +910,40 @@ void Content::setupContent(
 		};
 		excludeSelections(main, other);
 		excludeSelections(other, main);
+	} else {
+		divider->hide(anim::type::instant);
 	}
 
+	const auto count = [](Rows *widget) {
+		return widget ? widget->count() : 0;
+	};
+	const auto selected = [](Rows *widget) {
+		return widget ? widget->selected() : -1;
+	};
 	const auto rowsCount = [=] {
-		return main->count() + (other ? other->count() : 0);
+		return count(main) + count(other);
 	};
 	const auto selectedIndex = [=] {
-		if (const auto index = main->selected(); index >= 0) {
+		if (const auto index = selected(main); index >= 0) {
 			return index;
+		} else if (const auto index = selected(other); index >= 0) {
+			return count(main) + index;
 		}
-		const auto index = other ? other->selected() : -1;
+		return -1;
-		return (index >= 0) ? (main->count() + index) : -1;
 	};
 	const auto setSelectedIndex = [=](int index) {
-		const auto count = main->count();
+		const auto first = count(main);
-		if (index >= count) {
+		if (index >= first) {
-			main->setSelected(-1);
+			if (main) {
+				main->setSelected(-1);
+			}
 			if (other) {
-				other->setSelected(index - count);
+				other->setSelected(index - first);
 			}
 		} else {
-			main->setSelected(index);
+			if (main) {
+				main->setSelected(index);
+			}
 			if (other) {
 				other->setSelected(-1);
 			}
@@ -904,11 +958,9 @@ void Content::setupContent(
 				result.ymin + shift,
 				result.ymax + shift);
 		};
-		if (const auto index = main->selected(); index >= 0) {
+		if (const auto index = selected(main); index >= 0) {
 			return coords(main, index);
-		}
+		} else if (const auto index = selected(other); index >= 0) {
-		const auto index = other ? other->selected() : -1;
-		if (index >= 0) {
 			return coords(other, index);
 		}
 		return Ui::ScrollToRequest(-1, -1);
@@ -930,14 +982,21 @@ void Content::setupContent(
 		}
 		return selectedCoords();
 	};
-	_filter = [=](const QString &query) {
+	const auto filter = [](Rows *widget, const QString &query) {
-		main->filter(query);
+		if (widget) {
-		if (other) {
+			widget->filter(query);
-			other->filter(query);
 		}
 	};
+	_filter = [=](const QString &query) {
+		filter(main, query);
+		filter(other, query);
+	};
 	_activations = [=] {
-		if (!other) {
+		if (!main && !other) {
+			return rpl::never<Language>() | rpl::type_erased();
+		} else if (!main) {
+			return other->activations();
+		} else if (!other) {
 			return main->activations();
 		}
 		return rpl::merge(
@@ -949,7 +1008,9 @@ void Content::setupContent(
 		if (selectedIndex() < 0) {
 			_jump(1);
 		}
-		main->activateSelected();
+		if (main) {
+			main->activateSelected();
+		}
 		if (other) {
 			other->activateSelected();
 		}
@@ -981,49 +1042,11 @@ void LanguageBox::prepare() {
 
 	const auto select = createMultiSelect();
 
-	const auto current = Lang::LanguageIdOrDefault(Lang::Current().id());
-	auto official = Lang::CurrentCloudManager().languageList();
-	if (official.empty()) {
-		official.push_back({ "en", {}, {}, "English", "English" });
-	}
-	ranges::stable_partition(official, [&](const Language &language) {
-		return (language.id == current);
-	});
-	ranges::stable_partition(official, [&](const Language &language) {
-		return (language.id == current) || (language.id == "en");
-	});
-	const auto foundInOfficial = [&](const Language &language) {
-		return ranges::find(official, language.id, [](const Language &v) {
-			return v.id;
-		}) != official.end();
-	};
-	auto unofficial = Local::readRecentLanguages();
-	unofficial.erase(
-		ranges::remove_if(
-			unofficial,
-			foundInOfficial),
-		end(unofficial));
-	ranges::stable_partition(unofficial, [&](const Language &language) {
-		return (language.id == current);
-	});
-	if (official.front().id != current
-		&& (unofficial.empty() || unofficial.front().id != current)) {
-		const auto name = (current == "#custom")
-			? "Custom lang pack"
-			: lang(lng_language_name);
-		unofficial.push_back({
-			current,
-			QString(),
-			QString(),
-			name,
-			lang(lng_language_name)
-		});
-	}
-
 	using namespace rpl::mappers;
 
+	const auto [recent, official] = PrepareLists();
 	const auto inner = setInnerWidget(
-		object_ptr<Content>(this, official, unofficial),
+		object_ptr<Content>(this, recent, official),
 		st::boxLayerScroll,
 		select->height());
 	inner->resizeToWidth(st::boxWidth);
@@ -1053,10 +1076,7 @@ void LanguageBox::prepare() {
 		// "#custom" is applied each time it's passed to switchToLanguage().
 		// So we check that the language really has changed.
 		if (language.id != Lang::Current().id()) {
-			Lang::CurrentCloudManager().switchToLanguage(
+			Lang::CurrentCloudManager().switchToLanguage(language);
-				language.id,
-				language.pluralId,
-				language.baseId);
 		}
 	}, inner->lifetime());
 

Telegram/SourceFiles/intro/introwidget.cpp

@@ -623,7 +623,7 @@ void Widget::Step::finish(const MTPUser &user, QImage &&photo) {
 	const auto defaultId = Lang::DefaultLanguageId();
 	const auto suggested = Lang::CurrentCloudManager().suggestedLanguage();
 	if (currentId.isEmpty() && !suggested.isEmpty() && suggested != defaultId) {
-		Lang::Current().switchToId(defaultId);
+		Lang::Current().switchToId(Lang::DefaultLanguage());
 		Local::writeLangPack();
 	}
 

Telegram/SourceFiles/lang/lang_cloud_manager.cpp

@@ -38,6 +38,7 @@ protected:
 private:
 	QString _name;
 	int _percent = 0;
+	bool _official = false;
 	QString _editLink;
 	Fn<void()> _apply;
 
@@ -66,6 +67,7 @@ ConfirmSwitchBox::ConfirmSwitchBox(
 	Fn<void()> apply)
 : _name(qs(data.vnative_name))
 , _percent(data.vtranslated_count.v * 100 / data.vstrings_count.v)
+, _official(data.is_official())
 , _editLink(editLink)
 , _apply(std::move(apply)) {
 }
@@ -89,7 +91,9 @@ void ConfirmSwitchBox::prepare() {
 		EntityInTextBold,
 		0,
 		percent.text.size()));
-	const auto text = lng_language_switch_about__generic(
+	const auto text = (_official
+		? lng_language_switch_about_official__generic<TextWithEntities>
+		: lng_language_switch_about_unofficial__generic<TextWithEntities>)(
 		lt_lang_name,
 		name,
 		lt_percent,
@@ -351,32 +355,43 @@ void CloudManager::offerSwitchLangPack() {
 	}
 }
 
-QString CloudManager::findOfferedLanguageName() {
+Language CloudManager::findOfferedLanguage() const {
 	for (const auto &language : _languages) {
 		if (language.id == _offerSwitchToId) {
-			return language.name;
+			return language;
 		}
 	}
-	return QString();
+	return {};
 }
 
 bool CloudManager::showOfferSwitchBox() {
-	auto name = findOfferedLanguageName();
+	const auto language = findOfferedLanguage();
-	if (name.isEmpty()) {
+	if (language.id.isEmpty()) {
 		return false;
 	}
 
-	Ui::show(Box<ConfirmBox>("Do you want to switch your language to " + name + "? You can always change your language in Settings.", "Change", lang(lng_cancel), [this] {
+	const auto confirm = [=] {
 		Ui::hideLayer();
 		if (_offerSwitchToId.isEmpty()) {
 			return;
 		}
-		performSwitchAndRestart(_offerSwitchToId);
+		performSwitchAndRestart(language);
-	}, [this] {
+	};
+	const auto cancel = [=] {
 		Ui::hideLayer();
-		changeIdAndReInitConnection(DefaultLanguageId());
+		changeIdAndReInitConnection(DefaultLanguage());
 		Local::writeLangPack();
-	}), LayerOption::KeepOther);
+	};
+	Ui::show(
+		Box<ConfirmBox>(
+			"Do you want to switch your language to "
+			+ language.nativeName
+			+ "? You can always change your language in Settings.",
+			"Change",
+			lang(lng_cancel),
+			confirm,
+			cancel),
+		LayerOption::KeepOther);
 	return true;
 }
 
@@ -405,10 +420,20 @@ bool CloudManager::canApplyWithoutRestart(const QString &id) const {
 }
 
 void CloudManager::resetToDefault() {
-	performSwitch(DefaultLanguageId());
+	performSwitch(DefaultLanguage());
+}
+
+void CloudManager::switchToLanguage(const QString &id) {
+	requestLanguageAndSwitch(id, false);
 }
 
 void CloudManager::switchWithWarning(const QString &id) {
+	requestLanguageAndSwitch(id, true);
+}
+
+void CloudManager::requestLanguageAndSwitch(
+		const QString &id,
+		bool warning) {
 	Expects(!id.isEmpty());
 
 	if (LanguageIdOrDefault(_langpack.id()) == id) {
@@ -422,18 +447,20 @@ void CloudManager::switchWithWarning(const QString &id) {
 		MTP_string(id)
 	)).done([=](const MTPLangPackLanguage &result) {
 		_switchingToLanguageRequest = 0;
+		const auto language = Lang::ParseLanguage(result);
+		const auto finalize = [=] {
+			performSwitchAndRestart(language);
+		};
+		if (!warning) {
+			finalize();
+			return;
+		}
 		result.match([=](const MTPDlangPackLanguage &data) {
 			const auto link = "https://translations.telegram.org/"
 				+ id
 				+ '/';
 			if (data.vstrings_count.v > 0) {
-				const auto pluralId = qs(data.vplural_code);
+				Ui::show(Box<ConfirmSwitchBox>(data, link, finalize));
-				const auto baseId = qs(data.vbase_lang_code);
-				const auto perform = [=] {
-					Local::pushRecentLanguage(ParseLanguage(result));
-					performSwitchAndRestart(id, pluralId, baseId);
-				};
-				Ui::show(Box<ConfirmSwitchBox>(data, link, perform));
 			} else {
 				Ui::show(Box<NotReadyBox>(data, link));
 			}
@@ -446,27 +473,23 @@ void CloudManager::switchWithWarning(const QString &id) {
 	}).send();
 }
 
-void CloudManager::switchToLanguage(
+void CloudManager::switchToLanguage(const Language &data) {
-		const QString &id,
+	if (_langpack.id() == data.id && data.id != qstr("#custom")) {
-		const QString &pluralId,
-		const QString &baseId) {
-	const auto requested = LanguageIdOrDefault(id);
-	if (_langpack.id() == requested && requested != qstr("#custom")) {
 		return;
 	}
 
 	request(_switchingToLanguageRequest).cancel();
-	if (requested == qstr("#custom")) {
+	if (data.id == qstr("#custom")) {
 		performSwitchToCustom();
-	} else if (canApplyWithoutRestart(requested)) {
+	} else if (canApplyWithoutRestart(data.id)) {
-		performSwitch(requested, pluralId, baseId);
+		performSwitch(data);
 	} else {
 		QVector<MTPstring> keys;
 		keys.reserve(3);
 		keys.push_back(MTP_string("lng_sure_save_language"));
 		_switchingToLanguageRequest = request(MTPlangpack_GetStrings(
 			MTP_string(Lang::CloudLangPackName()),
-			MTP_string(requested),
+			MTP_string(data.id),
 			MTP_vector<MTPstring>(std::move(keys))
 		)).done([=](const MTPVector<MTPLangPackString> &result) {
 			_switchingToLanguageRequest = 0;
@@ -480,15 +503,12 @@ void CloudManager::switchToLanguage(
 			const auto text = lang(lng_sure_save_language)
 				+ "\n\n"
 				+ getValue(lng_sure_save_language);
-			const auto perform = [=] {
-				performSwitchAndRestart(requested, pluralId, baseId);
-			};
 			Ui::show(
 				Box<ConfirmBox>(
 					text,
 					lang(lng_box_ok),
 					lang(lng_cancel),
-					perform),
+					[=] { performSwitchAndRestart(data); }),
 				LayerOption::KeepOther);
 		}).fail([=](const RPCError &error) {
 			_switchingToLanguageRequest = 0;
@@ -545,24 +565,19 @@ void CloudManager::switchToTestLanguage() {
 	const auto testLanguageId = (_langpack.id() == qstr("#TEST_X"))
 		? qsl("#TEST_0")
 		: qsl("#TEST_X");
-	performSwitch(testLanguageId);
+	performSwitch({ testLanguageId });
 }
 
-void CloudManager::performSwitch(
+void CloudManager::performSwitch(const Language &data) {
-		const QString &id,
-		const QString &pluralId,
-		const QString &baseId) {
 	_restartAfterSwitch = false;
-	switchLangPackId(id, pluralId, baseId);
+	switchLangPackId(data);
 	requestLangPackDifference(Pack::Current);
 	requestLangPackDifference(Pack::Base);
 }
 
-void CloudManager::performSwitchAndRestart(
+void CloudManager::performSwitchAndRestart(const Language &data) {
-		const QString &id,
+	Local::pushRecentLanguage(data);
-		const QString &pluralId,
+	performSwitch(data);
-		const QString &baseId) {
-	performSwitch(id, pluralId, baseId);
 	restartAfterSwitch();
 }
 
@@ -574,26 +589,21 @@ void CloudManager::restartAfterSwitch() {
 	}
 }
 
-void CloudManager::switchLangPackId(
+void CloudManager::switchLangPackId(const Language &data) {
-		const QString &id,
-		const QString &pluralId,
-		const QString &baseId) {
 	const auto currentId = _langpack.id();
 	const auto currentBaseId = _langpack.baseId();
-	const auto notChanged = (currentId == id && currentBaseId == baseId)
+	const auto notChanged = (currentId == data.id
+		&& currentBaseId == data.baseId)
 		|| (currentId.isEmpty()
 			&& currentBaseId.isEmpty()
-			&& id == DefaultLanguageId());
+			&& data.id == DefaultLanguageId());
 	if (!notChanged) {
-		changeIdAndReInitConnection(id, pluralId, baseId);
+		changeIdAndReInitConnection(data);
 	}
 }
 
-void CloudManager::changeIdAndReInitConnection(
+void CloudManager::changeIdAndReInitConnection(const Language &data) {
-		const QString &id,
+	_langpack.switchToId(data);
-		const QString &pluralId,
-		const QString &baseId) {
-	_langpack.switchToId(id, pluralId, baseId);
 
 	auto mtproto = requestMTP();
 	mtproto->reInitConnection(mtproto->mainDcId());

Telegram/SourceFiles/lang/lang_cloud_manager.h

@@ -18,14 +18,8 @@ namespace Lang {
 
 class Instance;
 enum class Pack;
+struct Language;
 
-struct Language {
-	QString id;
-	QString pluralId;
-	QString baseId;
-	QString name;
-	QString nativeName;
-};
 Language ParseLanguage(const MTPLangPackLanguage &data);
 
 class CloudManager : public base::has_weak_ptr, private MTP::Sender, private base::Subscriber {
@@ -47,10 +41,8 @@ public:
 
 	void resetToDefault();
 	void switchWithWarning(const QString &id);
-	void switchToLanguage(
+	void switchToLanguage(const QString &id);
-		const QString &id,
+	void switchToLanguage(const Language &data);
-		const QString &pluralId = QString(),
-		const QString &baseId = QString());
 	void switchToTestLanguage();
 	void setSuggestedLanguage(const QString &langCode);
 	QString suggestedLanguage() const {
@@ -67,28 +59,17 @@ private:
 	void requestLangPackDifference(Pack pack);
 	bool canApplyWithoutRestart(const QString &id) const;
 	void performSwitchToCustom();
-	void performSwitch(
+	void performSwitch(const Language &data);
-		const QString &id,
+	void performSwitchAndRestart(const Language &data);
-		const QString &pluralId = QString(),
-		const QString &baseId = QString());
-	void performSwitchAndRestart(
-		const QString &id,
-		const QString &pluralId = QString(),
-		const QString &baseId = QString());
 	void restartAfterSwitch();
 	void offerSwitchLangPack();
 	bool showOfferSwitchBox();
-	QString findOfferedLanguageName();
+	Language findOfferedLanguage() const;
 
+	void requestLanguageAndSwitch(const QString &id, bool warning);
 	void applyLangPackData(Pack pack, const MTPDlangPackDifference &data);
-	void switchLangPackId(
+	void switchLangPackId(const Language &data);
-		const QString &id,
+	void changeIdAndReInitConnection(const Language &data);
-		const QString &pluralId,
-		const QString &baseId);
-	void changeIdAndReInitConnection(
-		const QString &id,
-		const QString &pluralId = QString(),
-		const QString &baseId = QString());
 
 	Instance &_langpack;
 	Languages _languages;
@@ -108,14 +89,6 @@ private:
 
 };
 
-inline bool operator==(const Language &a, const Language &b) {
-	return (a.id == b.id) && (a.name == b.name);
-}
-
-inline bool operator!=(const Language &a, const Language &b) {
-	return !(a == b);
-}
-
 CloudManager &CurrentCloudManager();
 
 } // namespace Lang

Telegram/SourceFiles/lang/lang_instance.cpp

@@ -18,6 +18,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Lang {
 namespace {
 
+const auto kSerializeVersionTag = qsl("#new");
+constexpr auto kSerializeVersion = 1;
 constexpr auto kDefaultLanguage = str_const("en");
 constexpr auto kCloudLangPackName = str_const("tdesktop");
 constexpr auto kCustomLanguage = str_const("#custom");
@@ -223,6 +225,16 @@ QString CustomLanguageId() {
 	return str_const_toString(kCustomLanguage);
 }
 
+Language DefaultLanguage() {
+	return Language{
+		qsl("en"),
+		QString(),
+		QString(),
+		qsl("English"),
+		qsl("English"),
+	};
+}
+
 struct Instance::PrivateTag {
 };
 
@@ -236,11 +248,8 @@ Instance::Instance(not_null<Instance*> derived, const PrivateTag &)
 , _nonDefaultSet(kLangKeysCount, 0) {
 }
 
-void Instance::switchToId(
+void Instance::switchToId(const Language &data) {
-		const QString &id,
+	reset(data);
-		const QString &pluralId,
-		const QString &baseId) {
-	reset(id, pluralId, baseId);
 	if (_id == qstr("#TEST_X") || _id == qstr("#TEST_0")) {
 		for (auto &value : _values) {
 			value = PrepareTestValue(value, _id[5]);
@@ -259,7 +268,7 @@ void Instance::setBaseId(const QString &baseId, const QString &pluralId) {
 		if (!_base) {
 			_base = std::make_unique<Instance>(this, PrivateTag{});
 		}
-		_base->switchToId(baseId, _pluralId, QString());
+		_base->switchToId({ baseId, _pluralId });
 	}
 }
 
@@ -270,18 +279,17 @@ void Instance::switchToCustomFile(const QString &filePath) {
 	}
 }
 
-void Instance::reset(
+void Instance::reset(const Language &data) {
-		const QString &id,
+	const auto computedPluralId = !data.pluralId.isEmpty()
-		const QString &pluralId,
+		? data.pluralId
-		const QString &baseId) {
+		: !data.baseId.isEmpty()
-	const auto computedPluralId = !pluralId.isEmpty()
+		? data.baseId
-		? pluralId
+		: data.id;
-		: !baseId.isEmpty()
+	setBaseId(data.baseId, computedPluralId);
-		? baseId
+	_id = LanguageIdOrDefault(data.id);
-		: id;
-	setBaseId(baseId, computedPluralId);
-	_id = LanguageIdOrDefault(id);
 	_pluralId = computedPluralId;
+	_name = data.name;
+	_nativeName = data.nativeName;
 
 	_legacyId = kLegacyLanguageNone;
 	_customFilePathAbsolute = QString();
@@ -325,6 +333,16 @@ QString Instance::baseId() const {
 	return id(Pack::Base);
 }
 
+QString Instance::name() const {
+	return _name.isEmpty() ? getValue(lng_language_name) : _name;
+}
+
+QString Instance::nativeName() const {
+	return _nativeName.isEmpty()
+		? getValue(lng_language_name)
+		: _nativeName;
+}
+
 QString Instance::id(Pack pack) const {
 	return (pack != Pack::Base)
 		? _id
@@ -352,35 +370,45 @@ QString Instance::langPackName() const {
 }
 
 QByteArray Instance::serialize() const {
-	auto size = Serialize::stringSize(_id);
+	auto size = Serialize::stringSize(kSerializeVersionTag)
-	size += sizeof(qint32); // version
+		+ sizeof(qint32) // serializeVersion
-	size += Serialize::stringSize(_customFilePathAbsolute) + Serialize::stringSize(_customFilePathRelative);
+		+ Serialize::stringSize(_id)
-	size += Serialize::bytearraySize(_customFileContent);
+		+ Serialize::stringSize(_pluralId)
-	size += sizeof(qint32); // _nonDefaultValues.size()
+		+ Serialize::stringSize(_name)
+		+ Serialize::stringSize(_nativeName)
+		+ sizeof(qint32) // version
+		+ Serialize::stringSize(_customFilePathAbsolute)
+		+ Serialize::stringSize(_customFilePathRelative)
+		+ Serialize::bytearraySize(_customFileContent)
+		+ sizeof(qint32); // _nonDefaultValues.size()
 	for (auto &nonDefault : _nonDefaultValues) {
-		size += Serialize::bytearraySize(nonDefault.first) + Serialize::bytearraySize(nonDefault.second);
+		size += Serialize::bytearraySize(nonDefault.first)
-	}
+			+ Serialize::bytearraySize(nonDefault.second);
-	size += Serialize::stringSize(_pluralId);
-	auto base = _base ? _base->serialize() : QByteArray();
-	if (!base.isEmpty()) {
-		size += Serialize::bytearraySize(base);
 	}
+	const auto base = _base ? _base->serialize() : QByteArray();
+	size += Serialize::bytearraySize(base);
 
 	auto result = QByteArray();
 	result.reserve(size);
 	{
 		QDataStream stream(&result, QIODevice::WriteOnly);
 		stream.setVersion(QDataStream::Qt_5_1);
-		stream << _id << qint32(_version);
+		stream
-		stream << _customFilePathAbsolute << _customFilePathRelative << _customFileContent;
+			<< kSerializeVersionTag
-		stream << qint32(_nonDefaultValues.size());
+			<< qint32(kSerializeVersion)
-		for (auto &nonDefault : _nonDefaultValues) {
+			<< _id
+			<< _pluralId
+			<< _name
+			<< _nativeName
+			<< qint32(_version)
+			<< _customFilePathAbsolute
+			<< _customFilePathRelative
+			<< _customFileContent
+			<< qint32(_nonDefaultValues.size());
+		for (const auto &nonDefault : _nonDefaultValues) {
 			stream << nonDefault.first << nonDefault.second;
 		}
-		stream << _pluralId;
+		stream << base;
-		if (!base.isEmpty()) {
-			stream << base;
-		}
 	}
 	return result;
 }
@@ -390,18 +418,41 @@ void Instance::fillFromSerialized(
 		int dataAppVersion) {
 	QDataStream stream(data);
 	stream.setVersion(QDataStream::Qt_5_1);
-	QString id;
+	qint32 serializeVersion = 0;
-	QString pluralId;
+	QString serializeVersionTag;
+	QString id, pluralId, name, nativeName;
 	qint32 version = 0;
 	QString customFilePathAbsolute, customFilePathRelative;
 	QByteArray customFileContent;
 	qint32 nonDefaultValuesCount = 0;
-	stream >> id >> version;
+	stream >> serializeVersionTag;
-	stream
+	const auto legacyFormat = (serializeVersionTag != kSerializeVersionTag);
-		>> customFilePathAbsolute
+	if (legacyFormat) {
-		>> customFilePathRelative
+		id = serializeVersionTag;
-		>> customFileContent;
+		stream
-	stream >> nonDefaultValuesCount;
+			>> version
+			>> customFilePathAbsolute
+			>> customFilePathRelative
+			>> customFileContent
+			>> nonDefaultValuesCount;
+	} else {
+		stream >> serializeVersion;
+		if (serializeVersion == kSerializeVersion) {
+			stream
+				>> id
+				>> pluralId
+				>> name
+				>> nativeName
+				>> version
+				>> customFilePathAbsolute
+				>> customFilePathRelative
+				>> customFileContent
+				>> nonDefaultValuesCount;
+		} else {
+			LOG(("Lang Error: Unsupported serialize version."));
+			return;
+		}
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("Lang Error: Could not read data from serialized langpack."));
 		return;
@@ -444,26 +495,25 @@ void Instance::fillFromSerialized(
 	}
 
 	_base = nullptr;
-	if (!stream.atEnd()) {
+	QByteArray base;
-		stream >> pluralId;
+	if (legacyFormat) {
 		if (!stream.atEnd()) {
-			QByteArray base;
+			stream >> pluralId;
-			stream >> base;
+		} else {
-			if (stream.status() != QDataStream::Ok || base.isEmpty()) {
+			pluralId = id;
-				LOG(("Lang Error: "
-					"Could not read data from serialized langpack."));
-				return;
-			}
-			_base = std::make_unique<Instance>(this, PrivateTag{});
-			_base->fillFromSerialized(base, dataAppVersion);
 		}
-		if (stream.status() != QDataStream::Ok) {
+		if (!stream.atEnd()) {
+			stream >> base;
+		}
+		if (stream.status() != QDataStream::Ok || base.isEmpty()) {
 			LOG(("Lang Error: "
 				"Could not read data from serialized langpack."));
 			return;
 		}
-	} else {
+	}
-		pluralId = id;
+	if (!base.isEmpty()) {
+		_base = std::make_unique<Instance>(this, PrivateTag{});
+		_base->fillFromSerialized(base, dataAppVersion);
 	}
 
 	_id = id;
@@ -472,6 +522,8 @@ void Instance::fillFromSerialized(
 			customFilePathAbsolute,
 			customFilePathRelative)
 		: pluralId;
+	_name = name;
+	_nativeName = nativeName;
 	_version = version;
 	_customFilePathAbsolute = customFilePathAbsolute;
 	_customFilePathRelative = customFilePathRelative;
@@ -501,6 +553,7 @@ void Instance::fillFromCustomContent(
 	setBaseId(QString(), QString());
 	_id = CustomLanguageId();
 	_pluralId = PluralCodeForCustom(absolutePath, relativePath);
+	_name = _nativeName = QString();
 	loadFromCustomContent(absolutePath, relativePath, content);
 }
 
@@ -520,10 +573,9 @@ bool Instance::loadFromCustomFile(const QString &filePath) {
 	auto relativePath = QDir().relativeFilePath(filePath);
 	auto content = Lang::FileParser::ReadFile(absolutePath, relativePath);
 	if (!content.isEmpty()) {
-		reset(
+		reset({
 			CustomLanguageId(),
-			PluralCodeForCustom(absolutePath, relativePath),
+			PluralCodeForCustom(absolutePath, relativePath) });
-			QString());
 		loadFromCustomContent(absolutePath, relativePath, content);
 		updatePluralRules();
 		return true;
@@ -564,6 +616,7 @@ void Instance::fillFromLegacy(int legacyId, const QString &legacyPath) {
 	if (!isCustom()) {
 		_pluralId = _id;
 	}
+	_name = _nativeName = QString();
 	_base = nullptr;
 	updatePluralRules();
 }

Telegram/SourceFiles/lang/lang_instance.h

@@ -31,10 +31,27 @@ inline QString ConvertLegacyLanguageId(const QString &languageId) {
 	return languageId.toLower().replace('_', '-');
 }
 
+struct Language {
+	QString id;
+	QString pluralId;
+	QString baseId;
+	QString name;
+	QString nativeName;
+};
+
+inline bool operator==(const Language &a, const Language &b) {
+	return (a.id == b.id) && (a.name == b.name);
+}
+
+inline bool operator!=(const Language &a, const Language &b) {
+	return !(a == b);
+}
+
 QString DefaultLanguageId();
 QString LanguageIdOrDefault(const QString &id);
 QString CloudLangPackName();
 QString CustomLanguageId();
+Language DefaultLanguage();
 
 class Instance;
 Instance &Current();
@@ -54,10 +71,7 @@ public:
 	Instance();
 	Instance(not_null<Instance*> derived, const PrivateTag &);
 
-	void switchToId(
+	void switchToId(const Language &language);
-		const QString &id,
-		const QString &pluralId = QString(),
-		const QString &baseId = QString());
 	void switchToCustomFile(const QString &filePath);
 
 	Instance(const Instance &other) = delete;
@@ -70,6 +84,8 @@ public:
 	QString cloudLangCode(Pack pack) const;
 	QString id() const;
 	QString baseId() const;
+	QString name() const;
+	QString nativeName() const;
 	QString id(Pack pack) const;
 	bool isCustom() const;
 	int version(Pack pack) const;
@@ -111,10 +127,7 @@ private:
 	void applyDifferenceToMe(const MTPDlangPackDifference &difference);
 	void applyValue(const QByteArray &key, const QByteArray &value);
 	void resetValue(const QByteArray &key);
-	void reset(
+	void reset(const Language &language);
-		const QString &id,
-		const QString &pluralId,
-		const QString &baseId);
 	void fillFromCustomContent(
 		const QString &absolutePath,
 		const QString &relativePath,
@@ -130,6 +143,7 @@ private:
 	Instance *_derived = nullptr;
 
 	QString _id, _pluralId;
+	QString _name, _nativeName;
 	int _legacyId = kLegacyLanguageNone;
 	QString _customFilePathAbsolute;
 	QString _customFilePathRelative;

Telegram/SourceFiles/settings/settings_codes.cpp

@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/localstorage.h"
 #include "boxes/confirm_box.h"
 #include "lang/lang_cloud_manager.h"
+#include "lang/lang_instance.h"
 #include "messenger.h"
 #include "mtproto/mtp_instance.h"
 #include "mtproto/dc_options.h"
@@ -51,7 +52,7 @@ auto GenerateCodes() {
 		});
 	}
 	codes.emplace(qsl("loadlang"), [] {
-		Lang::CurrentCloudManager().switchToLanguage(qsl("#custom"));
+		Lang::CurrentCloudManager().switchToLanguage({ qsl("#custom") });
 	});
 	codes.emplace(qsl("debugfiles"), [] {
 		if (!Logs::DebugEnabled()) {

Telegram/SourceFiles/settings/settings_main.cpp

@@ -33,14 +33,14 @@ void SetupLanguageButton(
 	const auto button = AddButtonWithLabel(
 		container,
 		lng_settings_language,
-		Lang::Viewer(lng_language_name),
+		rpl::single(Lang::Current().nativeName()),
 		icon ? st::settingsSectionButton : st::settingsButton,
 		icon ? &st::settingsIconLanguage : nullptr);
 	const auto guard = Ui::AttachAsChild(button, base::binary_guard());
 	button->addClickHandler([=] {
 		const auto m = button->clickModifiers();
 		if ((m & Qt::ShiftModifier) && (m & Qt::AltModifier)) {
-			Lang::CurrentCloudManager().switchToLanguage(qsl("#custom"));
+			Lang::CurrentCloudManager().switchToLanguage({ qsl("#custom") });
 		} else {
 			*guard = LanguageBox::Show();
 		}