Use pattern matching (#17449)

OrchardCMS · Feb 4, 2025 · 0d33478 · 0d33478
1 parent b7ab554
commit 0d33478
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/OrchardCore/OrchardCore.Localization.Core/DefaultPluralRuleProvider.cs b/src/OrchardCore/OrchardCore.Localization.Core/DefaultPluralRuleProvider.cs
@@ -22,19 +22,19 @@ static DefaultPluralRuleProvider()
         AddRule(["jv"], n => (n != 0 ? 1 : 0));
         AddRule(["mk"], n => (n == 1 || n % 10 == 1 ? 0 : 1));
         AddRule(["be", "bs", "hr", "lt"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
-        AddRule(["cs"], n => ((n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 2));
+        AddRule(["cs"], n => ((n == 1) ? 0 : n is >= 2 and <= 4 ? 1 : 2));
         AddRule(["csb", "pl"], n => ((n == 1) ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
         AddRule(["lv"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n != 0 ? 1 : 2));
         AddRule(["mnk"], n => (n == 0 ? 0 : n == 1 ? 1 : 2));
         AddRule(["ro"], n => (n == 1 ? 0 : (n == 0 || (n % 100 > 0 && n % 100 < 20)) ? 1 : 2));
         AddRule(["cy"], n => ((n == 1) ? 0 : (n == 2) ? 1 : (n != 8 && n != 11) ? 2 : 3));
-        AddRule(["gd"], n => ((n == 1 || n == 11) ? 0 : (n == 2 || n == 12) ? 1 : (n > 2 && n < 20) ? 2 : 3));
+        AddRule(["gd"], n => ((n == 1 || n == 11) ? 0 : (n == 2 || n == 12) ? 1 : n is > 2 and < 20 ? 2 : 3));
         AddRule(["kw"], n => ((n == 1) ? 0 : (n == 2) ? 1 : (n == 3) ? 2 : 3));
         AddRule(["mt"], n => (n == 1 ? 0 : n == 0 || (n % 100 > 1 && n % 100 < 11) ? 1 : (n % 100 > 10 && n % 100 < 20) ? 2 : 3));
         AddRule(["sl"], n => (n % 100 == 1 ? 1 : n % 100 == 2 ? 2 : n % 100 == 3 || n % 100 == 4 ? 3 : 0));
         AddRule(["ru", "sr", "uk"], n => (n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2));
-        AddRule(["sk"], n => ((n == 1) ? 0 : (n >= 2 && n <= 4) ? 1 : 2));
-        AddRule(["ga"], n => (n == 1 ? 0 : n == 2 ? 1 : (n > 2 && n < 7) ? 2 : (n > 6 && n < 11) ? 3 : 4));
+        AddRule(["sk"], n => ((n == 1) ? 0 : n is >= 2 and <= 4 ? 1 : 2));
+        AddRule(["ga"], n => (n == 1 ? 0 : n == 2 ? 1 : n is > 2 and < 7 ? 2 : n is > 6 and < 11 ? 3 : 4));
         AddRule(["ar"], n => (n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5));
     }
 

diff --git a/src/OrchardCore/OrchardCore/Localization/NullHtmlLocalizer.cs b/src/OrchardCore/OrchardCore/Localization/NullHtmlLocalizer.cs
@@ -34,7 +34,7 @@ public LocalizedHtmlString this[string name]
         {
             var translation = name;
 
-            if (arguments.Length == 1 && arguments[0] is PluralizationArgument pluralArgument)
+            if (arguments is [PluralizationArgument pluralArgument])
             {
                 translation = pluralArgument.Forms[_defaultPluralRule(pluralArgument.Count)];
 

diff --git a/src/OrchardCore/OrchardCore/Localization/NullStringLocalizer.cs b/src/OrchardCore/OrchardCore/Localization/NullStringLocalizer.cs
@@ -25,7 +25,7 @@ public class NullStringLocalizer : IStringLocalizer
         {
             var translation = name;
 
-            if (arguments.Length == 1 && arguments[0] is PluralizationArgument pluralArgument)
+            if (arguments is [PluralizationArgument pluralArgument])
             {
                 translation = pluralArgument.Forms[_defaultPluralRule(pluralArgument.Count)];