Merge branch '3.x' into fix/list-error-deleting-role

area17 · Nov 29, 2023 · 179224b · 179224b
2 parents 8691523 + 0bb9fc5
commit 179224b
Show file tree

Hide file tree

Showing 9 changed files with 843 additions and 359 deletions.
diff --git a/docs/content/1_docs/3_modules/6_table-builder.md b/docs/content/1_docs/3_modules/6_table-builder.md
@@ -125,7 +125,7 @@ The example blow illustrates a possible usage:
 Text::make()
   ->field('customField')
   ->customRender(function (Model $model) {
-    return view('my.view', ['title' => $model->title'])->render();
+    return view('my.view', ['title' => $model->title])->render();
   });
 ```
 

diff --git a/frontend/js/components/Cropper.vue b/frontend/js/components/Cropper.vue
@@ -181,7 +181,21 @@
       },
       initCrop: function () {
         const crop = this.toNaturalCrop(this.crop)
-        this.cropper.setData(crop)
+        // Mike ([email protected]) --
+        //
+        // it seems due to rounding errors(?) that sometimes
+        // the x position can be reset incorrectly
+        // see: https://github.com/fengyuanchen/cropperjs/issues/1057
+        //
+        // from my testing it seems to be a little inconsistent and unpredictable
+        // I guess you just need for the rounding error to happen
+        // But, it seems setting the properties individually avoids this...
+        //
+        // -- Mike ([email protected])
+        this.cropper.setData({ x: crop.x })
+        this.cropper.setData({ y: crop.y })
+        this.cropper.setData({ width: crop.width })
+        this.cropper.setData({ height: crop.height })
       },
       test: function () {
         const crop = this.toNaturalCrop({ x: 0, y: 0, width: 380, height: 475 })

diff --git a/lang/en/lang.php b/lang/en/lang.php
@@ -26,7 +26,7 @@
         'reset-password' => 'Reset password',
         'reset-send' => 'Send password reset link',
         'verify-login' => 'Verify login',
-        'auth-causer' => 'Authentication'
+        'auth-causer' => 'Authentication',
     ],
     'buckets' => [
         'intro' => 'What would you like to feature today?',
@@ -58,7 +58,7 @@
             'restored' => 'Restored',
             'deleted' => 'Deleted',
             'login' => 'Login action',
-            'logout' => 'Logout action'
+            'logout' => 'Logout action',
         ],
         'activity-row' => [
             'edit' => 'Edit',
@@ -138,7 +138,6 @@
         'version' => 'Version',
     ],
     'form' => [
-        'options' => 'Options',
         'content' => 'Content',
         'dialogs' => [
             'delete' => [
@@ -149,6 +148,7 @@
             ],
         ],
         'editor' => 'Editor',
+        'options' => 'Options',
     ],
     'lang-manager' => [
         'published' => 'Live',
@@ -195,12 +195,12 @@
         'filter' => [
             'no' => 'No',
             'yes' => 'Yes',
-            'not-set' => 'Without value',
             'all-items' => 'All items',
             'draft' => 'Draft',
             'mine' => 'Mine',
             'published' => 'Published',
             'trash' => 'Trash',
+            'not-set' => 'Without value',
         ],
         'filters' => [
             'all-label' => 'All :label',
@@ -396,11 +396,6 @@
         'restore-live-new' => 'Restore as published and create new',
         'restore-message' => 'You are currently editing an older revision of this content (saved by :user on :date). Make changes if needed and click restore to save a new revision.',
         'restore-success' => 'Revision restored.',
-        'draft-revision' => 'Save as draft revision',
-        'draft-revision-close' => 'Save as draft revision and close',
-        'draft-revision-new' => 'Save as draft revision and create new',
-        'draft-revisions-available' => 'You are currently viewing the published version of this content. There are newer draft revisions available.',
-        'editing-draft-revision' => 'You are currently editing a draft revision of this content. Make changes if needed and click Save as revision or Publish.',
         'revisions' => 'Revisions',
         'save' => 'Save as draft',
         'save-close' => 'Save as draft and close',
@@ -417,6 +412,11 @@
         'scheduled' => 'Scheduled',
         'expired' => 'Expired',
         'unsaved-changes' => 'There are unsaved changes',
+        'draft-revision' => 'Save as draft revision',
+        'draft-revision-close' => 'Save as draft revision and close',
+        'draft-revision-new' => 'Save as draft revision and create new',
+        'draft-revisions-available' => 'You are currently viewing the published version of this content. There are newer draft revisions available.',
+        'editing-draft-revision' => 'You are currently editing a draft revision of this content. Make changes if needed and click Save as revision or Publish.',
     ],
     'select' => [
         'empty-text' => 'Sorry, no matching options.',

diff --git a/lang/fr/lang.php b/lang/fr/lang.php
@@ -374,8 +374,6 @@
         'last-edit' => 'Édité',
         'preview' => 'Prévisualiser les changements',
         'publish' => 'Publier',
-        'scheduled' => 'Planifié',
-        'expired' => 'Expiré',
         'publish-close' => 'Publier et fermer',
         'publish-new' => 'Publier et créer un nouveau',
         'published-on' => 'Publié le',
@@ -387,11 +385,6 @@
         'restore-live-new' => 'Restaurer avec le statut publié et créer un nouveau',
         'restore-message' => 'Vous modifiez actuellement une ancienne révision de ce contenu (enregistrée par :user le :date). Apportez les modifications nécessaires et cliquez sur restaurer pour enregistrer une nouvelle révision.',
         'restore-success' => 'Révision restaurée.',
-        'draft-revision' => 'Sauvegarder en tant que brouillon de révision',
-        'draft-revision-close' => 'Sauvegarder en tant que brouillon de révision et fermer',
-        'draft-revision-new' => 'Sauvegarder en tant que brouillon de révision et créer un nouveau',
-        'draft-revisions-available' => 'Vous visualisez actuellement la version publiée de ce contenu. Il y a des brouillons de révisions plus récents disponibles.',
-        'editing-draft-revision' => 'Vous modifiez actuellement un brouillon de révision de ce contenu. Apportez les modifications nécessaires et cliquez sur Sauvegarder en tant que révision ou Publier.',
         'revisions' => 'Révisions',
         'save' => 'Enregistrer comme brouillon',
         'save-close' => 'Enregistrer comme brouillon et fermer',
@@ -405,7 +398,14 @@
         'parent-page' => 'Page parente',
         'review-status' => 'Statut de révision',
         'visibility' => 'Visibilité',
+        'scheduled' => 'Planifié',
+        'expired' => 'Expiré',
         'unsaved-changes' => 'Il y a des changements non sauvegardés',
+        'draft-revision' => 'Sauvegarder en tant que brouillon de révision',
+        'draft-revision-close' => 'Sauvegarder en tant que brouillon de révision et fermer',
+        'draft-revision-new' => 'Sauvegarder en tant que brouillon de révision et créer un nouveau',
+        'draft-revisions-available' => 'Vous visualisez actuellement la version publiée de ce contenu. Il y a des brouillons de révisions plus récents disponibles.',
+        'editing-draft-revision' => 'Vous modifiez actuellement un brouillon de révision de ce contenu. Apportez les modifications nécessaires et cliquez sur Sauvegarder en tant que révision ou Publier.',
     ],
     'select' => [
         'empty-text' => 'Désolé, aucune correspondance trouvée.',

diff --git a/lang/it/lang.php b/lang/it/lang.php
@@ -174,7 +174,9 @@
                 'destroy-permanently' => 'Distruggi definitivamente',
                 'disclaimer' => 'Non sarà più possibile recuperare questo elemento.',
                 'title' => 'Distruggi elemento',
+                'cancel' => 'Cancella',
             ],
+            'cancel' => 'Cancella',
         ],
         'dropdown' => [
             'delete' => 'Elimina',
@@ -373,8 +375,6 @@
         'last-edit' => 'Ultima modifica',
         'preview' => 'Anteprima modifiche',
         'publish' => 'Pubblica',
-        'scheduled' => 'Pianificato',
-        'expired' => 'Scaduto',
         'publish-close' => 'Pubblica e chiudi',
         'publish-new' => 'Pubblica e crea nuovo',
         'published-on' => 'Pubblicato il',
@@ -386,11 +386,6 @@
         'restore-live-new' => 'Ripristina come pubblicato e crea nuovo',
         'restore-message' => 'Stai modificando una revisione vecchia di questo contenuto (salvata da :user il :date). Fare le modifiche necessarie e cliccare "Ripristina" per salvare una nuova revisione.',
         'restore-success' => 'Revisione ripristinata.',
-        'draft-revision' => 'Salva come revisione bozza',
-        'draft-revision-close' => 'Salva come revisione bozza e chiudi',
-        'draft-revision-new' => 'Salva come revisione bozza e crea nuova',
-        'draft-revisions-available' => 'Stai visualizzando la versione pubblicata di questo contenuto. Ci sono revisioni in bozza più nuove.',
-        'editing-draft-revision' => 'Stai modificando una revisione bozza di questo contenuto. Apportare le modifiche necessarie e fare clic su "Salva come revisione" o "Pubblica".',
         'revisions' => 'Revisioni',
         'save' => 'Salva come bozza',
         'save-close' => 'Salva come bozza e chiudi',
@@ -404,7 +399,14 @@
         'parent-page' => 'Pagina genitore',
         'review-status' => 'Stato revisione',
         'visibility' => 'Visibilità',
+        'scheduled' => 'Pianificato',
+        'expired' => 'Scaduto',
         'unsaved-changes' => 'Ci sono modifiche non salvate',
+        'draft-revision' => 'Salva come revisione bozza',
+        'draft-revision-close' => 'Salva come revisione bozza e chiudi',
+        'draft-revision-new' => 'Salva come revisione bozza e crea nuova',
+        'draft-revisions-available' => 'Stai visualizzando la versione pubblicata di questo contenuto. Ci sono revisioni in bozza più nuove.',
+        'editing-draft-revision' => 'Stai modificando una revisione bozza di questo contenuto. Apportare le modifiche necessarie e fare clic su "Salva come revisione" o "Pubblica".',
     ],
     'select' => [
         'empty-text' => 'Spiacenti, nessuna opzione corrispondente.',