Merge commit '93012b57820caa7a5246a2f1bc4bcc3fbeee4f62' into fix/blog…

…-post-test # Conflicts: # site/gatsby-site/playwright/e2e/blog.spec.ts
responsible-ai-collaborative · Dec 11, 2024 · 164dd01 · 164dd01
2 parents 76e8ed2 + 93012b5
commit 164dd01
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 16 deletions.
diff --git a/site/gatsby-site/i18n/locales/es/entities.json b/site/gatsby-site/i18n/locales/es/entities.json
@@ -21,8 +21,8 @@
     "Incidents involved as both Developer and Deployer": "Incidentes involucrados como desarrollador e implementador",
     "Incidents Harmed By": "Afectado por Incidentes",
     "Alleged: <2></2> developed and deployed an AI system, which harmed <6></6>.": "Presunto: un sistema de IA desarrollado e implementado por <2></2>, perjudicó a <6></6>.",
-    "The AI implicated system is": "El sistema de IA implicado es",
-    "The AI implicated systems are": "Los sistemas de IA implicados son",
+    "Implicated AI system:": "Sistema de IA implicado:",
+    "Implicated AI systems:": "Sistemas de IA implicados:",
     "Alleged: <1></1> developed an AI system deployed by <4></4>, which harmed <6></6>.": "Presunto: un sistema de IA desarrollado por <1></1> e implementado por <4></4>, perjudicó a <6></6>.",
     "Entities involved in AI Incidents": "^Entities involved in AI Incidents",
     "{{count}} Incident responses": "{{count}} respuestas de incidentes",

diff --git a/site/gatsby-site/i18n/locales/fr/entities.json b/site/gatsby-site/i18n/locales/fr/entities.json
@@ -28,6 +28,6 @@
     "Back to Entity: {{name}}": "Retour à l'entité: {{name}}",
     "Entity updated successfully.": "Entité mise à jour avec succès.",
     "Error updating Entity.": "Erreur lors de la mise à jour de l'entité.",
-    "The AI implicated system is": "Le système d'IA impliqué est",
-    "The AI implicated systems are": "Les systèmes d'IA impliqués sont"
+    "Implicated AI system:": "Système de l'IA impliqué:",
+    "Implicated AI systems:": "Systèmes de l'IA impliqués:"
 }
diff --git a/site/gatsby-site/i18n/locales/ja/entities.json b/site/gatsby-site/i18n/locales/ja/entities.json
@@ -29,6 +29,6 @@
     "Back to Entity: {{name}}": "組織に戻る: {{name}}",
     "Entity updated successfully.": "組織が正常に更新されました。",
     "Error updating Entity.": "組織の更新中にエラーが発生しました。",
-    "The AI implicated system is": "関連するAIシステムは です",
-    "The AI implicated systems are": "関連するAIシステムは です"
+    "Implicated AI system:": "AI関連システム:",
+    "Implicated AI systems:": "AI関連システム:"
 }
diff --git a/site/gatsby-site/playwright/e2e-full/cite.spec.ts b/site/gatsby-site/playwright/e2e-full/cite.spec.ts
@@ -452,7 +452,7 @@ test.describe('Cite pages', () => {
     test('Should show proper entities card text', async ({ page }) => {
         await page.goto('/cite/3/');
         await expect(page.locator('[data-cy="alleged-entities"]')).toHaveText(
-            'Alleged: Kronos developed an AI system deployed by Starbucks, which harmed Starbucks Employees.The AI implicated system is Entity 1.'
+            'Alleged: Kronos developed an AI system deployed by Starbucks, which harmed Starbucks Employees.Implicated AI system: Entity 1'
         );
     });
 

diff --git a/site/gatsby-site/playwright/e2e-full/dynamicCite.spec.ts b/site/gatsby-site/playwright/e2e-full/dynamicCite.spec.ts
@@ -34,7 +34,7 @@ test.describe('Dynamic Cite pages', () => {
     await expect(page.getByText(`Kronos’s scheduling algorithm and its use by Starbucks managers allegedly negatively impacted financial and scheduling stability for Starbucks employees, which disadvantaged wage workers.`)).toBeVisible();
 
     await expect(page.locator('[data-cy="alleged-entities"]')).toHaveText(
-      'Alleged: Kronos developed an AI system deployed by Starbucks, which harmed Starbucks Employees.The AI implicated system is Entity 1.'
+      'Alleged: Kronos developed an AI system deployed by Starbucks, which harmed Starbucks Employees.Implicated AI system: Entity 1'
     );
 
     await expect(page.locator('[data-cy="citation"]').getByText("Report Count", { exact: true }).locator('xpath=following-sibling::div[1]')).toHaveText('2');

diff --git a/site/gatsby-site/server/emails/templates/EntityIncidentUpdated.ts b/site/gatsby-site/server/emails/templates/EntityIncidentUpdated.ts
@@ -165,7 +165,7 @@ export default `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http:/
     <div style="font-family: inherit; text-align: inherit"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: inherit; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #000000; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-line: underline; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial">Incident Description</span><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: inherit; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #000000; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial">: </span><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: inherit; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #000000; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; background-color: rgb(255, 255, 255); float: none; display: inline">{{incidentDescription}}</span></div>
     <div style="font-family: inherit; text-align: inherit"><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: inherit; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #000000; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-line: underline; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial">Incident Date</span><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: inherit; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #000000; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial">: </span><span style="box-sizing: border-box; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; font-style: inherit; font-variant-ligatures: inherit; font-variant-caps: inherit; font-variant-numeric: inherit; font-variant-east-asian: inherit; font-weight: inherit; font-stretch: inherit; line-height: inherit; font-family: inherit; font-size: 14px; vertical-align: baseline; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px; border-left-width: 0px; border-top-style: initial; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: initial; border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image-source: initial; border-image-slice: initial; border-image-width: initial; border-image-outset: initial; border-image-repeat: initial; color: #000000; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; background-color: rgb(255, 255, 255); float: none; display: inline">{{incidentDate}}</span></div>
     <div style="font-family: inherit; text-align: inherit"><br></div>
-    <div style="font-family: inherit; text-align: inherit"><span style="color: #000000; font-family: arial, helvetica, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline">Alleged: {{developers}} developed an AI system deployed by {{deployers}}, which harmed {{entitiesHarmed}}. The implicated systems are {{implicatedSystems}}.</span></div>
+    <div style="font-family: inherit; text-align: inherit"><span style="color: #000000; font-family: arial, helvetica, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline">Alleged: {{developers}} developed an AI system deployed by {{deployers}}, which harmed {{entitiesHarmed}}. Implicated AI system(s): {{implicatedSystems}}.</span></div>
     <div style="font-family: inherit; text-align: inherit"><br></div>
     <div style="font-family: inherit; text-align: inherit">Sincerely,</div>
     <div style="font-family: inherit; text-align: inherit">Responsible AI Collaborative</div><div></div></div></td>

diff --git a/site/gatsby-site/server/emails/templates/NewEntityIncident.ts b/site/gatsby-site/server/emails/templates/NewEntityIncident.ts
@@ -166,7 +166,7 @@ export default `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http:/
     <u>Incident Description</u>: <span style="color: #000000; font-family: arial, helvetica, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline">{{incidentDescription}}</span><br>
     <u>Incident Date</u>: <span style="color: #000000; font-family: arial, helvetica, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline">{{incidentDate}}</span></div>
     <div style="font-family: inherit; text-align: inherit"><br></div>
-    <div style="font-family: inherit; text-align: inherit">Alleged: {{developers}} developed an AI system deployed by {{deployers}}, which harmed {{entitiesHarmed}}. The implicated systems are {{implicatedSystems}}.</div>
+    <div style="font-family: inherit; text-align: inherit">Alleged: {{developers}} developed an AI system deployed by {{deployers}}, which harmed {{entitiesHarmed}}. Implicated AI system(s): {{implicatedSystems}}.</div>
     <div style="font-family: inherit; text-align: inherit"><br></div>
     <div style="font-family: inherit; text-align: inherit">Sincerely,</div>
     <div style="font-family: inherit; text-align: inherit">Responsible AI Collaborative</div><div></div></div></td>

diff --git a/site/gatsby-site/server/emails/templates/NewIncident.ts b/site/gatsby-site/server/emails/templates/NewIncident.ts
@@ -165,7 +165,7 @@ export default `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http:/
     <u>Incident Description</u>: <span style="color: #000000; font-family: arial, helvetica, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline">{{incidentDescription}}</span><br>
     <u>Incident Date</u>: <span style="color: #000000; font-family: arial, helvetica, sans-serif; font-size: 14px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; white-space: pre-wrap; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; background-color: rgb(255, 255, 255); text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline">{{incidentDate}}</span></div>
     <div style="font-family: inherit; text-align: inherit"><br></div>
-    <div style="font-family: inherit; text-align: inherit">Alleged: {{developers}} developed an AI system deployed by {{deployers}}, which harmed {{entitiesHarmed}}. The implicated systems are {{implicatedSystems}}.</div>
+    <div style="font-family: inherit; text-align: inherit">Alleged: {{developers}} developed an AI system deployed by {{deployers}}, which harmed {{entitiesHarmed}}. Implicated AI system(s): {{implicatedSystems}}.</div>
     <div style="font-family: inherit; text-align: inherit"><br></div>
     <div style="font-family: inherit; text-align: inherit">Sincerely,</div>
     <div style="font-family: inherit; text-align: inherit">Responsible AI Collaborative</div><div></div></div></td>

diff --git a/site/gatsby-site/src/components/entities/AllegedEntities.js b/site/gatsby-site/src/components/entities/AllegedEntities.js
@@ -51,11 +51,8 @@ function ImplicatedSystemsList({ entities }) {
     <div className="mt-2">
       {entities.length > 0 && (
         <>
-          <Trans ns="entities">
-            The AI implicated system{entities.length > 1 ? 's' : ''}{' '}
-            {entities.length > 1 ? 'are' : 'is'}
-          </Trans>{' '}
-          <EntitiesList entities={entities} />.
+          <Trans ns="entities">Implicated AI system{entities.length > 1 ? 's' : ''}:</Trans>{' '}
+          <EntitiesList entities={entities} />{' '}
         </>
       )}
     </div>