From aefb59ef98522ef8a10ab64b25840f11e622e1c7 Mon Sep 17 00:00:00 2001
From: Stardrad Yin <yin8086@gmail.com>
Date: Wed, 23 Jan 2013 03:16:08 -0500
Subject: [PATCH] Modify Chinese translation in properties file, and add new translation that synchronizes with commit synchronize with commit e4e6829
---
src/com/gitblit/client/UsersTableModel.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index f635f7e..439d5af 100644
--- a/src/com/gitblit/client/UsersTableModel.java
+++ b/src/com/gitblit/client/UsersTableModel.java
@@ -36,7 +36,7 @@
List<UserModel> list;
enum Columns {
- Name, Display_Name, AccessLevel, Teams, Repositories;
+ Name, Display_Name, Type, Teams, Repositories;
@Override
public String toString() {
@@ -71,8 +71,8 @@
return Translation.get("gb.name");
case Display_Name:
return Translation.get("gb.displayName");
- case AccessLevel:
- return Translation.get("gb.accessLevel");
+ case Type:
+ return Translation.get("gb.type");
case Teams:
return Translation.get("gb.teamMemberships");
case Repositories:
@@ -101,17 +101,24 @@
return model.username;
case Display_Name:
return model.displayName;
- case AccessLevel:
- if (model.canAdmin()) {
- return "administrator";
+ case Type:
+ StringBuilder sb = new StringBuilder();
+ if (model.accountType != null) {
+ sb.append(model.accountType.name());
}
- return "";
+ if (model.canAdmin()) {
+ if (sb.length() > 0) {
+ sb.append(", ");
+ }
+ sb.append("admin");
+ }
+ return sb.toString();
case Teams:
return (model.teams == null || model.teams.size() == 0) ? "" : String
.valueOf(model.teams.size());
case Repositories:
- return (model.repositories == null || model.repositories.size() == 0) ? "" : String
- .valueOf(model.repositories.size());
+ return (model.permissions == null || model.permissions.size() == 0) ? "" : String
+ .valueOf(model.permissions.size());
}
return null;
}
--
Gitblit v1.9.1