From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/client/SettingPanel.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/client/SettingPanel.java b/src/com/gitblit/client/SettingPanel.java
index 8d07dc8..6da09e1 100644
--- a/src/com/gitblit/client/SettingPanel.java
+++ b/src/com/gitblit/client/SettingPanel.java
@@ -50,10 +50,16 @@
initialize();
}
+ public SettingPanel(SettingModel setting) {
+ this();
+ setSetting(setting);
+ }
+
private void initialize() {
descriptionArea = new JTextArea();
descriptionArea.setRows(6);
descriptionArea.setFont(new Font("monospaced", Font.PLAIN, 11));
+ descriptionArea.setEditable(false);
settingName = new JLabel(" ");
settingName.setFont(settingName.getFont().deriveFont(Font.BOLD));
@@ -83,10 +89,10 @@
settingName.setText(setting.name);
if (setting.since == null) {
sinceVersion.setText("custom");
- } else {
+ } else {
sinceVersion.setText("since " + setting.since);
}
- settingDefault.setText("default: " + setting.defaultValue);
+ settingDefault.setText(Translation.get("gb.default") + ": " + setting.defaultValue);
List<String> values = new ArrayList<String>();
if (setting.caseSensitive) {
--
Gitblit v1.9.1