From 719798110ff7f4b61e168d70f5a181d584d50a19 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 30 Mar 2012 08:02:49 -0400
Subject: [PATCH] Fixed overzealous externalization of save and cancel buttons
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 4 ++--
src/com/gitblit/wicket/pages/EditTeamPage.java | 4 ++--
src/com/gitblit/wicket/pages/ChangePasswordPage.java | 4 ++--
src/com/gitblit/wicket/pages/EditUserPage.java | 4 ++--
src/com/gitblit/wicket/pages/SendProposalPage.java | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
index 5e15c8f..4fb5d23 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
@@ -113,8 +113,8 @@
confirmPasswordField.setResetPassword(false);
form.add(confirmPasswordField);
- form.add(new Button(getString("gb.save")));
- Button cancel = new Button(getString("gb.cancel")) {
+ form.add(new Button("save"));
+ Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
@Override
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index c4bacc6..af1b2b4 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -335,8 +335,8 @@
form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()
.getPostReceiveScriptsInherited(repositoryModel)));
- form.add(new Button(getString("gb.save")));
- Button cancel = new Button(getString("gb.cancel")) {
+ form.add(new Button("save"));
+ Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
@Override
diff --git a/src/com/gitblit/wicket/pages/EditTeamPage.java b/src/com/gitblit/wicket/pages/EditTeamPage.java
index feab1aa..890ea8f 100644
--- a/src/com/gitblit/wicket/pages/EditTeamPage.java
+++ b/src/com/gitblit/wicket/pages/EditTeamPage.java
@@ -232,8 +232,8 @@
form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()
.getPostReceiveScriptsInherited(null)));
- form.add(new Button(getString("gb.save")));
- Button cancel = new Button(getString("gb.cancel")) {
+ form.add(new Button("save"));
+ Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
@Override
diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java
index ecc4592..36f7578 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/com/gitblit/wicket/pages/EditUserPage.java
@@ -215,8 +215,8 @@
form.add(repositories);
form.add(teams);
- form.add(new Button(getString("gb.save")));
- Button cancel = new Button(getString("gb.cancel")) {
+ form.add(new Button("save"));
+ Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
@Override
diff --git a/src/com/gitblit/wicket/pages/SendProposalPage.java b/src/com/gitblit/wicket/pages/SendProposalPage.java
index e97a090..aa9c03a 100644
--- a/src/com/gitblit/wicket/pages/SendProposalPage.java
+++ b/src/com/gitblit/wicket/pages/SendProposalPage.java
@@ -130,8 +130,8 @@
form.add(new Label("tokenType", proposal.tokenType.name()));
form.add(new Label("token", proposal.token));
- form.add(new Button(getString("gb.save")));
- Button cancel = new Button(getString("gb.cancel")) {
+ form.add(new Button("save"));
+ Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
@Override
--
Gitblit v1.9.1