fix(h5p-server): missing translations when language was not found (#1063

)
Lumieducation · Feb 17, 2021 · 5bc9976 · 5bc9976
1 parent 09cec79
commit 5bc9976
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/packages/h5p-server/src/LibraryManager.ts b/packages/h5p-server/src/LibraryManager.ts
@@ -152,6 +152,12 @@ export default class LibraryManager {
                 );
                 return this.getLanguage(library, languageCodeMatch[1]);
             }
+            if (language !== 'en' && language !== '.en') {
+                return this.getLanguage(library, 'en');
+            }
+            if (language === 'en') {
+                return this.getLanguage(library, '.en');
+            }
             return null;
         }
     }

diff --git a/packages/h5p-server/test/LibraryManager.test.ts b/packages/h5p-server/test/LibraryManager.test.ts
@@ -282,16 +282,29 @@ describe('basic file library manager functionality', () => {
         );
     });
 
-    it('returns null file for language en', async () => {
+    it('returns the English language file for language xx', async () => {
         const libManager = new LibraryManager(
             new FileLibraryStorage(`${__dirname}/data/libraries`)
         );
 
         const language = await libManager.getLanguage(
             { machineName: 'H5P.Example1', majorVersion: 1, minorVersion: 1 },
-            'en'
+            'xx'
         );
-        expect(language).toBeNull();
+        expect(JSON.parse(language)).toMatchObject({
+            semantics: [
+                {
+                    label: 'Greeting text',
+                    default: 'Hello world!',
+                    description: 'The greeting text displayed to the end user.'
+                },
+                {
+                    label: 'Card image',
+                    description:
+                        'Image shown on card, optional. Without this the card will show just the text.'
+                }
+            ]
+        });
     });
 
     it('returns the de language file for de-DE', async () => {