mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-02 23:45:44 +00:00
Code Issues Releases Wiki Activity

langs improved for future translations, win version only for now

Browse Source
This commit is contained in:
John Preston
2014-12-18 21:40:49 +03:00
parent dec5db074c
commit d34ab1e1fe
33 changed files with 1374 additions and 927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/application.cpp
View File

@@ -129,10 +129,11 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
cSetIntRetinaFactor(int32(cRetinaFactor()));
}
if (!cLangFile().isEmpty()) {
if (!cLangFile().isEmpty() && QFileInfo(cLangFile()).exists()) {
LangLoaderPlain loader(cLangFile());
if (!loader.errors().isEmpty()) {
LOG(("Lang load errors: %1").arg(loader.errors()));
cSetLangErrors(loader.errors());
if (!cLangErrors().isEmpty()) {
LOG(("Lang load errors: %1").arg(cLangErrors()));
} else if (!loader.warnings().isEmpty()) {
LOG(("Lang load warnings: %1").arg(loader.warnings()));
}
@@ -689,6 +690,10 @@ void Application::startApp() {
}
}
}
if (!cLangErrors().isEmpty()) {
window->showLayer(new ConfirmBox("Lang failed: " + cLangFile() + "\n\nError: " + cLangErrors(), true, lang(lng_close)));
}
}
void Application::socketDisconnected() {
@@ -823,7 +828,7 @@ Window *Application::wnd() {
return mainApp ? mainApp->window : 0;
}
QString Application::lang() {
QString Application::language() {
if (!lng.length()) {
lng = psCurrentLanguage();
}