Skip to content

Commit

Permalink
V3.5.2 - Migrate Localisations back to PHP Files from JSON (#2040)
Browse files Browse the repository at this point in the history
This reverts the package to using PHP files rather than JSON files for localisations.

This is due to conflicts with other packages resulting in unexpected behaviour.
  • Loading branch information
lrljoe authored Nov 10, 2024
1 parent 29873a0 commit 05f664d
Show file tree
Hide file tree
Showing 182 changed files with 1,213 additions and 1,701 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-tests-pcov-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run Unit Tests
run: php ./vendor/bin/phpunit --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml
run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run Unit Tests
run: php ./vendor/bin/phpunit --no-coverage
run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage


test-laravel11:
Expand Down Expand Up @@ -162,4 +162,4 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run Unit Tests
run: php ./vendor/bin/phpunit --no-coverage
run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run Unit Tests
run: php ./vendor/bin/phpunit --no-coverage
run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage


test-laravel11:
Expand Down Expand Up @@ -164,4 +164,4 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run Unit Tests
run: php ./vendor/bin/phpunit --no-coverage
run: php ./vendor/bin/phpunit --testsuite "Laravel Livewire Tables Unit Test Suite" --no-coverage
2 changes: 1 addition & 1 deletion docs/datatable/available-methods.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public function configure(): void

Set the message displayed when the table is filtered but there are no results to show.

Defaults to: "_No items found. Try to broaden your search._"
Defaults to: "_No items found, try to broaden your search._"

```php
public function configure(): void
Expand Down
2 changes: 1 addition & 1 deletion docs/filters/available-methods.md
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ Example blade:
type="button"
class="flex-shrink-0 ml-0.5 h-4 w-4 rounded-full inline-flex items-center justify-center text-indigo-400 hover:bg-indigo-200 hover:text-indigo-500 focus:outline-none focus:bg-indigo-500 focus:text-white"
>
<span class="sr-only">@lang('livewire-tables::Remove filter option')</span>
<span class="sr-only">@lang('livewire-tables::core.Remove filter option')</span>
<svg class="h-2 w-2" stroke="currentColor" fill="none" viewBox="0 0 8 8">
<path stroke-linecap="round" stroke-width="1.5" d="M1 1l6 6m0-6L1 7" />
</svg>
Expand Down
10 changes: 8 additions & 2 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@
failOnEmptyTestSuite="false"
beStrictAboutOutputDuringTests="true" >
<testsuites>
<testsuite name="Laravel Livewire Tables Test Suite">
<directory>tests</directory>
<testsuite name="Laravel Livewire Tables Unit Test Suite">
<directory>tests/Unit</directory>
</testsuite>
<testsuite name="Laravel Livewire Tables Localisations Unit">
<directory>tests/Localisations/Unit</directory>
</testsuite>
<testsuite name="Laravel Livewire Tables Localisations Presence">
<directory>tests/Localisations/Presence</directory>
</testsuite>
</testsuites>
<source>
Expand Down
62 changes: 0 additions & 62 deletions resources/lang/ar.json

This file was deleted.

34 changes: 34 additions & 0 deletions resources/lang/ar/core.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

return [
'All' => 'الجميع',
'All Columns' => 'كافة الأعمدة',
'Applied Filters' => 'المرشحات التطبيقية',
'Applied Sorting' => 'الفرز التطبيقي',
'Bulk Actions' => 'إجراءات جملة',
'Clear' => 'واضح',
'Columns' => 'الأعمدة',
'Debugging Values' => 'قيم التصحيح',
'Deselect All' => 'الغاء تحديد الكل',
'Done Reordering' => 'تمت إعادة الترتيب',
'Filters' => 'المرشحات',
'not_applicable' => 'N/A',
'No' => 'لا',
'No items found, try to broaden your search' => 'لم يتم العثور على العناصر. حاول توسيع نطاق البحث',
'of' => 'ل',
'Remove filter option' => 'إزالة خيار التصفية',
'Remove sort option' => 'إزالة خيار الفرز',
'Reorder' => 'إعادة ترتيب',
'results' => 'نتائج',
'row' => 'صف',
'rows' => 'صفوف',
'rows, do you want to select all' => 'الصفوف ، هل تريد تحديد الكل',
'Search' => 'يبحث',
'Select All' => 'اختر الكل',
'Showing' => 'عرض',
'to' => 'ل',
'Yes' => 'نعم',
'You are currently selecting all' => 'أنت الآن تختار الكل',
'You are not connected to the internet' => 'أنت غير متصل بالإنترنت',
'You have selected' => 'قمت بتحديدها',
];
62 changes: 0 additions & 62 deletions resources/lang/ca.json

This file was deleted.

34 changes: 34 additions & 0 deletions resources/lang/ca/core.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

return [
'All' => 'Tot',
'All Columns' => 'Totes les columnes',
'Applied Filters' => 'Filtres Aplicats',
'Applied Sorting' => 'Ordenació Aplicada',
'Bulk Actions' => 'Accions Massives',
'Clear' => 'Esborra',
'Columns' => 'Columnes',
'Debugging Values' => 'Valors de depuració',
'Deselect All' => 'Deselecciona tot',
'Done Reordering' => 'Reordenació finalitzada',
'Filters' => 'Filtres',
'not_applicable' => 'N/A',
'No' => 'No',
'No items found, try to broaden your search' => "No s'han trobat elements. Intenti ampliar la cerca",
'of' => 'de',
'Remove filter option' => 'Elimina opció de filtre',
'Remove sort option' => "Elimina opció d'ordenació",
'Reorder' => 'Reordena',
'results' => 'resultats',
'row' => 'fila',
'rows' => 'files',
'rows, do you want to select all' => 'files, vol seleccionar totes',
'to' => 'a',
'Search' => 'Cerca',
'Select All' => 'Selecciona tot',
'Showing' => 'Mostrant',
'Yes' => '',
'You are currently selecting all' => 'Actualment està seleccionant tot',
'You are not connected to the internet' => 'No està conectat a Internet',
'You have selected' => 'Ha seleccionat',
];
62 changes: 0 additions & 62 deletions resources/lang/da.json

This file was deleted.

34 changes: 34 additions & 0 deletions resources/lang/da/core.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

return [
'All' => 'Alle',
'All Columns' => 'Alle kolonner',
'Applied Filters' => 'Anvendte filtre',
'Applied Sorting' => 'Anvendt sortering',
'Bulk Actions' => 'Massehandlinger',
'Clear' => 'Ryd',
'Columns' => 'Kolonner',
'Debugging Values' => 'Debugging-værdier',
'Deselect All' => 'Fravælg alle',
'Done Reordering' => 'Færdig med omorganisering',
'Filters' => 'Filtre',
'not_applicable' => 'N/A',
'No' => 'Nej',
'No items found, try to broaden your search' => 'Ingen elementer fundet. Prøv at udvide din søgning',
'of' => 'af',
'Remove filter option' => 'Fjern filtermulighed',
'Remove sort option' => 'Fjern sorteringsmulighed',
'Reorder' => 'Omorganisér',
'results' => 'resultater',
'row' => 'række',
'rows' => 'rækker',
'rows, do you want to select all' => 'rækker, vil du vælge alle',
'Search' => 'Søg',
'Select All' => 'Vælg alle',
'Showing' => 'Viser',
'to' => 'til',
'Yes' => 'Ja',
'You are currently selecting all' => 'Du vælger i øjeblikket alle',
'You are not connected to the internet' => 'Du er ikke forbundet til internettet',
'You have selected' => 'Du har valgt',
];
Loading

0 comments on commit 05f664d

Please sign in to comment.