Fix resource name area prefix

devlooped · Sep 21, 2020 · 012f87b · 012f87b
1 parent b88664b
commit 012f87b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/src/ThisAssembly.Strings/CSharp.sbntxt b/src/ThisAssembly.Strings/CSharp.sbntxt
@@ -22,7 +22,7 @@
         {{~ for value in $0.Values ~}}
 		{{~ if!(value.HasFormat) ~}}
         {{- summary value ~}}
-	    public static string {{ value.Name }} => Strings.GetResourceManager("{{ $1 }}").GetString("{{ value.Prefix + value.Name }}");
+	    public static string {{ value.Name }} => Strings.GetResourceManager("{{ $1 }}").GetString("{{ $0.Prefix + value.Name }}");
         {{~ else ~}}
         {{~ if value.IsIndexedFormat ~}}
         {{- summary value ~}}
@@ -32,7 +32,7 @@
             {{- end -}}) 
             => string.Format(
                 CultureInfo.CurrentCulture,
-                Strings.GetResourceManager("{{ $1 }}").GetString("{{ value.Prefix + value.Name }}"),
+                Strings.GetResourceManager("{{ $1 }}").GetString("{{ $0.Prefix + value.Name }}"),
                 {{ for arg in value.Format -}}
                 arg{{- arg -}}{{- if !for.last -}}, {{ end }}{{- end -}});
         {{~ else if value.IsNamedFormat ~}}
@@ -45,7 +45,7 @@
                 CultureInfo.CurrentCulture,
                 Strings
                     .GetResourceManager("{{ $1 }}")
-                    .GetString("{{ value.Prefix + value.Name }}")
+                    .GetString("{{ $0.Prefix + value.Name }}")
                     {{- for arg in value.Format }}
                     .Replace("{{ arg }}", "{{ for.index }}"){{- end -}},
                 {{ for arg in value.Format -}}

diff --git a/src/ThisAssembly.Tests/Rendering.cs b/src/ThisAssembly.Tests/Rendering.cs
@@ -6,6 +6,15 @@ namespace ThisAssemblyTests
 {
     public class Rendering
     {
+        public void LoadAndRender()
+        {
+            var root = ResourceFile.Load(@"Resources.resx", "Strings");
+            var model = new Model(root, "MyAssembly.Resources");
+            var template = Template.Parse(File.ReadAllText("CSharp.sbntxt"));
+
+            Console.WriteLine(template.Render(model, member => member.Name));
+        }
+
         public void Render()
         {
             var template = Template.Parse(File.ReadAllText("CSharp.sbntxt"));

diff --git a/src/ThisAssembly.Tests/Resources.resx b/src/ThisAssembly.Tests/Resources.resx
@@ -117,6 +117,12 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Foo_Bar_Baz" xml:space="preserve">
+    <value>Value</value>
+  </data>
+  <data name="Foo_Hey" xml:space="preserve">
+    <value>Hey</value>
+  </data>
   <data name="Indexed" xml:space="preserve">
     <value>Hello {0}, {1}. Should we call you {0}?</value>
   </data>

diff --git a/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj b/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
@@ -28,6 +28,7 @@
   <ItemGroup>
     <EmbeddedResource Update="Resources.resx">
       <Generator></Generator>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>