From 547e777eb00b41b7691c2d4f89c7cf004b624bbf Mon Sep 17 00:00:00 2001
From: Lokowitz <marvinlokowitz@gmail.com>
Date: Sat, 17 May 2025 20:16:26 +0000
Subject: [PATCH] more fixes

---
 messages/en-US.json                                   | 11 ++++++-----
 .../[orgId]/settings/access/users/[userId]/layout.tsx |  4 ++--
 src/app/admin/license/page.tsx                        |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/messages/en-US.json b/messages/en-US.json
index ab3ba6bb..6966b6f5 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -702,6 +702,7 @@
     "pangolinServerAdmin": "Server Admin - Pangolin",
     "licenseTierProfessional": "Professional License",
     "licenseTierEnterprise": "Enterprise License",
+    "licenseTierCommercial": "Commercial License",
     "licensed": "Licensed",
     "yes": "Yes",
     "no": "No",
@@ -757,11 +758,11 @@
     "idpJmespathAboutDescription": "The paths below use JMESPath syntax to extract values from the ID token.",
     "idpJmespathAboutDescriptionLink": "Learn more about JMESPath",
     "idpJmespathLabel": "Identifier Path",
-    "idpJmespathLabelDescription": "The JMESPath to the user identifier in the ID token",
+    "idpJmespathLabelDescription": "The path to the user identifier in the ID token",
     "idpJmespathEmailPathOptional": "Email Path (Optional)",
-    "idpJmespathEmailPathOptionalDescription": "The JMESPath to the user's email in the ID token",
+    "idpJmespathEmailPathOptionalDescription": "The path to the user's email in the ID token",
     "idpJmespathNamePathOptional": "Name Path (Optional)",
-    "idpJmespathNamePathOptionalDescription": "The JMESPath to the user's name in the ID token",
+    "idpJmespathNamePathOptionalDescription": "The path to the user's name in the ID token",
     "idpOidcConfigureScopes": "Scopes",
     "idpOidcConfigureScopesDescription": "Space-separated list of OAuth2 scopes to request",
     "idpSubmit": "Create Identity Provider",
@@ -785,9 +786,9 @@
     "defaultMappingsOptional": "Default Mappings (Optional)",
     "defaultMappingsOptionalDescription": "The default mappings are used when when there is not an organization policy defined for an organization. You can specify the default role and organization mappings to fall back to here.",
     "defaultMappingsRole": "Default Role Mapping",
-    "defaultMappingsRoleDescription": "JMESPath to extract role information from the ID token. The result of this expression must return the role name as defined in the organization as a string.",
+    "defaultMappingsRoleDescription": "The result of this expression must return the role name as defined in the organization as a string.",
     "defaultMappingsOrg": "Default Organization Mapping",
-    "defaultMappingsOrgDescription": "JMESPath to extract organization information from the ID token. This expression must return the org ID or true for the user to be allowed to access the organization.",
+    "defaultMappingsOrgDescription": "This expression must return the org ID or true for the user to be allowed to access the organization.",
     "defaultMappingsSubmit": "Save Default Mappings",
     "orgPoliciesEdit": "Edit Organization Policy",
     "org": "Organization",
diff --git a/src/app/[orgId]/settings/access/users/[userId]/layout.tsx b/src/app/[orgId]/settings/access/users/[userId]/layout.tsx
index 44c1ee19..82fbba86 100644
--- a/src/app/[orgId]/settings/access/users/[userId]/layout.tsx
+++ b/src/app/[orgId]/settings/access/users/[userId]/layout.tsx
@@ -15,7 +15,7 @@ import {
 import Link from "next/link";
 import { cache } from "react";
 import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import { useTranslations } from "next-intl";
+import { getTranslations } from 'next-intl/server';
 
 interface UserLayoutProps {
     children: React.ReactNode;
@@ -27,7 +27,7 @@ export default async function UserLayoutProps(props: UserLayoutProps) {
 
     const { children } = props;
 
-    const t = useTranslations();
+    const t = await getTranslations();
 
     let user = null;
     try {
diff --git a/src/app/admin/license/page.tsx b/src/app/admin/license/page.tsx
index 67d2912e..ac2c6d67 100644
--- a/src/app/admin/license/page.tsx
+++ b/src/app/admin/license/page.tsx
@@ -384,10 +384,10 @@ export default function LicensePage() {
                                             <Check />
                                             {licenseStatus?.tier ===
                                             "PROFESSIONAL"
-                                                ? t('licenseTierProfessional')
+                                                ? t('licenseTierCommercial')
                                                 : licenseStatus?.tier ===
                                                     "ENTERPRISE"
-                                                  ? t('licenseTierEnterprise')
+                                                  ? t('licenseTierCommercial')
                                                   : t('licensed')}
                                         </div>
                                     </div>