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/Constants.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java index c53119b..f2067f6 100644 --- a/src/com/gitblit/Constants.java +++ b/src/com/gitblit/Constants.java @@ -15,6 +15,10 @@ */ package com.gitblit; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + /** * Constant values used by Gitblit. @@ -30,7 +34,7 @@ // The build script extracts this exact line so be careful editing it // and only use A-Z a-z 0-9 .-_ in the string. - public static final String VERSION = "1.2.0-SNAPSHOT"; + public static final String VERSION = "1.2.1-SNAPSHOT"; // The build script extracts this exact line so be careful editing it // and only use A-Z a-z 0-9 .-_ in the string. @@ -38,11 +42,13 @@ // The build script extracts this exact line so be careful editing it // and only use A-Z a-z 0-9 .-_ in the string. - public static final String JGIT_VERSION = "JGit 2.1.0 (201209190230-r)"; + public static final String JGIT_VERSION = "JGit 2.2.0 (201212191850-r)"; public static final String ADMIN_ROLE = "#admin"; public static final String FORK_ROLE = "#fork"; + + public static final String CREATE_ROLE = "#create"; public static final String NOT_FEDERATED_ROLE = "#notfederated"; @@ -70,7 +76,7 @@ public static final String ENCODING = "UTF-8"; - public static final int LEN_SHORTLOG = 80; + public static final int LEN_SHORTLOG = 78; public static final int LEN_SHORTLOG_REFS = 60; @@ -79,6 +85,8 @@ public static final String CONFIG_GITBLIT = "gitblit"; public static final String CONFIG_CUSTOM_FIELDS = "customFields"; + + public static final String ISO8601 = "yyyy-MM-dd'T'HH:mm:ssZ"; public static String getGitBlitVersion() { return NAME + " v" + VERSION; @@ -249,6 +257,7 @@ LIST_USERS, CREATE_USER, EDIT_USER, DELETE_USER, LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM, LIST_REPOSITORY_MEMBERS, SET_REPOSITORY_MEMBERS, LIST_REPOSITORY_TEAMS, SET_REPOSITORY_TEAMS, + LIST_REPOSITORY_MEMBER_PERMISSIONS, SET_REPOSITORY_MEMBER_PERMISSIONS, LIST_REPOSITORY_TEAM_PERMISSIONS, SET_REPOSITORY_TEAM_PERMISSIONS, LIST_FEDERATION_REGISTRATIONS, LIST_FEDERATION_RESULTS, LIST_FEDERATION_PROPOSALS, LIST_FEDERATION_SETS, EDIT_SETTINGS, LIST_STATUS; @@ -307,4 +316,98 @@ return null; } } + + /** + * The access permissions available for a repository. + */ + public static enum AccessPermission { + NONE("N"), EXCLUDE("X"), VIEW("V"), CLONE("R"), PUSH("RW"), CREATE("RWC"), DELETE("RWD"), REWIND("RW+"), OWNER("RW+"); + + public static final AccessPermission [] NEWPERMISSIONS = { EXCLUDE, VIEW, CLONE, PUSH, CREATE, DELETE, REWIND }; + + public static AccessPermission LEGACY = REWIND; + + public final String code; + + private AccessPermission(String code) { + this.code = code; + } + + public boolean atLeast(AccessPermission perm) { + return ordinal() >= perm.ordinal(); + } + + public boolean exceeds(AccessPermission perm) { + return ordinal() > perm.ordinal(); + } + + public String asRole(String repository) { + return code + ":" + repository; + } + + @Override + public String toString() { + return code; + } + + public static AccessPermission permissionFromRole(String role) { + String [] fields = role.split(":", 2); + if (fields.length == 1) { + // legacy/undefined assume full permissions + return AccessPermission.LEGACY; + } else { + // code:repository + return AccessPermission.fromCode(fields[0]); + } + } + + public static String repositoryFromRole(String role) { + String [] fields = role.split(":", 2); + if (fields.length == 1) { + // legacy/undefined assume full permissions + return role; + } else { + // code:repository + return fields[1]; + } + } + + public static AccessPermission fromCode(String code) { + for (AccessPermission perm : values()) { + if (perm.code.equalsIgnoreCase(code)) { + return perm; + } + } + return AccessPermission.NONE; + } + } + + public static enum RegistrantType { + REPOSITORY, USER, TEAM; + } + + public static enum PermissionType { + MISSING, EXPLICIT, TEAM, REGEX, OWNER, ADMINISTRATOR; + } + + public static enum GCStatus { + READY, COLLECTING; + + public boolean exceeds(GCStatus s) { + return ordinal() > s.ordinal(); + } + } + + public static enum AuthenticationType { + CREDENTIALS, COOKIE, CERTIFICATE, CONTAINER; + + public boolean isStandard() { + return ordinal() <= COOKIE.ordinal(); + } + } + + @Documented + @Retention(RetentionPolicy.RUNTIME) + public @interface Unused { + } } -- Gitblit v1.9.1