Merge branch 'silverstripe:2' into patch-1

.github/workflows/ci.yml

@@ -4,13 +4,8 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Tuesday at 12:10pm UTC
-  schedule:
-    - cron: '10 12 * * 2'
 
 jobs:
   ci:
     name: CI
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 12:10 PM UTC, only on Tuesday and Wednesday
+  schedule:
+    - cron: '10 12 * * 2,3'
+
+jobs:
+  dispatch-ci:
+    name: Dispatch CI
+    # Only run cron on the silverstripe account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch CI
+        uses: silverstripe/gha-dispatch-ci@v1

.tx/config

@@ -1,8 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[silverstripe-assets.master]
+[o:silverstripe:p:silverstripe-assets:r:master]
 file_filter = lang/<lang>.yml
 source_file = lang/en.yml
 source_lang = en
-type = YML
+type        = YML
+

README.md

@@ -5,6 +5,12 @@
 
 Required component of [Silverstripe Framework](https://github.com/silverstripe/silverstripe-framework)
 
+## Installation
+
+```sh
+composer require silverstripe/assets
+```
+
 ## Links ##
 
  * [License](./LICENSE)

_config/asset.yml

@@ -10,14 +10,14 @@ SilverStripe\Core\Injector\Injector:
     class: SilverStripe\Assets\Flysystem\ProtectedAssetAdapter
   # Define the default filesystem
   League\Flysystem\Filesystem.public:
-    class: League\Flysystem\Filesystem
+    class: SilverStripe\Assets\Flysystem\Filesystem
     constructor:
       FilesystemAdapter: '%$SilverStripe\Assets\Flysystem\PublicAdapter'
       FilesystemConfig:
         visibility: public
   # Define the secondary filesystem for protected assets
   League\Flysystem\Filesystem.protected:
-    class: League\Flysystem\Filesystem
+    class: SilverStripe\Assets\Flysystem\Filesystem
     constructor:
       FilesystemAdapter: '%$SilverStripe\Assets\Flysystem\ProtectedAdapter'
       FilesystemConfig:
@@ -29,7 +29,6 @@ SilverStripe\Core\Injector\Injector:
       ResolutionFileIDHelpers:
         - '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
         - '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
-        - '%$SilverStripe\Assets\FilenameParsing\LegacyFileIDHelper'
       DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
       VersionedStage: Live
   # Define protected resolution strategy
@@ -39,7 +38,6 @@ SilverStripe\Core\Injector\Injector:
       DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
       ResolutionFileIDHelpers:
         - '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
-        - '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
       VersionedStage: Stage
 ---
 Name: assetscore

composer.json

@@ -19,18 +19,18 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "silverstripe/framework": "^4.10",
-        "silverstripe/vendor-plugin": "^1.0",
-        "symfony/filesystem": "^3.4|^4.0|^5.0",
-        "intervention/image": "^2.7",
-        "league/flysystem": "^1.0.70"
+        "php": "^8.1",
+        "silverstripe/framework": "^5.1",
+        "silverstripe/vendor-plugin": "^2",
+        "symfony/filesystem": "^6.1",
+        "intervention/image": "^2.7.2",
+        "league/flysystem": "^3.9.0"
     },
     "require-dev": {
-        "silverstripe/recipe-testing": "^2",
-        "silverstripe/versioned": "^1@dev",
-        "squizlabs/php_codesniffer": "^3",
-        "mikey179/vfsstream": "^1.6"
+        "silverstripe/recipe-testing": "^3",
+        "silverstripe/versioned": "^2",
+        "squizlabs/php_codesniffer": "^3.7",
+        "mikey179/vfsstream": "^v1.6.11"
     },
     "suggest": {
         "ext-exif": "If you use GD backend (the default) you may want to have EXIF extension installed to elude some tricky issues"
@@ -50,4 +50,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}

lang/bg.yml

@@ -14,7 +14,7 @@ bg:
     JpgType: 'JPEG файл - подходящ за снимки'
     JsType: 'Javascript файл'
     LASTEDIT: 'Последно променен'
-    MODIFIED: 'Редактиран'
+    MODIFIED: Редактиран
     Mp3Type: 'MP3 аудио'
     MpgType: 'MPEG видео'
     NOFILESIZE: 'Големината на файла е 0 байта'
@@ -32,6 +32,7 @@ bg:
     WavType: 'WAV аудио'
     XlsType: 'Excel таблица'
     ZipType: 'Компресиран файл ZIP'
+    db_File: Файл
   SilverStripe\Assets\Folder:
     PLURALNAME: Папки
     PLURALS:

lang/da.yml

@@ -0,0 +1,50 @@
+da:
+  SilverStripe\Assets\File:
+    AviType: 'AVI video fil'
+    CREATED: 'Først uploadet'
+    CssType: 'CSS fil'
+    DRAFT: Kladde
+    DmgType: 'Apple disk image'
+    DocType: 'Word dokument'
+    EDIT_ALL_DESCRIPTION: 'Rediger enhver fil'
+    EDIT_ALL_HELP: 'Rediger enhver fil på sitet, også beskyttede'
+    GifType: 'GIF billede - god til illustrationer'
+    GzType: 'GZIP komprimeret fil'
+    HtmlType: 'HTML fil'
+    INVALIDEXTENSION_SHORT: 'Endelse ikke tilladt'
+    IcoType: 'Ikon billedefil'
+    JpgType: 'JPEG billede - god til fotos'
+    JsType: 'Javascript fil'
+    LASTEDIT: 'Senest ændret'
+    MODIFIED: Modificeret
+    Mp3Type: 'MP3 lyd fil'
+    MpgType: 'MPEG video fil'
+    NOFILESIZE: 'Filstørrelse er nul bytes.'
+    NOVALIDUPLOAD: 'Filen er ikke gyldig til upload'
+    PATH: Sti
+    PLURALNAME: Filer
+    PLURALS:
+      one: 'En fil'
+      other: '{count} Filer'
+    PdfType: 'Adobe Acrobat PDF fil'
+    PngType: 'PNG billede - godt allround format'
+    SINGULARNAME: Fil
+    TOOLARGE: 'Filen er for stor, maksimalt tilladt {size}'
+    TiffType: 'Tagged billede format'
+    URL: URL
+    WavType: 'WAV lyd fil'
+    XlsType: 'Excel regneark'
+    ZipType: 'ZIP komprimeret fil'
+    db_File: Fil
+  SilverStripe\Assets\Folder:
+    PLURALNAME: Mapper
+    PLURALS:
+      one: 'En mappe'
+      other: '{count} Mapper'
+    SINGULARNAME: Mappe
+  SilverStripe\Assets\Image:
+    PLURALNAME: Billeder
+    PLURALS:
+      one: 'Et billede'
+      other: '{count} billeder'
+    SINGULARNAME: Billede

lang/de.yml

@@ -31,6 +31,11 @@ de:
     WavType: WAV-Audiodatei
     XlsType: Excel-Tabelle
     ZipType: 'ZIP-komprimierte Datei'
+    EDIT_ALL_DESCRIPTION: 'Alle Dateien bearbeiten'
+    EDIT_ALL_HELP: 'Alle, auch eingeschränkte, Dateien bearbeiten'
+    NOVALIDUPLOAD: 'Die Datei ist kein gültiger Upload'
+    TiffType: 'Tagged Image File Format'
+    db_File: Datei
   SilverStripe\Assets\Folder:
     PLURALNAME: Ordner
     PLURALS: