move resource throw deeper (#1436)

Humanizr · Feb 22, 2024 · 3a71cf4 · 3a71cf4
1 parent ea1104c
commit 3a71cf4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 25 deletions.
diff --git a/src/Humanizer/Localisation/Formatters/DefaultFormatter.cs b/src/Humanizer/Localisation/Formatters/DefaultFormatter.cs
@@ -85,14 +85,7 @@ string GetResourceForTimeSpan(TimeUnit unit, int count, bool toWords = false)
         protected virtual string Format(string resourceKey)
         {
             var resolvedKey = GetResourceKey(resourceKey);
-            var resourceString = Resources.GetResource(resolvedKey, _culture);
-
-            if (string.IsNullOrEmpty(resourceString))
-            {
-                throw new ArgumentException($"The resource object with key '{resourceKey}' (resolved to '{resolvedKey}') was not found", nameof(resourceKey));
-            }
-
-            return resourceString;
+            return Resources.GetResource(resolvedKey, _culture);
         }
 
         /// <summary>
@@ -106,11 +99,6 @@ protected virtual string Format(string resourceKey, int number, bool toWords = f
             var resolvedKey = GetResourceKey(resourceKey, number);
             var resourceString = Resources.GetResource(resolvedKey, _culture);
 
-            if (string.IsNullOrEmpty(resourceString))
-            {
-                throw new ArgumentException($"The resource object with key '{resourceKey}' for number `{number}' (resolved to '{resolvedKey}') was not found", nameof(resourceKey));
-            }
-
             if (toWords)
             {
                 return string.Format(resourceString, number.ToWords(_culture));

diff --git a/src/Humanizer/Localisation/Formatters/IcelandicFormatter.cs b/src/Humanizer/Localisation/Formatters/IcelandicFormatter.cs
@@ -13,11 +13,6 @@ protected override string Format(string resourceKey, int number, bool toWords =
     {
         var resourceString = Resources.GetResource(GetResourceKey(resourceKey, number), localCulture);
 
-        if (string.IsNullOrEmpty(resourceString))
-        {
-            throw new ArgumentException($@"The resource object with key '{resourceKey}' was not found", nameof(resourceKey));
-        }
-
         if (toWords)
         {
             var unitGender = GetGrammaticalGender(resourceString);

diff --git a/src/Humanizer/Localisation/Formatters/LuxembourgishFormatter.cs b/src/Humanizer/Localisation/Formatters/LuxembourgishFormatter.cs
@@ -29,11 +29,6 @@ protected override string Format(string resourceKey, int number, bool toWords =
     {
         var resourceString = Resources.GetResource(GetResourceKey(resourceKey, number), localCulture);
 
-        if (string.IsNullOrEmpty(resourceString))
-        {
-            throw new ArgumentException($@"The resource object with key '{resourceKey}' was not found", nameof(resourceKey));
-        }
-
         var unitGender = GetUnitGender(resourceString);
 
         var numberAsWord = number.ToWords(unitGender, localCulture);

diff --git a/src/Humanizer/Localisation/Resources.cs b/src/Humanizer/Localisation/Resources.cs
@@ -15,8 +15,17 @@ public static class Resources
         /// <param name="resourceKey">The name of the resource to retrieve.</param>
         /// <param name="culture">The culture of the resource to retrieve. If not specified, current thread's UI culture is used.</param>
         /// <returns>The value of the resource localized for the specified culture.</returns>
-        public static string GetResource(string resourceKey, CultureInfo culture = null) =>
-            ResourceManager.GetString(resourceKey, culture);
+        public static string GetResource(string resourceKey, CultureInfo culture = null)
+        {
+            var resource = ResourceManager.GetString(resourceKey, culture);
+
+            if (resource == null || string.IsNullOrEmpty(resource))
+            {
+                throw new ArgumentException($@"The resource object with key '{resourceKey}' was not found", nameof(resourceKey));
+            }
+
+            return resource;
+        }
 
         /// <summary>
         /// Tries to get the value of the specified string resource, without fallback