#144 Inherit CultureAttribute from MulticastAttribute

atata-framework · Feb 26, 2018 · 51995d0 · 51995d0
1 parent 23223b0
commit 51995d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/src/Atata/Attributes/CultureAttribute.cs b/src/Atata/Attributes/CultureAttribute.cs
@@ -1,15 +1,11 @@
-using System;
-using System.Globalization;
-
-namespace Atata
+namespace Atata
 {
     /// <summary>
     /// Specifies the culture of a component.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Class | AttributeTargets.Assembly)]
-    public class CultureAttribute : Attribute
+    public class CultureAttribute : MulticastAttribute
     {
-        public CultureAttribute(string value = null)
+        public CultureAttribute(string value)
         {
             Value = value;
         }
@@ -18,15 +14,5 @@ public CultureAttribute(string value = null)
         /// Gets the culture value.
         /// </summary>
         public string Value { get; private set; }
-
-        public bool HasValue
-        {
-            get { return !string.IsNullOrWhiteSpace(Value); }
-        }
-
-        public CultureInfo GetCultureInfo()
-        {
-            return HasValue ? new CultureInfo(Value) : CultureInfo.CurrentCulture;
-        }
     }
 }
diff --git a/src/Atata/UIComponentMetadata.cs b/src/Atata/UIComponentMetadata.cs
@@ -132,7 +132,9 @@ private IEnumerable<TAttribute> FilterAndOrderByTarget<TAttribute>(IEnumerable<T
         /// <returns>The <see cref="CultureInfo"/> instance.</returns>
         public CultureInfo GetCulture()
         {
-            return (Get<CultureAttribute>(AttributeLevels.All, x => x.HasValue) ?? new CultureAttribute()).GetCultureInfo();
+            string cultureName = Get<CultureAttribute>(AttributeLevels.All)?.Value;
+
+            return cultureName != null ? CultureInfo.GetCultureInfo(cultureName) : CultureInfo.CurrentCulture;
         }
 
         /// <summary>