New release (#16)

* Create NuGet.config * Correct NuGet feed for the OrchardCore preview * Set up CI with Azure Pipelines * Fixed test task in Azure Pipelines (#13) * Pack application as dotnet global tool (#12) * Update azure-pipelines.yml * Update readme.md * Add additional identifiers for StringLocalizer * Change version number
OrchardCoreContrib · Feb 6, 2019 · 369b040 · 369b040
1 parent 5421334
commit 369b040
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/PoExtractor.CS/Constants.cs b/PoExtractor.CS/Constants.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace PoExtractor.CS {
+    public static class Constants {
+        public static string[] StringLocalizerIdentifiers = new string[] { "T", "S", "TS", "H", "TH" };
+    }
+}
diff --git a/PoExtractor.CS/PluralStringExtractor.cs b/PoExtractor.CS/PluralStringExtractor.cs
@@ -3,6 +3,7 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using PoExtractor.Core;
 using PoExtractor.Core.Contracts;
+using System.Linq;
 
 namespace PoExtractor.CS {
     /// <summary>
@@ -21,7 +22,7 @@ public override bool TryExtract(SyntaxNode node, out LocalizableStringOccurence
             if (node is InvocationExpressionSyntax invocation &&
                 invocation.Expression is MemberAccessExpressionSyntax accessor &&
                 accessor.Expression is IdentifierNameSyntax identifierName &&
-                identifierName.Identifier.Text == "T" &&
+                Constants.StringLocalizerIdentifiers.Contains(identifierName.Identifier.Text) &&
                 accessor.Name.Identifier.Text == "Plural") {
 
                 var arguments = invocation.ArgumentList.Arguments;

diff --git a/PoExtractor.CS/SingularStringExtractor.cs b/PoExtractor.CS/SingularStringExtractor.cs
@@ -3,6 +3,7 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using PoExtractor.Core;
 using PoExtractor.Core.Contracts;
+using System.Linq;
 
 namespace PoExtractor.CS {
     /// <summary>
@@ -20,7 +21,7 @@ public override bool TryExtract(SyntaxNode node, out LocalizableStringOccurence
 
             if (node is ElementAccessExpressionSyntax accessor &&
                 accessor.Expression is IdentifierNameSyntax identifierName &&
-                identifierName.Identifier.Text == "T" &&
+                Constants.StringLocalizerIdentifiers.Contains(identifierName.Identifier.Text) &&
                 accessor.ArgumentList != null) {
 
                 var argument = accessor.ArgumentList.Arguments.FirstOrDefault();

diff --git a/PoExtractor.OrchardCore/PoExtractor.OrchardCore.csproj b/PoExtractor.OrchardCore/PoExtractor.OrchardCore.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>PoExtractor.OrchardCore</AssemblyName>
     <ToolCommandName>extractpo-oc</ToolCommandName>
     <PackAsTool>true</PackAsTool>
-    <Version>0.1.0</Version>
+    <Version>0.1.1</Version>
     <PackageId>PoExtractor.OrchardCore</PackageId>
     <Authors>Lukas Kabrt</Authors>
     <Company />

diff --git a/PoExtractor/PoExtractor.csproj b/PoExtractor/PoExtractor.csproj
@@ -6,7 +6,7 @@
     <AssemblyName>PoExtractor</AssemblyName>
     <ToolCommandName>extractpo</ToolCommandName>
     <PackAsTool>true</PackAsTool>
-    <Version>0.1.0</Version>
+    <Version>0.1.1</Version>
     <PackageId>PoExtractor</PackageId>
     <Authors>Lukas Kabrt</Authors>
     <Company />