Skip to content

Commit

Permalink
Merge pull request #200 from Laravel-Lang/main
Browse files Browse the repository at this point in the history
fork sync
  • Loading branch information
makowskid authored May 6, 2024
2 parents cf0b3aa + 9c5a60d commit c0d11b7
Show file tree
Hide file tree
Showing 556 changed files with 8,478 additions and 2,475 deletions.
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ updates:
directory: /
schedule:
interval: daily
labels:
- dependabot
18 changes: 2 additions & 16 deletions .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,5 @@ permissions: write-all

jobs:
style:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Check the code style
uses: TheDragonCode/codestyler@v4
if: ${{ github.event_name != 'push' || github.ref != 'refs/heads/main' }}

- name: Fix the code style
uses: TheDragonCode/codestyler@v4
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
with:
github_token: ${{ secrets.COMPOSER_TOKEN }}
fix: true
name: Code Style
uses: TheDragonCode/.github/.github/workflows/code-style.yml@main
23 changes: 23 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Documentation

on:
push:
branches:
- main

permissions: write-all

jobs:
update:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Generate docs trigger
uses: myrotvorets/trigger-repository-dispatch-action@v2.0.2
with:
token: ${{ secrets.COMPOSER_TOKEN }}
repo: Laravel-Lang/docs
type: docs
28 changes: 5 additions & 23 deletions .github/workflows/download.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: download
name: Download Projects

on:
schedule:
Expand All @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: true
matrix:
version: [ "10.x", "11.x", "master" ]
version: [ "11.x", "master" ]
with:
project: Laravel Framework ${{ matrix.version }}
paths: source/framework/${{ matrix.version }}/*
Expand All @@ -23,31 +23,13 @@ jobs:
--project=framework \
--ver=${{ matrix.version }} \
--copy=src/Illuminate/Translation/lang
lumen:
uses: Laravel-Lang/.github/.github/workflows/download.yml@main
strategy:
fail-fast: true
matrix:
version: [ "10.x", "master" ]
with:
project: Lumen Framework ${{ matrix.version }}
paths: source/lumen-framework/${{ matrix.version }}/*
commands: |
vendor/bin/lang download \
--url=https://github.com/laravel/lumen-framework/archive/refs/heads/${{ matrix.version }}.zip \
--project=lumen-framework \
--ver=${{ matrix.version }} \
--copy=lang \
--copy=resources/lang \
--copy=src/Illuminate/Translation/lang
breeze:
uses: Laravel-Lang/.github/.github/workflows/download.yml@main
strategy:
fail-fast: true
matrix:
version: [ "1.x", "2.x", "master" ]
version: [ "2.x", "master" ]
with:
project: Laravel Breeze ${{ matrix.version }}
paths: source/breeze/${{ matrix.version }}/*
Expand All @@ -62,7 +44,7 @@ jobs:
strategy:
fail-fast: true
matrix:
version: [ "13.x", "14.x", "15.x", "master" ]
version: [ "15.x", "master" ]
with:
project: Laravel Cashier Stripe ${{ matrix.version }}
paths: source/cashier/stripe/${{ matrix.version }}/*
Expand Down Expand Up @@ -92,7 +74,7 @@ jobs:
strategy:
fail-fast: true
matrix:
version: [ "2.x", "3.x", "4.x", "5.x", "master" ]
version: [ "5.x", "master" ]
with:
project: Laravel Jetstream ${{ matrix.version }}
paths: source/jetstream/${{ matrix.version }}/*
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/locales.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Add Locales

on:
schedule:
- cron: 29 1 * * *
workflow_dispatch:

permissions: write-all

jobs:
missing:
uses: Laravel-Lang/.github/.github/workflows/locales.yml@main
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ on:

jobs:
Update:
uses: Laravel-Lang/.github/.github/workflows/release-drafter.yml@main
uses: Laravel-Lang/.github/.github/workflows/release-drafter.yml@main
13 changes: 13 additions & 0 deletions .github/workflows/statuses.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Translation Status

on:
push:
branches:
- main
workflow_dispatch:

permissions: write-all

jobs:
create:
uses: Laravel-Lang/.github/.github/workflows/statuses.yml@main
13 changes: 13 additions & 0 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Synchronization

on:
push:
branches:
- main
workflow_dispatch:

permissions: write-all

jobs:
create:
uses: Laravel-Lang/.github/.github/workflows/sync.yml@main
4 changes: 2 additions & 2 deletions .github/workflows/phpunit.yml → .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [ "8.1", "8.2", "8.3" ]
publisher: [ "14.0", "15.0", "16.0" ]
php: [ "8.2", "8.3" ]
publisher: [ "16.0" ]

name: PHP ${{ matrix.php }}, Publisher ${{ matrix.publisher }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/translate.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: translate
name: Machine Translation

on:
schedule:
- cron: 27 1 * * *
#schedule:
# - cron: 27 1 * * *
workflow_dispatch:

permissions: write-all
Expand Down
98 changes: 0 additions & 98 deletions .github/workflows/update.yml

This file was deleted.

12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,26 @@

## Documentation

See the [documentation](https://laravel-lang.com) for detailed installation.
See the [documentation](https://laravel-lang.com/packages-lang.html) for detailed installation.

## Communication

We also have official [chats](https://t.me/addlist/l0XGtvEIBiljMTMy) in Telegram.

## Contributing

Please see [CONTRIBUTING](https://laravel-lang.com/contributions.html) for details.

## Support Us

❤️ Laravel Lang? Please consider supporting our collective on [Boosty](https://boosty.to/laravel-lang).

## License

This package is licensed under the [MIT License](https://laravel-lang.com/license.html).


[badge_build]: https://img.shields.io/github/actions/workflow/status/laravel-lang/lang/phpunit.yml?branch=main&style=flat-square
[badge_build]: https://img.shields.io/github/actions/workflow/status/laravel-lang/lang/tests.yml?branch=main&style=flat-square

[badge_downloads]: https://img.shields.io/packagist/dt/laravel-lang/lang.svg?style=flat-square

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"source": "https://github.com/Laravel-Lang/lang"
},
"require": {
"php": "^8.1",
"php": "^8.2",
"ext-json": "*",
"laravel-lang/publisher": "^14.0 || ^15.0 || ^16.0"
"laravel-lang/publisher": "^16.0"
},
"require-dev": {
"laravel-lang/status-generator": "^1.19 || ^2.0",
"laravel-lang/status-generator": "^2.11",
"phpunit/phpunit": "^10.0",
"symfony/var-dumper": "^6.0 || ^7.0"
"symfony/var-dumper": "^7.0"
},
"minimum-stability": "stable",
"prefer-stable": true,
Expand Down
Loading

0 comments on commit c0d11b7

Please sign in to comment.