Merge tag 'v1.2.2' into staging

accessibility-exchange · Nov 23, 2023 · cc15746 · cc15746
2 parents 66e81e8 + 1fc9f43
commit cc15746
Show file tree

Hide file tree

Showing 38 changed files with 148 additions and 2,655 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,11 @@
 /node_modules
 /public/hot
 /public/storage
+/public/robots.txt
+/public/sitemap.xml
+/resources/lang/lsq
+/resources/lang/lsq.json
+/resources/lang/vendor/hearth/lsq
 /storage/*.key
 /vendor
 .DS_Store

diff --git a/.kube/app/values.production.yaml b/.kube/app/values.production.yaml
@@ -1,5 +1,6 @@
 hosts:
   - accessibilityexchange.ca
+  - www.accessibilityexchange.ca
 disks:
   - size: 10Gi
     name: accessibility-app-data

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         "framework",
         "laravel"
     ],
-    "version": "1.2.1",
+    "version": "1.2.2",
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",
@@ -122,9 +122,7 @@
         ],
         "format": "vendor/bin/pint",
         "localize": [
-            "@php artisan localize en,fr --remove-missing",
-            "cp -r resources/lang/fr/* resources/lang/lsq",
-            "cp resources/lang/fr.json resources/lang/lsq.json"
+            "@php artisan localize en,fr --remove-missing"
         ],
         "test": [
             "Composer\\Config::disableProcessTimeout",

diff --git a/config/filesystems.php b/config/filesystems.php
@@ -82,6 +82,11 @@
 
     'links' => [
         public_path('storage') => storage_path('app/public'),
+        public_path('sitemap.xml') => storage_path('app/public/sitemap.xml'),
+        public_path('robots.txt') => storage_path('app/public/robots.txt'),
+        lang_path('lsq') => lang_path('fr'),
+        lang_path('lsq.json') => lang_path('fr.json'),
+        lang_path('vendor/hearth/lsq') => lang_path('vendor/hearth/fr'),
     ],
 
 ];
diff --git a/resources/lang/lsq.json b/resources/lang/lsq.json
diff --git a/resources/lang/lsq/app.php b/resources/lang/lsq/app.php
diff --git a/resources/lang/lsq/auth.php b/resources/lang/lsq/auth.php
diff --git a/resources/lang/lsq/forms.php b/resources/lang/lsq/forms.php
diff --git a/resources/lang/lsq/invitation.php b/resources/lang/lsq/invitation.php
diff --git a/resources/lang/lsq/languages.php b/resources/lang/lsq/languages.php
diff --git a/resources/lang/lsq/locales.php b/resources/lang/lsq/locales.php
diff --git a/resources/lang/lsq/mail.php b/resources/lang/lsq/mail.php
diff --git a/resources/lang/lsq/membership.php b/resources/lang/lsq/membership.php
diff --git a/resources/lang/lsq/organization.php b/resources/lang/lsq/organization.php
diff --git a/resources/lang/lsq/pagination.php b/resources/lang/lsq/pagination.php
diff --git a/resources/lang/lsq/project.php b/resources/lang/lsq/project.php
diff --git a/resources/lang/lsq/regulated-organization.php b/resources/lang/lsq/regulated-organization.php
diff --git a/resources/lang/lsq/resource-collection.php b/resources/lang/lsq/resource-collection.php
diff --git a/resources/lang/lsq/resource-select.php b/resources/lang/lsq/resource-select.php
diff --git a/resources/lang/lsq/roles.php b/resources/lang/lsq/roles.php