@ndla/ui 3.0.9 → 3.0.13

package/lib/locale/messages-en.d.ts

@@ -149,6 +149,7 @@ declare const messages: {
             all: string;
             hits: string;
             showingSearchPhrase: string;
+            showingCompetenceGoalSearchPhrase: string;
             searchPhraseSuggestion: string;
             notionLabels: string;
             notionsHeading: string;
@@ -194,6 +195,7 @@ declare const messages: {
             dialogHeader: string;
             dialogText: string;
         };
+        archived: string;
     };
     subjectsPage: {
         chooseSubject: string;
@@ -206,6 +208,7 @@ declare const messages: {
     };
     welcomePage: {
         search: string;
+        searchDisclaimer: string;
         resetSearch: string;
         closeSearch: string;
         searchAllInfo: string;
@@ -326,11 +329,8 @@ declare const messages: {
         };
     };
     article: {
-        author: string;
-        published: string;
         edition: string;
         publisher: string;
-        created: string;
         lastUpdated: string;
         closeLabel: string;
         useContent: string;
@@ -407,6 +407,9 @@ declare const messages: {
             copyTitle: string;
             hasCopiedTitle: string;
         };
+        image: {
+            rules: string;
+        };
         images: {
             heading: string;
             description: string;
@@ -546,6 +549,7 @@ declare const messages: {
         fr: string;
         de: string;
         se: string;
+        sma: string;
         es: string;
         zh: string;
         unknown: string;

package/lib/locale/messages-en.js

@@ -134,6 +134,7 @@ var messages = _objectSpread(_objectSpread({
       all: 'All',
       hits: '{{count}} hits',
       showingSearchPhrase: 'Showing results for:',
+      showingCompetenceGoalSearchPhrase: 'Showing results for competence goals {text}',
       searchPhraseSuggestion: 'Search instead for:',
       notionLabels: 'Used in',
       notionsHeading: 'Begrepsforklaring',
@@ -178,7 +179,8 @@ var messages = _objectSpread(_objectSpread({
       iconLabel: 'in beta',
       dialogHeader: '{{title}} is under construction',
       dialogText: 'Read more at'
-    }
+    },
+    archived: 'This is an expired and unmaintained subject.'
   },
   subjectsPage: {
     chooseSubject: 'Choose subject',
@@ -191,6 +193,7 @@ var messages = _objectSpread(_objectSpread({
   },
   welcomePage: {
     search: 'Search',
+    searchDisclaimer: 'We are constantly working to improve ourselves! If you have comments to the search, please use the «spør NDLA» function in the bottom right corner.',
     resetSearch: 'Empty search',
     closeSearch: 'Close search',
     searchAllInfo: 'View all results',
@@ -287,11 +290,8 @@ var messages = _objectSpread(_objectSpread({
     }
   },
   article: {
-    author: 'Author',
-    published: 'Published',
     edition: 'Edition',
     publisher: 'Publisher',
-    created: 'Created',
     lastUpdated: 'Last updated',
     closeLabel: 'Close',
     useContent: 'Cite or use',
@@ -368,6 +368,9 @@ var messages = _objectSpread(_objectSpread({
       copyTitle: 'Copy link',
       hasCopiedTitle: 'Link copied'
     },
+    image: {
+      rules: 'Rules for use of image:'
+    },
     images: {
       heading: 'How to use images from the article',
       description: 'Remember to copy the text to be attached to the image where you use it.',
@@ -506,7 +509,8 @@ var messages = _objectSpread(_objectSpread({
     en: 'English',
     fr: 'French',
     de: 'German',
-    se: 'Sami',
+    se: 'Northern Sami',
+    sma: 'Southern Sami',
     es: 'Spanish',
     zh: 'Chinese',
     unknown: 'Unknown',

package/lib/locale/messages-nb.d.ts

@@ -195,6 +195,7 @@ declare const messages: {
             dialogHeader: string;
             dialogText: string;
         };
+        archived: string;
     };
     subjectsPage: {
         errorDescription: string;
@@ -418,6 +419,9 @@ declare const messages: {
             copyTitle: string;
             hasCopiedTitle: string;
         };
+        image: {
+            rules: string;
+        };
         images: {
             heading: string;
             description: string;
@@ -545,6 +549,7 @@ declare const messages: {
         fr: string;
         de: string;
         se: string;
+        sma: string;
         es: string;
         zh: string;
         unknown: string;
@@ -680,6 +685,7 @@ declare const messages: {
         createLearningPathButtonText: string;
         lastUpdated: string;
         youAreInALearningPath: string;
+        readTime: string;
         readTimeHour: string;
         readTimeHour_plurals: string;
         readTimeMinutesShort: string;

package/lib/locale/messages-nb.js

@@ -179,7 +179,8 @@ var messages = _objectSpread(_objectSpread({
       iconLabel: 'i arbeid',
       dialogHeader: '{{title}} er under arbeid.',
       dialogText: 'Du kan lese mer om hva dette betyr på'
-    }
+    },
+    archived: 'Dette er et utgått fag som ikke vedlikeholdes.'
   },
   subjectsPage: {
     errorDescription: 'Beklager, en feil oppstod under lasting av fagene.',
@@ -379,6 +380,9 @@ var messages = _objectSpread(_objectSpread({
       copyTitle: 'Kopier lenke',
       hasCopiedTitle: 'Lenke kopiert'
     },
+    image: {
+      rules: 'Regler for bruk av bildet:'
+    },
     images: {
       heading: 'Slik bruker du bilder fra artikkelen',
       description: 'Husk å kopiere teksten som skal legges ved bildet der du bruker det.',
@@ -505,7 +509,8 @@ var messages = _objectSpread(_objectSpread({
     en: 'Engelsk',
     fr: 'Fransk',
     de: 'Tysk',
-    se: 'Samisk',
+    se: 'Nordsamisk',
+    sma: 'Sørsamisk',
     es: 'Spansk',
     zh: 'Kinesisk',
     unknown: 'Ukjent',
@@ -641,6 +646,7 @@ var messages = _objectSpread(_objectSpread({
     createLearningPathButtonText: 'Gå til stier',
     lastUpdated: 'Sist oppdatert',
     youAreInALearningPath: 'Du er nå inne i en læringssti',
+    readTime: '{{hours}} Skoletimer = {{minutes}} min',
     readTimeHour: 'time',
     readTimeHour_plurals: 'timer',
     readTimeMinutesShort: 'min',

package/lib/locale/messages-nn.d.ts

@@ -149,6 +149,7 @@ declare const messages: {
             all: string;
             hits: string;
             showingSearchPhrase: string;
+            showingCompetenceGoalSearchPhrase: string;
             searchPhraseSuggestion: string;
             notionLabels: string;
             notionsHeading: string;
@@ -194,6 +195,7 @@ declare const messages: {
             dialogHeader: string;
             dialogText: string;
         };
+        archived: string;
     };
     subjectsPage: {
         errorDescription: string;
@@ -417,6 +419,9 @@ declare const messages: {
             copyTitle: string;
             hasCopiedTitle: string;
         };
+        image: {
+            rules: string;
+        };
         images: {
             heading: string;
             description: string;
@@ -544,6 +549,7 @@ declare const messages: {
         fr: string;
         de: string;
         se: string;
+        sma: string;
         es: string;
         zh: string;
         unknown: string;

package/lib/locale/messages-nn.js

@@ -134,6 +134,7 @@ var messages = _objectSpread(_objectSpread({
       all: 'Alle',
       hits: '{{count}} Treff',
       showingSearchPhrase: 'Viser resultat for',
+      showingCompetenceGoalSearchPhrase: 'Viser resultat for kompetansemål {text}',
       searchPhraseSuggestion: 'Søk i staden for',
       notionLabels: 'Brukes i',
       notionsHeading: 'Begrepsforklaring',
@@ -178,7 +179,8 @@ var messages = _objectSpread(_objectSpread({
       iconLabel: 'i arbeid',
       dialogHeader: '{{title}} er under arbeid.',
       dialogText: 'Du kan lese meir om kva dette betyr på'
-    }
+    },
+    archived: 'Dette er eit utgått fag som ikkje blir halde ved like.'
   },
   subjectsPage: {
     errorDescription: 'Orsak, ein feil oppstod under lasting av faga.',
@@ -378,6 +380,9 @@ var messages = _objectSpread(_objectSpread({
       copyTitle: 'Kopier lenke',
       hasCopiedTitle: 'Lenke kopiert'
     },
+    image: {
+      rules: 'Reglar for bruk av biletet:'
+    },
     images: {
       heading: 'Slik bruker du bilete frå artikkelen',
       description: 'Hugs å kopiere teksten som skal leggjast ved biletet der du bruker det.',
@@ -504,7 +509,8 @@ var messages = _objectSpread(_objectSpread({
     en: 'Engelsk',
     fr: 'Fransk',
     de: 'Tysk',
-    se: 'Samisk',
+    se: 'Nordsamisk',
+    sma: 'Sørsamisk',
     es: 'Spansk',
     zh: 'Kinesisk',
     unknown: 'Ukjent',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "3.0.9",
+  "version": "3.0.13",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,18 +31,18 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/button": "^1.0.5",
-    "@ndla/carousel": "^1.0.5",
+    "@ndla/button": "^1.0.6",
+    "@ndla/carousel": "^1.0.6",
     "@ndla/core": "^0.7.2",
-    "@ndla/hooks": "^1.0.3",
-    "@ndla/icons": "^1.3.0",
-    "@ndla/licenses": "^1.0.6",
-    "@ndla/modal": "^1.1.8",
-    "@ndla/safelink": "^1.0.4",
+    "@ndla/hooks": "^1.0.6",
+    "@ndla/icons": "^1.3.1",
+    "@ndla/licenses": "^1.0.7",
+    "@ndla/modal": "^1.1.11",
+    "@ndla/safelink": "^1.0.5",
     "@ndla/switch": "^0.0.32",
-    "@ndla/tabs": "^1.0.5",
+    "@ndla/tabs": "^1.0.8",
     "@ndla/tooltip": "^0.2.46",
-    "@ndla/util": "^1.0.3",
+    "@ndla/util": "^2.0.0",
     "@reach/menu-button": "^0.12.1",
     "@reach/slider": "^0.12.1",
     "@types/hoist-non-react-statics": "^3.3.1",
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "378a5d61749861dd7197093daa8e8a1f66c35b29"
+  "gitHead": "815d8d7d88d2a021c35f96421eb357925c0c2b6b"
 }

package/src/Article/ArticleByline.tsx

@@ -64,7 +64,7 @@ type Props = {
 };
 
 const ArticleByline = ({
-  authors,
+  authors = [],
   suppliers,
   license,
   licenseBox,
@@ -95,16 +95,17 @@ const ArticleByline = ({
     return contributorsArray.join('');
   };
   const licenseRights = getLicenseByAbbreviation(license, locale).rights;
-
   return (
     <Wrapper>
       <div>
         {t('article.lastUpdated')} {published}
       </div>
-      {authors && (
+      {(authors.length > 0 || licenseRights.length > 0) && (
         <TextWrapper>
           <LicenseByline licenseRights={licenseRights}>
-            <AuthorsWrapper>{t('article.authorsLabel', { names: renderContributors(authors) })}</AuthorsWrapper>
+            {authors.length > 0 && (
+              <AuthorsWrapper>{t('article.authorsLabel', { names: renderContributors(authors) })}</AuthorsWrapper>
+            )}
           </LicenseByline>
         </TextWrapper>
       )}

package/src/MultidisciplinarySubject/MultidisciplinarySubject.tsx

@@ -1,4 +1,4 @@
-import React, { ReactChildren } from 'react';
+import React, { ReactNode } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from '@emotion/styled';
 import { breakpoints, fonts, mq } from '@ndla/core';
@@ -87,7 +87,7 @@ const Illustration = styled.div`
 
 type Props = {
   cards: ListItemProps[];
-  children: ReactChildren;
+  children: ReactNode;
   totalCardCount: number;
   hideCards?: boolean;
 };

package/src/locale/__tests__/translations-test.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2021-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import { validateTranslationFiles } from '@ndla/util';
+import messagesNB from '../messages-nb';
+import messagesNN from '../messages-nn';
+import messagesEN from '../messages-en';
+
+test('That all translations has all language keys', () => {
+  const anyMissing = validateTranslationFiles(
+    [
+      {
+        languageName: 'Norsk bokmål',
+        translationObject: messagesNB,
+      },
+      {
+        languageName: 'Norsk nynorsk',
+        translationObject: messagesNN,
+      },
+      {
+        languageName: 'English',
+        translationObject: messagesEN,
+      },
+    ],
+    'only-on-error',
+  );
+
+  expect(anyMissing).toBe(false);
+});

package/src/locale/messages-en.ts

@@ -131,6 +131,7 @@ const messages = {
       all: 'All',
       hits: '{{count}} hits',
       showingSearchPhrase: 'Showing results for:',
+      showingCompetenceGoalSearchPhrase: 'Showing results for competence goals {text}',
       searchPhraseSuggestion: 'Search instead for:',
       notionLabels: 'Used in',
       notionsHeading: 'Begrepsforklaring',
@@ -177,6 +178,7 @@ const messages = {
       dialogHeader: '{{title}} is under construction',
       dialogText: 'Read more at',
     },
+    archived: 'This is an expired and unmaintained subject.',
   },
   subjectsPage: {
     chooseSubject: 'Choose subject',
@@ -189,6 +191,8 @@ const messages = {
   },
   welcomePage: {
     search: 'Search',
+    searchDisclaimer:
+      'We are constantly working to improve ourselves! If you have comments to the search, please use the «spør NDLA» function in the bottom right corner.',
     resetSearch: 'Empty search',
     closeSearch: 'Close search',
     searchAllInfo: 'View all results',
@@ -310,11 +314,8 @@ const messages = {
     },
   },
   article: {
-    author: 'Author',
-    published: 'Published',
     edition: 'Edition',
     publisher: 'Publisher',
-    created: 'Created',
     lastUpdated: 'Last updated',
     closeLabel: 'Close',
     useContent: 'Cite or use',
@@ -391,6 +392,9 @@ const messages = {
       copyTitle: 'Copy link',
       hasCopiedTitle: 'Link copied',
     },
+    image: {
+      rules: 'Rules for use of image:',
+    },
     images: {
       heading: 'How to use images from the article',
       description: 'Remember to copy the text to be attached to the image where you use it.',
@@ -529,7 +533,8 @@ const messages = {
     en: 'English',
     fr: 'French',
     de: 'German',
-    se: 'Sami',
+    se: 'Northern Sami',
+    sma: 'Southern Sami',
     es: 'Spanish',
     zh: 'Chinese',
     unknown: 'Unknown',

package/src/locale/messages-nb.ts

@@ -177,6 +177,7 @@ const messages = {
       dialogHeader: '{{title}} er under arbeid.',
       dialogText: 'Du kan lese mer om hva dette betyr på',
     },
+    archived: 'Dette er et utgått fag som ikke vedlikeholdes.',
   },
   subjectsPage: {
     errorDescription: 'Beklager, en feil oppstod under lasting av fagene.',
@@ -402,6 +403,9 @@ const messages = {
       copyTitle: 'Kopier lenke',
       hasCopiedTitle: 'Lenke kopiert',
     },
+    image: {
+      rules: 'Regler for bruk av bildet:',
+    },
     images: {
       heading: 'Slik bruker du bilder fra artikkelen',
       description: 'Husk å kopiere teksten som skal legges ved bildet der du bruker det.',
@@ -528,7 +532,8 @@ const messages = {
     en: 'Engelsk',
     fr: 'Fransk',
     de: 'Tysk',
-    se: 'Samisk',
+    se: 'Nordsamisk',
+    sma: 'Sørsamisk',
     es: 'Spansk',
     zh: 'Kinesisk',
     unknown: 'Ukjent',
@@ -669,6 +674,7 @@ const messages = {
     createLearningPathButtonText: 'Gå til stier',
     lastUpdated: 'Sist oppdatert',
     youAreInALearningPath: 'Du er nå inne i en læringssti',
+    readTime: '{{hours}} Skoletimer = {{minutes}} min',
     readTimeHour: 'time',
     readTimeHour_plurals: 'timer',
     readTimeMinutesShort: 'min',

package/src/locale/messages-nn.ts

@@ -131,6 +131,7 @@ const messages = {
       all: 'Alle',
       hits: '{{count}} Treff',
       showingSearchPhrase: 'Viser resultat for',
+      showingCompetenceGoalSearchPhrase: 'Viser resultat for kompetansemål {text}',
       searchPhraseSuggestion: 'Søk i staden for',
       notionLabels: 'Brukes i',
       notionsHeading: 'Begrepsforklaring',
@@ -176,6 +177,7 @@ const messages = {
       dialogHeader: '{{title}} er under arbeid.',
       dialogText: 'Du kan lese meir om kva dette betyr på',
     },
+    archived: 'Dette er eit utgått fag som ikkje blir halde ved like.',
   },
   subjectsPage: {
     errorDescription: 'Orsak, ein feil oppstod under lasting av faga.',
@@ -402,6 +404,9 @@ const messages = {
       copyTitle: 'Kopier lenke',
       hasCopiedTitle: 'Lenke kopiert',
     },
+    image: {
+      rules: 'Reglar for bruk av biletet:',
+    },
     images: {
       heading: 'Slik bruker du bilete frå artikkelen',
       description: 'Hugs å kopiere teksten som skal leggjast ved biletet der du bruker det.',
@@ -528,7 +533,8 @@ const messages = {
     en: 'Engelsk',
     fr: 'Fransk',
     de: 'Tysk',
-    se: 'Samisk',
+    se: 'Nordsamisk',
+    sma: 'Sørsamisk',
     es: 'Spansk',
     zh: 'Kinesisk',
     unknown: 'Ukjent',