mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'message_formatting' into 'master'

Browse Source 
Do not include formatting spaces to localizable strings

See merge request OpenMW/openmw!3624
macos_ci_fix
Evil Eye 1 year ago
parent ee4993b462 c5b16d1ba2
commit 8d8e970aba
9 changed files with 103 additions and 107 deletions
Show Stats Download Patch File Download Diff File

6
apps/launcher/importpage.cpp
Unescape Escape View File

@ -104,9 +104,9 @@ void Launcher::ImportPage::on_importerButton_clicked()
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not open or create %1 for writing </b></p> \
<p>Please make sure you have the right permissions \
and try again.</p></body></html>")
tr("<html><head/><body><p><b>Could not open or create %1 for writing </b></p>"
"<p>Please make sure you have the right permissions "
"and try again.</p></body></html>")
.arg(file.fileName()));
msgBox.exec();
return;

56
apps/launcher/maindialog.cpp
Unescape Escape View File

@ -121,9 +121,9 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
if (!create_directories(userConfigDir))
{
cfgError(tr("Error opening OpenMW configuration file"),
tr("<br><b>Could not create directory %0</b><br><br> \
Please make sure you have the right permissions \
and try again.<br>")
tr("<br><b>Could not create directory %0</b><br><br>"
"Please make sure you have the right permissions "
"and try again.<br>")
.arg(Files::pathToQString(canonical(userConfigDir))));
return FirstRunDialogResultFailure;
}
@ -136,10 +136,10 @@ Launcher::FirstRunDialogResult Launcher::MainDialog::showFirstRunDialog()
msgBox.setIcon(QMessageBox::Question);
msgBox.setStandardButtons(QMessageBox::NoButton);
msgBox.setText(
tr("<html><head/><body><p><b>Welcome to OpenMW!</b></p> \
<p>It is recommended to run the Installation Wizard.</p> \
<p>The Wizard will let you select an existing Morrowind installation, \
or install Morrowind for OpenMW to use.</p></body></html>"));
tr("<html><head/><body><p><b>Welcome to OpenMW!</b></p>"
"<p>It is recommended to run the Installation Wizard.</p>"
"<p>The Wizard will let you select an existing Morrowind installation, "
"or install Morrowind for OpenMW to use.</p></body></html>"));
QAbstractButton* wizardButton
= msgBox.addButton(tr("Run &Installation Wizard"), QMessageBox::AcceptRole); // ActionRole doesn't work?!
@ -297,9 +297,9 @@ bool Launcher::MainDialog::setupLauncherSettings()
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
cfgError(tr("Error opening OpenMW configuration file"),
tr("<br><b>Could not open %0 for reading:</b><br><br>%1<br><br> \
Please make sure you have the right permissions \
and try again.<br>")
tr("<br><b>Could not open %0 for reading:</b><br><br>%1<br><br>"
"Please make sure you have the right permissions "
"and try again.<br>")
.arg(file.fileName())
.arg(file.errorString()));
return false;
@ -327,9 +327,9 @@ bool Launcher::MainDialog::setupGameSettings()
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
cfgError(tr("Error opening OpenMW configuration file"),
tr("<br><b>Could not open %0 for reading</b><br><br> \
Please make sure you have the right permissions \
and try again.<br>")
tr("<br><b>Could not open %0 for reading</b><br><br>"
"Please make sure you have the right permissions "
"and try again.<br>")
.arg(file.fileName()));
return {};
}
@ -388,8 +388,8 @@ bool Launcher::MainDialog::setupGameData()
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::NoButton);
msgBox.setText(
tr("<br><b>Could not find the Data Files location</b><br><br> \
The directory containing the data files was not found."));
tr("<br><b>Could not find the Data Files location</b><br><br>"
"The directory containing the data files was not found."));
QAbstractButton* wizardButton = msgBox.addButton(tr("Run &Installation Wizard..."), QMessageBox::ActionRole);
QAbstractButton* skipButton = msgBox.addButton(tr("Skip"), QMessageBox::RejectRole);
@ -419,8 +419,8 @@ bool Launcher::MainDialog::setupGraphicsSettings()
catch (std::exception& e)
{
cfgError(tr("Error reading OpenMW configuration files"),
tr("<br>The problem may be due to an incomplete installation of OpenMW.<br> \
Reinstalling OpenMW may resolve the problem.<br>")
tr("<br>The problem may be due to an incomplete installation of OpenMW.<br>"
"Reinstalling OpenMW may resolve the problem.<br>")
+ e.what());
return false;
}
@ -460,9 +460,9 @@ bool Launcher::MainDialog::writeSettings()
if (!create_directories(userPath))
{
cfgError(tr("Error creating OpenMW configuration directory"),
tr("<br><b>Could not create %0</b><br><br> \
Please make sure you have the right permissions \
and try again.<br>")
tr("<br><b>Could not create %0</b><br><br>"
"Please make sure you have the right permissions "
"and try again.<br>")
.arg(Files::pathToQString(userPath)));
return false;
}
@ -479,9 +479,9 @@ bool Launcher::MainDialog::writeSettings()
{
// File cannot be opened or created
cfgError(tr("Error writing OpenMW configuration file"),
tr("<br><b>Could not open or create %0 for writing</b><br><br> \
Please make sure you have the right permissions \
and try again.<br>")
tr("<br><b>Could not open or create %0 for writing</b><br><br>"
"Please make sure you have the right permissions "
"and try again.<br>")
.arg(file.fileName()));
return false;
}
@ -510,9 +510,9 @@ bool Launcher::MainDialog::writeSettings()
{
// File cannot be opened or created
cfgError(tr("Error writing Launcher configuration file"),
tr("<br><b>Could not open or create %0 for writing</b><br><br> \
Please make sure you have the right permissions \
and try again.<br>")
tr("<br><b>Could not open or create %0 for writing</b><br><br>"
"Please make sure you have the right permissions "
"and try again.<br>")
.arg(file.fileName()));
return false;
}
@ -562,8 +562,8 @@ void Launcher::MainDialog::play()
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<br><b>You do not have a game file selected.</b><br><br> \
OpenMW will not start without a game file selected.<br>"));
tr("<br><b>You do not have a game file selected.</b><br><br>"
"OpenMW will not start without a game file selected.<br>"));
msgBox.exec();
return;
}

8
apps/wizard/componentselectionpage.cpp
Unescape Escape View File

@ -138,10 +138,10 @@ bool Wizard::ComponentSelectionPage::validatePage()
msgBox.setIcon(QMessageBox::Information);
msgBox.setStandardButtons(QMessageBox::Cancel);
msgBox.setText(
tr("<html><head/><body><p><b>You are about to install Tribunal</b></p> \
<p>Bloodmoon is already installed on your computer.</p> \
<p>However, it is recommended that you install Tribunal before Bloodmoon.</p> \
<p>Would you like to re-install Bloodmoon?</p></body></html>"));
tr("<html><head/><body><p><b>You are about to install Tribunal</b></p>"
"<p>Bloodmoon is already installed on your computer.</p>"
"<p>However, it is recommended that you install Tribunal before Bloodmoon.</p>"
"<p>Would you like to re-install Bloodmoon?</p></body></html>"));
QAbstractButton* reinstallButton
= msgBox.addButton(tr("Re-install &Bloodmoon"), QMessageBox::ActionRole);

17
apps/wizard/conclusionpage.cpp
Unescape Escape View File

@ -37,22 +37,23 @@ void Wizard::ConclusionPage::initializePage()
if (field(QLatin1String("installation.retailDisc")).toBool() == true)
{
textLabel->setText(
tr("<html><head/><body><p>The OpenMW Wizard successfully installed Morrowind on your computer.</p> \
<p>Click Finish to close the Wizard.</p></body></html>"));
tr("<html><head/><body><p>The OpenMW Wizard successfully installed Morrowind on your computer.</p>"
"<p>Click Finish to close the Wizard.</p></body></html>"));
}
else
{
textLabel->setText(tr(
"<html><head/><body><p>The OpenMW Wizard successfully modified your existing Morrowind installation.</p> \
<p>Click Finish to close the Wizard.</p></body></html>"));
textLabel->setText(
tr("<html><head/><body><p>The OpenMW Wizard successfully modified your existing Morrowind "
"installation.</p><p>Click Finish to close the Wizard.</p></body></html>"));
}
}
else
{
textLabel->setText(
tr("<html><head/><body><p>The OpenMW Wizard failed to install Morrowind on your computer.</p> \
<p>Please report any bugs you might have encountered to our \
<a href=\"https://gitlab.com/OpenMW/openmw/issues\">bug tracker</a>.<br/>Make sure to include the installation log.</p><br/></body></html>"));
tr("<html><head/><body><p>The OpenMW Wizard failed to install Morrowind on your computer.</p>"
"<p>Please report any bugs you might have encountered to our "
"<a href=\"https://gitlab.com/OpenMW/openmw/issues\">bug tracker</a>.<br/>Make sure to include the "
"installation log.</p><br/></body></html>"));
}
}

14
apps/wizard/existinginstallationpage.cpp
Unescape Escape View File

@ -58,9 +58,9 @@ bool Wizard::ExistingInstallationPage::validatePage()
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Cancel);
msgBox.setText(
QObject::tr("<br><b>Could not find Morrowind.ini</b><br><br> \
The Wizard needs to update settings in this file.<br><br> \
Press \"Browse...\" to specify the location manually.<br>"));
QObject::tr("<br><b>Could not find Morrowind.ini</b><br><br>"
"The Wizard needs to update settings in this file.<br><br>"
"Press \"Browse...\" to specify the location manually.<br>"));
QAbstractButton* browseButton2 = msgBox.addButton(QObject::tr("B&rowse..."), QMessageBox::ActionRole);
@ -107,8 +107,8 @@ void Wizard::ExistingInstallationPage::on_browseButton_clicked()
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
QObject::tr("<b>Morrowind.bsa</b> is missing!<br>\
Make sure your Morrowind installation is complete."));
QObject::tr("<b>Morrowind.bsa</b> is missing!<br>"
"Make sure your Morrowind installation is complete."));
msgBox.exec();
return;
}
@ -187,8 +187,8 @@ bool Wizard::ExistingInstallationPage::versionIsOK(QString directory_name)
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::No);
msgBox.setText(
QObject::tr("<br><b>There may be a more recent version of Morrowind available.</b><br><br>\
Do you wish to continue anyway?<br>"));
QObject::tr("<br><b>There may be a more recent version of Morrowind available.</b><br><br>"
"Do you wish to continue anyway?<br>"));
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
{

24
apps/wizard/installationpage.cpp
Unescape Escape View File

@ -175,8 +175,8 @@ void Wizard::InstallationPage::showFileDialog(Wizard::Component component)
if (path.isEmpty())
{
logTextEdit->appendHtml(
tr("<p><br/><span style=\"color:red;\"> \
<b>Error: The installation was aborted by the user</b></span></p>"));
tr("<p><br/><span style=\"color:red;\">"
"<b>Error: The installation was aborted by the user</b></span></p>"));
mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
mWizard->mError = true;
@ -205,8 +205,8 @@ void Wizard::InstallationPage::showOldVersionDialog()
if (ret == QMessageBox::No)
{
logTextEdit->appendHtml(
tr("<p><br/><span style=\"color:red;\"> \
<b>Error: The installation was aborted by the user</b></span></p>"));
tr("<p><br/><span style=\"color:red;\">"
"<b>Error: The installation was aborted by the user</b></span></p>"));
mWizard->addLogText(QLatin1String("Error: The installation was aborted by the user"));
mWizard->mError = true;
@ -236,14 +236,8 @@ void Wizard::InstallationPage::installationError(const QString& text, const QStr
{
installProgressLabel->setText(tr("Installation failed!"));
logTextEdit->appendHtml(
tr("<p><br/><span style=\"color:red;\"> \
<b>Error: %1</b></p>")
.arg(text));
logTextEdit->appendHtml(
tr("<p><span style=\"color:red;\"> \
<b>%1</b></p>")
.arg(details));
logTextEdit->appendHtml(tr("<p><br/><span style=\"color:red;\"><b>Error: %1</b></p>").arg(text));
logTextEdit->appendHtml(tr("<p><span style=\"color:red;\"><b>%1</b></p>").arg(details));
mWizard->addLogText(QLatin1String("Error: ") + text);
mWizard->addLogText(details);
@ -254,9 +248,9 @@ void Wizard::InstallationPage::installationError(const QString& text, const QStr
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>The Wizard has encountered an error</b></p> \
<p>The error reported was:</p><p>%1</p> \
<p>Press &quot;Show Details...&quot; for more information.</p></body></html>")
tr("<html><head/><body><p><b>The Wizard has encountered an error</b></p>"
"<p>The error reported was:</p><p>%1</p>"
"<p>Press &quot;Show Details...&quot; for more information.</p></body></html>")
.arg(text));
msgBox.setDetailedText(details);

19
apps/wizard/installationtargetpage.cpp
Unescape Escape View File

@ -48,9 +48,9 @@ bool Wizard::InstallationTargetPage::validatePage()
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not create the destination directory</b></p> \
<p>Please make sure you have the right permissions \
and try again, or specify a different location.</p></body></html>"));
tr("<html><head/><body><p><b>Could not create the destination directory</b></p>"
"<p>Please make sure you have the right permissions "
"and try again, or specify a different location.</p></body></html>"));
msgBox.exec();
return false;
}
@ -65,9 +65,9 @@ bool Wizard::InstallationTargetPage::validatePage()
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not write to the destination directory</b></p> \
<p>Please make sure you have the right permissions \
and try again, or specify a different location.</p></body></html>"));
tr("<html><head/><body><p><b>Could not write to the destination directory</b></p>"
"<p>Please make sure you have the right permissions "
"and try again, or specify a different location.</p></body></html>"));
msgBox.exec();
return false;
}
@ -79,9 +79,10 @@ bool Wizard::InstallationTargetPage::validatePage()
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>The destination directory is not empty</b></p> \
<p>An existing Morrowind installation is present in the specified location.</p> \
<p>Please specify a different location, or go back and select the location as an existing installation.</p></body></html>"));
tr("<html><head/><body><p><b>The destination directory is not empty</b></p>"
"<p>An existing Morrowind installation is present in the specified location.</p>"
"<p>Please specify a different location, or go back and select the location as an existing "
"installation.</p></body></html>"));
msgBox.exec();
return false;
}

36
apps/wizard/mainwizard.cpp
Unescape Escape View File

@ -55,9 +55,9 @@ Wizard::MainWizard::MainWizard(QWidget* parent)
&MainWizard::importerFinished);
mLogError = tr(
"<html><head/><body><p><b>Could not open %1 for writing</b></p> \
<p>Please make sure you have the right permissions \
and try again.</p></body></html>");
"<html><head/><body><p><b>Could not open %1 for writing</b></p>"
"<p>Please make sure you have the right permissions "
"and try again.</p></body></html>");
std::filesystem::create_directories(mCfgMgr.getUserConfigPath());
std::filesystem::create_directories(mCfgMgr.getUserDataPath());
@ -139,9 +139,9 @@ void Wizard::MainWizard::addLogText(const QString& text)
void Wizard::MainWizard::setupGameSettings()
{
QString message(
tr("<html><head/><body><p><b>Could not open %1 for reading</b></p> \
<p>Please make sure you have the right permissions \
and try again.</p></body></html>"));
tr("<html><head/><body><p><b>Could not open %1 for reading</b></p>"
"<p>Please make sure you have the right permissions "
"and try again.</p></body></html>"));
// Load the user config file first, separately
// So we can write it properly, uncontaminated
@ -210,9 +210,9 @@ void Wizard::MainWizard::setupLauncherSettings()
path.append(QLatin1String(Config::LauncherSettings::sLauncherConfigFileName));
QString message(
tr("<html><head/><body><p><b>Could not open %1 for reading</b></p> \
<p>Please make sure you have the right permissions \
and try again.</p></body></html>"));
tr("<html><head/><body><p><b>Could not open %1 for reading</b></p>"
"<p>Please make sure you have the right permissions "
"and try again.</p></body></html>"));
QFile file(path);
@ -427,9 +427,9 @@ void Wizard::MainWizard::writeSettings()
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not create %1</b></p> \
<p>Please make sure you have the right permissions \
and try again.</p></body></html>")
tr("<html><head/><body><p><b>Could not create %1</b></p>"
"<p>Please make sure you have the right permissions "
"and try again.</p></body></html>")
.arg(userPath));
connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
msgBox.exec();
@ -448,9 +448,9 @@ void Wizard::MainWizard::writeSettings()
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
<p>Please make sure you have the right permissions \
and try again.</p></body></html>")
tr("<html><head/><body><p><b>Could not open %1 for writing</b></p>"
"<p>Please make sure you have the right permissions "
"and try again.</p></body></html>")
.arg(file.fileName()));
connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
msgBox.exec();
@ -475,9 +475,9 @@ void Wizard::MainWizard::writeSettings()
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not open %1 for writing</b></p> \
<p>Please make sure you have the right permissions \
and try again.</p></body></html>")
tr("<html><head/><body><p><b>Could not open %1 for writing</b></p>"
"<p>Please make sure you have the right permissions "
"and try again.</p></body></html>")
.arg(file.fileName()));
connect(&msgBox, &QDialog::finished, qApp, &QApplication::quit, Qt::QueuedConnection);
msgBox.exec();

30
components/process/processinvoker.cpp
Unescape Escape View File

@ -76,9 +76,9 @@ bool Process::ProcessInvoker::startProcess(const QString& name, const QStringLis
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not find %1</b></p> \
<p>The application is not found.</p> \
<p>Please make sure OpenMW is installed correctly and try again.</p></body></html>")
tr("<html><head/><body><p><b>Could not find %1</b></p>"
"<p>The application is not found.</p>"
"<p>Please make sure OpenMW is installed correctly and try again.</p></body></html>")
.arg(info.fileName()));
msgBox.exec();
return false;
@ -91,9 +91,9 @@ bool Process::ProcessInvoker::startProcess(const QString& name, const QStringLis
msgBox.setIcon(QMessageBox::Warning);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not start %1</b></p> \
<p>The application is not executable.</p> \
<p>Please make sure you have the right permissions and try again.</p></body></html>")
tr("<html><head/><body><p><b>Could not start %1</b></p>"
"<p>The application is not executable.</p>"
"<p>Please make sure you have the right permissions and try again.</p></body></html>")
.arg(info.fileName()));
msgBox.exec();
return false;
@ -109,9 +109,9 @@ bool Process::ProcessInvoker::startProcess(const QString& name, const QStringLis
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Could not start %1</b></p> \
<p>An error occurred while starting %1.</p> \
<p>Press \"Show Details...\" for more information.</p></body></html>")
tr("<html><head/><body><p><b>Could not start %1</b></p>"
"<p>An error occurred while starting %1.</p>"
"<p>Press \"Show Details...\" for more information.</p></body></html>")
.arg(info.fileName()));
msgBox.setDetailedText(mProcess->errorString());
msgBox.exec();
@ -168,9 +168,9 @@ void Process::ProcessInvoker::processError(QProcess::ProcessError error)
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
<p>An error occurred while running %1.</p> \
<p>Press \"Show Details...\" for more information.</p></body></html>")
tr("<html><head/><body><p><b>Executable %1 returned an error</b></p>"
"<p>An error occurred while running %1.</p>"
"<p>Press \"Show Details...\" for more information.</p></body></html>")
.arg(mName));
msgBox.setDetailedText(mProcess->errorString());
msgBox.exec();
@ -191,9 +191,9 @@ void Process::ProcessInvoker::processFinished(int exitCode, QProcess::ExitStatus
msgBox.setIcon(QMessageBox::Critical);
msgBox.setStandardButtons(QMessageBox::Ok);
msgBox.setText(
tr("<html><head/><body><p><b>Executable %1 returned an error</b></p> \
<p>An error occurred while running %1.</p> \
<p>Press \"Show Details...\" for more information.</p></body></html>")
tr("<html><head/><body><p><b>Executable %1 returned an error</b></p>"
"<p>An error occurred while running %1.</p>"
"<p>Press \"Show Details...\" for more information.</p></body></html>")
.arg(mName));
msgBox.setDetailedText(error);
msgBox.exec();

Write Preview
Loading…
Cancel
Save