Merge branch 'latest' into WS-1816-ensure-correct-L2-tracking-for-Magyarul-Romania

Author: alex-magana

src/app/components/Byline/index.styles.tsx

@@ -38,6 +38,9 @@ export default {
   comma: ({ palette, isDarkUi }: Theme) =>
     css({ color: isDarkUi ? palette.GREY_2 : palette.GREY_6 }),
 
+  and: ({ palette, isDarkUi }: Theme) =>
+    css({ color: isDarkUi ? palette.GREY_2 : palette.GREY_6 }),
+
   authorChevron: ({ palette, isDarkUi, spacings, mq }: Theme) =>
     css({
       verticalAlign: 'middle',

src/app/components/Byline/index.tsx

@@ -17,6 +17,14 @@ const Comma = () => {
   );
 };
 
+const And = ({ andTranslation }) => {
+  return (
+    <span aria-hidden="true">
+      <Text css={BylineCss.and}>{` ${andTranslation} `}</Text>
+    </span>
+  );
+};
+
 const Contributors = ({ contributorValues, isSingleContributor }) => {
   const { translations, dir } = use(ServiceContext);
   const isRtl = dir === 'rtl';
@@ -27,6 +35,7 @@ const Contributors = ({ contributorValues, isSingleContributor }) => {
       reportingFrom = 'Reporting from',
       role = 'Role',
     } = {},
+    and = 'and',
   } = translations ?? {};
 
   const hasMultipleContributors = !isSingleContributor;
@@ -54,6 +63,9 @@ const Contributors = ({ contributorValues, isSingleContributor }) => {
             role="list"
             key={authorName}
           >
+            {index === lastContributorIndex && !isSingleContributor && (
+              <And andTranslation={and} />
+            )}
             {authorImage && isSingleContributor && (
               <li
                 css={[
@@ -145,7 +157,8 @@ const Contributors = ({ contributorValues, isSingleContributor }) => {
                 </span>
                 {(location && <Comma />) ||
                   (hasMultipleContributors &&
-                    index !== lastContributorIndex && <Comma />)}
+                    index !== lastContributorIndex &&
+                    index !== lastContributorIndex - 1 && <Comma />)}
               </li>
             ) : null}
             {location ? (
@@ -163,9 +176,9 @@ const Contributors = ({ contributorValues, isSingleContributor }) => {
                     {location}
                   </Text>
                 </span>
-                {hasMultipleContributors && index !== lastContributorIndex && (
-                  <Comma />
-                )}
+                {hasMultipleContributors &&
+                  index !== lastContributorIndex &&
+                  index !== lastContributorIndex - 1 && <Comma />}
               </li>
             ) : null}
           </ul>

src/app/lib/config/services/afaanoromoo.ts

@@ -62,6 +62,7 @@ export const service: DefaultServiceConfig = {
       },
     },
     translations: {
+      and: 'fi',
       pagination: {
         previousPage: 'Kan duraa',
         nextPage: 'Itti aanee',

src/app/lib/config/services/afrique.ts

@@ -65,6 +65,7 @@ export const service: DefaultServiceConfig = {
       },
     },
     translations: {
+      and: 'et',
       pagination: {
         page: 'Page',
         previousPage: 'Page précédente',

src/app/lib/config/services/amharic.ts

@@ -60,6 +60,7 @@ export const service: DefaultServiceConfig = {
       },
     },
     translations: {
+      and: 'እና',
       pagination: {
         page: 'ገፁ',
         previousPage: 'ከዚህ በፊት ያለ',

src/app/lib/config/services/azeri.ts

@@ -65,6 +65,7 @@ export const service: DefaultServiceConfig = {
       },
     },
     translations: {
+      and: 'və',
       pagination: {
         page: 'səhifə',
         previousPage: 'Geriyə',

src/app/lib/config/services/bengali.ts

@@ -67,6 +67,7 @@ export const service: DefaultServiceConfig = {
     },
     googleSiteVerification: 'D-aEHUiyVaMoUJXjVRbDVkxS0dLTMUZLD3dLPTnWO4Q',
     translations: {
+      and: 'এবং',
       pagination: {
         page: 'পৃষ্ঠা',
         previousPage: 'ফিরে যাব',

src/app/lib/config/services/burmese.ts

@@ -61,6 +61,7 @@ export const service: DefaultServiceConfig = {
       },
     },
     translations: {
+      and: 'နှင့်',
       pagination: {
         page: 'စာမျက်နှာ',
         previousPage: 'နောက်သို့ပြန်သွားရန်',

src/app/lib/config/services/gahuza.ts

@@ -60,6 +60,7 @@ export const service: DefaultServiceConfig = {
       },
     },
     translations: {
+      and: 'na',
       pagination: {
         previousPage: 'Subira inyuma',
         nextPage: 'Ibikurikira',

src/app/lib/config/services/gujarati.ts

@@ -65,6 +65,7 @@ export const service: DefaultServiceConfig = {
       },
     },
     translations: {
+      and: 'અને',
       pagination: {
         previousPage: 'આ પહેલાં',
         nextPage: 'આ પછી',