Support input of date using dd-mm-yyyy format; Always use four digits…

… for year in date (e.g. "0064-07-18" instead of "64-07-18")
Qalculate · Jan 4, 2025 · c06210b · c06210b
1 parent adaf74d
commit c06210b
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/libqalculate/QalculateDateTime.cc b/libqalculate/QalculateDateTime.cc
@@ -496,6 +496,10 @@ bool QalculateDateTime::set(string str) {
 #ifndef _WIN32
 		}
 #endif
+	} else if(newyear <= 31 && newyear > 0 && newday > 999 && newmonth <= 12) {
+		long int y = newday;
+		newday = newyear;
+		newyear = y;
 	}
 	if(!set(newyear, newmonth, newday)) return false;
 	if(b_t) {
@@ -521,7 +525,16 @@ void QalculateDateTime::set(const QalculateDateTime &date) {
 	b_time = date.timeIsSet();
 }
 string QalculateDateTime::toISOString() const {
-	string str = i2s(i_year);
+	string str;
+	long int y = i_year;
+	if(y < 0) {
+		y = -y;
+		str += "-";
+	}
+	if(y < 10) str += "0";
+	if(y < 100) str += "0";
+	if(y < 1000) str += "0";
+	str += i2s(y);
 	str += "-";
 	if(i_month < 10) {
 		str += "0";