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

localize "Preferences | Version Control | Shelf" configurable

Browse Source 
GitOrigin-RevId: 50a0de676d60e3fd1ff0ab4fbe8a794b0959c73b
This commit is contained in:
Dmitry.Krasilschikov
2020-01-16 08:11:51 +00:00
committed by intellij-monorepo-bot
parent 09ff310028
commit 6d6e23e492
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources-en/src/messages/VcsBundle.properties
+5 -1
View File
@@ -701,4 +701,8 @@ settings.border.when.empty.changelist.becomes.inactive=When empty changelist bec
settings.file.status.color.modified.in.not.active.changelist=Modified in not active changelist
settings.file.status.color.added.in.not.active.changelist=Added in not active changelist
settings.file.status.color.changelist.conflict=Changelist conflict
settings.issue.navigation.patterns={0} will search for the specified patterns in checkin comments and link them to issues in your issue tracker:
settings.issue.navigation.patterns={0} will search for the specified patterns in checkin comments and link them to issues in your issue tracker:
settings.shelf.content.larger=The base content of files larger than {0}K will not be stored
settings.change.shelves.location=Change Shelves Location
settings.current.location=Current location is
settings.default.location=Default location is
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/ShelfProjectConfigurationPanel.java
+4 -6
View File
@@ -41,8 +41,6 @@ import static java.awt.GridBagConstraints.NONE;
import static java.awt.GridBagConstraints.NORTHWEST;
public class ShelfProjectConfigurationPanel extends JPanel {
@NotNull private static final String CURRENT_LOCATION_HINT = "Current location is ";
@NotNull private static final String DEFAULT_LOCATION_HINT = "Default location is ";
@NotNull private final VcsConfiguration myVcsConfiguration;
@NotNull private final Project myProject;
@NotNull private final JBCheckBox myBaseRevisionTexts;
@@ -73,7 +71,7 @@ public class ShelfProjectConfigurationPanel extends JPanel {
contentPanel.add(createStoreBaseRevisionOption(), gb);
JPanel shelfConfigurablePanel = new JPanel(new BorderLayout(DEFAULT_HGAP, DEFAULT_VGAP));
JButton shelfConfigurableButton = new JButton("Change Shelves Location");
JButton shelfConfigurableButton = new JButton(VcsBundle.message("settings.change.shelves.location"));
shelfConfigurableButton.setEnabled(!myProject.isDefault());
shelfConfigurableButton.addActionListener(new ActionListener() {
@Override
@@ -91,7 +89,8 @@ public class ShelfProjectConfigurationPanel extends JPanel {
}
private void updateLabelInfo() {
myInfoLabel.setText((myProject.isDefault() ? DEFAULT_LOCATION_HINT : CURRENT_LOCATION_HINT) +
myInfoLabel.setText((myProject.isDefault() ? VcsBundle.message("settings.default.location")
: VcsBundle.message("settings.current.location")) +
(myVcsConfiguration.USE_CUSTOM_SHELF_PATH ? toSystemDependentName(
assertNotNull(myVcsConfiguration.CUSTOM_SHELF_PATH)) : getDefaultShelfPresentationPath(myProject)));
}
@@ -105,8 +104,7 @@ public class ShelfProjectConfigurationPanel extends JPanel {
}
private JComponent createStoreBaseRevisionOption() {
final JBLabel noteLabel =
new JBLabel("The base content of files larger than " + ourMaximumFileForBaseRevisionSize / 1000 + "K will not be stored");
final JBLabel noteLabel = new JBLabel(VcsBundle.message("settings.shelf.content.larger", ourMaximumFileForBaseRevisionSize / 1000));
noteLabel.setComponentStyle(UIUtil.ComponentStyle.SMALL);
noteLabel.setFontColor(UIUtil.FontColor.BRIGHTER);
noteLabel.setBorder(JBUI.Borders.empty(2, 25, 5, 0));