Merge branch 'terra-application-v1' into pct-scroll

cerner · Sep 11, 2023 · ba1df5f · ba1df5f
2 parents eaa8dab + 0c47693
commit ba1df5f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 6 deletions.
diff --git a/packages/terra-application-docs/CHANGELOG.md b/packages/terra-application-docs/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 2.11.0 - (September 8, 2023)
+
+* Changed
+  * Minor dependency version bump
+
 ## 2.10.0 - (August 22, 2023)
 
 * Added

diff --git a/packages/terra-application-docs/package.json b/packages/terra-application-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerner/terra-application-docs",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "Contains documentation for packages in the terra-application monorepo",
   "main": "index.js",
   "publishConfig": {
@@ -35,7 +35,7 @@
     "precompile": "rm -rf lib"
   },
   "dependencies": {
-    "@cerner/terra-dev-site": "^7.9.0",
+    "@cerner/terra-dev-site": "^7.10.0",
     "@cerner/terra-docs": "^1.0.0",
     "classnames": "^2.2.5",
     "prop-types": "^15.5.8",
@@ -53,6 +53,6 @@
     "terra-application": "^1.54.0"
   },
   "devDependencies": {
-    "terra-application": "^1.55.1"
+    "terra-application": "^1.56.0-alpha.0"
   }
 }
diff --git a/packages/terra-application/CHANGELOG.md b/packages/terra-application/CHANGELOG.md
@@ -5,6 +5,11 @@
 * Changed
  * Added `noScroll` prop to remove scroll in powerchart.
 
+## 1.56.0-alpha.0 - (September 8, 2023)
+
+* Changed
+  * Updated `getBrowserLocale` method for IE.
+
 ## 1.55.1 - (August 22, 2023)
 
 * Changed

diff --git a/packages/terra-application/package.json b/packages/terra-application/package.json
@@ -1,7 +1,7 @@
 {
   "name": "terra-application",
   "main": "lib/application-base/ApplicationBase.js",
-  "version": "1.55.1",
+  "version": "1.56.0-alpha.0",
   "description": "A framework to support application development with Terra components",
   "engines": {
     "node": "^8.9.2 || ^10.13.0 || ^12.0.0 || ^14.0.0"

diff --git a/packages/terra-application/src/application-base/private/getBrowserLocale.js b/packages/terra-application/src/application-base/private/getBrowserLocale.js
@@ -50,6 +50,11 @@ const getBrowserLocale = () => {
     return preferredLocale;
   }
 
+  /* for IE support, as languages and language in IE return undefined, and userLanguage and browserLanguage return "en-US" */
+  if (isSupported(navigator.systemLanguage)) {
+    return navigator.systemLanguage;
+  }
+
   if (isSupported(navigator.language)) {
     return navigator.language;
   }

diff --git a/packages/terra-dev-site/CHANGELOG.md b/packages/terra-dev-site/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 7.10.0 - (September 8, 2023)
+
+* Changed
+  * Minor dependency version bump
+
 ## 7.9.0 - (August 22, 2023)
 
 * Changed

diff --git a/packages/terra-dev-site/package.json b/packages/terra-dev-site/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cerner/terra-dev-site",
-  "version": "7.9.0",
+  "version": "7.10.0",
   "description": "Dynamically builds a react-hash-routed site based on site configuration, navigation configuration and component configuration.",
   "engines": {
     "node": ">=10"
@@ -91,6 +91,6 @@
     "webpack": "^4.44.2 || ^5.0.0"
   },
   "devDependencies": {
-    "terra-application": "^1.55.1"
+    "terra-application": "^1.56.0-alpha.0"
   }
 }