MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs] i18n for file history

Browse Source 
GitOrigin-RevId: c3ec86f611b66887c60ca07e5c7f5d007913f34d
This commit is contained in:
Julia Beliaeva
2020-03-06 14:33:05 +00:00
committed by intellij-monorepo-bot
parent 8d04320931
commit a15efddfc2
7 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties
+8
View File
@@ -906,6 +906,14 @@ local.changes.tab=Local Changes
error.cant.perform.operation.now=Can not {0} now
local.changes.freeze.message=Local changes are not available until {0} is finished
file.history.checking.last.revision.process=Checking last revision
file.history.diff.with.local.process=Collecting changes...
file.history.diff.revisions.process=Comparing revisions...
file.history.exceeded.limit.message=File History: only {0} revisions were loaded for {1}\nTo change the history limit, go to Settings | Version Control.
file.history.details.empty.status=Commit message
file.history.details.on.date.at.time=on {0} at {1}
file.history.details.committer.info=committed by {0}
file.history.details.committer.tooltip.info=via {0}
file.history.diff.handler.paths.diff.title=Difference between {0} and {1} in {2}
file.history.diff.handler.paths.diff.with.local.title=Difference between {0} and local version in {1}
file.history.diff.handler.affected.changes.title=Initial commit {0} in {1}
platform/vcs-impl/src/com/intellij/openapi/vcs/history/DetailsPanel.java
+2 -1
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.ide.CopyPasteManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.ui.ColorUtil;
import com.intellij.ui.JBColor;
import com.intellij.util.ui.HtmlPanel;
@@ -52,7 +53,7 @@ class DetailsPanel extends HtmlPanel implements DataProvider, CopyProvider {
return mySelection == null || mySelection.isEmpty();
}
};
myStatusText.setText("Commit message");
myStatusText.setText(VcsBundle.message("file.history.details.empty.status"));
myStatusText.attachTo(this);
setPreferredSize(new JBDimension(150, 100));
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+5 -3
View File
@@ -198,10 +198,12 @@ public class FileHistoryPanelImpl extends JPanel implements DataProvider, Dispos
sb.append(VcsUtil.getShortRevisionString(revision.getRevisionNumber())).append(" ");
sb.append(revision.getAuthor());
long time = revision.getRevisionDate().getTime();
sb.append(" on ").append(DateFormatUtil.formatDate(time)).append(" at ").append(DateFormatUtil.formatTime(time));
sb.append(" ").append(VcsBundle.message("file.history.details.on.date.at.time", DateFormatUtil.formatDate(time),
DateFormatUtil.formatTime(time)));
if (revision instanceof VcsFileRevisionEx) {
if (!Comparing.equal(revision.getAuthor(), ((VcsFileRevisionEx)revision).getCommitterName())) {
sb.append(" (committed by ").append(((VcsFileRevisionEx)revision).getCommitterName()).append(")");
sb.append(" (").append(VcsBundle.message("file.history.details.committer.info",
((VcsFileRevisionEx)revision).getCommitterName())).append(")");
}
}
if (withMessage) {
@@ -750,7 +752,7 @@ public class FileHistoryPanelImpl extends JPanel implements DataProvider, Dispos
StringBuilder sb = new StringBuilder(StringUtil.notNullize(ex.getAuthor()));
if (ex.getAuthorEmail() != null) sb.append(" <").append(ex.getAuthorEmail()).append(">");
if (ex.getCommitterName() != null && !Comparing.equal(ex.getAuthor(), ex.getCommitterName())) {
sb.append(", via ").append(ex.getCommitterName());
sb.append(", ").append(VcsBundle.message("file.history.details.committer.tooltip.info", ex.getCommitterName()));
if (ex.getCommitterEmail() != null) sb.append(" <").append(ex.getCommitterEmail()).append(">");
}
((AuthorCellRenderer)renderer).setTooltipText(sb.toString());
platform/vcs-impl/src/com/intellij/openapi/vcs/history/LimitHistoryCheck.java
+3 -3
View File
@@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.history;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.vcs.VcsBundle;
import com.intellij.openapi.vcs.VcsConfiguration;
import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
import org.jetbrains.annotations.NotNull;
@@ -46,9 +47,8 @@ public class LimitHistoryCheck {
++myCount;
if (isOver()) {
if (!myWarningShown) {
VcsBalloonProblemNotifier
.showOverChangesView(myProject, "File History: only " + myLimit + " revisions were loaded for " + myFilePath +
"\nTo change the history limit, go to Settings | Version Control.", MessageType.WARNING);
String message = VcsBundle.message("file.history.exceeded.limit.message", myLimit, myFilePath);
VcsBalloonProblemNotifier.showOverChangesView(myProject, message, MessageType.WARNING);
myWarningShown = true;
}
throw new VcsFileHistoryLimitReachedException();
platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsCachingHistory.java
+1 -1
View File
@@ -140,7 +140,7 @@ public class VcsCachingHistory {
@NotNull VcsCacheableHistorySessionFactory<Serializable, VcsAbstractHistorySession> cacheableFactory) {
ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
if (indicator != null) {
indicator.setText2("Checking last revision");
indicator.setText2(VcsBundle.message("file.history.checking.last.revision.process"));
}
VcsAbstractHistorySession cached = myVcsHistoryCache.getFull(filePath, vcsKey, cacheableFactory);
if (cached == null || cached.getRevisionList().isEmpty()) return null;
platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsDiffUtil.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class VcsDiffUtil {
BackgroundableActionLock lock = BackgroundableActionLock.getLock(project, VcsBackgroundableActions.COMPARE_WITH, file);
final Task.Backgroundable task = new Task.Backgroundable(project, "Collecting Changes...", true) {
final Task.Backgroundable task = new Task.Backgroundable(project, VcsBundle.message("file.history.diff.with.local.process"), true) {
private Collection<Change> changes;
private VcsRevisionNumber currentRevNumber;
platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsHistoryUtil.java
+1 -1
View File
@@ -184,7 +184,7 @@ public class VcsHistoryUtil {
@NotNull final FilePath filePath,
@NotNull final VcsFileRevision older,
@NotNull final VcsFileRevision newer) {
new Task.Backgroundable(project, "Comparing Revisions...") {
new Task.Backgroundable(project, VcsBundle.message("file.history.diff.revisions.process")) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
try {