Merge pull request #974 from teleporthq/feat/ignore-browser-lang

Add flag to next config to enable ignoring browser default language

Author: vladgrecu

packages/teleport-project-generator-next/src/internationalization/project.ts

@@ -120,14 +120,18 @@ export class NextProjectPlugini18nConfig implements ProjectPlugin {
   async runAfter(structure: ProjectPluginStructure) {
     const { uidl, files, template } = structure
 
-    const { languages = { en: 'English' }, main = { locale: 'en', name: 'English' } } =
-      uidl.internationalization || {}
+    const {
+      languages = { en: 'English' },
+      main = { locale: 'en', name: 'English' },
+      ignoreBrowserLanguage = false,
+    } = uidl.internationalization || {}
+
     if (languages !== undefined && Object.keys(languages).length > 0) {
       const languageKeys = Object.keys(languages)
       const nextConfig = `module.exports = {
   i18n: {
     locales: [${languageKeys.map((key) => `'${key}'`).join(', ')}],
-    defaultLocale: "${main.locale}",
+    defaultLocale: "${main.locale}",${ignoreBrowserLanguage ? '\n    localeDetection: false,' : ''}
   }
 }`
       const existingNextConfig =

packages/teleport-types/src/uidl.ts

@@ -96,6 +96,7 @@ export interface ProjectUIDL {
     }
     languages: Record<string, string>
     translations: Record<string, Record<string, UIDLElementNode | UIDLStaticValue>>
+    ignoreBrowserLanguage?: boolean
   }
 }
 

packages/teleport-types/src/vuidl.ts

@@ -269,6 +269,7 @@ export type VProjectUIDL = Modify<
         name: string
         locale: string
       }
+      ignoreBrowserLanguage?: boolean
       languages: Record<string, string>
       translations: Record<string, Record<string, VUIDLElementNode | UIDLStaticValue>>
     }

packages/teleport-uidl-validator/src/decoders/project-decoder.ts

@@ -9,6 +9,7 @@ import {
   withDefault,
   number,
   union,
+  boolean,
 } from '@mojotech/json-type-validation'
 import {
   VUIDLGlobalProjectValues,
@@ -88,6 +89,7 @@ export const projectUIDLDecoder: Decoder<VProjectUIDL> = object({
         name: string(),
         locale: string(),
       }),
+      ignoreBrowserLanguage: optional(boolean()),
       languages: dict(string()),
       translations: dict(dict(union(elementNodeDecoder, staticValueDecoder))),
     })