Skip to content

Commit

Permalink
Merge branch '1' into 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Mar 29, 2023
2 parents 102a3b5 + 41cd424 commit 2e98b60
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 104 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ on:
push:
pull_request:
workflow_dispatch:
# Every Monday at 11:30am UTC
schedule:
- cron: '30 11 * * 1'

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
16 changes: 16 additions & 0 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Dispatch CI

on:
# At 11:30 AM UTC, only on Monday and Tuesday
schedule:
- cron: '30 11 * * 1,2'

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
10 changes: 0 additions & 10 deletions lang/ar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,5 @@ ar:
SELECT_EMPTY: اختر...
SELECT_TYPE: 'اختر نوع المحتوى'
TAB_OTHERS: أخرى
SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
MENUTITLE: ''
SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
ErrorItemViewPermissionDenied: 'ليس لديك الصلاحيات اللازمة لعرض {ObjectTitle}'
MENUTITLE: ''
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: ''
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
14 changes: 0 additions & 14 deletions lang/bg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,3 @@ bg:
COLUMN_TYPE: Тип
SELECT_EMPTY: Изберете...
SELECT_TYPE: 'Изберете тип съдържание'
TAB_OTHERS: ''
MENUTITLE: ''
SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
MENUTITLE: ''
SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
ErrorItemViewPermissionDenied: ''
MENUTITLE: ''
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: ''
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
5 changes: 0 additions & 5 deletions lang/da.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,3 @@ da:
MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: 'Ingen diff tilgængelig'
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
10 changes: 0 additions & 10 deletions lang/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,5 @@ de:
SELECT_EMPTY: Auswählen...
SELECT_TYPE: 'Inhaltstyp auswählen'
TAB_OTHERS: Andere
SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
MENUTITLE: ''
SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
ErrorItemViewPermissionDenied: 'Sie haben nicht die nötigen Berechtigungen, um {ObjectTitle} auszuwählen'
MENUTITLE: ''
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: ''
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
13 changes: 0 additions & 13 deletions lang/fi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,3 @@ fi:
MENUTITLE: Arkistot
SELECT_EMPTY: Valitse...
SELECT_TYPE: 'Valitse sisällön tyyppi'
TAB_OTHERS: ''
SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
MENUTITLE: ''
SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
ErrorItemViewPermissionDenied: ''
MENUTITLE: ''
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: ''
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
10 changes: 0 additions & 10 deletions lang/fi_FI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,5 @@ fi_FI:
SELECT_EMPTY: Valitse...
SELECT_TYPE: 'Valitse sisältötyyppi'
TAB_OTHERS: Muut
SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
MENUTITLE: ''
SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
ErrorItemViewPermissionDenied: 'Oikeutesi eivät riitä {ObjectTitle} tarkasteluun'
MENUTITLE: ''
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: ''
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
8 changes: 0 additions & 8 deletions lang/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,3 @@ fr:
MENUTITLE: 'Éditer la page'
SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
ErrorItemViewPermissionDenied: 'Vous n''avez pas les permissions nécessaires pour voir {ObjectTitle}'
MENUTITLE: ''
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: ''
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
5 changes: 0 additions & 5 deletions lang/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,3 @@ it:
MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: 'Diff non disponibile'
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
5 changes: 0 additions & 5 deletions lang/pl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,3 @@ pl:
MENUTITLE: HistoryViewer
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: 'Nie znaleziono różnic w stronach'
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
5 changes: 0 additions & 5 deletions lang/sl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,3 @@ sl:
MENUTITLE: SilverStripe\VersionedAdmin\Controllers\HistoryViewerController
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: 'Spremembe niso na voljo'
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''
14 changes: 0 additions & 14 deletions lang/sv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,3 @@ sv:
COLUMN_TYPE: Typ
SELECT_EMPTY: Välj...
SELECT_TYPE: 'Välj en innehållstyp'
TAB_OTHERS: ''
MENUTITLE: ''
SilverStripe\VersionedAdmin\Controllers\CMSPageHistoryViewerController:
MENUTITLE: ''
SilverStripe\VersionedAdmin\Controllers\HistoryViewerController:
ErrorItemViewPermissionDenied: ''
MENUTITLE: ''
SilverStripe\VersionedAdmin\Forms\DiffField:
NO_DIFF_AVAILABLE: ''
SilverStripe\Versioned\RestoreAction:
RESTORE: ''
RESTORE_DESC: ''
RESTORE_TO_ROOT: ''
RESTORE_TO_ROOT_DESC: ''

0 comments on commit 2e98b60

Please sign in to comment.