Merge branch 'develop'

CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+1.6.0 (2024-02-28)
+------------------
+
+- Added some new terms (see glossary)
+
+
 1.5.0 (2023-12-21)
 ------------------
 

GLOSSARY.md

@@ -7,12 +7,13 @@
 | :-----: | :-----: | :-----: | :-----: | :-----: |
 |[Add](#add)|[Add Something](#add-something)|[Edit](#edit)|[Edit Something](#edit-something)|[Show](#show)|
 |[Show Something](#show-something)|[Preview](#preview)|[Preview Something](#preview-something)|[Save](#save)|[Save Something](#save-something)|
-|[Send](#send)|[Send Something](#send-something)|[Enable](#enable)|[Enable Something](#enable-something)|[Disable](#disable)|
-|[Disable Something](#disable-something)|[Archive](#archive)|[Archive Something](#archive-something)|[Unarchive](#unarchive)|[Unarchive Something](#unarchive-something)|
-|[Refresh](#refresh)|[Refresh Something](#refresh-something)|[Reload](#reload)|[Reload Something](#reload-something)|[Restore](#restore)|
-|[Restore Something](#restore-something)|[Delete](#delete)|[Delete Something](#delete-something)|[Cancel](#cancel)|[Cancel Something](#cancel-something)|
-|[Duplicate](#duplicate)|[Duplicate Something](#duplicate-something)|[Close](#close)|[Close Something](#close-something)|[Search](#search)|
-|[Browse](#browse)|[Up](#up)|[Down](#down)| | |
+|[Save And Close](#save-and-close)|[Save And Return](#save-and-return)|[Save And New](#save-and-new)|[Send](#send)|[Send Something](#send-something)|
+|[Enable](#enable)|[Enable Something](#enable-something)|[Disable](#disable)|[Disable Something](#disable-something)|[Archive](#archive)|
+|[Archive Something](#archive-something)|[Unarchive](#unarchive)|[Unarchive Something](#unarchive-something)|[Refresh](#refresh)|[Refresh Something](#refresh-something)|
+|[Reload](#reload)|[Reload Something](#reload-something)|[Restore](#restore)|[Restore Something](#restore-something)|[Delete](#delete)|
+|[Delete Something](#delete-something)|[Cancel](#cancel)|[Cancel Something](#cancel-something)|[Duplicate](#duplicate)|[Duplicate Something](#duplicate-something)|
+|[Close](#close)|[Close Something](#close-something)|[Search](#search)|[Browse](#browse)|[Up](#up)|
+|[Down](#down)|[Login](#login)|[Logout](#logout)| | |
 
 
 [**Back**](#back)
@@ -297,6 +298,57 @@ trans('action.save_something', [
 
 [Back to top ^](#glossary)
 
+### Save And Close
+
+<details>
+<summary>Click for details and usage of Save And Close</summary>
+
+- Key: `'save_and_close'`
+- Value: `'Save & Close'`
+- Usage: `'action.save_and_close'`
+
+```php
+trans('action.save_and_close');
+```
+
+</details>
+
+[Back to top ^](#glossary)
+
+### Save And Return
+
+<details>
+<summary>Click for details and usage of Save And Return</summary>
+
+- Key: `'save_and_return'`
+- Value: `'Save & Return'`
+- Usage: `'action.save_and_return'`
+
+```php
+trans('action.save_and_return');
+```
+
+</details>
+
+[Back to top ^](#glossary)
+
+### Save And New
+
+<details>
+<summary>Click for details and usage of Save And New</summary>
+
+- Key: `'save_and_new'`
+- Value: `'Save & New'`
+- Usage: `'action.save_and_new'`
+
+```php
+trans('action.save_and_new');
+```
+
+</details>
+
+[Back to top ^](#glossary)
+
 ### Send
 
 <details>
@@ -845,6 +897,40 @@ trans('action.down');
 
 [Back to top ^](#glossary)
 
+### Login
+
+<details>
+<summary>Click for details and usage of Login</summary>
+
+- Key: `'login'`
+- Value: `'login'`
+- Usage: `'action.login'`
+
+```php
+trans('action.login');
+```
+
+</details>
+
+[Back to top ^](#glossary)
+
+### Logout
+
+<details>
+<summary>Click for details and usage of Logout</summary>
+
+- Key: `'logout'`
+- Value: `'logout'`
+- Usage: `'action.logout'`
+
+```php
+trans('action.logout');
+```
+
+</details>
+
+[Back to top ^](#glossary)
+
 ## Back
 
 ### Simple

composer.json

@@ -23,11 +23,11 @@
         "laravel-lang/publisher": "^14.1 || ^15.0 || ^16.0"
     },
     "require-dev": {
-        "illuminate/filesystem": "^10.0 || ^11.0",
-        "illuminate/support": "^10.0 || ^11.0",
-        "laravel-lang/status-generator": "^1.19 || ^2.0",
-        "phpunit/phpunit": "^10.0",
-        "symfony/var-dumper": "^6.0"
+        "illuminate/filesystem": "^10.46 || ^11.0",
+        "illuminate/support": "^10.46 || ^11.0",
+        "laravel-lang/status-generator": "^1.19 || ^2.7.1",
+        "phpunit/phpunit": "^10.5.11",
+        "symfony/var-dumper": "^6.4.4"
     },
     "autoload": {
         "psr-4": {

locales/en/php.json

@@ -72,6 +72,8 @@
     "list": "back to the list",
     "liter": "liter",
     "local": "Local",
+    "login": "login",
+    "logout": "logout",
     "MB": "MB",
     "meter": "meter",
     "milliliter": "milliliter",
@@ -105,6 +107,9 @@
     "restore": "restore",
     "restore_something": "restore :something",
     "save": "save",
+    "save_and_close": "Save & Close",
+    "save_and_new": "Save & New",
+    "save_and_return": "Save & Return",
     "save_something": "save :something",
     "saved": "saved",
     "saved_fem": "saved",

locales/fr/php.json

@@ -72,6 +72,8 @@
     "list": "retour à la liste",
     "liter": "litre",
     "local": "Local",
+    "login": "connexion",
+    "logout": "déconnexion",
     "MB": "Mo",
     "meter": "mètre",
     "milliliter": "millilitre",
@@ -105,6 +107,9 @@
     "restore": "restaurer",
     "restore_something": "restaurer :something",
     "save": "enregistrer",
+    "save_and_close": "enregistrer et fermer",
+    "save_and_new": "enregistrer et nouveau",
+    "save_and_return": "enregistrer et retourner",
     "save_something": "enregistrer :something",
     "saved": "enregistré",
     "saved_fem": "enregistrée",

source/action.php

@@ -13,6 +13,11 @@
 
     'save' => 'save',
     'save_something' => 'save :something',
+
+    'save_and_close' => 'Save & Close',
+    'save_and_return' => 'Save & Return',
+    'save_and_new' => 'Save & New',
+
     'send' => 'send',
     'send_something' => 'send :something',
 
@@ -52,4 +57,7 @@
 
     'up' => 'up',
     'down' => 'down',
+
+    'login' => 'login',
+    'logout' => 'logout',
 ];