From cb025431e553848764a85ce3d69741df7753c83d Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Mon, 25 Mar 2019 14:26:34 -0400 Subject: [PATCH] Added a space between pressure number and units in the Welcome message. --- oscar/welcome.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp index 382e9f91..9bba7b6f 100644 --- a/oscar/welcome.cpp +++ b/oscar/welcome.cpp @@ -203,14 +203,14 @@ QString Welcome::GenerateCPAPHTML() if (cpapmode == MODE_CPAP) { EventDataType pressure = day->settings_max(CPAP_Pressure); - html += tr("Your CPAP machine blasted you with a constant %1%2 of air").arg(pressure).arg(schema::channel[CPAP_Pressure].units()); + html += tr("Your CPAP machine used a constant %1 %2 of air").arg(pressure).arg(schema::channel[CPAP_Pressure].units()); } else if (cpapmode == MODE_APAP) { EventDataType pressure = day->percentile(CPAP_Pressure, perc/100.0); - html += tr("Your pressure was under %1%2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_Pressure].units()).arg(perc); + html += tr("Your pressure was under %1 %2 for %3% of the time.").arg(pressure).arg(schema::channel[CPAP_Pressure].units()).arg(perc); } else if (cpapmode == MODE_BILEVEL_FIXED) { EventDataType ipap = day->settings_max(CPAP_IPAP); EventDataType epap = day->settings_min(CPAP_EPAP); - html += tr("Your machine blasted you with a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units()); + html += tr("Your machine used a constant %1-%2 %3 of air.").arg(epap).arg(ipap).arg(schema::channel[CPAP_Pressure].units()); } else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) { EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0); EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0); @@ -219,14 +219,14 @@ QString Welcome::GenerateCPAPHTML() EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0); EventDataType epap = qRound(day->settings_wavg(CPAP_EPAP)); - html += tr("Your EPAP pressure fixed at %1%2.").arg(epap).arg(schema::channel[CPAP_EPAP].units())+"
"; - html += tr("Your IPAP pressure was under %1%2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc); + html += tr("Your EPAP pressure fixed at %1 %2.").arg(epap).arg(schema::channel[CPAP_EPAP].units())+"
"; + html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc); } else if (cpapmode == MODE_ASV_VARIABLE_EPAP){ EventDataType ipap = day->percentile(CPAP_IPAP, perc/100.0); EventDataType epap = day->percentile(CPAP_EPAP, perc/100.0); - html += tr("Your EPAP pressure was under %1%2 for %3% of the time.").arg(epap).arg(schema::channel[CPAP_EPAP].units()).arg(perc)+"
"; - html += tr("Your IPAP pressure was under %1%2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc); + html += tr("Your EPAP pressure was under %1 %2 for %3% of the time.").arg(epap).arg(schema::channel[CPAP_EPAP].units()).arg(perc)+"
"; + html += tr("Your IPAP pressure was under %1 %2 for %3% of the time.").arg(ipap).arg(schema::channel[CPAP_IPAP].units()).arg(perc); } html += "
";