Skip to content

Commit 1712108

Browse files
Attempt to translate pop up errors
1 parent 026ee5b commit 1712108

File tree

3 files changed

+75
-12
lines changed

3 files changed

+75
-12
lines changed

src/GUI/Translations/ru.ts

Lines changed: 56 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,22 +418,74 @@
418418
<context>
419419
<name>QObject</name>
420420
<message>
421-
<location filename="../../ProgramConstants.hpp" line="106"/>
421+
<location filename="../../ProgramConstants.hpp" line="71"/>
422+
<source>Unable to find Settings.json in Resource folder.</source>
423+
<translation>Невозможно найти файл Settings.json в папке Resources.</translation>
424+
</message>
425+
<message>
426+
<location filename="../../ProgramConstants.hpp" line="72"/>
427+
<source>Unable to find TechTree.json in Resource folder.</source>
428+
<translation>Невозможно найти файл TechTree.json в папке Resources.</translation>
429+
</message>
430+
<message>
431+
<location filename="../../ProgramConstants.hpp" line="73"/>
432+
<source>Unable to find Resource/Theme folder.</source>
433+
<translation>Невозможно найти папку Resource/Theme.</translation>
434+
</message>
435+
<message>
436+
<location filename="../../ProgramConstants.hpp" line="74"/>
437+
<source>Unable to find Resource/Icons folder.</source>
438+
<translation>Невозможно найти папку Resource/Icons.</translation>
439+
</message>
440+
<message>
441+
<location filename="../../ProgramConstants.hpp" line="75"/>
442+
<source>Unable to find Resource/Translations folder.</source>
443+
<translation>Невозможно найти папку Resource/Translations.</translation>
444+
</message>
445+
<message>
446+
<location filename="../../ProgramConstants.hpp" line="76"/>
447+
<source>Unknown error has been occured.</source>
448+
<translation>Возникла неизвестная ошибка</translation>
449+
</message>
450+
<message>
451+
<location filename="../../ProgramConstants.hpp" line="77"/>
452+
<source>Error with CSF file</source>
453+
<translation>Ошибка с CSF файлом</translation>
454+
</message>
455+
<message>
456+
<location filename="../../ProgramConstants.hpp" line="78"/>
457+
<source>Cannot process the empty file.</source>
458+
<translation>Невозможно обработать пустой файл.</translation>
459+
</message>
460+
<message>
461+
<location filename="../../ProgramConstants.hpp" line="79"/>
462+
<source>Unable to find selected CSF file.</source>
463+
<translation>Невозможно найти указанный CSF файл.</translation>
464+
</message>
465+
<message>
466+
<location filename="../../ProgramConstants.hpp" line="80"/>
467+
<source>Choosen CSF file doesn&apos;t have CONTROLBAR category.
468+
Make sure that you are load correct file.</source>
469+
<translation>У выбранного CSF файла отсутствует категория CONTROLBAR
470+
Проверьте, что вы загружаете правильный файл.</translation>
471+
</message>
472+
<message>
473+
<location filename="../../ProgramConstants.hpp" line="110"/>
422474
<source>Buildings</source>
423475
<translation>Здания</translation>
424476
</message>
425477
<message>
426-
<location filename="../../ProgramConstants.hpp" line="107"/>
478+
<location filename="../../ProgramConstants.hpp" line="111"/>
427479
<source>Infantry</source>
428480
<translation>Пехота</translation>
429481
</message>
430482
<message>
431-
<location filename="../../ProgramConstants.hpp" line="108"/>
483+
<location filename="../../ProgramConstants.hpp" line="112"/>
432484
<source>Vehicles</source>
433485
<translation>Техника</translation>
434486
</message>
435487
<message>
436-
<location filename="../../ProgramConstants.hpp" line="109"/>
488+
<location filename="../../ProgramConstants.hpp" line="113"/>
437489
<source>Aircrafts</source>
438490
<translation>Авиация</translation>
439491
</message>

src/GUI/WindowManager.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,21 @@ void WindowManager::LaunchWidget_AcceptConfiguration()
4545

4646
if (strCSFFilePath == "")
4747
{
48-
QMessageBox::critical(nullptr, "Error with CSF file", "Unable to find selected CSF file");
48+
QMessageBox::critical(nullptr, PROGRAM_CONSTANTS->CSF_ERROR_HEADER, PROGRAM_CONSTANTS->CSF_EMPTY_STRING_ERROR);
49+
return;
50+
}
51+
52+
if (!QFile::exists(strCSFFilePath))
53+
{
54+
QMessageBox::critical(nullptr, PROGRAM_CONSTANTS->CSF_ERROR_HEADER, PROGRAM_CONSTANTS->CSF_DOESNTEXIST_ERROR);
4955
return;
5056
}
5157

5258
CSF_PARSER = std::make_unique<CSFParser>(strCSFFilePath);
5359

5460
if (!CSF_PARSER->ExistCategory(PROGRAM_CONSTANTS->HOTKEY_CSF_CATEGORY))
5561
{
56-
QMessageBox::critical(nullptr, "Error with CSF file", "Choosen CSF file doesn't have CONTROLBAR category.\nMake sure that you are load correct file.");
62+
QMessageBox::critical(nullptr, PROGRAM_CONSTANTS->CSF_ERROR_HEADER, PROGRAM_CONSTANTS->CSF_NOCTLBAR_ERROR);
5763
return;
5864
}
5965

src/ProgramConstants.hpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <QPair>
66
#include <QSize>
77
#include <QObject>
8+
#include <QTranslator>
89

910
#include "Settings.hpp"
1011

@@ -68,12 +69,16 @@ class ProgramConstants
6869
const int EMPTY_KEY_WIDTH = 25;
6970

7071
// Errors
71-
const char* SETTINGS_NO_FOUND = "Unable to find Settings.json in Resource folder.";
72-
const char* TECH_TREE_NO_FOUND = "Unable to find TechTree.json in Resource folder.";
73-
const char* THEME_FOLDER_NO_FOUND = "Unable to find Resource/Theme folder.";
74-
const char* ICONS_FOLDER_NO_FOUND = "Unable to find Resource/Icons folder.";
75-
const char* TRANSLATIONS_NO_FOUND = "Unable to find Resource/Translations folder.";
76-
const char* UNKNOWN_ERROR = "Unknown error has been occured.";
72+
const char* SETTINGS_NO_FOUND = QObject::tr("Unable to find Settings.json in Resource folder.").toStdString().c_str();
73+
const char* TECH_TREE_NO_FOUND = QObject::tr("Unable to find TechTree.json in Resource folder.").toStdString().c_str();
74+
const char* THEME_FOLDER_NO_FOUND = QObject::tr("Unable to find Resource/Theme folder.").toStdString().c_str();
75+
const char* ICONS_FOLDER_NO_FOUND = QObject::tr("Unable to find Resource/Icons folder.").toStdString().c_str();
76+
const char* TRANSLATIONS_NO_FOUND = QObject::tr("Unable to find Resource/Translations folder.").toStdString().c_str();
77+
const char* UNKNOWN_ERROR = QObject::tr("Unknown error has been occured.").toStdString().c_str();
78+
const QString CSF_ERROR_HEADER = QObject::tr("Error with CSF file");
79+
const QString CSF_EMPTY_STRING_ERROR = QObject::tr("Cannot process the empty file.");
80+
const QString CSF_DOESNTEXIST_ERROR = QObject::tr("Unable to find selected CSF file.");
81+
const QString CSF_NOCTLBAR_ERROR = QObject::tr("Choosen CSF file doesn't have CONTROLBAR category.\nMake sure that you are load correct file.");
7782

7883
// Other constants
7984
const QString HOTKEY_CSF_CATEGORY = "CONTROLBAR";

0 commit comments

Comments
 (0)