Merge remote-tracking branch 'parent/main' into upstream-20230103

2024-01-03 19:15:01 +09:00 · 2024-01-03 19:15:01 +09:00 · 7356f776f2
commit 7356f776f2
parent 41631fe46d 7cce2a41f2
60 changed files with 1349 additions and 323 deletions
--- a/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
@ -222,7 +222,7 @@ class FocalPointModal extends ImmutablePureComponent {
      const worker = createWorker({
        workerPath: tesseractWorkerPath,
        corePath: tesseractCorePath,
-        langPath: `${assetHost}/ocr/lang-data/`,
+        langPath: `${assetHost}/ocr/lang-data`,
        logger: ({ status, progress }) => {
          if (status === 'recognizing text') {
            this.setState({ ocrStatus: 'detecting', progress });