Skip to content

Commit

Permalink
Some minor cleaning up.
Browse files Browse the repository at this point in the history
  • Loading branch information
@agarny
agarny committed Nov 27, 2019
1 parent 18a77b6 commit dd3c836
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion src/misc/closesimulation.cpp.inl
View file
Expand Up @@ -17,7 +17,7 @@ static PyObject * closeSimulation(PyObject *pSelf, PyObject *pArgs)
auto simulation = static_cast<SimulationSupport::Simulation *>(wrappedSimulation->_objPointerCopy);

if (!Core::centralWidget()->closeFile(simulation->fileName())) {
PyErr_SetString(PyExc_IOError, qPrintable(QObject::tr("unable to close the simulation")));
PyErr_SetString(PyExc_IOError, qPrintable(QObject::tr("unable to close the simulation.")));

return nullptr;
}
Expand Down
28 changes: 14 additions & 14 deletions src/misc/furtherinitialize.cpp.inl
View file
Expand Up @@ -117,7 +117,7 @@ QString Simulation::furtherInitialize() const
}

if (!propertySet) {
simulationError(QObject::tr("the requested solver property (%1) could not be set").arg(id),
simulationError(QObject::tr("the requested solver property (%1) could not be set.").arg(id),
Error::InvalidSimulationEnvironment);

return false;
Expand All @@ -133,7 +133,7 @@ QString Simulation::furtherInitialize() const
}
#ifdef GUI_SUPPORT

simulationError(QObject::tr("the requested solver (%1) could not be found").arg(nlaSolverName),
simulationError(QObject::tr("the requested solver (%1) could not be found.").arg(nlaSolverName),
Error::InvalidSimulationEnvironment);

return false;
Expand All @@ -143,7 +143,7 @@ QString Simulation::furtherInitialize() const
#ifndef GUI_SUPPORT

if (mustHaveNlaSolver && !hasNlaSolver) {
return QObject::tr("the requested solver (%1) could not be found").arg(nlaSolverName);
return QObject::tr("the requested solver (%1) could not be found.").arg(nlaSolverName);
}
#endif
}
Expand Down Expand Up @@ -360,28 +360,28 @@ QString Simulation::furtherInitialize() const

if (xParameter == nullptr) {
if (yParameter == nullptr) {
simulationError(QObject::tr("the requested curve (%1) could not be set (the variable %2 in component %3 and the variable %4 in component %5 could not be found)").arg(QString::fromStdString(sedmlCurve->getId()),
xCellmlVariable,
xCellmlComponent,
yCellmlVariable,
yCellmlComponent),
simulationError(QObject::tr("the requested curve (%1) could not be set (the variable %2 in component %3 and the variable %4 in component %5 could not be found).").arg(QString::fromStdString(sedmlCurve->getId()),
xCellmlVariable,
xCellmlComponent,
yCellmlVariable,
yCellmlComponent),
Error::InvalidSimulationEnvironment);

return false;
}

simulationError(QObject::tr("the requested curve (%1) could not be set (the variable %2 in component %3 could not be found)").arg(QString::fromStdString(sedmlCurve->getId()),
xCellmlVariable,
xCellmlComponent),
simulationError(QObject::tr("the requested curve (%1) could not be set (the variable %2 in component %3 could not be found).").arg(QString::fromStdString(sedmlCurve->getId()),
xCellmlVariable,
xCellmlComponent),
Error::InvalidSimulationEnvironment);

return false;
}

if (yParameter == nullptr) {
simulationError(QObject::tr("the requested curve (%1) could not be set (the variable %2 in component %3 could not be found)").arg(QString::fromStdString(sedmlCurve->getId()),
yCellmlVariable,
yCellmlComponent),
simulationError(QObject::tr("the requested curve (%1) could not be set (the variable %2 in component %3 could not be found).").arg(QString::fromStdString(sedmlCurve->getId()),
yCellmlVariable,
yCellmlComponent),
Error::InvalidSimulationEnvironment);

return false;
Expand Down
6 changes: 3 additions & 3 deletions src/misc/initializesolver.cpp.inl
View file
Expand Up @@ -33,12 +33,12 @@ QString Simulation::initializeSolver(const libsedml::SedListOfAlgorithmParameter

if (solverInterface == nullptr) {
#ifdef GUI_SUPPORT
simulationError(QObject::tr("the requested solver (%1) could not be found").arg(pKisaoId),
simulationError(QObject::tr("the requested solver (%1) could not be found.").arg(pKisaoId),
Error::InvalidSimulationEnvironment);

return false;
#else
return QObject::tr("the requested solver (%1) could not be found").arg(pKisaoId);
return QObject::tr("the requested solver (%1) could not be found.").arg(pKisaoId);
#endif
}

Expand Down Expand Up @@ -103,7 +103,7 @@ QString Simulation::initializeSolver(const libsedml::SedListOfAlgorithmParameter
}

if (!propertySet) {
simulationError(QObject::tr("the requested solver property (%1) could not be set").arg(parameterKisaoId),
simulationError(QObject::tr("the requested solver property (%1) could not be set.").arg(parameterKisaoId),
Error::InvalidSimulationEnvironment);

return false;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp
View file
Expand Up @@ -129,7 +129,7 @@ static int DataStoreValuesDict_ass_subscript(PyObject *pValuesDict,
return 0;
}

PyErr_SetString(PyExc_TypeError, "Invalid value");
PyErr_SetString(PyExc_TypeError, "invalid value.");

return -1;
}
Expand Down
24 changes: 12 additions & 12 deletions src/plugins/simulation/SimulationExperimentView/i18n/SimulationExperimentView_fr.ts
View file
Expand Up @@ -644,28 +644,28 @@
<context>
<name>QObject</name>
<message>
<source>unable to get the simulation&apos;s runtime</source>
<translation>incapable d&apos;obtenir le modèle d&apos;exécution de la simulation</translation>
<source>unable to get the simulation&apos;s runtime.</source>
<translation>incapable d&apos;obtenir le modèle d&apos;exécution de la simulation.</translation>
</message>
<message>
<source>unable to close the simulation</source>
<translation>incapable de fermer la simulation</translation>
<source>unable to close the simulation.</source>
<translation>incapable de fermer la simulation.</translation>
</message>
<message>
<source>the requested solver (%1) could not be found</source>
<translation>le solveur demandé (%1) n&apos;a pas pu être trouvé</translation>
<source>the requested solver (%1) could not be found.</source>
<translation>le solveur demandé (%1) n&apos;a pas pu être trouvé.</translation>
</message>
<message>
<source>the requested solver property (%1) could not be set</source>
<translation>la propriété demandée (%1) du solveur n&apos;a pas pu être spécifiée</translation>
<source>the requested solver property (%1) could not be set.</source>
<translation>la propriété demandée (%1) du solveur n&apos;a pas pu être spécifiée.</translation>
</message>
<message>
<source>the requested curve (%1) could not be set (the variable %2 in component %3 and the variable %4 in component %5 could not be found)</source>
<translation>la courbe demandée (%1) n&apos;a pas pu être spécifiée (la variable %2 dans le composant %3 et la variable %4 dans le composant %5 n&apos;ont pas pu être trouvées)</translation>
<source>the requested curve (%1) could not be set (the variable %2 in component %3 and the variable %4 in component %5 could not be found).</source>
<translation>la courbe demandée (%1) n&apos;a pas pu être spécifiée (la variable %2 dans le composant %3 et la variable %4 dans le composant %5 n&apos;ont pas pu être trouvées).</translation>
</message>
<message>
<source>the requested curve (%1) could not be set (the variable %2 in component %3 could not be found)</source>
<translation>la courbe demandée (%1) n&apos;a pas pu être spécifiée (la variable %2 dans le composant %3 n&apos;a pas pu être trouvée)</translation>
<source>the requested curve (%1) could not be set (the variable %2 in component %3 could not be found).</source>
<translation>la courbe demandée (%1) n&apos;a pas pu être spécifiée (la variable %2 dans le composant %3 n&apos;a pas pu être trouvée).</translation>
</message>
</context>
</TS>
2 changes: 1 addition & 1 deletion ...plugins/simulation/SimulationExperimentView/src/simulationexperimentviewpythonwrapper.cpp
View file
Expand Up @@ -53,7 +53,7 @@ static PyObject * simulation(const QString &pFileName,
if (simulation->runtime() == nullptr) {
// The simulation is missing a runtime, so raise a Python exception

PyErr_SetString(PyExc_ValueError, qPrintable(QObject::tr("unable to get the simulation's runtime")));
PyErr_SetString(PyExc_ValueError, qPrintable(QObject::tr("unable to get the simulation's runtime.")));

return nullptr;
}
Expand Down
20 changes: 10 additions & 10 deletions src/plugins/support/SimulationSupport/i18n/SimulationSupport_fr.ts
View file
Expand Up @@ -54,24 +54,24 @@
<translation>Le solveur demandé (%1) n&apos;a pas pu être trouvé.</translation>
</message>
<message>
<source>unable to close the simulation</source>
<translation>incapable de fermer la simulation</translation>
<source>unable to close the simulation.</source>
<translation>incapable de fermer la simulation.</translation>
</message>
<message>
<source>the requested solver (%1) could not be found</source>
<translation>le solveur demandé (%1) n&apos;a pas pu être trouvé</translation>
<source>the requested solver (%1) could not be found.</source>
<translation>le solveur demandé (%1) n&apos;a pas pu être trouvé.</translation>
</message>
<message>
<source>the requested solver property (%1) could not be set</source>
<translation>la propriété demandée (%1) du solveur n&apos;a pas pu être spécifiée</translation>
<source>the requested solver property (%1) could not be set.</source>
<translation>la propriété demandée (%1) du solveur n&apos;a pas pu être spécifiée.</translation>
</message>
<message>
<source>the requested curve (%1) could not be set (the variable %2 in component %3 and the variable %4 in component %5 could not be found)</source>
<translation>la courbe demandée (%1) n&apos;a pas pu être spécifiée (la variable %2 dans le composant %3 et la variable %4 dans le composant %5 n&apos;ont pas pu être trouvées)</translation>
<source>the requested curve (%1) could not be set (the variable %2 in component %3 and the variable %4 in component %5 could not be found).</source>
<translation>la courbe demandée (%1) n&apos;a pas pu être spécifiée (la variable %2 dans le composant %3 et la variable %4 dans le composant %5 n&apos;ont pas pu être trouvées).</translation>
</message>
<message>
<source>the requested curve (%1) could not be set (the variable %2 in component %3 could not be found)</source>
<translation>la courbe demandée (%1) n&apos;a pas pu être spécifiée (la variable %2 dans le composant %3 n&apos;a pas pu être trouvée)</translation>
<source>the requested curve (%1) could not be set (the variable %2 in component %3 could not be found).</source>
<translation>la courbe demandée (%1) n&apos;a pas pu être spécifiée (la variable %2 dans le composant %3 n&apos;a pas pu être trouvée).</translation>
</message>
</context>
</TS>

0 comments on commit dd3c836

Please sign in to comment.