Localisation - Avoid Conflicts With Other Packages (#1955)

* Merging Localisation Tweaks * Fix styling * Tweak localisations * Fix styling * Tweaks to sorting pill direction label * Fix styling * Fixes for Sorting Pill Labels --------- Co-authored-by: lrljoe <[email protected]>
rappasoft · Sep 20, 2024 · 256b12d · 256b12d
1 parent 07e8dbc
commit 256b12d
Show file tree

Hide file tree

Showing 46 changed files with 743 additions and 677 deletions.
diff --git a/.github/workflows/run-phpstan.yml b/.github/workflows/run-phpstan.yml
@@ -11,6 +11,7 @@ on:
       - '*/*'       # matches every branch containing a single '/'
       - '**'        # matches every branch
       - '!master'
+      - '!development'
 
 jobs:
   test:

diff --git a/.github/workflows/run-tests-pcov-pull.yml b/.github/workflows/run-tests-pcov-pull.yml
@@ -3,12 +3,9 @@ name: run-tests-pcov-pull
 on:
   push:
     branches:
-      - 'develop'
       - 'development'
-      - 'master'
   pull_request:
     branches:
-      - 'develop'
       - 'development'
       - 'master'
 

diff --git a/.github/workflows/run-tests-pull.yml b/.github/workflows/run-tests-pull.yml
@@ -3,7 +3,6 @@ name: run-tests-pull
 on:
   pull_request:
     branches:
-      - 'develop'
       - 'development'
       - 'master'
 

diff --git a/docs/filters/available-methods.md b/docs/filters/available-methods.md
@@ -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('Remove filter option')</span>
+        <span class="sr-only">@lang('livewire-tables::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>

diff --git a/resources/lang/ar.json b/resources/lang/ar.json
@@ -1,31 +1,32 @@
 {
-    "All": "الجميع",
-    "All Columns": "كافة الأعمدة",
-    "Applied Filters": "المرشحات التطبيقية",
-    "Applied Sorting": "الفرز التطبيقي",
-    "Bulk Actions": "إجراءات جملة",
-    "Clear": "واضح",
-    "Columns": "الأعمدة",
-    "Debugging Values": "قيم التصحيح",
-    "Deselect All": "الغاء تحديد الكل",
-    "Done Reordering": "تمت إعادة الترتيب",
-    "Filters": "المرشحات",
-    "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": "قمت بتحديدها"
+    "livewire-tables::All": "الجميع",
+    "livewire-tables::All Columns": "كافة الأعمدة",
+    "livewire-tables::Applied Filters": "المرشحات التطبيقية",
+    "livewire-tables::Applied Sorting": "الفرز التطبيقي",
+    "livewire-tables::Bulk Actions": "إجراءات جملة",
+    "livewire-tables::Clear": "واضح",
+    "livewire-tables::Columns": "الأعمدة",
+    "livewire-tables::Debugging Values": "قيم التصحيح",
+    "livewire-tables::Deselect All": "الغاء تحديد الكل",
+    "livewire-tables::Done Reordering": "تمت إعادة الترتيب",
+    "livewire-tables::Filters": "المرشحات",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "لا",
+    "livewire-tables::No items found. Try to broaden your search.": "لم يتم العثور على العناصر. حاول توسيع نطاق البحث.",
+    "livewire-tables::of": "ل",
+    "livewire-tables::Remove filter option": "إزالة خيار التصفية",
+    "livewire-tables::Remove sort option": "إزالة خيار الفرز",
+    "livewire-tables::Reorder": "إعادة ترتيب",
+    "livewire-tables::results": "نتائج",
+    "livewire-tables::row": "صف",
+    "livewire-tables::rows": "صفوف",
+    "livewire-tables::rows, do you want to select all": "الصفوف ، هل تريد تحديد الكل",
+    "livewire-tables::Search": "يبحث",
+    "livewire-tables::Select All": "اختر الكل",
+    "livewire-tables::Showing": "عرض",
+    "livewire-tables::to": "ل",
+    "livewire-tables::Yes": "نعم",
+    "livewire-tables::You are currently selecting all": "أنت الآن تختار الكل",
+    "livewire-tables::You are not connected to the internet.": "أنت غير متصل بالإنترنت.",
+    "livewire-tables::You have selected": "قمت بتحديدها"
 }
diff --git a/resources/lang/ca.json b/resources/lang/ca.json
@@ -1,31 +1,32 @@
 {
-    "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",
-    "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": "Sí",
-    "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"
+    "livewire-tables::All": "Tot",
+    "livewire-tables::All Columns": "Totes les columnes",
+    "livewire-tables::Applied Filters": "Filtres Aplicats",
+    "livewire-tables::Applied Sorting": "Ordenació Aplicada",
+    "livewire-tables::Bulk Actions": "Accions Massives",
+    "livewire-tables::Clear": "Esborra",
+    "livewire-tables::Columns": "Columnes",
+    "livewire-tables::Debugging Values": "Valors de depuració",
+    "livewire-tables::Deselect All": "Deselecciona tot",
+    "livewire-tables::Done Reordering": "Reordenació finalitzada",
+    "livewire-tables::Filters": "Filtres",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "No",
+    "livewire-tables::No items found. Try to broaden your search.": "No s'han trobat elements. Intenti ampliar la cerca.",
+    "livewire-tables::of": "de",
+    "livewire-tables::Remove filter option": "Elimina opció de filtre",
+    "livewire-tables::Remove sort option": "Elimina opció d'ordenació",
+    "livewire-tables::Reorder": "Reordena",
+    "livewire-tables::results": "resultats",
+    "livewire-tables::row": "fila",
+    "livewire-tables::rows": "files",
+    "livewire-tables::rows, do you want to select all": "files, vol seleccionar totes",
+    "livewire-tables::to": "a",
+    "livewire-tables::Search": "Cerca",
+    "livewire-tables::Select All": "Selecciona tot",
+    "livewire-tables::Showing": "Mostrant",
+    "livewire-tables::Yes": "Sí",
+    "livewire-tables::You are currently selecting all": "Actualment està seleccionant tot",
+    "livewire-tables::You are not connected to the internet.": "No està conectat a Internet.",
+    "livewire-tables::You have selected": "Ha seleccionat"
 }
diff --git a/resources/lang/da.json b/resources/lang/da.json
@@ -1,31 +1,32 @@
 {
-    "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",
-    "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"
+    "livewire-tables::All": "Alle",
+    "livewire-tables::All Columns": "Alle kolonner",
+    "livewire-tables::Applied Filters": "Anvendte filtre",
+    "livewire-tables::Applied Sorting": "Anvendt sortering",
+    "livewire-tables::Bulk Actions": "Massehandlinger",
+    "livewire-tables::Clear": "Ryd",
+    "livewire-tables::Columns": "Kolonner",
+    "livewire-tables::Debugging Values": "Debugging-værdier",
+    "livewire-tables::Deselect All": "Fravælg alle",
+    "livewire-tables::Done Reordering": "Færdig med omorganisering",
+    "livewire-tables::Filters": "Filtre",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Nej",
+    "livewire-tables::No items found. Try to broaden your search.": "Ingen elementer fundet. Prøv at udvide din søgning.",
+    "livewire-tables::of": "af",
+    "livewire-tables::Remove filter option": "Fjern filtermulighed",
+    "livewire-tables::Remove sort option": "Fjern sorteringsmulighed",
+    "livewire-tables::Reorder": "Omorganisér",
+    "livewire-tables::results": "resultater",
+    "livewire-tables::row": "række",
+    "livewire-tables::rows": "rækker",
+    "livewire-tables::rows, do you want to select all": "rækker, vil du vælge alle",
+    "livewire-tables::Search": "Søg",
+    "livewire-tables::Select All": "Vælg alle",
+    "livewire-tables::Showing": "Viser",
+    "livewire-tables::to": "til",
+    "livewire-tables::Yes": "Ja",
+    "livewire-tables::You are currently selecting all": "Du vælger i øjeblikket alle",
+    "livewire-tables::You are not connected to the internet.": "Du er ikke forbundet til internettet.",
+    "livewire-tables::You have selected": "Du har valgt"
 }
diff --git a/resources/lang/de.json b/resources/lang/de.json
@@ -1,31 +1,32 @@
 {
-    "All": "Alle",
-    "All Columns": "Alle Spalten",
-    "Applied Filters": "Angewendete Filter",
-    "Applied Sorting": "Angewendete Sortierung",
-    "Bulk Actions": "Aktionen",
-    "Clear": "Zurücksetzen",
-    "Columns": "Spalten",
-    "Debugging Values": "Werte debuggen",
-    "Deselect All": "Alle abwählen",
-    "Done Reordering": "Sortieren abgeschlossen",
-    "Filters": "Filter",
-    "No": "Nein",
-    "No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.",
-    "of": "von",
-    "Remove filter option": "Entferne Filterauswahl",
-    "Remove sort option": "Entferne Sortierauswahl",
-    "Reorder": "erneut Sortieren",
-    "results": "Ergebnisse",
-    "row": "Zeile",
-    "rows": "Zeilen",
-    "rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
-    "Search": "Suche",
-    "Select All": "Alle auswählen",
-    "Showing": "Anzeigen",
-    "to": "nach",
-    "Yes": "Ja",
-    "You are currently selecting all": "Es sind schon alle ausgewählt",
-    "You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
-    "You have selected": "Es sind ausgewählt"
+    "livewire-tables::All": "Alle",
+    "livewire-tables::All Columns": "Alle Spalten",
+    "livewire-tables::Applied Filters": "Angewendete Filter",
+    "livewire-tables::Applied Sorting": "Angewendete Sortierung",
+    "livewire-tables::Bulk Actions": "Aktionen",
+    "livewire-tables::Clear": "Zurücksetzen",
+    "livewire-tables::Columns": "Spalten",
+    "livewire-tables::Debugging Values": "Werte debuggen",
+    "livewire-tables::Deselect All": "Alle abwählen",
+    "livewire-tables::Done Reordering": "Sortieren abgeschlossen",
+    "livewire-tables::Filters": "Filter",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "Nein",
+    "livewire-tables::No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern.",
+    "livewire-tables::of": "von",
+    "livewire-tables::Remove filter option": "Entferne Filterauswahl",
+    "livewire-tables::Remove sort option": "Entferne Sortierauswahl",
+    "livewire-tables::Reorder": "erneut Sortieren",
+    "livewire-tables::results": "Ergebnisse",
+    "livewire-tables::row": "Zeile",
+    "livewire-tables::rows": "Zeilen",
+    "livewire-tables::rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
+    "livewire-tables::Search": "Suche",
+    "livewire-tables::Select All": "Alle auswählen",
+    "livewire-tables::Showing": "Anzeigen",
+    "livewire-tables::to": "nach",
+    "livewire-tables::Yes": "Ja",
+    "livewire-tables::You are currently selecting all": "Es sind schon alle ausgewählt",
+    "livewire-tables::You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
+    "livewire-tables::You have selected": "Es sind ausgewählt"
 }
diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -1,33 +1,36 @@
 {
-    "All": "All",
-    "All Columns": "All Columns",
-    "Applied Filters": "Applied Filters",
-    "Applied Sorting": "Applied Sorting",
-    "Bulk Actions": "Bulk Actions",
-    "Bulk Actions Confirm": "Are you sure?",
-    "Clear": "Clear",
-    "Columns": "Columns",
-    "Debugging Values": "Debugging Values",
-    "Deselect All": "Deselect All",
-    "Done Reordering": "Done Reordering",
-    "Filters": "Filters",
-    "No": "No",
-    "No items found. Try to broaden your search.": "No items found. Try to broaden your search.",
-    "of": "of",
-    "Remove filter option": "Remove filter option",
-    "Remove sort option": "Remove sort option",
-    "Reorder": "Reorder",
-    "results": "results",
-    "row": "row",
-    "rows": "rows",
-    "rows, do you want to select all": "rows, do you want to select all",
-    "Search": "Search",
-    "Select All": "Select All",
-    "Select All On Page": "Select All On Page",
-    "Showing": "Showing",
-    "to": "to",
-    "Yes": "Yes",
-    "You are currently selecting all": "You are currently selecting all",
-    "You are not connected to the internet.": "You are not connected to the internet.",
-    "You have selected": "You have selected"
+    "livewire-tables::All": "All",
+    "livewire-tables::All Columns": "All Columns",
+    "livewire-tables::Applied Filters": "Applied Filters",
+    "livewire-tables::Applied Sorting": "Applied Sorting",
+    "livewire-tables::Bulk Actions": "Bulk Actions",
+    "livewire-tables::Bulk Actions Confirm": "Are you sure?",
+    "livewire-tables::Clear": "Clear",
+    "livewire-tables::Columns": "Columns",
+    "livewire-tables::Debugging Values": "Debugging Values",
+    "livewire-tables::Deselect All": "Deselect All",
+    "livewire-tables::Done Reordering": "Done Reordering",
+    "livewire-tables::Filters": "Filters",
+    "livewire-tables::max": "Max",
+    "livewire-tables::min": "Min",
+    "livewire-tables::not_applicable": "N/A",
+    "livewire-tables::No": "No",
+    "livewire-tables::No items found. Try to broaden your search.": "No items found. Try to broaden your search.",
+    "livewire-tables::of": "of",
+    "livewire-tables::Remove filter option": "Remove filter option",
+    "livewire-tables::Remove sort option": "Remove sort option",
+    "livewire-tables::Reorder": "Reorder",
+    "livewire-tables::results": "results",
+    "livewire-tables::row": "row",
+    "livewire-tables::rows": "rows",
+    "livewire-tables::rows, do you want to select all": "rows, do you want to select all",
+    "livewire-tables::Search": "Search",
+    "livewire-tables::Select All": "Select All",
+    "livewire-tables::Select All On Page": "Select All On Page",
+    "livewire-tables::Showing": "Showing",
+    "livewire-tables::to": "to",
+    "livewire-tables::Yes": "Yes",
+    "livewire-tables::You are currently selecting all": "You are currently selecting all",
+    "livewire-tables::You are not connected to the internet.": "You are not connected to the internet.",
+    "livewire-tables::You have selected": "You have selected"
 }