Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix typo in string resources #1178

Merged
merged 2 commits into from
Jul 21, 2021
Merged

Fix typo in string resources #1178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d91cd2
Fix typo in string resources
GitHubPang Jul 20, 2021
26e1e11
Fix typo in string resources
GitHubPang Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
<value>Use of key '{0}' requires the key '{1}' to be present.</value>
</data>
<data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
<value>The value's length for key '{0}' exceeds it's limit of '{1}'.</value>
<value>The value's length for key '{0}' exceeds its limit of '{1}'.</value>
</data>
<data name="ADP_KeywordNotSupported" xml:space="preserve">
<value>Keyword not supported: '{0}'.</value>
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -1546,7 +1546,7 @@
<value>Internal error. Invalid key encryption algorithm specified: '{0}'. Expected value: '{1}'.</value>
</data>
<data name="TCE_InvalidKeySize" xml:space="preserve">
<value>The column encryption key has been successfully decrypted but it's length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database.</value>
<value>The column encryption key has been successfully decrypted but its length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database.</value>
</data>
<data name="TCE_InvalidKeyStoreProviderName" xml:space="preserve">
<value>Invalid key store provider name: '{0}'. A key store provider name must denote either a system key store provider or a registered custom key store provider. Valid system key store provider names are: {1}. Valid (currently registered) custom key store provider names are: {2}. Please verify key store provider information in column master key definitions in the database, and verify all custom key store providers used in your application are registered properly.</value>
Expand Down
6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,7 @@
<value>Specified QuotePrefix and QuoteSuffix values do not match.</value>
</data>
<data name="ADP_InvalidArgumentLength" xml:space="preserve">
<value>The length of argument '{0}' exceeds it's limit of '{1}'.</value>
<value>The length of argument '{0}' exceeds its limit of '{1}'.</value>
</data>
<data name="SQL_WrongType" xml:space="preserve">
<value>Expecting argument of type {1}, but received type {0}.</value>
Expand All @@ -1783,7 +1783,7 @@
<value>Use of key '{0}' requires the key '{1}' to be present.</value>
</data>
<data name="ADP_InvalidConnectionOptionValueLength" xml:space="preserve">
<value>The value's length for key '{0}' exceeds it's limit of '{1}'.</value>
<value>The value's length for key '{0}' exceeds its limit of '{1}'.</value>
</data>
<data name="ADP_KeywordNotSupported" xml:space="preserve">
<value>Keyword not supported: '{0}'.</value>
cheenamalhotra marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -4162,7 +4162,7 @@
<value>Internal error. Column encryption key cannot be null.</value>
</data>
<data name="TCE_InvalidKeySize" xml:space="preserve">
<value>The column encryption key has been successfully decrypted but it's length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database.</value>
<value>The column encryption key has been successfully decrypted but its length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database.</value>
</data>
<data name="TCE_InvalidEncryptionType" xml:space="preserve">
<value>Encryption type '{1}' specified for the column in the database is either invalid or corrupted. Valid encryption types for algorithm '{0}' are: {2}.</value>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public void ChangePassword_NewPassword_ExceedMaxLength()
{
ArgumentException ex = Assert.Throws<ArgumentException>(() => SqlConnection.ChangePassword("server=SQLSRV", new string('d', 129)));
// The length of argument 'newPassword' exceeds
// it's limit of '128'
// its limit of '128'
Assert.Null(ex.InnerException);
Assert.NotNull(ex.Message);
Assert.True(ex.Message.IndexOf("'newPassword'") != -1);
Expand Down