diff --git a/ChangeLog/6.0.12_dev.txt b/ChangeLog/6.0.12_dev.txt index e88636505d..a39ae7e4aa 100644 --- a/ChangeLog/6.0.12_dev.txt +++ b/ChangeLog/6.0.12_dev.txt @@ -1 +1,2 @@ -[main] Addressed DataTypeCollection.Add method issue of wrong adding storage-specifid types to the collection \ No newline at end of file +[main] Addressed DataTypeCollection.Add method issue of wrong adding storage-specifid types to the collection +[sqlserver] Sql error messages for British English are correctly parsed \ No newline at end of file diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs index e9833aa2e6..fc86bd5f60 100644 --- a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs +++ b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/DriverFactory.cs @@ -44,7 +44,8 @@ private static ErrorMessageParser CreateMessageParser(SqlServerConnection connec bool isEnglish; using (var command = connection.CreateCommand()) { command.CommandText = LangIdQuery; - isEnglish = command.ExecuteScalar().ToString()=="0"; + var langId = (short) command.ExecuteScalar(); + isEnglish = langId == 0 || langId == 23; } var templates = new Dictionary(); using (var command = connection.CreateCommand()) {