Skip to content

Commit be3fca3

Browse files
laurenastrid1Lauren Nathan
andauthored
Updates arm container error message (#20770) (#20775)
* updated arm container error message * remove extra dash and unused string * remove unnecessary formats --------- Co-authored-by: Lauren Nathan <[email protected]>
1 parent 2b5057a commit be3fca3

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

extensions/mssql/l10n/bundle.l10n.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -764,10 +764,10 @@
764764
"Hide full error message": "Hide full error message",
765765
"Show full error message": "Show full error message",
766766
"Previous step failed. Please check the error message and try again.": "Previous step failed. Please check the error message and try again.",
767-
"The SQL Server 2025 RTM container image isn't compatible with ARM-based systems (including Windows ARM and Apple Silicon).": "The SQL Server 2025 RTM container image isn't compatible with ARM-based systems (including Windows ARM and Apple Silicon).",
768-
"Container creation isn't supported on this system. ARM support will be available starting with the SQL Server 2025 CU1 container image.": "Container creation isn't supported on this system. ARM support will be available starting with the SQL Server 2025 CU1 container image.",
769-
"See": "See",
770-
"for more details": "for more details",
767+
"SQL Server is not supported on ARM processors including both Windows and Apple silicon-based machines.": "SQL Server is not supported on ARM processors including both Windows and Apple silicon-based machines.",
768+
"To continue, run SQL Server on a machine with a supported processor. Check ": "To continue, run SQL Server on a machine with a supported processor. Check ",
769+
"the documentation ": "the documentation ",
770+
"for more information.": "for more information.",
771771
"+ Add Fabric Account": "+ Add Fabric Account",
772772
"Loading fabric provisioning...": "Loading fabric provisioning...",
773773
"SQL database in Fabric (Preview)": "SQL database in Fabric (Preview)",

extensions/mssql/src/reactviews/common/locConstants.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,14 +1137,14 @@ export class LocConstants {
11371137
previousStepFailed: l10n.t(
11381138
"Previous step failed. Please check the error message and try again.",
11391139
),
1140-
armErrorHeader: l10n.t(
1141-
"The SQL Server 2025 RTM container image isn't compatible with ARM-based systems (including Windows ARM and Apple Silicon).",
1142-
),
11431140
armErrorDescription: l10n.t(
1144-
"Container creation isn't supported on this system. ARM support will be available starting with the SQL Server 2025 CU1 container image.",
1141+
"SQL Server is not supported on ARM processors including both Windows and Apple silicon-based machines.",
1142+
),
1143+
toContinueCheck: l10n.t(
1144+
"To continue, run SQL Server on a machine with a supported processor. Check ",
11451145
),
1146-
see: l10n.t("See"),
1147-
forMoreDetails: l10n.t("for more details"),
1146+
theDocumentation: l10n.t("the documentation "),
1147+
forMoreInformation: l10n.t("for more information."),
11481148
};
11491149
}
11501150

extensions/mssql/src/reactviews/pages/Deployment/LocalContainers/armSql2025ErrorDialog.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ const useStyles = makeStyles({
4747
// Issue tracking this: https://github.com/microsoft/vscode-mssql/issues/20337
4848
export const ArmSql2025ErrorDialog = ({ closeDialog }: { closeDialog: () => void }) => {
4949
const classes = useStyles();
50-
const armReferenceLink = "https://aka.ms/sql-container-arm";
50+
const armReferenceLink =
51+
"https://learn.microsoft.com/en-us/sql/sql-server/install/hardware-and-software-requirements-for-installing-sql-server-2025?view=sql-server-ver17";
5152

5253
return (
5354
<Dialog open={true /* standalone dialog always open*/}>
@@ -66,16 +67,15 @@ export const ArmSql2025ErrorDialog = ({ closeDialog }: { closeDialog: () => void
6667
<Text className={classes.titleText}> {Loc.common.warning} </Text>
6768
</DialogTitle>
6869
<DialogContent className={classes.contentDiv}>
69-
<Text className={classes.contentItem}>
70-
{Loc.localContainers.armErrorHeader}
71-
</Text>
7270
<Text className={classes.contentItem}>
7371
{Loc.localContainers.armErrorDescription}
7472
</Text>
7573
<Text className={classes.contentItem}>
76-
{Loc.localContainers.see}{" "}
77-
<Link href={armReferenceLink}>{armReferenceLink}</Link>{" "}
78-
{Loc.localContainers.forMoreDetails}.
74+
{Loc.localContainers.toContinueCheck}
75+
<Link href={armReferenceLink}>
76+
{Loc.localContainers.theDocumentation}
77+
</Link>
78+
{Loc.localContainers.forMoreInformation}
7979
</Text>
8080
</DialogContent>
8181
<DialogActions>

localization/xliff/vscode-mssql.xlf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -903,9 +903,6 @@
903903
<trans-unit id="++CODE++ca0fa7ee8e0d9d4e742094db2e8d59b963dce003cc884c8573d64d59fcfe16dd">
904904
<source xml:lang="en">Container Name</source>
905905
</trans-unit>
906-
<trans-unit id="++CODE++ac2c68de32aa4911b308194e21f3d6754c675df3e7a84a21e90b097451b58572">
907-
<source xml:lang="en">Container creation isn&apos;t supported on this system. ARM support will be available starting with the SQL Server 2025 CU1 container image.</source>
908-
</trans-unit>
909906
<trans-unit id="++CODE++06659b52e63599b06c4386ad5423c3dc67b010f0dbbd03cba2f48b68ed1b62f5">
910907
<source xml:lang="en">Container does not exist. Would you like to remove the connection?</source>
911908
</trans-unit>
@@ -3215,6 +3212,9 @@
32153212
<trans-unit id="++CODE++49946129c776c67af592a7bd5399b229d9e11260362f8dd0ee8a96778dbc3bee">
32163213
<source xml:lang="en">SQL Server does not support Windows containers. Please switch to Linux containers in Docker Desktop settings.</source>
32173214
</trans-unit>
3215+
<trans-unit id="++CODE++fa9d43d3408d2b926cc81a65d48ab465911dbeecf89755eb0bb46c4a4ad61e04">
3216+
<source xml:lang="en">SQL Server is not supported on ARM processors including both Windows and Apple silicon-based machines.</source>
3217+
</trans-unit>
32183218
<trans-unit id="++CODE++035f6f2b97a039d49cb4ed684e5e8118c2acf2ff2fcc0e25fc94e2eacbc63b80">
32193219
<source xml:lang="en">SQL Server port number</source>
32203220
</trans-unit>
@@ -3376,9 +3376,6 @@
33763376
<trans-unit id="++CODE++7f55382219f0202c1b4f56deb099e2fedcec87ee73fe2edb2105df5447323bc6">
33773377
<source xml:lang="en">Search...</source>
33783378
</trans-unit>
3379-
<trans-unit id="++CODE++6863067eb0a2c7499425c6c189b2c88bac55ca754285a6ab1ef37b75b4cfad4d">
3380-
<source xml:lang="en">See</source>
3381-
</trans-unit>
33823379
<trans-unit id="++CODE++2a78025de6aae5e7ff88e5a951bb3a78ddd67388913529cf9e2dd9653e62b02d">
33833380
<source xml:lang="en">Select</source>
33843381
</trans-unit>
@@ -3808,9 +3805,6 @@
38083805
<source xml:lang="en">The MSSQL for VS Code extension is introducing new modern data development features! Would you like to enable them? [Learn more]({0})</source>
38093806
<note>{0} is a url to learn more about the new features</note>
38103807
</trans-unit>
3811-
<trans-unit id="++CODE++8284b2207062ceca3245e799f300ae72ab7e751c75b0f7e32f297adcfdf8e19f">
3812-
<source xml:lang="en">The SQL Server 2025 RTM container image isn&apos;t compatible with ARM-based systems (including Windows ARM and Apple Silicon).</source>
3813-
</trans-unit>
38143808
<trans-unit id="++CODE++3eacf5cf678e2285cae1276d29f034aa0e7ceb3f8940239c1d67a2d486649719">
38153809
<source xml:lang="en">The behavior when a user tries to delete a row with data that is involved in a foreign key relationship.</source>
38163810
</trans-unit>
@@ -3913,6 +3907,9 @@
39133907
<trans-unit id="++CODE++94843fe76f0c666e2bce801eb3dbfa672cd6517a14f968c8e41669c580b60cb3">
39143908
<source xml:lang="en">To compare two schemas, first select a source schema and target schema, then press compare.</source>
39153909
</trans-unit>
3910+
<trans-unit id="++CODE++500066c85e5ad619476a8235df0b22c1d1cb23a1104f6d78c0353a03f797a18d">
3911+
<source xml:lang="en">To continue, run SQL Server on a machine with a supported processor. Check </source>
3912+
</trans-unit>
39163913
<trans-unit id="++CODE++4c4d50191531a82f528c2802cf6b245d0c776a5d4b51d3b5da127aaf21728547">
39173914
<source xml:lang="en">To use this command, Open a .sql file -or- Change editor language to &quot;SQL&quot; -or- Select T-SQL text in the active SQL editor.</source>
39183915
</trans-unit>
@@ -4177,8 +4174,8 @@
41774174
<trans-unit id="++CODE++c6072170d758e5358d717360829bd1f9b1603b355b5f7fe375d1aabdca7a20de">
41784175
<source xml:lang="en">encrypt</source>
41794176
</trans-unit>
4180-
<trans-unit id="++CODE++4c7148e466d4434d1a1411c15f757ec78ba8f3ef4b6210d4a156bc3aaa6e71e5">
4181-
<source xml:lang="en">for more details</source>
4177+
<trans-unit id="++CODE++0895e3ea3d207f413c6e9c0870ef6824c14f2142a3f719d7dabf315b55a20792">
4178+
<source xml:lang="en">for more information.</source>
41824179
</trans-unit>
41834180
<trans-unit id="++CODE++20e10f43f47b1e36c004e81cbec22591b794b0154ca893825d723624a57be8ae">
41844181
<source xml:lang="en">hostname\instance or &lt;server&gt;.database.windows.net or ADO.NET connection string</source>
@@ -4204,6 +4201,9 @@
42044201
<trans-unit id="++CODE++9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08">
42054202
<source xml:lang="en">test</source>
42064203
</trans-unit>
4204+
<trans-unit id="++CODE++0c98b4c52b0d7946a1b33eda22dea80446afbd3e387a03295bb55f9f0424dc73">
4205+
<source xml:lang="en">the documentation </source>
4206+
</trans-unit>
42074207
<trans-unit id="++CODE++630c74b2de45669259227b267211f2cbc1b0d85d38728a506258a9e8bdf42acc">
42084208
<source xml:lang="en">untitled</source>
42094209
</trans-unit>

0 commit comments

Comments
 (0)