Fix issue where CSV from computer with another locale could not be played

alex-spataru · alex-spataru · commit 1522b887547a · 2021-01-24T17:53:17.000-05:00
diff --git a/src/CsvPlayer.cpp b/src/CsvPlayer.cpp
@@ -399,7 +399,7 @@ void CsvPlayer::updateData()
             // No error, calculate difference & schedule update
             if (!error)
             {
-                auto format = "yyyy/MMM/dd/ HH:mm:ss::zzz";
+                auto format = "yyyy/MM/dd/ HH:mm:ss::zzz";
                 auto currDateTime = QDateTime::fromString(currTime, format);
                 auto nextDateTime = QDateTime::fromString(nextTime, format);
                 auto msecsToNextF = currDateTime.msecsTo(nextDateTime);
diff --git a/src/Export.cpp b/src/Export.cpp
@@ -249,7 +249,7 @@ void Export::writeValues()
 
         // Prepend current time
         titles.prepend("RX Date/Time");
-        values.prepend(dateTime.toString("yyyy/MMM/dd/ HH:mm:ss::zzz"));
+        values.prepend(dateTime.toString("yyyy/MM/dd/ HH:mm:ss::zzz"));
 
         // File not open, create it & add cell titles
         if (!isOpen() && exportEnabled())
@@ -333,5 +333,5 @@ void Export::updateValues()
 
     // Update JSON list
     m_jsonList.append(
-        qMakePair<QDateTime, QJsonObject>(QDateTime::currentDateTime(), json));
+        qMakePair<QDateTime, QJsonObject>(QDateTime::currentDateTimeUtc(), json));
 }
diff --git a/src/SerialManager.cpp b/src/SerialManager.cpp
@@ -65,7 +65,8 @@ static QString SAFE_STRING(const QByteArray &data)
         else if (code == 127)
             hexString.append(" DEL ");
 
-        else if (code > 127) {
+        else if (code > 127)
+        {
             auto hexByte = QString::number(code, 16);
             while (hexByte.length() < 4)
                 hexByte.prepend("0");
diff --git a/src/Translator.cpp b/src/Translator.cpp
@@ -128,7 +128,7 @@ QString Translator::welcomeConsoleText() const
  */
 QStringList Translator::availableLanguages() const
 {
-    return QStringList { "English", "Español", "简体中文", "Deutsch"};
+    return QStringList { "English", "Español", "简体中文", "Deutsch" };
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ void CsvPlayer::updateData()`
`399`	`399`	`// No error, calculate difference & schedule update`
`400`	`400`	`if (!error)`
`401`	`401`	`{`
`402`		`- auto format = "yyyy/MMM/dd/ HH:mm:ss::zzz";`
	`402`	`+ auto format = "yyyy/MM/dd/ HH:mm:ss::zzz";`
`403`	`403`	`auto currDateTime = QDateTime::fromString(currTime, format);`
`404`	`404`	`auto nextDateTime = QDateTime::fromString(nextTime, format);`
`405`	`405`	`auto msecsToNextF = currDateTime.msecsTo(nextDateTime);`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ QString Translator::welcomeConsoleText() const`
`128`	`128`	`*/`
`129`	`129`	`QStringList Translator::availableLanguages() const`
`130`	`130`	`{`
`131`		`- return QStringList { "English", "Español", "简体中文", "Deutsch"};`
	`131`	`+ return QStringList { "English", "Español", "简体中文", "Deutsch" };`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`/**`