From 56c9301ccf620bdca6f7bcaafb84bbd30a18b555 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 27 Jul 2012 18:58:15 +0400 Subject: [PATCH] IDEA-89362 Call the history tab for directory "Folder" instead of "File" --- .../platform-resources-en/src/messages/VcsBundle.properties | 1 + .../openapi/vcs/history/FileHistorySessionPartner.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index 8cbe3c5ef24e..c07a32421c8c 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -104,6 +104,7 @@ loading.file.history.progress=Loading file history message.title.could.not.load.file.history=Problems while loading file history diff.content.title.repository.version={0} ( Repository Version ) action.name.file.history=File {0} History +action.name.file.history.dir=Folder {0} History group.name.version.control=&VCS message.text.cannot.open.editor=Cannot open text editor for file {0} message.title.cannot.open.editor=Cannot Open Editor diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistorySessionPartner.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistorySessionPartner.java index c5eb16d78ea8..58c573a92922 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistorySessionPartner.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistorySessionPartner.java @@ -108,7 +108,8 @@ public class FileHistorySessionPartner implements VcsAppendableHistorySessionPar } ApplicationManager.getApplication().invokeLater(new Runnable() { public void run() { - String actionName = VcsBundle.message("action.name.file.history", myPath.getName()); + String actionName = VcsBundle.message(myPath.isDirectory() ? "action.name.file.history.dir" : "action.name.file.history", + myPath.getName()); ContentManager contentManager = ProjectLevelVcsManagerEx.getInstanceEx(myVcs.getProject()).getContentManager(); myFileHistoryPanel = resetHistoryPanel();