Merge branch 'barryvdh:master' into master

Author: PCoetzeeDev

.github/workflows/run-tests.yml

@@ -19,12 +19,12 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.2, 8.1, 8.0]
-        laravel: [10.*, 9.*]
+        php: [8.3, 8.2, 8.1]
+        laravel: [11.*, 10.*, 9.*]
         dependency-version: [prefer-lowest, prefer-stable]
         exclude:
-          - laravel: 10.*
-            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

composer.json

@@ -15,12 +15,12 @@
   ],
   "require": {
     "php": ">=7.2",
-    "illuminate/support": "^9|^10",
-    "illuminate/translation": "^9|^10",
-    "symfony/finder": "^6"
+    "illuminate/support": "^9|^10|^11",
+    "illuminate/translation": "^9|^10|^11",
+    "symfony/finder": "^6|^7"
   },
   "require-dev": {
-    "orchestra/testbench": "^7|^8"
+    "orchestra/testbench": "^7|^8|^9"
   },
   "suggest": {
      "tanmuhittin/laravel-google-translate": "If you want to translate using Google API"

resources/views/index.php

@@ -232,7 +232,7 @@
         <hr>
     <h4>Total: <?= $numTranslations ?>, changed: <?= $numChanged ?></h4>
         <table class="table">
-            <thead>
+            <thead style="position: sticky; top: 0; background: #fff;">
             <tr>
                 <th width="15%">Key</th>
                 <?php foreach ($locales as $locale): ?>

src/Manager.php

@@ -347,7 +347,8 @@ protected function makeTree($translations, $json = false)
     {
         $array = [];
         foreach ($translations as $translation) {
-            if ($json) {
+            // For JSON and sentences, do not use dotted notation
+            if ($json || Str::contains($translation->key, [' ']) || Str::endsWith($translation->key, ['.'])) {
                 $this->jsonSet($array[$translation->locale][$translation->group], $translation->key,
                     $translation->value);
             } else {