Merge branch 'master' into joeh/popoutSmallerOrLarger

iTwin · Dec 12, 2023 · 71a0573 · 71a0573
2 parents 160d61d + 6319c32
commit 71a0573
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/common/changes/@itwin/appui-react/joeh-localizePopoutText_2023-12-08-17-19.json b/common/changes/@itwin/appui-react/joeh-localizePopoutText_2023-12-08-17-19.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@itwin/appui-react",
+      "comment": "Localize popout error text",
+      "type": "none"
+    }
+  ],
+  "packageName": "@itwin/appui-react"
+}
diff --git a/docs/changehistory/NextVersion.md b/docs/changehistory/NextVersion.md
@@ -3,6 +3,7 @@
 Table of contents:
 
 - [@itwin/appui-react](#itwinappui-react)
+  - [Fixes](#fixes)
   - [Changes](#changes)
   - [Fixes](#fixes)
 - [@itwin/components-react](#itwincomponents-react)
@@ -12,6 +13,10 @@ Table of contents:
 
 ## @itwin/appui-react
 
+### Fixes
+
+- Localize popout error message text.
+
 ### Changes
 
 - Promoted `FrameworkToolAdmin` to _beta_. #618

diff --git a/ui/appui-react/public/locales/en/UiFramework.json b/ui/appui-react/public/locales/en/UiFramework.json
@@ -279,7 +279,8 @@
       "popoutActiveTab": "Pop out active widget tab"
     },
     "errorMessage": {
-      "unknownError": "Something went wrong..."
+      "unknownError": "Something went wrong...",
+      "widgetPopoutFail": "Widget failed to popout, ensure you allow popout for this site."
     }
   },
   "statusBar": {

diff --git a/ui/appui-react/src/appui-react/frontstage/FrontstageDef.tsx b/ui/appui-react/src/appui-react/frontstage/FrontstageDef.tsx
@@ -297,7 +297,7 @@ export class FrontstageDef {
       IModelApp.notifications.outputMessage(
         new NotifyMessageDetails(
           OutputMessagePriority.Error,
-          "Widget Failed To Popout",
+          UiFramework.translate("widget.errorMessage.widgetPopoutFail"),
           undefined,
           OutputMessageType.Toast
         )