Skip to content

Commit 05bb47f

Browse files
authored
Minor unicode renames and typo fixes (#9)
- Replaces Russian names and texts of summaries with English equivalents. - Fixes mistakes in some messages in resource file - Better names for certain types and test classes
1 parent 0e6e75b commit 05bb47f

6 files changed

Lines changed: 19 additions & 20 deletions

Orm/Xtensive.Orm.Tests/Issues/CustomCompilerException.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public abstract class FundBase : Entity
2929
obj =>
3030
(obj is MutualFund)
3131
? (obj as MutualFund).ManagementCompany
32-
: (obj is MilitaryIpoteka)
33-
? (obj as MilitaryIpoteka).JuridicalPerson
32+
: (obj is MilitaryMortgage)
33+
? (obj as MilitaryMortgage).JuridicalPerson
3434
: (obj is SelfRegulatoryOrganization)
3535
? (obj as SelfRegulatoryOrganization).Organization
3636
: (obj is PrivatePensionFund)
@@ -39,20 +39,20 @@ public abstract class FundBase : Entity
3939
? (obj as ShareholderInvestmentFund).JuridicalPerson
4040
: null;
4141

42-
private static readonly Func<FundBase, JuridicalPerson> VirtualJuridicalPersoCompiled =
42+
private static readonly Func<FundBase, JuridicalPerson> VirtualJuridicalPersonCompiled =
4343
VirtualJuridicalPersonExpression.Compile();
4444

4545
public JuridicalPerson VirtualJuridicalPerson
4646
{
47-
get { return VirtualJuridicalPersoCompiled(this); }
47+
get { return VirtualJuridicalPersonCompiled(this); }
4848
}
4949

5050
[CompilerContainer(typeof(Expression))]
5151
public static class CustomLinqCompilerContainer
5252
{
53-
/// <summary>Необхдим для использования виртуального поля</summary>
53+
/// <summary>Required to use a virtual field</summary>
5454
/// <param name="assignmentExpression"> The assignment expression. </param>
55-
/// <returns>Выражение с привязанными параметрами</returns>
55+
/// <returns>Expression with bound parameters</returns>
5656
[Compiler(typeof(FundBase), "VirtualJuridicalPerson", TargetKind.PropertyGet)]
5757
public static Expression Depositary(Expression assignmentExpression)
5858
{
@@ -65,15 +65,14 @@ public static Expression Depositary(Expression assignmentExpression)
6565
public class MutualFund : FundBase
6666
{
6767
/// <summary>
68-
/// Управляющая компания
69-
/// Управляющая компания фонда
68+
/// Fund's management company
7069
/// </summary>
7170
[Field(Nullable = false)]
7271
public JuridicalPerson ManagementCompany { get; set; }
7372
}
7473

7574
[Serializable]
76-
public class MilitaryIpoteka : FundBase
75+
public class MilitaryMortgage : FundBase
7776
{
7877
[Field(Nullable = false)]
7978
public JuridicalPerson JuridicalPerson { get; set; }

Orm/Xtensive.Orm.Tests/Issues/IssueJira0346_OptimizeSessionSaveChangesWithoutInboundOnlyAndOutboundOnly.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ protected override void PopulateData()
168168
Login = "walli98",
169169
Password = "1",
170170
UserInfo = new UserInfo {
171-
FirstName = "Иван",
172-
LastName = "Бобышкин"
171+
FirstName = "John",
172+
LastName = "Bean"
173173
},
174174
UserState = userStates.Find(el=>el.Name=="Activated"),
175175
Location = new Location{City = new City{Name = "City1"},Latitude = 0, Longitude = 1}
@@ -178,8 +178,8 @@ protected override void PopulateData()
178178
Login = "visa43",
179179
Password = "1",
180180
UserInfo = new UserInfo {
181-
FirstName = "Иван",
182-
LastName = "Похлебкин"
181+
FirstName = "John",
182+
LastName = "Potter"
183183
},
184184
UserState = userStates.Find(el=>el.Name=="Blocked"),
185185
Location = new Location { City = new City { Name = "City1" }, Latitude = 0, Longitude = 1 }
@@ -188,8 +188,8 @@ protected override void PopulateData()
188188
Login = "csi90210",
189189
Password = "1",
190190
UserInfo = new UserInfo {
191-
FirstName = "Алексей",
192-
LastName = "Алексеев"
191+
FirstName = "Alex",
192+
LastName = "Alexander"
193193
},
194194
UserState = userStates.Find(el => el.Name == "Activated"),
195195
Location = new Location { City = new City { Name = "City1" }, Latitude = 0, Longitude = 1 }

Orm/Xtensive.Orm.Tests/Issues/IssueJira0617_IncorrectRemoveOfRedundantColumns.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ public void Test09()
694694
.GroupBy(a => new {
695695
Currency = a.Currency,
696696
BalanceHolder = a.BalanceHolder,
697-
СreationDate = a.CreationDate,
697+
CreationDate = a.CreationDate,
698698
Deal = a.Deal,
699699
ExecutionDate = a.ExecutionDate,
700700
MasterAccount = a.MasterAccount,
@@ -706,7 +706,7 @@ public void Test09()
706706
BalanceHolder = gr.Key.BalanceHolder,
707707
MasterFinToolBase = gr.Key.MasterFinToolBase,
708708
Currency = gr.Key.Currency,
709-
CreationDate = gr.Key.СreationDate,
709+
CreationDate = gr.Key.CreationDate,
710710
Deal = gr.Key.Deal,
711711
MasterAccount = gr.Key.MasterAccount,
712712
Sum = gr.Sum(s => s.Sum),
1.73 KB
Binary file not shown.

Orm/Xtensive.Orm/Strings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Orm/Xtensive.Orm/Strings.resx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@
333333
<value>Type '{0}' must implement '{1}', or must be its descendant.</value>
334334
</data>
335335
<data name="ExFieldIsInfinite" xml:space="preserve">
336-
<value>Field with index '{0}' is infinitу.</value>
336+
<value>Field with index '{0}' is infinite.</value>
337337
</data>
338338
<data name="ExCultureOfAppliedRuleShouldBeEitherNullOrTheSameAsOnTarget" xml:space="preserve">
339339
<value>Culture of the applied rule should either be undefined (null), or be the same as on target rule.</value>
@@ -3424,4 +3424,4 @@ Error: {1}</value>
34243424
<data name="ExUnableToSaveModifiedEntitesBecauseSomeAsynchronousQueryIsIncomplete" xml:space="preserve">
34253425
<value>Unable to save modified entites because some asynchronous query is incomplete. Make sure you awaited asyncronous queries before persisting any changes.</value>
34263426
</data>
3427-
</root>
3427+
</root>

0 commit comments

Comments
 (0)