From 9af47c10c6a268877c1d232c8d71ee6df4f8a7ab Mon Sep 17 00:00:00 2001
From: Jeroen Baten <jeroen@jeroenbaten.nl>
Date: Fri, 04 Jan 2013 05:18:37 -0500
Subject: [PATCH] Dutch translation before spellcheck
---
src/com/gitblit/wicket/panels/UsersPanel.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/UsersPanel.java b/src/com/gitblit/wicket/panels/UsersPanel.java
index ecf4537..46c502e 100644
--- a/src/com/gitblit/wicket/panels/UsersPanel.java
+++ b/src/com/gitblit/wicket/panels/UsersPanel.java
@@ -71,11 +71,20 @@
WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());
item.add(editLink);
}
-
- item.add(new Label("accesslevel", entry.canAdmin ? "administrator" : ""));
+
+ if (StringUtils.isEmpty(entry.emailAddress)) {
+ item.add(new Label("emailAddress").setVisible(false));
+ } else {
+ editLink = new LinkPanel("emailAddress", "list", entry.emailAddress,
+ EditUserPage.class, WicketUtils.newUsernameParameter(entry.username));
+ WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());
+ item.add(editLink);
+ }
+
+ item.add(new Label("accesslevel", entry.canAdmin() ? "administrator" : ""));
item.add(new Label("teams", entry.teams.size() > 0 ? ("" + entry.teams.size()) : ""));
item.add(new Label("repositories",
- entry.repositories.size() > 0 ? ("" + entry.repositories.size()) : ""));
+ entry.permissions.size() > 0 ? ("" + entry.permissions.size()) : ""));
Fragment userLinks = new Fragment("userLinks", "userAdminLinks", this);
userLinks.add(new BookmarkablePageLink<Void>("editUser", EditUserPage.class,
WicketUtils.newUsernameParameter(entry.username)));
@@ -87,15 +96,15 @@
public void onClick() {
if (GitBlit.self().deleteUser(entry.username)) {
users.remove(entry);
- info(MessageFormat.format("User ''{0}'' deleted.", entry.username));
+ info(MessageFormat.format(getString("gb.userDeleted"), entry.username));
} else {
- error(MessageFormat.format("Failed to delete user ''{0}''!",
+ error(MessageFormat.format(getString("gb.deleteUserFailed"),
entry.username));
}
}
};
deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(
- "Delete user \"{0}\"?", entry.username)));
+ getString("gb.deleteUser"), entry.username)));
userLinks.add(deleteLink);
item.add(userLinks);
--
Gitblit v1.9.1