Browse Source

Fixed SD2-954: String resources are missing for Refactor menu.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1772 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
52e507e78c
  1. 4
      AddIns/ICSharpCode.SharpDevelop.addin
  2. BIN
      data/resources/StringResources.es.resources
  3. 10
      src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs
  4. 2
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs
  5. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

4
AddIns/ICSharpCode.SharpDevelop.addin

@ -1315,11 +1315,11 @@ @@ -1315,11 +1315,11 @@
<Condition name="RefactoringProviderSupports" supports="*">
<MenuItem id = "Refactor" label = "${res:XML.MainMenu.RefactorMenu}" type="Menu">
<MenuItem id = "Rename"
label = "Rename"
label = "${res:SharpDevelop.Refactoring.RenameCommand}"
class = "ICSharpCode.SharpDevelop.Refactoring.RenameCommand" />
<Condition name="RefactoringProviderSupports" supports="FindUnusedUsingDeclarations">
<MenuItem id = "RemoveUnusedUsings"
label = "Removed unused import statements"
label = "${res:SharpDevelop.Refactoring.RemoveUnusedImports}"
class = "ICSharpCode.SharpDevelop.Refactoring.RemoveUnusedUsingsCommand" />
</Condition>
</MenuItem>

BIN
data/resources/StringResources.es.resources

Binary file not shown.

10
src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs

@ -60,7 +60,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -60,7 +60,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
{
if (c.CompilationUnit.Classes.Count == 1) {
// Rename file to ##
cmd = new MenuCommand("Rename file to " + Path.GetFileName(correctFileName),
cmd = new MenuCommand(StringParser.Parse("${res:SharpDevelop.Refactoring.RenameFileTo}", new string[,] {{ "FileName", Path.GetFileName(correctFileName) }}),
delegate {
FileService.RenameFile(c.CompilationUnit.FileName, correctFileName, false);
if (c.ProjectContent.Project != null) {
@ -70,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -70,7 +70,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
list.Add(cmd);
} else if (language.RefactoringProvider.SupportsCreateNewFileLikeExisting && language.RefactoringProvider.SupportsGetFullCodeRangeForType) {
// Move class to file ##
cmd = new MenuCommand("Move class to file " + Path.GetFileName(correctFileName),
cmd = new MenuCommand(StringParser.Parse("${res:SharpDevelop.Refactoring.MoveClassToFile}", new string[,] {{ "FileName", Path.GetFileName(correctFileName) }}),
delegate {
MoveClassToFile(c, correctFileName);
});
@ -261,14 +261,16 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands @@ -261,14 +261,16 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
res.ProvidedDocumentInformation = FindReferencesAndRenameHelper.GetDocumentInformation(derivedClass.CompilationUnit.FileName);
results.Add(res);
}
SearchInFilesManager.ShowSearchResults("Classes deriving from " + c.Name, results);
SearchInFilesManager.ShowSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ClassesDerivingFrom}", new string[,] {{ "Name", c.Name }}),
results);
}
void FindReferences(object sender, EventArgs e)
{
MenuCommand item = (MenuCommand)sender;
IClass c = (IClass)item.Tag;
FindReferencesAndRenameHelper.ShowAsSearchResults("References to " + c.Name, RefactoringService.FindReferences(c, null));
FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", new string[,] {{ "Name", c.Name }}),
RefactoringService.FindReferences(c, null));
}
}
}

2
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/Refactoring/NRefactoryRefactoringProvider.cs

@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring @@ -40,7 +40,7 @@ namespace ICSharpCode.SharpDevelop.Dom.Refactoring
static void ShowSourceCodeErrors(string errors)
{
HostCallback.ShowMessage("The operation cannot be performed because your source code contains errors:\n" + errors);
HostCallback.ShowMessage("${res:SharpDevelop.Refactoring.CannotPerformOperationBecauseOfSyntaxErrors}\n" + errors);
}
NR.IParser ParseFile(string fileContent)

BIN
src/Main/StartUp/Project/Resources/StringResources.resources

Binary file not shown.
Loading…
Cancel
Save