Skip to content

Commit

Permalink
Fix untranslatable strings
Browse files Browse the repository at this point in the history 
Fixes #3513
  • Loading branch information
@amtriathlon
amtriathlon committed Jun 21, 2020
1 parent c3145c5 commit 5eafea6
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 39 deletions.
46 changes: 23 additions & 23 deletions src/Charts/Overview.cpp
View file
Expand Up @@ -197,77 +197,77 @@ OverviewWindow::setConfiguration(QString config)
add = new PMCOverviewItem(space, "coggan_tss");
space->addItem(1,0,9, add);

add = new MetaOverviewItem(space, "Sport", "Sport");
add = new MetaOverviewItem(space, tr("Sport"), "Sport");
space->addItem(2,0,5, add);

add = new MetaOverviewItem(space, "Workout Code", "Workout Code");
add = new MetaOverviewItem(space, tr("Workout Code"), "Workout Code");
space->addItem(3,0,5, add);

add = new MetricOverviewItem(space, "Duration", "workout_time");
add = new MetricOverviewItem(space, tr("Duration"), "workout_time");
space->addItem(4,0,9, add);

add = new MetaOverviewItem(space, "Notes", "Notes");
add = new MetaOverviewItem(space, tr("Notes"), "Notes");
space->addItem(5,0,13, add);

// column 1
add = new MetricOverviewItem(space, "HRV rMSSD", "rMSSD");
add = new MetricOverviewItem(space, tr("HRV rMSSD"), "rMSSD");
space->addItem(1,1,9, add);

add = new MetricOverviewItem(space, "Heartrate", "average_hr");
add = new MetricOverviewItem(space, tr("Heartrate"), "average_hr");
space->addItem(2,1,5, add);

add = new ZoneOverviewItem(space, "Heartrate Zones", RideFile::hr);
add = new ZoneOverviewItem(space, tr("Heartrate Zones"), RideFile::hr);
space->addItem(3,1,11, add);

add = new MetricOverviewItem(space, "Climbing", "elevation_gain");
add = new MetricOverviewItem(space, tr("Climbing"), "elevation_gain");
space->addItem(4,1,5, add);

add = new MetricOverviewItem(space, "Cadence", "average_cad");
add = new MetricOverviewItem(space, tr("Cadence"), "average_cad");
space->addItem(5,1,5, add);

add = new MetricOverviewItem(space, "Work", "total_work");
add = new MetricOverviewItem(space, tr("Work"), "total_work");
space->addItem(6,1,5, add);

// column 2
add = new RPEOverviewItem(space, "RPE");
add = new RPEOverviewItem(space, tr("RPE"));
space->addItem(1,2,9, add);

add = new MetricOverviewItem(space, "Stress", "coggan_tss");
add = new MetricOverviewItem(space, tr("Stress"), "coggan_tss");
space->addItem(2,2,5, add);

add = new ZoneOverviewItem(space, "Fatigue Zones", RideFile::wbal);
add = new ZoneOverviewItem(space, tr("Fatigue Zones"), RideFile::wbal);
space->addItem(3,2,11, add);

add = new IntervalOverviewItem(space, "Intervals", "elapsed_time", "average_power", "workout_time");
add = new IntervalOverviewItem(space, tr("Intervals"), "elapsed_time", "average_power", "workout_time");
space->addItem(4,2,17, add);

// column 3
add = new MetricOverviewItem(space, "Power", "average_power");
add = new MetricOverviewItem(space, tr("Power"), "average_power");
space->addItem(1,3,9, add);

add = new MetricOverviewItem(space, "IsoPower", "coggan_np");
add = new MetricOverviewItem(space, tr("IsoPower"), "coggan_np");
space->addItem(2,3,5, add);

add = new ZoneOverviewItem(space, "Power Zones", RideFile::watts);
add = new ZoneOverviewItem(space, tr("Power Zones"), RideFile::watts);
space->addItem(3,3,11, add);

add = new MetricOverviewItem(space, "Peak Power Index", "peak_power_index");
add = new MetricOverviewItem(space, tr("Peak Power Index"), "peak_power_index");
space->addItem(4,3,8, add);

add = new MetricOverviewItem(space, "Variability", "coggam_variability_index");
add = new MetricOverviewItem(space, tr("Variability"), "coggam_variability_index");
space->addItem(5,3,8, add);

// column 4
add = new MetricOverviewItem(space, "Distance", "total_distance");
add = new MetricOverviewItem(space, tr("Distance"), "total_distance");
space->addItem(1,4,9, add);

add = new MetricOverviewItem(space, "Speed", "average_speed");
add = new MetricOverviewItem(space, tr("Speed"), "average_speed");
space->addItem(2,4,5, add);

add = new ZoneOverviewItem(space, "Pace Zones", RideFile::kph);
add = new ZoneOverviewItem(space, tr("Pace Zones"), RideFile::kph);
space->addItem(3,4,11, add);

add = new RouteOverviewItem(space, "Route");
add = new RouteOverviewItem(space, tr("Route"));
space->addItem(4,4,17, add);

}
Expand Down
6 changes: 3 additions & 3 deletions src/Charts/UserChart.cpp
View file
Expand Up @@ -389,7 +389,7 @@ UserChartSettings::UserChartSettings(Context *context, bool rangemode, GenericCh

// Chart tab
QWidget *cs= new QWidget(this);
tabs->addTab(cs, "Chart");
tabs->addTab(cs, tr("Chart"));

QVBoxLayout *vf = new QVBoxLayout(cs);
QFormLayout *cf = new QFormLayout();
Expand Down Expand Up @@ -446,7 +446,7 @@ UserChartSettings::UserChartSettings(Context *context, bool rangemode, GenericCh
// Series tab
QWidget *seriesWidget = new QWidget(this);
QVBoxLayout *seriesLayout = new QVBoxLayout(seriesWidget);
tabs->addTab(seriesWidget, "Series");
tabs->addTab(seriesWidget, tr("Series"));

seriesTable = new QTableWidget(this);
#ifdef Q_OS_MAX
Expand Down Expand Up @@ -509,7 +509,7 @@ UserChartSettings::UserChartSettings(Context *context, bool rangemode, GenericCh
// axis tab
QWidget *axisWidget = new QWidget(this);
QVBoxLayout *axisLayout = new QVBoxLayout(axisWidget);
tabs->addTab(axisWidget, "Axes");
tabs->addTab(axisWidget, tr("Axes"));

axisTable = new QTableWidget(this);
#ifdef Q_OS_MAX
Expand Down
12 changes: 6 additions & 6 deletions src/Metrics/PDModel.h
View file
Expand Up @@ -120,7 +120,7 @@ class PDModel : public QObject, public QwtSyntheticPointData
virtual void saveParameters(QList<double>&here) = 0;
virtual void loadParameters(QList<double>&here) = 0;

virtual QString name() { return "Base Model"; } // model name e.g. CP 2 parameter model
virtual QString name() { return tr("Base Model"); } // model name e.g. CP 2 parameter model
virtual QString code() { return "Base"; } // short name used in metric names e.g. 2P model

bool inverseTime;
Expand Down Expand Up @@ -237,7 +237,7 @@ class CP2Model : public PDModel
double WPrime();
double CP();

QString name() { return "Classic Parameter"; } // model name e.g. CP 2 parameter model
QString name() { return tr("Classic 2 Parameter"); } // model name e.g. CP 2 parameter model
QString code() { return "cp2"; } // short name used in metric names e.g. 2P model

void saveParameters(QList<double>&here);
Expand Down Expand Up @@ -289,7 +289,7 @@ class CP3Model : public PDModel
double CP();
double PMax();

QString name() { return "Morton 3 Parameter"; } // model name e.g. CP 2 parameter model
QString name() { return tr("Morton 3 Parameter"); } // model name e.g. CP 2 parameter model
QString code() { return "cp3"; } // short name used in metric names e.g. 2P model

void saveParameters(QList<double>&here);
Expand Down Expand Up @@ -322,7 +322,7 @@ class WSModel : public PDModel // ward-smith
double FTP();
double PMax();

QString name() { return "Ward-Smith"; } // model name e.g. CP 2 parameter model
QString name() { return tr("Ward-Smith"); } // model name e.g. CP 2 parameter model
QString code() { return "WS"; } // short name used in metric names e.g. 2P model

void saveParameters(QList<double>&here);
Expand Down Expand Up @@ -357,7 +357,7 @@ class MultiModel : public PDModel
double FTP();
double PMax();

QString name() { return "Veloclinic Multicomponent"; } // model name e.g. CP 2 parameter model
QString name() { return tr("Veloclinic Multicomponent"); } // model name e.g. CP 2 parameter model
QString code() { return "Velo"; } // short name used in metric names e.g. 2P model

// veloclinic has multiple additional parameters
Expand Down Expand Up @@ -470,7 +470,7 @@ class ExtendedModel : public PDModel
double FTP();
double PMax();

QString name() { return "Extended CP"; } // model name e.g. CP 2 parameter model
QString name() { return tr("Extended CP"); } // model name e.g. CP 2 parameter model
QString code() { return "ext"; } // short name used in metric names e.g. 2P model

// Extended has multiple additional parameters
Expand Down
12 changes: 6 additions & 6 deletions src/R/RLibrary.cpp
View file
Expand Up @@ -268,7 +268,7 @@ RLibrary::resolve(const char *symbol)
QFunctionPointer returning = libR->resolve(symbol);
if (returning) return returning;
else {
errors << QString("R lib: failed to resolve symbol: '%1'").arg(symbol);
errors << tr("R lib: failed to resolve symbol: '%1'").arg(symbol);
loaded = false;
return NULL;
}
Expand Down Expand Up @@ -302,8 +302,8 @@ RLibrary::load()
// if home still blanks
bool sethome = false;
if (home == "") {
errors << "R_HOME has not been configured in options or the system environment"
" so we looked in the common places to find the R install.\n\n";
errors << tr("R_HOME has not been configured in options or the system environment"
" so we looked in the common places to find the R install.\n\n");
sethome = true;
}

Expand Down Expand Up @@ -341,7 +341,7 @@ RLibrary::load()
QString full = QString("%1/%2").arg(home).arg(name);
if (QFile(full).exists()) {

errors << QString("The R library was found at '%1'\n").arg(full);
errors << tr("The R library was found at '%1'\n").arg(full);

// we need to make sure the dependants are loaded so update
// LD_LIBRARY_PATH or PATH so they can be found - this only
Expand All @@ -361,11 +361,11 @@ RLibrary::load()
// snaffle away errors
errors <<libR->errorString();
} else {
errors << "We failed to find the R shared libraries.";
errors << tr("We failed to find the R shared libraries.");
}

if (!loaded) {
errors <<"The dynamic library load failed.";
errors <<tr("The dynamic library load failed.");
return loaded;
}

Expand Down
3 changes: 2 additions & 1 deletion src/R/RLibrary.h
View file
Expand Up @@ -21,11 +21,12 @@

// QFunctionPointer typedef introduced in QT5
#include <QtGlobal>

#include <QCoreApplication>
#include <QStringList>
class QString;
class QLibrary;
class RLibrary {
Q_DECLARE_TR_FUNCTIONS(RLibrary)

public:

Expand Down

0 comments on commit 5eafea6

Please sign in to comment.