Merge branch 'master' into NET8

bassmaster187 · Feb 11, 2025 · 03d248e · 03d248e
2 parents 8f2159b + 5a447a1
commit 03d248e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/TeslaLogger/bin/language-en.txt b/TeslaLogger/bin/language-en.txt
@@ -265,6 +265,8 @@ BA_FillOut=Fill out this form:
 BA_CopyUrl="Copy the resulting URL as shown"
 BA_Paste="Paste the resulting URL into the box and click "_QQ_"Get Tokens"_QQ_" Button:"
 BA_FLEETAPI="Tesla Fleet API"
+BA_ALLCARS="All vehicles except Model S/X built before 2021"
+BA_MODELSXOLD="Model S/X built before 2021"
 Get Tokens=Get Tokens
 Subscription="Subscription"
 Subscribe="Subscribe"

diff --git a/TeslaLogger/www/admin/info.php b/TeslaLogger/www/admin/info.php
@@ -88,7 +88,7 @@ function ShowInfo()
 		$("#PositiveButton").click(function(){window.location.href='https://github.com/bassmaster187/TeslaLogger/blob/master/docker_setup.md#docker-update--upgrade';});
 		$("#NegativeButton").hide();
 	<?php
-	} else if (isDocker() && !DatasourceUpdated())
+	} else if (isDocker() && !isDockerNET8() && !DatasourceUpdated())
 	{?>
 		$("#InfoText").html("<h1>Please update datasource.yaml file. Check: <a href='https://github.com/bassmaster187/TeslaLogger/blob/master/docker_setup.md#docker-update--upgrade'>LINK</a></h1>");
 		$(".HeaderT").show();