Skip to content
This repository has been archived by the owner on Oct 4, 2021. It is now read-only.

[Ide] Simpler culture specific resource file template fix … #6676

Merged
merged 2 commits into from
Nov 27, 2018
Merged

[Ide] Simpler culture specific resource file template fix … #6676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c307b20
Revert "Merge pull request #6590 from mono/Fixes-579048"
mrward Nov 27, 2018
5b86ce0
[Ide] Simpler culture specific resource file template fix
mrward Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplateTagsModifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,13 @@ internal static void ModifyTags (SolutionFolderItem policyParent, Project projec
//need an 'identifier' for tag substitution, e.g. class name or page name
//if not given an identifier, use fileName
if ((identifier == null) && (fileName != null))
identifier = Path.GetFileNameWithoutExtension (fileName);
identifier = Path.GetFileName (fileName);

if (identifier != null) {
//check if there any suffix (like: Resources.xx.resx)
if (identifier.Contains (".")) {
var suffixes = identifier.Split ('.');
suffixes [0] = CreateIdentifierName (suffixes [0]);
identifier = string.Join (".", suffixes);
}
else {
identifier = CreateIdentifierName (identifier);
}

//remove all extensions
while (Path.GetExtension (identifier).Length > 0)
identifier = Path.GetFileNameWithoutExtension (identifier);
identifier = CreateIdentifierName (identifier);
tags ["Name"] = identifier;
tags ["FullName"] = ns.Length > 0 ? ns + "." + identifier : identifier;

Expand Down
6 changes: 1 addition & 5 deletions main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,7 @@ public virtual string GetFileName (SolutionFolderItem policyParent, Project proj

//substitute tags
if ((name != null) && (name.Length > 0)) {
//checks if the entryName contains the extension (i.e. added explicitly with the name)
var identifier = entryName ?? name;
if (identifier.EndsWith (Path.GetExtension (name), StringComparison.OrdinalIgnoreCase))
identifier = Path.GetFileNameWithoutExtension (identifier);
var model = CombinedTagModel.GetTagModel (ProjectTagModel, policyParent, project, language, identifier, fileName);
var model = CombinedTagModel.GetTagModel (ProjectTagModel, policyParent, project, language, entryName ?? name, null);
fileName = StringParserService.Parse (name, model);
}

Expand Down
2 changes: 1 addition & 1 deletion main/src/core/MonoDevelop.Ide/templates/EmptyResourceFile.xft.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<TemplateFiles>
<ProjectResource>
<File name="${Name}.resx" CustomTool="ResXFileCodeGenerator">
<File DefaultExtension=".resx" CustomTool="ResXFileCodeGenerator">
<![CDATA[<?xml version="1.0" encoding="utf-8"?>
<root>
<resheader name="resmimetype">
Expand Down
90 changes: 0 additions & 90 deletions main/tests/Ide.Tests/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplateTests.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion main/tests/Ide.Tests/MonoDevelop.Ide.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@
<Compile Include="MonoDevelop.Ide.TypeSystem\TypeSystemServiceTests.cs" />
<Compile Include="MonoDevelop.Ide.RoslynServices\MonoDevelopFrameworkAssemblyPathResolverFactoryTests.cs" />
<Compile Include="MonoDevelop.Ide.TypeSystem\MonoDevelopWorkspaceTests.cs" />
<Compile Include="MonoDevelop.Ide.Templates\SingleFileDescriptionTemplateTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj">
Expand Down