Fixed overzealous externalization of save and cancel buttons

diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
index 5e15c8fc8fd8b339120012363b173fd59d7483b4..4fb5d2377b3b53cc55994bc34a99432c9553ac12 100644 (file)
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
@@ -113,8 +113,8 @@ public class ChangePasswordPage extends RootSubPage {
                confirmPasswordField.setResetPassword(false);\r
                form.add(confirmPasswordField);\r
 \r
-               form.add(new Button(getString("gb.save")));\r
-               Button cancel = new Button(getString("gb.cancel")) {\r
+               form.add(new Button("save"));\r
+               Button cancel = new Button("cancel") {\r
                        private static final long serialVersionUID = 1L;\r
 \r
                        @Override\r

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index c4bacc6972a97cba51aaf2417865ecb8fb5cde13..af1b2b4492221dbc371e5fbf526f441c760d26fd 100644 (file)
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -335,8 +335,8 @@ public class EditRepositoryPage extends RootSubPage {
                form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()\r
                                .getPostReceiveScriptsInherited(repositoryModel)));\r
 \r
-               form.add(new Button(getString("gb.save")));\r
-               Button cancel = new Button(getString("gb.cancel")) {\r
+               form.add(new Button("save"));\r
+               Button cancel = new Button("cancel") {\r
                        private static final long serialVersionUID = 1L;\r
 \r
                        @Override\r

diff --git a/src/com/gitblit/wicket/pages/EditTeamPage.java b/src/com/gitblit/wicket/pages/EditTeamPage.java
index feab1aa9b4c2892140fcd1d2916fc5ae59d293ce..890ea8f7f4a07df88a7d29a19fb794ce9b6fbe6e 100644 (file)
--- a/src/com/gitblit/wicket/pages/EditTeamPage.java
+++ b/src/com/gitblit/wicket/pages/EditTeamPage.java
@@ -232,8 +232,8 @@ public class EditTeamPage extends RootSubPage {
                form.add(new BulletListPanel("inheritedPostReceive", "inherited", GitBlit.self()\r
                                .getPostReceiveScriptsInherited(null)));\r
 \r
-               form.add(new Button(getString("gb.save")));\r
-               Button cancel = new Button(getString("gb.cancel")) {\r
+               form.add(new Button("save"));\r
+               Button cancel = new Button("cancel") {\r
                        private static final long serialVersionUID = 1L;\r
 \r
                        @Override\r

diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java
index ecc45924a0863156f1cc183ed601845f2e3ecf1c..36f7578de2f5016963d60d09422b58f418f93d33 100644 (file)
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/com/gitblit/wicket/pages/EditUserPage.java
@@ -215,8 +215,8 @@ public class EditUserPage extends RootSubPage {
                form.add(repositories);\r
                form.add(teams);\r
 \r
-               form.add(new Button(getString("gb.save")));\r
-               Button cancel = new Button(getString("gb.cancel")) {\r
+               form.add(new Button("save"));\r
+               Button cancel = new Button("cancel") {\r
                        private static final long serialVersionUID = 1L;\r
 \r
                        @Override\r

diff --git a/src/com/gitblit/wicket/pages/SendProposalPage.java b/src/com/gitblit/wicket/pages/SendProposalPage.java
index e97a090f6e7bd8150824a57ac2e3d872d16f5923..aa9c03a1c1a65dc267b7db763378e950f16ae481 100644 (file)
--- a/src/com/gitblit/wicket/pages/SendProposalPage.java
+++ b/src/com/gitblit/wicket/pages/SendProposalPage.java
@@ -130,8 +130,8 @@ public class SendProposalPage extends RootSubPage {
                form.add(new Label("tokenType", proposal.tokenType.name()));\r
                form.add(new Label("token", proposal.token));\r
 \r
-               form.add(new Button(getString("gb.save")));\r
-               Button cancel = new Button(getString("gb.cancel")) {\r
+               form.add(new Button("save"));\r
+               Button cancel = new Button("cancel") {\r
                        private static final long serialVersionUID = 1L;\r
 \r
                        @Override\r