Merge branch 'develop' into release/3.0.5

cds-snc · May 10, 2023 · 862aeed · 862aeed
2 parents f8ac97e + 8c10f92
commit 862aeed
Show file tree

Hide file tree

Showing 6 changed files with 776 additions and 769 deletions.
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -64,6 +64,8 @@ jobs:
       - name: Cypress Tests
         uses: cypress-io/github-action@d79d2d530a66e641eb4a5f227e13bc985c60b964 # v4.2.2
         with:
+          # we have already installed all dependencies above
+          install: false
           browser: chrome
           headed: false
           build: yarn build:test
@@ -73,6 +75,8 @@ jobs:
       - name: Cypress Component Tests
         uses: cypress-io/github-action@d79d2d530a66e641eb4a5f227e13bc985c60b964 # v4.2.2
         with:
+          # we have already installed all dependencies above
+          install: false
           browser: chrome
           component: true
           headed: false

diff --git a/public/static/locales/en/unlock-publishing.json b/public/static/locales/en/unlock-publishing.json
@@ -1,7 +1,7 @@
 {
   "unlockPublishing": {
     "title": "Unlock publishing",
-    "paragraph1": "Before you publish your first form, provide the contact information of your manager or the person you report to. GC Forms will not display their contact information publicly.",
+    "paragraph1": "Before you publish your first form, provide the contact information of your manager or the person you report to. We ask for their email, as a back-up, in case we cannot reach you in the future. We will not display their contact information publicly.",
     "form": {
       "field1": {
         "title": "Provide the email of your manager, or the person you report to",

diff --git a/public/static/locales/fr/unlock-publishing.json b/public/static/locales/fr/unlock-publishing.json
@@ -1,7 +1,7 @@
 {
   "unlockPublishing": {
     "title": "Déverrouiller la publication de formulaires",
-    "paragraph1": "Avant de publier votre premier formulaire, veuillez fournir les coordonnées de votre gestionnaire ou de la personne a qui vous relevez. Formulaires GC n'affichera pas leurs coordonnées publiquement.",
+    "paragraph1": "Avant de publier votre premier formulaire, veuillez fournir les coordonnées de votre gestionnaire ou de la personne a qui vous relevez. Nous vous demandons leur courriel, comme deuxième point de contact, au case où nous ne parviendrons pas à vous contacter à l'avenir. Nous n'afficherons pas leurs coordonnées publiquement.",
     "form": {
       "field1": {
         "title": "Fournissez l’adresse courriel de votre gestionnaire ou de votre supérieur·e direct·e",