Fix/LanguageSwitcher uses wrong language for checks (#942)

This fixes a bug where the LanguageSwitcher was using the fallback
language in the config, when it should have used the default language.
We did not find this bug sooner, since we have always ran the web app
with the same fallback and default languages.

Author: SjurSutterudSagen

packages/pxweb2/src/app/components/Footer/Footer.tsx

@@ -115,7 +115,7 @@ export const Footer: React.FC<FooterProps> = ({
                             location.pathname,
                             lang.shorthand,
                             config.language.supportedLanguages,
-                            config.language.fallbackLanguage,
+                            config.language.defaultLanguage,
                             config.language.showDefaultLanguageInPath,
                           );
                         const isCurrent = i18n.language?.startsWith(

packages/pxweb2/src/app/components/Header/Header.tsx

@@ -36,7 +36,7 @@ export const Header = ({ stroke = false }: HeaderProps) => {
             '/',
             i18n.language,
             config.language.supportedLanguages,
-            config.language.fallbackLanguage,
+            config.language.defaultLanguage,
             config.language.showDefaultLanguageInPath,
           )}
         >

packages/pxweb2/src/app/components/LanguageSwitcher/LanguageSwitcher.tsx

@@ -35,7 +35,7 @@ export const LanguageSwitcher = () => {
         location.pathname,
         event.target.value,
         config.language.supportedLanguages,
-        config.language.fallbackLanguage,
+        config.language.defaultLanguage,
         config.language.showDefaultLanguageInPath,
       ),
     );

packages/pxweb2/src/app/util/language/getLanguagePath.spec.tsx

@@ -6,63 +6,63 @@ describe('getLanguagePath', () => {
     { languageName: 'English', shorthand: 'en' },
     { languageName: 'Polish', shorthand: 'pl' },
   ];
-  const fallbackLanguage = 'en';
+  const defaultLanguage = 'en';
 
   describe('when showDefaultLanguageInPath is false', () => {
-    it('should return the correct path when pathname starts with a language code and target is fallback', () => {
+    it('should return the correct path when pathname starts with a language code and target is default', () => {
       const pathname = '/no/some/path';
       const targetLanguage = 'en';
 
       const result = getLanguagePath(
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         false,
       );
 
       expect(result).toBe('/some/path');
     });
 
-    it('should return the correct path when pathname starts with a language code and target is not fallback', () => {
+    it('should return the correct path when pathname starts with a language code and target is not default', () => {
       const pathname = '/en/some/path';
       const targetLanguage = 'no';
 
       const result = getLanguagePath(
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         false,
       );
 
       expect(result).toBe('/no/some/path');
     });
 
-    it('should return the correct path when pathname does not start with a language code and target is fallback', () => {
+    it('should return the correct path when pathname does not start with a language code and target is default', () => {
       const pathname = '/some/path';
       const targetLanguage = 'en';
 
       const result = getLanguagePath(
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         false,
       );
 
       expect(result).toBe('/some/path');
     });
 
-    it('should return the correct path when pathname does not start with a language code and target is not fallback', () => {
+    it('should return the correct path when pathname does not start with a language code and target is not default', () => {
       const pathname = '/some/path';
       const targetLanguage = 'no';
 
       const result = getLanguagePath(
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         false,
       );
 
@@ -77,7 +77,7 @@ describe('getLanguagePath', () => {
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         false,
       );
 
@@ -92,7 +92,7 @@ describe('getLanguagePath', () => {
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         false,
       );
 
@@ -101,60 +101,60 @@ describe('getLanguagePath', () => {
   });
 
   describe('when showDefaultLanguageInPath is true', () => {
-    it('should include fallback language in path when target is fallback', () => {
+    it('should include default language in path when target is default', () => {
       const pathname = '/no/some/path';
       const targetLanguage = 'en';
 
       const result = getLanguagePath(
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         true,
       );
 
       expect(result).toBe('/en/some/path');
     });
 
-    it('should include fallback language when pathname does not start with language code and target is fallback', () => {
+    it('should include default language when pathname does not start with language code and target is default', () => {
       const pathname = '/some/path';
       const targetLanguage = 'en';
 
       const result = getLanguagePath(
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         true,
       );
 
       expect(result).toBe('/en/some/path');
     });
 
-    it('should handle empty path correctly with fallback language', () => {
+    it('should handle empty path correctly with default language', () => {
       const pathname = '/';
       const targetLanguage = 'en';
 
       const result = getLanguagePath(
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         true,
       );
 
       expect(result).toBe('/en/');
     });
 
-    it('should handle non-fallback language the same regardless of showDefaultLanguageInPath setting', () => {
+    it('should handle non-default language the same regardless of showDefaultLanguageInPath setting', () => {
       const pathname = '/some/path';
       const targetLanguage = 'no';
 
       const result = getLanguagePath(
         pathname,
         targetLanguage,
         supportedLanguages,
-        fallbackLanguage,
+        defaultLanguage,
         true,
       );
 

packages/pxweb2/src/app/util/language/getLanguagePath.ts

@@ -5,15 +5,15 @@ import { Config as LanguageConfig } from '../../util/config/configType';
  * @param pathname Current pathname from location
  * @param targetLanguage The language to switch to
  * @param supportedLanguages List of supported languages
- * @param fallbackLanguage The fallback language code
+ * @param defaultLanguage The fallback language code
  * @param showDefaultLanguageInPath Whether to show the default language in the path
  * @returns The correct path for the target language
  */
 export const getLanguagePath = (
   pathname: string,
   targetLanguage: string,
   supportedLanguages: LanguageConfig['language']['supportedLanguages'],
-  fallbackLanguage: string,
+  defaultLanguage: string,
   showDefaultLanguageInPath: boolean,
 ): string => {
   const [firstURLElement, ...pathParts] = pathname.slice(1).split('/');
@@ -25,7 +25,7 @@ export const getLanguagePath = (
     ? pathParts.join('/')
     : [firstURLElement, ...pathParts].join('/');
 
-  if (!showDefaultLanguageInPath && targetLanguage === fallbackLanguage) {
+  if (!showDefaultLanguageInPath && targetLanguage === defaultLanguage) {
     return `/${actualPath}`;
   }