From 319c1f670261015af1eb047977f5bd7da46dec39 Mon Sep 17 00:00:00 2001 From: Joern Date: Sat, 22 Apr 2017 19:22:34 +0200 Subject: [PATCH] Fix Terminology ... "measurements" (noun) not "measures" (verb) - thanks Mark --- src/Cloud/AddCloudWizard.cpp | 2 +- src/Cloud/BodyMeasures.cpp | 6 +++--- src/Cloud/BodyMeasuresDownload.cpp | 10 +++++----- src/Core/Athlete.cpp | 2 +- src/Core/RideItem.cpp | 2 +- src/FileIO/BodyMeasuresCsvImport.cpp | 2 +- src/Gui/ConfigDialog.cpp | 2 +- src/Gui/HelpWhatsThis.cpp | 2 +- src/Gui/MainWindow.cpp | 2 +- src/Metrics/BasicRideMetrics.cpp | 12 ++++++------ 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Cloud/AddCloudWizard.cpp b/src/Cloud/AddCloudWizard.cpp index 1a037cb502..6608e48c32 100644 --- a/src/Cloud/AddCloudWizard.cpp +++ b/src/Cloud/AddCloudWizard.cpp @@ -99,7 +99,7 @@ AddClass::AddClass(AddCloudWizard *parent) : QWizardPage(parent), wizard(parent) layout->addWidget(p); // Measures - p = new QCommandLinkButton(tr("Measures"), tr("Sync measures data such as weight, body fat, HRV and sleep.")); + p = new QCommandLinkButton(tr("Measurements"), tr("Sync measurements such as weight, body fat, HRV and sleep.")); p->setStyleSheet(QString("font-size: %1px;").arg(12 * dpiXFactor)); connect(p, SIGNAL(clicked()), mapper, SLOT(map())); mapper->setMapping(p, CloudService::Measures); diff --git a/src/Cloud/BodyMeasures.cpp b/src/Cloud/BodyMeasures.cpp index 0fb301f6c5..8933e4af60 100644 --- a/src/Cloud/BodyMeasures.cpp +++ b/src/Cloud/BodyMeasures.cpp @@ -71,7 +71,7 @@ BodyMeasureParser::serialize(QString filename, QList &data) { if (!file.open(QFile::WriteOnly)) { QMessageBox msgBox; msgBox.setIcon(QMessageBox::Critical); - msgBox.setText(QObject::tr("Problem Saving Body Measures")); + msgBox.setText(QObject::tr("Problem Saving Body Measurements")); msgBox.setInformativeText(QObject::tr("File: %1 cannot be opened for 'Writing'. Please check file properties.").arg(filename)); msgBox.exec(); return false; @@ -121,7 +121,7 @@ BodyMeasureParser::unserialize(QFile &file, QList &data) { if (!file.open(QFile::ReadOnly)) { QMessageBox msgBox; msgBox.setIcon(QMessageBox::Critical); - msgBox.setText(QObject::tr("Problem Reading Body Measures")); + msgBox.setText(QObject::tr("Problem Reading Body Measurements")); msgBox.setInformativeText(QObject::tr("File: %1 cannot be opened for 'Reading'. Please check file properties.").arg(file.fileName())); msgBox.exec(); return false; @@ -135,7 +135,7 @@ BodyMeasureParser::unserialize(QFile &file, QList &data) { if (parseError.error != QJsonParseError::NoError || document.isEmpty() || document.isNull()) { QMessageBox msgBox; msgBox.setIcon(QMessageBox::Critical); - msgBox.setText(QObject::tr("Problem Parsing Body Measures")); + msgBox.setText(QObject::tr("Problem Parsing Body Measurements")); msgBox.setInformativeText(QObject::tr("File: %1 is not a proper JSON file. Parsing error: %2").arg(file.fileName()).arg(parseError.errorString())); msgBox.exec(); return false; diff --git a/src/Cloud/BodyMeasuresDownload.cpp b/src/Cloud/BodyMeasuresDownload.cpp index 2892cbdd19..f45b71f99c 100644 --- a/src/Cloud/BodyMeasuresDownload.cpp +++ b/src/Cloud/BodyMeasuresDownload.cpp @@ -30,7 +30,7 @@ BodyMeasuresDownload::BodyMeasuresDownload(Context *context) : context(context) { - setWindowTitle(tr("Body Measures download")); + setWindowTitle(tr("Body Measurements download")); HelpWhatsThis *help = new HelpWhatsThis(this); this->setWhatsThis(help->getWhatsThisText(HelpWhatsThis::MenuBar_Tools_Download_BodyMeasures)); @@ -49,7 +49,7 @@ BodyMeasuresDownload::BodyMeasuresDownload(Context *context) : context(context) QGroupBox *groupBox2 = new QGroupBox(tr("Choose date range for download")); dateRangeAll = new QRadioButton(tr("From date of first recorded activity to today")); - dateRangeLastMeasure = new QRadioButton(tr("From date of last downloaded measure to today")); + dateRangeLastMeasure = new QRadioButton(tr("From date of last downloaded measurement to today")); dateRangeManual = new QRadioButton(tr("Enter manually:")); dateRangeAll->setChecked(true); QVBoxLayout *vbox2 = new QVBoxLayout; @@ -77,7 +77,7 @@ BodyMeasuresDownload::BodyMeasuresDownload(Context *context) : context(context) groupBox2->setLayout(vbox2); mainLayout->addWidget(groupBox2); - discardExistingMeasures = new QCheckBox(tr("Discard all existing measures"), this); + discardExistingMeasures = new QCheckBox(tr("Discard all existing measurements"), this); discardExistingMeasures->setChecked(false); mainLayout->addWidget(discardExistingMeasures); @@ -194,7 +194,7 @@ BodyMeasuresDownload::download() { toDate = QDateTime::currentDateTimeUtc(); } else if (dateRangeManual->isChecked()) { if (manualFromDate->dateTime() > manualToDate->dateTime()) { - QMessageBox::warning(this, tr("Body Measures"), tr("Invalid date range - please check your input")); + QMessageBox::warning(this, tr("Body Measurements"), tr("Invalid date range - please check your input")); // re-activate the buttons downloadButton->setEnabled(true); closeButton->setEnabled(true); @@ -270,7 +270,7 @@ BodyMeasuresDownload::download() { } else { // handle error document in err String - QMessageBox::warning(this, tr("Body Measures"), tr("Downloading of body measures failed with error: %1").arg(err)); + QMessageBox::warning(this, tr("Body Measurements"), tr("Downloading of body measurements failed with error: %1").arg(err)); } // re-activate the buttons diff --git a/src/Core/Athlete.cpp b/src/Core/Athlete.cpp index f77ef5c971..2e02a3695b 100644 --- a/src/Core/Athlete.cpp +++ b/src/Core/Athlete.cpp @@ -168,7 +168,7 @@ Athlete::Athlete(Context *context, const QDir &homeDir) // Routes routes = new Routes(context, home->config()); - // get body measures if the file exists + // get body measurements if the file exists QFile bmFile(QString("%1/bodymeasures.json").arg(context->athlete->home->config().canonicalPath())); if (bmFile.exists()) { QList bmData; diff --git a/src/Core/RideItem.cpp b/src/Core/RideItem.cpp index 3c7be4f12f..6d01d57ada 100644 --- a/src/Core/RideItem.cpp +++ b/src/Core/RideItem.cpp @@ -674,7 +674,7 @@ RideItem::refresh() double RideItem::getWeight(int type) { - // get any body measures first + // get any body measurements first context->athlete->getBodyMeasure(dateTime.date(), weightData); // return what was asked for! diff --git a/src/FileIO/BodyMeasuresCsvImport.cpp b/src/FileIO/BodyMeasuresCsvImport.cpp index fed1394cbb..178842f90d 100644 --- a/src/FileIO/BodyMeasuresCsvImport.cpp +++ b/src/FileIO/BodyMeasuresCsvImport.cpp @@ -42,7 +42,7 @@ BodyMeasuresCsvImport::getBodyMeasures(QString &error, QDateTime from, QDateTime bool weightkgExists = false; int lineNo = 0; - QString fileName = QFileDialog::getOpenFileName(NULL, tr("Select body measures file to import"), "", tr("CSV Files (*.csv)")); + QString fileName = QFileDialog::getOpenFileName(NULL, tr("Select body measurements file to import"), "", tr("CSV Files (*.csv)")); if (fileName.isEmpty()) { error = tr("No file selected."); return false; diff --git a/src/Gui/ConfigDialog.cpp b/src/Gui/ConfigDialog.cpp index 96c12581fe..592180ef54 100644 --- a/src/Gui/ConfigDialog.cpp +++ b/src/Gui/ConfigDialog.cpp @@ -340,7 +340,7 @@ AthleteConfig::AthleteConfig(QDir home, Context *context) : QTabWidget *tabs = new QTabWidget(this); tabs->addTab(athletePage, tr("About")); tabs->addTab(modelPage, tr("Model")); - tabs->addTab(athletePhysPage, tr("Measures")); + tabs->addTab(athletePhysPage, tr("Measurements")); tabs->addTab(zonesTab, tr("Zones")); tabs->addTab(credentialsPage, tr("Accounts")); tabs->addTab(autoImportPage, tr("Auto Import")); diff --git a/src/Gui/HelpWhatsThis.cpp b/src/Gui/HelpWhatsThis.cpp index 607518f729..47cec8d6e8 100644 --- a/src/Gui/HelpWhatsThis.cpp +++ b/src/Gui/HelpWhatsThis.cpp @@ -123,7 +123,7 @@ HelpWhatsThis::getText(GCHelp chapter) { case MenuBar_Tools_AirDens_EST: return text.arg("Menu%20Bar_Tools").arg(tr("Estimation of Air Density (Rho)")); case MenuBar_Tools_Download_BodyMeasures: - return text.arg("Menu%20Bar_Tools").arg(tr("Downloading of Body Measures (e.g. weight) from multiple sources")); + return text.arg("Menu%20Bar_Tools").arg(tr("Downloading of Body Measurements (e.g. weight) from multiple sources")); case MenuBar_Tools_VDOT_CALC: return text.arg("Menu%20Bar_Tools").arg(tr("Calculation of VDOT and Threshold Pace according to Daniels' Running Formula")); case MenuBar_Tools_Download_ERGDB: diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 179ac07538..a073c6fec4 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -455,7 +455,7 @@ MainWindow::MainWindow(const QDir &home) optionsMenu->addAction(tr("VDOT and T-Pace Calculator..."), this, SLOT(showVDOTCalculator())); optionsMenu->addSeparator(); - optionsMenu->addAction(tr("Get &Body Measures..."), this, + optionsMenu->addAction(tr("Get &Body Measurements..."), this, SLOT (downloadBodyMeasures())); optionsMenu->addSeparator(); optionsMenu->addAction(tr("Create a new workout..."), this, SLOT(showWorkoutWizard())); diff --git a/src/Metrics/BasicRideMetrics.cpp b/src/Metrics/BasicRideMetrics.cpp index 93db7b3a27..7a56291b2f 100644 --- a/src/Metrics/BasicRideMetrics.cpp +++ b/src/Metrics/BasicRideMetrics.cpp @@ -523,7 +523,7 @@ class AthleteWeight : public RideMetric { setImperialUnits(tr("lbs")); setPrecision(2); setConversion(LB_PER_KG); - setDescription(tr("Weight in kg or lbs: first from downloaded Body Measure data, then from Activity metadata and last from Athlete configuration with 75kg default")); + setDescription(tr("Weight in kg or lbs: first from Athlete body measurements, then from Activity metadata and last from Athlete configuration with 75kg default")); } void compute(RideItem *item, Specification, const QHash &) { @@ -572,7 +572,7 @@ class AthleteFat : public RideMetric { setImperialUnits(tr("lbs")); setPrecision(2); setConversion(LB_PER_KG); - setDescription(tr("Athlete bodyfat in kg or lbs from downloaded Body Measure data")); + setDescription(tr("Athlete bodyfat in kg or lbs from body measurements")); } void compute(RideItem *item, Specification, const QHash &) { @@ -613,7 +613,7 @@ class AthleteBones : public RideMetric { setImperialUnits(tr("lbs")); setPrecision(2); setConversion(LB_PER_KG); - setDescription(tr("Athlete bones in kg or lbs from downloaded Body Measure data")); + setDescription(tr("Athlete bones in kg or lbs from body measurements")); } void compute(RideItem *item, Specification, const QHash &) { @@ -654,7 +654,7 @@ class AthleteMuscles : public RideMetric { setImperialUnits(tr("lbs")); setPrecision(2); setConversion(LB_PER_KG); - setDescription(tr("Athlete muscles in kg or lbs from downloaded Body Measure data")); + setDescription(tr("Athlete muscles in kg or lbs from body measurements")); } void compute(RideItem *item, Specification, const QHash &) { @@ -695,7 +695,7 @@ class AthleteLean : public RideMetric { setImperialUnits(tr("lbs")); setPrecision(2); setConversion(LB_PER_KG); - setDescription(tr("Lean Weight in kg or lbs from downloaded Body Measure data")); + setDescription(tr("Lean Weight in kg or lbs from body measurements")); } void compute(RideItem *item, Specification, const QHash &) { @@ -735,7 +735,7 @@ class AthleteFatP : public RideMetric { setMetricUnits(tr("%")); setImperialUnits(tr("%")); setPrecision(1); - setDescription(tr("Bodyfat Percent from downloaded Body Measure data")); + setDescription(tr("Bodyfat in Percent from body measurements")); } void compute(RideItem *item, Specification, const QHash &) {