diff --git a/messages/en-US.json b/messages/en-US.json index a9fb43e5f..f931ea776 100644 --- a/messages/en-US.json +++ b/messages/en-US.json @@ -295,7 +295,8 @@ "resourceTypeDescription": "This controls the resource protocol and can’t be changed later.", "resourceTypeSearch": "Search resource types...", "resourceTypeNotFound": "No resource type found", - "resourceTypeHttpDescription": "Proxy web traffic over HTTPS using a domain name", + "resourceTypeHttp": "HTTP(S)", + "resourceTypeHttpDescription": "Proxy web traffic over HTTP or HTTPS using a domain name", "resourceTypeInferenceDescription": "Route AI requests through attached providers", "resourceTypeSshDescription": "Access an SSH server from the browser", "resourceTypeRdpDescription": "Access a remote desktop from the browser", @@ -4493,7 +4494,7 @@ "actionUpdateSiteApprovals": "Update Site Approvals", "check": "Check", "redirectsTitle": "Manage Redirects", - "redirectsDescription": "Forward requests from a path on your domains or resources to another URL", + "redirectsDescription": "Forward requests from a path on your domains or resources to another URL.", "redirectsSearch": "Search redirects...", "redirectAdd": "Add Redirect", "redirectSource": "Source", @@ -4518,7 +4519,7 @@ "redirectDestinationHostDescription": "Where requests are sent, including the scheme, such as https://example.com", "redirectDestinationHostRequired": "Enter a destination", "redirectSameDomainAsSource": "Same Domain as Source", - "redirectSameDomainAsSourceDescription": "Keep the destination on the source domain and only change the path", + "redirectSameDomainAsSourceDescription": "Keep the destination on the source domain and only change the path.", "redirectDestinationHostInvalid": "Enter a valid destination with a scheme, such as https://example.com", "redirectMatchPathDescription": "Which incoming paths this redirect applies to", "redirectRewritePathDescription": "Optionally change the path before redirecting. Leave unset to keep the original path.", @@ -4527,8 +4528,8 @@ "redirectPriorityInvalid": "Enter a whole number between 1 and 1000", "redirectPriorityDescription": "Higher priority routes are evaluated first. Redirects are always evaluated before targets.", "redirectCreate": "Create Redirect", - "redirectCreateDescription": "Forward requests matching a path to another URL", - "redirectEditDescription": "Update how this redirect forwards incoming requests", + "redirectCreateDescription": "Forward requests matching a path to another URL.", + "redirectEditDescription": "Update how this redirect forwards incoming requests.", "redirectGoBack": "Back to Redirects", "redirectCreated": "Redirect created successfully", "redirectErrorCreate": "Failed to create redirect", @@ -4536,14 +4537,14 @@ "selectedRedirectDomain": "Selected Domain", "selectedRedirectResource": "Selected Resource", "redirectResourceNoDomain": "This resource has no domain", - "redirectSourceSectionDescription": "Choose the domain or resource, and which incoming paths, this redirect matches", + "redirectSourceSectionDescription": "Choose the domain or resource, and which incoming paths, this redirect matches.", "redirectDestinationSectionDescription": "Where matching requests are sent, and how the path changes", - "redirectSettingsDescription": "Set which paths to match and where to send them", - "redirectEnabledDescription": "Turn the redirect off to stop forwarding requests without deleting it", + "redirectSettingsDescription": "Set which paths to match and where to send them.", + "redirectEnabledDescription": "Turn the redirect off to stop forwarding requests without deleting it.", "redirectAttachDomain": "Domain", - "redirectAttachDomainDescription": "Apply this redirect to a whole domain", + "redirectAttachDomainDescription": "Apply this redirect to a whole domain.", "redirectAttachResource": "Resource", - "redirectAttachResourceDescription": "Apply this redirect to a single resource", + "redirectAttachResourceDescription": "Apply this redirect to a single resource.", "redirectDomainRequired": "Select a domain to attach this redirect to", "redirectResourceRequired": "Select a resource to attach this redirect to", "redirectPermanent": "Permanent Redirect", diff --git a/src/app/[orgId]/settings/resources/private/[niceId]/http/page.tsx b/src/app/[orgId]/settings/resources/private/[niceId]/http/page.tsx index c764b0446..59875f31a 100644 --- a/src/app/[orgId]/settings/resources/private/[niceId]/http/page.tsx +++ b/src/app/[orgId]/settings/resources/private/[niceId]/http/page.tsx @@ -80,7 +80,7 @@ export default function PrivateResourceHttpPage() { - {t("httpSettings")} + {t("resourceTypeHttp")} {t( diff --git a/src/app/[orgId]/settings/resources/private/[niceId]/layout.tsx b/src/app/[orgId]/settings/resources/private/[niceId]/layout.tsx index 31fe7cfae..554f794c2 100644 --- a/src/app/[orgId]/settings/resources/private/[niceId]/layout.tsx +++ b/src/app/[orgId]/settings/resources/private/[niceId]/layout.tsx @@ -62,7 +62,10 @@ export default async function PrivateResourceLayout( href: `/{orgId}/settings/resources/private/{niceId}/general` }, { - title: t(modeSettingsKey), + title: + siteResource.mode === "http" + ? t("resourceTypeHttp") + : t(modeSettingsKey), href: `/{orgId}/settings/resources/private/{niceId}/${siteResource.mode === "inference" ? "ai-gateway" : siteResource.mode}` }, { diff --git a/src/app/[orgId]/settings/resources/private/create/page.tsx b/src/app/[orgId]/settings/resources/private/create/page.tsx index 790de01cf..3427e99a1 100644 --- a/src/app/[orgId]/settings/resources/private/create/page.tsx +++ b/src/app/[orgId]/settings/resources/private/create/page.tsx @@ -151,7 +151,7 @@ export default function CreatePrivateResourcePage() { }, { value: "http" as const, - title: t("createInternalResourceDialogModeHttp"), + title: t("resourceTypeHttp"), description: t("privateResourceTypeHttpDescription") }, { @@ -602,7 +602,7 @@ export default function CreatePrivateResourcePage() { - {t("httpSettings")} + {t("resourceTypeHttp")} {t( diff --git a/src/app/[orgId]/settings/resources/public/[niceId]/layout.tsx b/src/app/[orgId]/settings/resources/public/[niceId]/layout.tsx index 2bee1be7b..511fa6ac4 100644 --- a/src/app/[orgId]/settings/resources/public/[niceId]/layout.tsx +++ b/src/app/[orgId]/settings/resources/public/[niceId]/layout.tsx @@ -88,7 +88,10 @@ export default async function ResourceLayout(props: ResourceLayoutProps) { href: `/{orgId}/settings/resources/public/{niceId}/general` }, { - title: t(`${resource.mode}Settings`), + title: + resource.mode === "http" + ? t("resourceTypeHttp") + : t(`${resource.mode}Settings`), href: `/{orgId}/settings/resources/public/{niceId}/${resource.mode === "inference" ? "ai-gateway" : resource.mode}` } ]; diff --git a/src/app/[orgId]/settings/resources/public/create/page.tsx b/src/app/[orgId]/settings/resources/public/create/page.tsx index f05052001..598b691ad 100644 --- a/src/app/[orgId]/settings/resources/public/create/page.tsx +++ b/src/app/[orgId]/settings/resources/public/create/page.tsx @@ -770,7 +770,7 @@ export default function Page() { { title: string; description: string } > = { http: { - title: t("createInternalResourceDialogModeHttp"), + title: t("resourceTypeHttp"), description: t("resourceTypeHttpDescription") }, inference: { diff --git a/src/components/PrivateResourceInfoBox.tsx b/src/components/PrivateResourceInfoBox.tsx index bec193bae..8db5ac9f8 100644 --- a/src/components/PrivateResourceInfoBox.tsx +++ b/src/components/PrivateResourceInfoBox.tsx @@ -91,7 +91,7 @@ export function PrivateResourceInfoSections({ const modeLabel: Record = { host: t("editInternalResourceDialogModeHost"), cidr: t("editInternalResourceDialogModeCidr"), - http: t("editInternalResourceDialogModeHttp"), + http: t("resourceTypeHttp"), ssh: t("editInternalResourceDialogModeSsh"), inference: t("editInternalResourceDialogModeInference"), gateway: t("editInternalResourceDialogModeGateway") diff --git a/src/components/RedirectForm.tsx b/src/components/RedirectForm.tsx index 02f1007b0..9f14d61f2 100644 --- a/src/components/RedirectForm.tsx +++ b/src/components/RedirectForm.tsx @@ -483,7 +483,9 @@ export default function RedirectForm({ defaultDomainId={ redirect?.domainId } - allowWildcard + allowWildcard={ + false + } defaultSubdomain={ redirect?.subdomain }