From 7cd88ddbd93b115aeda76b87b1c99f9afa4aaaef Mon Sep 17 00:00:00 2001
From: Lukasz Jader <ljaderdev@gmail.com>
Date: Sat, 14 Jul 2012 08:01:51 -0400
Subject: [PATCH] Fix some typos in polish translation
---
src/com/gitblit/client/EditTeamDialog.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/client/EditTeamDialog.java b/src/com/gitblit/client/EditTeamDialog.java
index 49669e2..2f9796c 100644
--- a/src/com/gitblit/client/EditTeamDialog.java
+++ b/src/com/gitblit/client/EditTeamDialog.java
@@ -73,7 +73,11 @@
private JPalette<String> preReceivePalette;
+ private JLabel preReceiveInherited;
+
private JPalette<String> postReceivePalette;
+
+ private JLabel postReceiveInherited;
private Set<String> teamnames;
@@ -121,7 +125,8 @@
final Insets _insets = new Insets(5, 5, 5, 5);
repositoryPalette = new JPalette<String>();
userPalette = new JPalette<String>();
-
+ userPalette.setEnabled(settings.supportsTeamMembershipChanges);
+
JPanel fieldsPanelTop = new JPanel(new BorderLayout());
fieldsPanelTop.add(fieldsPanel, BorderLayout.NORTH);
@@ -146,16 +151,16 @@
usersPanel.add(userPalette, BorderLayout.CENTER);
preReceivePalette = new JPalette<String>(true);
+ preReceiveInherited = new JLabel();
JPanel preReceivePanel = new JPanel(new BorderLayout(5, 5));
- preReceivePanel.add(
- newFieldPanel(Translation.get("gb.preReceiveScripts"), preReceivePalette),
- BorderLayout.CENTER);
-
+ preReceivePanel.add(preReceivePalette, BorderLayout.CENTER);
+ preReceivePanel.add(preReceiveInherited, BorderLayout.WEST);
+
postReceivePalette = new JPalette<String>(true);
+ postReceiveInherited = new JLabel();
JPanel postReceivePanel = new JPanel(new BorderLayout(5, 5));
- postReceivePanel.add(
- newFieldPanel(Translation.get("gb.postReceiveScripts"), postReceivePalette),
- BorderLayout.CENTER);
+ postReceivePanel.add(postReceivePalette, BorderLayout.CENTER);
+ postReceivePanel.add(postReceiveInherited, BorderLayout.WEST);
JTabbedPane panel = new JTabbedPane(JTabbedPane.TOP);
panel.addTab(Translation.get("gb.general"), fieldsPanelTop);
@@ -303,20 +308,36 @@
userPalette.setObjects(users, selected);
}
- public void setPreReceiveScripts(List<String> unused, List<String> selected) {
+ public void setPreReceiveScripts(List<String> unused, List<String> inherited,
+ List<String> selected) {
Collections.sort(unused);
if (selected != null) {
Collections.sort(selected);
}
preReceivePalette.setObjects(unused, selected);
+ showInherited(inherited, preReceiveInherited);
}
- public void setPostReceiveScripts(List<String> unused, List<String> selected) {
+ public void setPostReceiveScripts(List<String> unused, List<String> inherited,
+ List<String> selected) {
Collections.sort(unused);
if (selected != null) {
Collections.sort(selected);
}
postReceivePalette.setObjects(unused, selected);
+ showInherited(inherited, postReceiveInherited);
+ }
+
+ private void showInherited(List<String> list, JLabel label) {
+ StringBuilder sb = new StringBuilder();
+ if (list != null && list.size() > 0) {
+ sb.append("<html><body><b>INHERITED</b><ul style=\"margin-left:5px;list-style-type: none;\">");
+ for (String script : list) {
+ sb.append("<li>").append(script).append("</li>");
+ }
+ sb.append("</ul></body></html>");
+ }
+ label.setText(sb.toString());
}
public TeamModel getTeam() {
--
Gitblit v1.9.1