Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
forxer committed Jun 2, 2024
2 parents a1f778d + 0292a9e commit 2fd34a8
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
CHANGELOG
=========

1.7.0 (2024-06-02)
------------------

- Added `misc.unknown` and `misc.unknown_fem` terms


1.6.0 (2024-02-28)
------------------

Expand Down
38 changes: 36 additions & 2 deletions GLOSSARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
|[Yes](#yes)|[No](#no)|[All](#all)|[All Fem](#all-fem)|[Previous](#previous)|
|[Previous Fem](#previous-fem)|[Next](#next)|[Next Fem](#next-fem)|[Or](#or)|[Other](#other)|
|[With](#with)|[Without](#without)|[Recycle Bin](#recycle-bin)|[Recycle Bin Of](#recycle-bin-of)|[Archives](#archives)|
|[Archives Of](#archives-of)|[Required Field](#required-field)|[Info Required Fields](#info-required-fields)|[Page N](#page-n)|[Developed By](#developed-by)|
|[Under Maintenance](#under-maintenance)|[Quoted](#quoted)| | | |
|[Archives Of](#archives-of)|[Required Field](#required-field)|[Info Required Fields](#info-required-fields)|[Unknown](#unknown)|[Unknown Fem](#unknown-fem)|
|[Page N](#page-n)|[Developed By](#developed-by)|[Under Maintenance](#under-maintenance)|[Quoted](#quoted)| |


[**Number**](#number)
Expand Down Expand Up @@ -1747,6 +1747,40 @@ trans('misc.info_required_fields');

[Back to top ^](#glossary)

### Unknown

<details>
<summary>Click for details and usage of Unknown</summary>

- Key: `'unknown'`
- Value: `'unknown'`
- Usage: `'misc.unknown'`

```php
trans('misc.unknown');
```

</details>

[Back to top ^](#glossary)

### Unknown Fem

<details>
<summary>Click for details and usage of Unknown Fem</summary>

- Key: `'unknown_fem'`
- Value: `'unknown'`
- Usage: `'misc.unknown_fem'`

```php
trans('misc.unknown_fem');
```

</details>

[Back to top ^](#glossary)

### Page N

<details>
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"laravel-lang/publisher": "^14.1 || ^15.0 || ^16.0"
},
"require-dev": {
"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"
"illuminate/filesystem": "^10.46 || ^11.9.2",
"illuminate/support": "^10.46 || ^11.9.2",
"laravel-lang/status-generator": "^1.19 || ^2.11.2",
"phpunit/phpunit": "^10.5.20",
"symfony/var-dumper": "^6.4.7"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 2 additions & 0 deletions locales/en/php.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
"unarchive": "unarchive",
"unarchive_something": "unarchive :something",
"under_maintenance": "under maintenance…",
"unknown": "unknown",
"unknown_fem": "unknown",
"up": "up",
"warning": "Warning",
"with": "with",
Expand Down
2 changes: 2 additions & 0 deletions locales/fr/php.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
"unarchive": "désarchiver",
"unarchive_something": "désarchiver :something",
"under_maintenance": "en maintenance…",
"unknown": "inconnu",
"unknown_fem": "inconnue",
"up": "monter",
"warning": "Avertissement",
"with": "avec",
Expand Down
3 changes: 3 additions & 0 deletions source/misc.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@

'info_required_fields' => 'Mandatory fields are indicated by:',

'unknown' => 'unknown',
'unknown_fem' => 'unknown',

'page_n' => 'Page :number',

'developed_by' => 'Developed by :author',
Expand Down

0 comments on commit 2fd34a8

Please sign in to comment.