Various adjustments to FR wording (#272)

Gabriel Cossette · ElminaIusifova · RachelMuston · web-flow · commit bedf5f1ce75b · 2021-08-25T14:01:22.000-04:00
* added en anglais seulement to the button

* Tweak wording

* Update alphagov link

* bilingual tweaks

* Remove "(English only)" mentions

* Adjust wording and spacing

* changed button link from issues to feedback form

also changed some column spacing and removed br tags

Co-authored-by: ElminaIusifova &lt;32398063+ElminaIusifova@users.noreply.github.com&gt;
Co-authored-by: Rachel &lt;rachel_muston@hotmail.com&gt;
Co-authored-by: Guillaume Charest &lt;guillaume.charest@hrsdc-rhdcc.gc.ca&gt;
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -58,7 +58,7 @@ available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.h
 
 [homepage]: https://www.contributor-covenant.org
 
-This Code of Conduct is also inspired by GDS' `alphagov` [Code of conduct](https://github.com/alphagov/code-of-conduct)
+This Code of Conduct is also inspired by GDS' `alphagov` [Code of conduct](https://github.com/alphagov/.github/blob/main/CODE_OF_CONDUCT.md)
 
 ---
 <!--markdownlint-disable MD025-->
@@ -119,4 +119,4 @@ disponible à l'adresse [https://www.contributor-covenant.org/version/1/4/code-o
 
 [page d'accueil]: https://www.contributor-covenant.org
 
-Le présent Code de conduite s'inspire également du " Code de conduite " du [alphaGov](https://github.com/alphagov/code-of-conduct) de GDS.
+Le présent Code de conduite s'inspire également du " Code de conduite " du [alphaGov](https://github.com/alphagov/.github/blob/main/CODE_OF_CONDUCT.md) (en anglais seulement) de GDS.
diff --git a/_data/i18n/general.yml b/_data/i18n/general.yml
@@ -57,10 +57,13 @@ footer:
     fr: À propos du site
   reportProblem:
     en: Report a problem on this page
-    fr: Signaler un problème sur cette page (site en anglais seulement)
+    fr: Signaler un problème sur cette page
+  problemLink:
+    en: https://forms-formulaires.alpha.canada.ca/id/35
+    fr: https://forms-formulaires.alpha.canada.ca/fr/id/35
   sourceCode:
     en: View source code of this page
-    fr: Voir le code source de cette page
+    fr: Voir le code source de cette page (interface en anglais seulement)
   Nav:
     Canada:
       en:
@@ -163,10 +166,10 @@ opportunities:
     fr: heure de l'Est
   startdate:
     en: Anticipated supplier selection date
-    fr: Date prévue de sélection du fournisseur
+    fr: Date prévue de sélection du fournisseur&nbsp;
   deliverydate:
     en: Work delivery date
-    fr: Date de livraison de travail
+    fr: Date de livraison de travail&nbsp;
   noOpen:
     en: No open opportunities
     fr: Aucune opportunité ouverte
@@ -200,13 +203,13 @@ apply:
 alert:
   alert1:
     en: This website is part of a pilot. If you want to share your feedback, please open an 
-    fr: Ce site fait partie d'un pilote. Si vous souhaitez partager vos commentaires, poser une 
+    fr: Ce site fait partie d'un pilote. Si vous souhaitez partager vos commentaires, veuiller créer une «&nbsp;
   issue:
     en: issue
-    fr: question
+    fr: issue&nbsp;
   alert2:
     en: or fill in a
-    fr: ou remplir un
+    fr: » (interface en anglais seulement) ou remplir un
   GCForm:
       en:
         link: https://forms-formulaires.alpha.canada.ca/id/35
diff --git a/_includes/pre-footer.html b/_includes/pre-footer.html
@@ -12,12 +12,12 @@
     </div>
     <div class="row">
       <div class="col-md-4 col-lg-3 col-sm-4">
-        <a href="https://github.com/canada-ca/micro-acquisition/issues" class="btn btn-default btn-lrg">{{ site.data.i18n.general.footer.reportProblem[page.lang]}}</a>
+        <a href="{{ site.data.i18n.general.footer.problemLink.[page.lang] }}" class="btn btn-default btn-lrg">{{ site.data.i18n.general.footer.reportProblem[page.lang]}}</a>
       </div>
-      <div class="col-md-5 col-lg-4 col-sm-5">
+      <div class="col-md-4 col-lg-3 col-sm-4">
         <a href="https://github.com/canada-ca/micro-acquisition/tree/main/{{page.path}}" class="btn btn-default btn-lrg">{{ site.data.i18n.general.footer.sourceCode[page.lang]}}</a>
         </div>  
-      <div class="wb-share col-md-3 col-sm-3  col-lg-offset-1" data-wb-share='{"lnkClass": "btn btn-default btn-block"}'></div>
+      <div class="wb-share col-md-3 col-sm-3 col-lg-offset-3" data-wb-share='{"lnkClass": "btn btn-default btn-block"}'></div>
     </div>
   </div>
 </div>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -33,7 +33,7 @@ <h2>{{ site.data.i18n.general.opportunities.details[page.lang] }}</h2>
         <p><b>{{ site.data.i18n.general.opportunities.value[page.lang] }}:</b>&nbsp;{{ page.value }}</p>
         <p><b>{{ site.data.i18n.general.opportunities.startdate[page.lang] }}:</b>&nbsp;{{ page.start_date }}</p>
         <p><b>{{ site.data.i18n.general.opportunities.deliverydate[page.lang] }}:</b>&nbsp;{{ page.delivery_date | date: "%Y-%m-%d %H:%M" }}, {{ site.data.i18n.general.opportunities.easternTime[page.lang] }}</p>
-        <p><b>{{ site.data.i18n.general.opportunities.skills[page.lang] }}:</b>{{ page.skills }}</p>
+        <p><b>{{ site.data.i18n.general.opportunities.skills[page.lang] }}:</b>&nbsp;{{ page.skills }}</p>
 
         {{ content }}
        
diff --git a/_pages/en/index.md b/_pages/en/index.md
@@ -50,7 +50,7 @@ permalink: /en/index.html
     <p class="mrgn-tp-xl">Learn more about the process in the <a href="{{ site.baseurl }}{% link _pages/en/user-guide.md %}">User Guide</a> and <a href="{{ site.baseurl }}{% link _pages/en/faq.md %}">Frequently Asked Questions</a>.</p>
     <h2>About this pilot</h2>
     <p>This micro-acquisition pilot project is being run for one year at <a href="https://www.canada.ca/en/employment-social-development.html">Employment and Social Development Canada</a> through a partnership between the Innovation Information Technology Branch and the Chief Financial Officer Branch.</p>
-    <p>This pilot would not have been possible without the help of the <a href="https://bcdevexchange.org/">BC Developers Exchange</a>/<a href="https://digital.gov.bc.ca/marketplace">BC Digital Marketplace</a> (English only) who have lead the way for years, and have generously shared their expertise.</p>
-    <p>We have also endeavoured to learn from the lessons of the <a href="https://github.com/canada-ca/devex">GC Developers Exchange</a> (English only) (the Government of Canada's first foray into low dollar value procurement of open source code).</p>
+    <p>This pilot would not have been possible without the help of the <a href="https://bcdevexchange.org/">BC Developers Exchange</a>/<a href="https://digital.gov.bc.ca/marketplace">BC Digital Marketplace</a> who have lead the way for years, and have generously shared their expertise.</p>
+    <p>We have also endeavoured to learn from the lessons of the <a href="https://github.com/canada-ca/devex">GC Developers Exchange</a> (the Government of Canada's first foray into low dollar value procurement of open source code).</p>
     <p><a href="mailto:microacquisition@hrsdc-rhdcc.gc.ca">Contact us</a> if you are an ESDC team with a coding opportunity!</p>
 </div>
diff --git a/_pages/en/user-guide.md b/_pages/en/user-guide.md
@@ -30,7 +30,7 @@ OR
 
 1. __An account on a public source code repository.__
   You can work on a repository of your choice.
-  Some repository options include [GitLab](https://gitlab.com/) (bilingual), [GitHub](https://github.com/) (English only), [Bitbucket](https://bitbucket.org/) (English only).
+  Some repository options include [GitLab](https://gitlab.com/) (bilingual), [GitHub](https://github.com/), [Bitbucket](https://bitbucket.org/).
 2. __Familiarity with Git version control system.__
   If you have not used Git before or need a refresher, this [Git cheat sheet](https://training.github.com/downloads/github-git-cheat-sheet) includes all the basic commands.
 3. __The ability to accept payment from a credit card using a payment system or via PayPal.__
diff --git a/_posts/en/2021-06-23-building-custom-Azure-marketplace-policies.md b/_posts/en/2021-06-23-building-custom-Azure-marketplace-policies.md
@@ -91,7 +91,7 @@ This is a fixed price opportunity governed by the terms of the Micro-Acquisition
 
    - The code must be delivered with an MIT license
    - The code must pass the following tests:
-     - [PowerShell Script Analyzer](https://github.com/PowerShell/PSScriptAnalyzer) (English only) - all default rules (all warnings, alerts and suppressions of those warnings or alerts in code must be included in the documentation along with a justification)
+     - [PowerShell Script Analyzer](https://github.com/PowerShell/PSScriptAnalyzer) - all default rules (all warnings, alerts and suppressions of those warnings or alerts in code must be included in the documentation along with a justification)
      - The winning supplier will be given access to an unsecured sandbox on Azure in order to do the following functional tests to ensure the scripts are working:
        - A client with a subscription that has financial approval for approved 3rd party offering: ‘ CIS Microsoft Windows Server 2016 Benchmark L1’ in the private marketplace can pass validation to install it.
        - A client with a subscription that does NOT have financial approval for approved 3rd party offering ‘ CIS Microsoft Windows Server 2016 Benchmark L2’ in the private marketplace will fail validation when trying to install this approved 3rd party offering.
