Skip to content

Commit eab6ad7

Browse files
ben51degreesben51degrees
committed
Merge branch 'feature/translation-engine' of https://github.com/51degrees/pipeline-dotnet into feature/translation-engine
# Conflicts: # FiftyOne.Pipeline.Elements/FiftyOne.Pipeline.Translation/FiftyOne.Pipeline.Translation.xml # FiftyOne.Pipeline.Elements/FiftyOne.Pipeline.Translation/FlowElements/TranslationEngine.cs # FiftyOne.Pipeline.Elements/FiftyOne.Pipeline.Translation/FlowElements/TranslationEngineBuilder.cs
2 parents 56014fc + 5cd1b3e commit eab6ad7

File tree

8 files changed

+146
-139
lines changed

8 files changed

+146
-139
lines changed

‎FiftyOne.Pipeline.Elements/FiftyOne.Pipeline.Translation.Tests/TranslationEngineTests.cs‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ public void TranslateWeighted()
245245
/// </summary>
246246
/// <param name="behaviour"></param>
247247
[TestMethod]
248-
[DataRow(MissingTranslationBehaviour.Original)]
249-
[DataRow(MissingTranslationBehaviour.EmptyString)]
250-
[DataRow(MissingTranslationBehaviour.FlowError)]
251-
public void MissingLanguage(MissingTranslationBehaviour behaviour)
248+
[DataRow(MissingTranslationBehavior.Original)]
249+
[DataRow(MissingTranslationBehavior.EmptyString)]
250+
[DataRow(MissingTranslationBehavior.FlowError)]
251+
public void MissingLanguage(MissingTranslationBehavior behaviour)
252252
{
253253
var flowData = SetupFrenchAnimals(behaviour: behaviour);
254254
flowData.AddEvidence("header.accept-language", "de_DE");
@@ -259,17 +259,17 @@ public void MissingLanguage(MissingTranslationBehaviour behaviour)
259259

260260
var translation = result["AnimalTranslated"];
261261

262-
if (behaviour == MissingTranslationBehaviour.Original)
262+
if (behaviour == MissingTranslationBehavior.Original)
263263
{
264264
Assert.IsNotNull(translation);
265265
Assert.AreEqual(translation, "cat");
266266
}
267-
else if (behaviour == MissingTranslationBehaviour.EmptyString)
267+
else if (behaviour == MissingTranslationBehavior.EmptyString)
268268
{
269269
Assert.IsNotNull(translation);
270270
Assert.AreEqual(translation, string.Empty);
271271
}
272-
else if (behaviour == MissingTranslationBehaviour.FlowError)
272+
else if (behaviour == MissingTranslationBehavior.FlowError)
273273
{
274274
Assert.AreEqual(1, flowData.Errors.Count);
275275
Assert.IsInstanceOfType(flowData.Errors[0].ExceptionData, typeof(KeyNotFoundException));
@@ -302,10 +302,10 @@ public void InvalidConfiguredLanguage()
302302
/// </summary>
303303
/// <param name="behaviour"></param>
304304
[TestMethod]
305-
[DataRow(MissingTranslationBehaviour.Original)]
306-
[DataRow(MissingTranslationBehaviour.EmptyString)]
307-
[DataRow(MissingTranslationBehaviour.FlowError)]
308-
public void InvalidLanguage(MissingTranslationBehaviour behaviour)
305+
[DataRow(MissingTranslationBehavior.Original)]
306+
[DataRow(MissingTranslationBehavior.EmptyString)]
307+
[DataRow(MissingTranslationBehavior.FlowError)]
308+
public void InvalidLanguage(MissingTranslationBehavior behaviour)
309309
{
310310
var flowData = SetupFrenchAnimals(behaviour: behaviour);
311311
flowData.AddEvidence("header.accept-language", "mm_llk");
@@ -316,17 +316,17 @@ public void InvalidLanguage(MissingTranslationBehaviour behaviour)
316316

317317
var translation = result["AnimalTranslated"];
318318

319-
if (behaviour == MissingTranslationBehaviour.Original)
319+
if (behaviour == MissingTranslationBehavior.Original)
320320
{
321321
Assert.IsNotNull(translation);
322322
Assert.AreEqual(translation, "cat");
323323
}
324-
else if (behaviour == MissingTranslationBehaviour.EmptyString)
324+
else if (behaviour == MissingTranslationBehavior.EmptyString)
325325
{
326326
Assert.IsNotNull(translation);
327327
Assert.AreEqual(translation, string.Empty);
328328
}
329-
else if (behaviour == MissingTranslationBehaviour.FlowError)
329+
else if (behaviour == MissingTranslationBehavior.FlowError)
330330
{
331331
Assert.AreEqual(1, flowData.Errors.Count);
332332
Assert.IsInstanceOfType(flowData.Errors[0].ExceptionData, typeof(KeyNotFoundException));
@@ -341,10 +341,10 @@ public void InvalidLanguage(MissingTranslationBehaviour behaviour)
341341
/// </summary>
342342
/// <param name="behaviour"></param>
343343
[TestMethod]
344-
[DataRow(MissingTranslationBehaviour.Original)]
345-
[DataRow(MissingTranslationBehaviour.EmptyString)]
346-
[DataRow(MissingTranslationBehaviour.FlowError)]
347-
public void NoTranslation(MissingTranslationBehaviour behaviour)
344+
[DataRow(MissingTranslationBehavior.Original)]
345+
[DataRow(MissingTranslationBehavior.EmptyString)]
346+
[DataRow(MissingTranslationBehavior.FlowError)]
347+
public void NoTranslation(MissingTranslationBehavior behaviour)
348348
{
349349
var flowData = SetupFrenchAnimals(behaviour: behaviour);
350350
flowData.AddEvidence("header.accept-language", "fr_FR");
@@ -355,17 +355,17 @@ public void NoTranslation(MissingTranslationBehaviour behaviour)
355355

356356
var translation = result["AnimalTranslated"];
357357

358-
if (behaviour == MissingTranslationBehaviour.Original)
358+
if (behaviour == MissingTranslationBehavior.Original)
359359
{
360360
Assert.IsNotNull(translation);
361361
Assert.AreEqual(translation, "buffalo");
362362
}
363-
else if (behaviour == MissingTranslationBehaviour.EmptyString)
363+
else if (behaviour == MissingTranslationBehavior.EmptyString)
364364
{
365365
Assert.IsNotNull(translation);
366366
Assert.AreEqual(translation, string.Empty);
367367
}
368-
else if (behaviour == MissingTranslationBehaviour.FlowError)
368+
else if (behaviour == MissingTranslationBehavior.FlowError)
369369
{
370370
Assert.AreEqual(1, flowData.Errors.Count);
371371
Assert.IsInstanceOfType(flowData.Errors[0].ExceptionData, typeof(KeyNotFoundException));
@@ -380,10 +380,10 @@ public void NoTranslation(MissingTranslationBehaviour behaviour)
380380
/// </summary>
381381
/// <param name="behaviour"></param>
382382
[TestMethod]
383-
[DataRow(MissingTranslationBehaviour.Original)]
384-
[DataRow(MissingTranslationBehaviour.EmptyString)]
385-
[DataRow(MissingTranslationBehaviour.FlowError)]
386-
public void EmptyTranslation(MissingTranslationBehaviour behaviour)
383+
[DataRow(MissingTranslationBehavior.Original)]
384+
[DataRow(MissingTranslationBehavior.EmptyString)]
385+
[DataRow(MissingTranslationBehavior.FlowError)]
386+
public void EmptyTranslation(MissingTranslationBehavior behaviour)
387387
{
388388
var flowData = SetupFrenchAnimals(
389389
behaviour: behaviour,
@@ -399,17 +399,17 @@ public void EmptyTranslation(MissingTranslationBehaviour behaviour)
399399

400400
var translation = result["AnimalTranslated"];
401401

402-
if (behaviour == MissingTranslationBehaviour.Original)
402+
if (behaviour == MissingTranslationBehavior.Original)
403403
{
404404
Assert.IsNotNull(translation);
405405
Assert.AreEqual(translation, "buffalo");
406406
}
407-
else if (behaviour == MissingTranslationBehaviour.EmptyString)
407+
else if (behaviour == MissingTranslationBehavior.EmptyString)
408408
{
409409
Assert.IsNotNull(translation);
410410
Assert.AreEqual(translation, string.Empty);
411411
}
412-
else if (behaviour == MissingTranslationBehaviour.FlowError)
412+
else if (behaviour == MissingTranslationBehavior.FlowError)
413413
{
414414
Assert.AreEqual(1, flowData.Errors.Count);
415415
Assert.IsInstanceOfType(flowData.Errors[0].ExceptionData, typeof(KeyNotFoundException));
@@ -587,7 +587,7 @@ public void TestChained()
587587
/// <param name="additionalAnimals"></param>
588588
/// <returns></returns>
589589
private IFlowData SetupFrenchAnimals(
590-
MissingTranslationBehaviour behaviour = MissingTranslationBehaviour.Original,
590+
MissingTranslationBehavior behaviour = MissingTranslationBehavior.Original,
591591
Dictionary<string, string> additionalAnimals = null)
592592
{
593593
var expected = new Dictionary<string, string>()

FiftyOne.Pipeline.Elements/FiftyOne.Pipeline.Translation/Data/MissingTranslationBehaviour.cs renamed to FiftyOne.Pipeline.Elements/FiftyOne.Pipeline.Translation/Data/MissingTranslationBehavior.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
namespace FiftyOne.Pipeline.Translation.Data
2424
{
2525
/// <summary>
26-
/// Defines the behaviour of the translation engine when a translation is
26+
/// Defines the behavior of the translation engine when a translation is
2727
/// missing for a value.
2828
/// </summary>
29-
public enum MissingTranslationBehaviour
29+
public enum MissingTranslationBehavior
3030
{
3131
/// <summary>
3232
/// Use the original value if there is no translation for it.
33-
/// This is the default behaviour.
33+
/// This is the default behavior.
3434
/// </summary>
3535
Original,
3636

‎FiftyOne.Pipeline.Elements/FiftyOne.Pipeline.Translation/Data/TranslationProperty.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public TranslationProperty(string source, string destination)
3838
DestinationProperty = destination;
3939
}
4040

41-
4241
/// <summary>
4342
/// Source property name on the source element data.
4443
/// </summary>

‎FiftyOne.Pipeline.Elements/FiftyOne.Pipeline.Translation/Data/Translator.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ internal class Translator
4242
private readonly IReadOnlyDictionary<string, string> _translations;
4343

4444
/// <summary>
45-
/// The behaviour to use when a translation is missing.
45+
/// The behavior to use when a translation is missing.
4646
/// </summary>
47-
private readonly MissingTranslationBehaviour _behaviour;
47+
private readonly MissingTranslationBehavior _behavior;
4848

4949
/// <summary>
5050
/// Default constructor. Initializes the translator with an empty set of
5151
/// translations.
5252
/// </summary>
53-
/// <param name="behaviour">
54-
/// The behaviour to use when a translation is missing.
53+
/// <param name="behavior">
54+
/// The behavior to use when a translation is missing.
5555
/// </param>
56-
public Translator(MissingTranslationBehaviour behaviour)
57-
: this(new Dictionary<string, string>(), behaviour)
56+
public Translator(MissingTranslationBehavior behavior)
57+
: this(new Dictionary<string, string>(), behavior)
5858
{ }
5959

6060
/// <summary>
@@ -64,13 +64,13 @@ public Translator(MissingTranslationBehaviour behaviour)
6464
/// The translations to use for translation. The key is the source
6565
/// value and the value is the translated value.
6666
/// </param>
67-
/// <param name="behaviour">
68-
/// The behaviour to use when a translation is missing.
67+
/// <param name="behavior">
68+
/// The behavior to use when a translation is missing.
6969
/// </param>
7070
/// <exception cref="ArgumentNullException"></exception>
7171
public Translator(
7272
IDictionary<string, string> translations,
73-
MissingTranslationBehaviour behaviour)
73+
MissingTranslationBehavior behavior)
7474
{
7575
if (translations == null)
7676
{
@@ -79,7 +79,7 @@ public Translator(
7979
_translations = new Dictionary<string, string>(
8080
translations,
8181
StringComparer.InvariantCultureIgnoreCase);
82-
_behaviour = behaviour;
82+
_behavior = behavior;
8383
}
8484

8585
/// <summary>
@@ -151,16 +151,16 @@ private string TranslateTyped(string value, IList<Exception> errors)
151151
}
152152
else
153153
{
154-
switch (_behaviour)
154+
switch (_behavior)
155155
{
156-
case MissingTranslationBehaviour.EmptyString:
156+
case MissingTranslationBehavior.EmptyString:
157157
return string.Empty;
158-
case MissingTranslationBehaviour.FlowError:
158+
case MissingTranslationBehavior.FlowError:
159159
errors.Add(new KeyNotFoundException(
160160
$"There was no translation found for " +
161161
$"the value '{value}'."));
162162
return null;
163-
case MissingTranslationBehaviour.Original:
163+
case MissingTranslationBehavior.Original:
164164
default:
165165
return value;
166166
}

0 commit comments

Comments
 (0)