Merge tag 'v1.2.4' into staging

accessibility-exchange · Dec 4, 2023 · e7c691d · e7c691d
2 parents 85c1fc1 + 4d59c59
commit e7c691d
Show file tree

Hide file tree

Showing 13 changed files with 107 additions and 33 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -0,0 +1,18 @@
+name: Publish release
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [dev]
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v3
+        id: release
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          release-type: php
+          package-name: accessibility-exchange/platform
+          pull-request-title-pattern: "chore(release): release ${version}"
diff --git a/.github/workflows/sync-to-production.yml b/.github/workflows/sync-to-production.yml
@@ -0,0 +1,24 @@
+name: Sync release to production
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'
+        required: true
+        type: string
+  release:
+    types: [released]
+
+jobs:
+  sync-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Open pull request to production
+        uses: tretuna/sync-branches@v1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FROM_BRANCH: ${{ inputs.version || github.event.release.tag_name }}
+          TO_BRANCH: "production"
+          PULL_REQUEST_TITLE: "chore(release): sync ${{ inputs.version || github.event.release.tag_name }} to production"
diff --git a/.github/workflows/sync-to-staging.yml b/.github/workflows/sync-to-staging.yml
@@ -0,0 +1,24 @@
+name: Sync release to staging
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'
+        required: true
+        type: string
+  release:
+    types: [published]
+
+jobs:
+  sync-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Open pull request to staging
+        uses: tretuna/sync-branches@v1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          FROM_BRANCH: ${{ inputs.version || github.event.release.tag_name }}
+          TO_BRANCH: "staging"
+          PULL_REQUEST_TITLE: "chore(release): sync ${{ inputs.version || github.event.release.tag_name }} to staging"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
 # Changelog
 
+## [1.2.4](https://github.com/accessibility-exchange/platform/compare/v1.2.3...v1.2.4) (2023-12-04)
+
+
+### Bug Fixes
+
+* course seeder not run in production (resolves [#2013](https://github.com/accessibility-exchange/platform/issues/2013)) [#2025](https://github.com/accessibility-exchange/platform/issues/2025) ([59004ee](https://github.com/accessibility-exchange/platform/commit/59004ee2b6c5c72feb6556708c68afa3838f2f6e))
+* pagination throws error (resolves [#2045](https://github.com/accessibility-exchange/platform/issues/2045)) [#2046](https://github.com/accessibility-exchange/platform/issues/2046) ([4484241](https://github.com/accessibility-exchange/platform/commit/44842413578b657d9f444195127f9b6c2523bf97))
+* resolve unsupported use of trans_choice (resolves [#2022](https://github.com/accessibility-exchange/platform/issues/2022)) [#2023](https://github.com/accessibility-exchange/platform/issues/2023) ([e4ffdc3](https://github.com/accessibility-exchange/platform/commit/e4ffdc330eda0f64b8faaa94c6cec1a97fd99b81))
+
+
+### Miscellaneous Chores
+
+* **localization:** translate en.json into French, Canada ([5c2328d](https://github.com/accessibility-exchange/platform/commit/5c2328d5d7e52fad3662b4e96902674ea59db8cb))
+* **localization:** update translations ([#2041](https://github.com/accessibility-exchange/platform/issues/2041)) ([5c2328d](https://github.com/accessibility-exchange/platform/commit/5c2328d5d7e52fad3662b4e96902674ea59db8cb))
+
+## Changelog
+
 All notable changes to this project will be documented in [GitHub Releases](https://github.com/accessibility-exchange/platform/releases).
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
         "framework",
         "laravel"
     ],
-    "version": "1.2.3",
+    "version": "1.2.4",
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",

diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -24,6 +24,10 @@ public function run()
             SectorSeeder::class,
             TopicSeeder::class,
             PageSeeder::class,
+            ResourceCollectionSeeder::class,
+            ResourceSeeder::class,
+            InterpretationSeeder::class,
+            CourseSeeder::class,
         ]);
     }
 }
diff --git a/database/seeders/DevSeeder.php b/database/seeders/DevSeeder.php
@@ -19,10 +19,6 @@ public function run(): void
 
         $this->call([
             DatabaseSeeder::class,
-            ResourceCollectionSeeder::class,
-            ResourceSeeder::class,
-            InterpretationSeeder::class,
-            CourseSeeder::class,
         ]);
 
         $user = User::factory()

diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php
diff --git a/resources/lang/en.json b/resources/lang/en.json
@@ -1079,6 +1079,8 @@
     "Please enter a valid website link under “Accessibility and Inclusion links”.": "Please enter a valid website link under “Accessibility and Inclusion links”.",
     "Please enter the email address of the individual you have hired as a Community Connector.": "Please enter the email address of the individual you have hired as a Community Connector.",
     "Please enter your own name and email, rather than you organization’s. You will be able to create your organization in a later step.": "Please enter your own name and email, rather than you organization’s. You will be able to create your organization in a later step.",
+    "Please fill out and return your application for your :role and :otherRole roles. You must return this and have it approved before you can attend orientation. You can find the applications in the links below, or in the email we sent you.": "Please fill out and return your application for your :role and :otherRole roles. You must return this and have it approved before you can attend orientation. You can find the applications in the links below, or in the email we sent you.",
+    "Please fill out and return your application for your :role role. You must return this and have it approved before you can attend orientation. You can find the application in the link below, or in the email we sent you.": "Please fill out and return your application for your :role role. You must return this and have it approved before you can attend orientation. You can find the application in the link below, or in the email we sent you.",
     "Please identify the type of Regulated Organization yours is:": "Please identify the type of Regulated Organization yours is:",
     "Please include any links that describes the accessibility and inclusion initiatives your regulated entity has. This can include reports, case studies, and more.": "Please include any links that describes the accessibility and inclusion initiatives your regulated entity has. This can include reports, case studies, and more.",
     "Please indicate how you would like to be notified of a new person or people being added to your engagements.": "Please indicate how you would like to be notified of a new person or people being added to your engagements.",

diff --git a/resources/lang/fr.json b/resources/lang/fr.json
@@ -1010,7 +1010,7 @@
     "Page status": "Page status",
     "Page title": "Titre de la page",
     "Page translations": "Traductions de la page",
-    "Paid": "Rémunérée",
+    "Paid": "Opportunité rémunérée",
     "Pain-related disabilities": "Incapacités liées à la douleur",
     "Parliamentary entities": "Entités parlementaires",
     "Participant": "Personne participante",
@@ -1079,6 +1079,8 @@
     "Please enter a valid website link under “Accessibility and Inclusion links”.": "Veuillez saisir un lien Internet valide sous \"Liens en lien avec l’accessibilité et l’inclusion\".",
     "Please enter the email address of the individual you have hired as a Community Connector.": "Veuillez entrer l’adresse courriel de la personne que vous avez embauchée en tant que personne facilitatrice communautaire.",
     "Please enter your own name and email, rather than you organization’s. You will be able to create your organization in a later step.": "Please enter your own name and email, rather than you organization’s. You will be able to create your organization in a later step.",
+    "Please fill out and return your application for your :role and :otherRole roles. You must return this and have it approved before you can attend orientation. You can find the applications in the links below, or in the email we sent you.": "Please fill out and return your application for your :role and :otherRole roles. You must return this and have it approved before you can attend orientation. You can find the applications in the links below, or in the email we sent you.",
+    "Please fill out and return your application for your :role role. You must return this and have it approved before you can attend orientation. You can find the application in the link below, or in the email we sent you.": "Please fill out and return your application for your :role role. You must return this and have it approved before you can attend orientation. You can find the application in the link below, or in the email we sent you.",
     "Please identify the type of Regulated Organization yours is:": "Veuillez identifier le type d’organisation réglementée que vous êtes :",
     "Please include any links that describes the accessibility and inclusion initiatives your regulated entity has. This can include reports, case studies, and more.": "Veuillez inclure tout lien qui décrit les initiatives en matière d’accessibilité et d’inclusion de votre entité réglementée. Cela peut inclure des rapports, des études de cas, et plus encore.",
     "Please indicate how you would like to be notified of a new person or people being added to your engagements.": "Veuillez indiquer comment vous souhaitez être informé de l’ajout d’une ou plusieurs nouvelles personnes à vos consultations.",
@@ -1334,7 +1336,7 @@
     "serve and support": "servir et soutenir",
     "serves and supports": "sert et soutien",
     "Service areas": "Régions desservies",
-    "Service delivery": "Service delivery",
+    "Service delivery": "Prestation de services",
     "Settings": "Paramètres",
     "Share some information about yourself, including which communities you are connected to, so governments and businesses can get to know you and how you may be able to help them.": "Partagez quelques informations sur vous-même, y compris les communautés auxquelles vous êtes rattaché ou pour lesquelles vous pouvez servir d’intermédiaire, afin que les gouvernements et les entreprises puissent apprendre à vous connaître et savoir comment vous pouvez les aider.",
     "Share some information about yourself so governments and businesses can get to know you and what you may be able to help them with.": "Partagez quelques informations sur vous-même afin que les gouvernements et les entreprises puissent apprendre à vous connaître et à savoir ce que vous pourriez leur apporter.",
@@ -1747,7 +1749,7 @@
     "you": "vous",
     "You already belong to an organization, so you cannot create a new one.": "Vous faites déjà partie d’une organisation, vous ne pouvez donc pas en créer une nouvelle.",
     "You are now able to publish your page.": "Vous êtes maintenant en mesure de publier votre page.",
-    "You are now able to publish your page and create projects and engagements.": "You are now able to publish your page and create projects and engagements.",
+    "You are now able to publish your page and create projects and engagements.": "Vous êtes maintenant en mesure de publier votre page ainsi que vos consultations.",
     "You are now able to publish your page and sign up for projects.": "You are now able to publish your page and sign up for projects.",
     "You are now able to publish your page and take part in consultations.": "Vous êtes maintenant en mesure de publier votre page et de participer à des consultations.",
     "You are now able to sign up for projects.": "You are now able to sign up for projects.",

diff --git a/resources/views/dashboard/partials/getting-started-individual.blade.php b/resources/views/dashboard/partials/getting-started-individual.blade.php
@@ -75,7 +75,12 @@
                     $roles[] = __('Community Connector');
                 }
             @endphp
-            {{ trans_choice('Please fill out and return your application for your :role role. You must return this and have it approved before you can attend orientation. You can find the application in the link below, or in the email we sent you.|Please fill out and return your application for your :role and :otherRole roles. You must return this and have it approved before you can attend orientation. You can find the applications in the links below, or in the email we sent you.', count($roles), ['role' => $roles[0], 'otherRole' => $roles[1] ?? '']) }}
+
+            @if (count($roles) == 1)
+                {{ __('Please fill out and return your application for your :role role. You must return this and have it approved before you can attend orientation. You can find the application in the link below, or in the email we sent you.', ['role' => $roles[0]]) }}
+            @elseif(count($roles) == 2)
+                {{ __('Please fill out and return your application for your :role and :otherRole roles. You must return this and have it approved before you can attend orientation. You can find the applications in the links below, or in the email we sent you.', ['role' => $roles[0], 'otherRole' => $roles[1]]) }}
+            @endif
         </p>
         <ul role="list">
             @if (Auth::user()->individual->isConsultant())

diff --git a/resources/views/dashboard/partials/getting-started-organization.blade.php b/resources/views/dashboard/partials/getting-started-organization.blade.php
@@ -65,7 +65,11 @@
                     }
                 @endphp
 
-                {{ trans_choice('Please fill out and return your application for your :role role. You must return this and have it approved before you can attend orientation. You can find the application in the link below, or in the email we sent you.|Please fill out and return your application for your :role and :otherRole roles. You must return this and have it approved before you can attend orientation. You can find the applications in the links below, or in the email we sent you.', count($roles), ['role' => $roles[0], 'otherRole' => $roles[1] ?? '']) }}
+                @if (count($roles) == 1)
+                    {{ __('Please fill out and return your application for your :role role. You must return this and have it approved before you can attend orientation. You can find the application in the link below, or in the email we sent you.', ['role' => $roles[0]]) }}
+                @elseif(count($roles) == 2)
+                    {{ __('Please fill out and return your application for your :role and :otherRole roles. You must return this and have it approved before you can attend orientation. You can find the applications in the links below, or in the email we sent you.', ['role' => $roles[0], 'otherRole' => $roles[1]]) }}
+                @endif
             </p>
             <ul role="list">
                 @if (Auth::user()->organization->isConsultant())

diff --git a/resources/views/vendor/livewire/tailwind-custom.blade.php b/resources/views/vendor/livewire/tailwind-custom.blade.php
@@ -1,7 +1,5 @@
 <div>
     @if ($paginator->hasPages())
-        @php(isset($this->numberOfPaginatorsRendered[$paginator->getPageName()]) ? $this->numberOfPaginatorsRendered[$paginator->getPageName()]++ : ($this->numberOfPaginatorsRendered[$paginator->getPageName()] = 1))
-
         <nav class="flex flex-col items-center justify-between" role="navigation" aria-label="Pagination Navigation">
             <div class="w-full text-center" role="alert" aria-live="polite">
                 <p>
@@ -67,8 +65,7 @@
                         {{-- Array Of Links --}}
                         @if (is_array($element))
                             @foreach ($element as $page => $url)
-                                <li
-                                    wire:key="paginator-{{ $paginator->getPageName() }}-{{ $this->numberOfPaginatorsRendered[$paginator->getPageName()] }}-page{{ $page }}">
+                                <li wire:key="paginator-{{ $paginator->getPageName() }}-page{{ $page }}">
                                     <a href="{{ route(RalphJSmit\Livewire\Urls\Facades\Url::currentRoute(), ['page' => $page]) }}"
                                         wire:click.prevent="gotoPage({{ $page }}, '{{ $paginator->getPageName() }}')"
                                         @if ($page == $paginator->currentPage()) aria-current="page" @endif>