Merge branch 'staging/bugfix'

.versioneer-lookup

@@ -24,10 +24,10 @@ maintenance 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev
 fix/.* 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev
 improve/.* 1.8.0 3fe45661cd79c5137d9d4f5f4adb4d9519bc2084 pep440-dev
 
-# staging/bugfix is the branch for preparation of the 1.8.6 bugfix release
+# staging/bugfix is the branch for preparation of the 1.8.7 bugfix release
 # so are any bug/... branches
-staging/bugfix 1.8.6 395354212c2bb65b37b303de171418f6475ca346 pep440-dev
-bug/.* 1.8.6 395354212c2bb65b37b303de171418f6475ca346 pep440-dev
+staging/bugfix 1.8.7 1875623f05e14c3a197c6ff324f02dce55cec7d2 pep440-dev
+bug/.* 1.8.7 1875623f05e14c3a197c6ff324f02dce55cec7d2 pep440-dev
 
 # staging/maintenance is currently the branch for preparation of 1.8.0rc6
 # so is regressionfix/...

SUPPORTERS.md

@@ -11,33 +11,36 @@ thanks to everyone who contributed!
   * Al Mucci
   * Arnljot Arntsen
   * Ash King
+  * Ben Fritsch
   * BigTreeTech
   * Boris Hussein
   * Brad Jackson
-  * Calvin Vette
   * Christian Petropolis
   * Christian Wolf
   * Christian Würthner
   * Christoph Sigrist
-  * Codense Consulting Oy
+  * CooperSpartan
   * Creality3D
   * DeltaMaker 3D Printers
   * Dennis Breining
+  * Douglas Floyd
+  * Ed Crump
   * Ernesto Martinez
   * Franziska Kunsmann
   * Hog Duske
+  * Jacob Renstrom
   * James Mackay
   * Jeff Green
   * Jeff Moe
   * jeffiel
   * Jeremy Cole
+  * John Cassel
   * Julian Melo
   * Justin Kaufman
   * Kaile Riser
   * Kazuhiro Ogura
   * Kenneth Jiang
   * Kurt Wubbels
-  * Kyle Menigoz
   * Lachlan Bell
   * Lefteris Lertas
   * LulzBot
@@ -65,7 +68,6 @@ thanks to everyone who contributed!
   * Stefan Krister
   * Steve Dougherty
   * Steve Thompson
-  * TJ Horner
   * Ulrich Kempken
 
-and 2145 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)!
+and 2036 more wonderful people pledging on the [Patreon campaign](https://patreon.com/foosel) or via [GitHub Sponsors](https://github.com/users/foosel/sponsorship)!

setup.py

@@ -31,7 +31,7 @@
 bundled_plugins = [
     "OctoPrint-FileCheck>=2021.2.23",
     "OctoPrint-FirmwareCheck>=2021.10.11",
-    "OctoPrint-PiSupport>=2022.3.28",
+    "OctoPrint-PiSupport>=2022.6.13",
 ]
 core_deps = [
     "argon2_cffi>=21.3.0,<22",

src/octoprint/plugins/errortracking/__init__.py

@@ -18,10 +18,10 @@
 )
 
 SENTRY_URL_SERVER = (
-    "https://faa02914ec8f42139e12a36482cfdb60@o118517.ingest.sentry.io/1373987"
+    "https://9c242ccf183444eaacd046d86d8b0ea2@o118517.ingest.sentry.io/1373987"
 )
 SENTRY_URL_COREUI = (
-    "https://be7a53389fb045b48d6c384bb8ee89eb@o118517.ingest.sentry.io/1374096"
+    "https://4d9844043596415faa606ff722174b90@o118517.ingest.sentry.io/1374096"
 )
 
 SETTINGS_DEFAULTS = {
@@ -158,7 +158,9 @@ def _enable_errortracking():
 
         unique_id = str(uuid.uuid4())
         s.set(
-            ["plugins", "errortracking", "unique_id"], unique_id, defaults=plugin_defaults
+            ["plugins", "errortracking", "unique_id"],
+            unique_id,
+            defaults=plugin_defaults,
         )
         s.save()
 

src/octoprint/server/__init__.py

@@ -1349,7 +1349,7 @@ def _get_locale(self):
         ):
             return Locale.negotiate([default_language], LANGUAGES)
 
-        return Locale.parse(request.accept_languages.best_match(LANGUAGES))
+        return Locale.parse(request.accept_languages.best_match(LANGUAGES, default="en"))
 
     def _setup_heartbeat_logging(self):
         logger = logging.getLogger(__name__ + ".heartbeat")