adding localizer <https://localizer.dev.java.net/> for a type-safe i18n support

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@6421 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2007-12-27 00:46:21 +00:00
1 parent 5241dd1f62
commit 34ba554bd2
5 files changed
+42 -4

No files matched your search

+16
View File
@@ -21,12 +21,15 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
import java.util.Locale;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.net.URLClassLoader;
import java.net.URL;
import org.kohsuke.stapler.Stapler;
import org.kohsuke.stapler.StaplerRequest;
import org.jvnet.localizer.LocaleProvider;
/**
* Entry point when Hudson is used as a webapp.
@@ -44,6 +47,19 @@ public class WebAppMain implements ServletContextListener {
try {
final ServletContext context = event.getServletContext();
// use the current request to determine the language
LocaleProvider.setProvider(new LocaleProvider() {
public Locale get() {
Locale locale=null;
StaplerRequest req = Stapler.getCurrentRequest();
if(req!=null)
locale = req.getLocale();
if(locale==null)
locale = Locale.getDefault();
return locale;
}
});
// quick check to see if we (seem to) have enough permissions to run. (see #719)
JVM jvm;
try {
@@ -6,7 +6,7 @@ import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import hudson.model.Descriptor;
import hudson.security.Permission.Group;
import hudson.security.PermissionGroup;
import net.sf.json.JSONObject;
import org.acegisecurity.acls.sid.GrantedAuthoritySid;
import org.acegisecurity.acls.sid.PrincipalSid;
@@ -173,7 +173,7 @@ public class GlobalMatrixAuthorizationStrategy extends AuthorizationStrategy {
}
public String getDisplayName() {
return "Role-based security";
return Messages.GlobalMatrixAuthorizationStrategy_DisplayName();
}
public AuthorizationStrategy newInstance(StaplerRequest req, JSONObject formData) throws FormException {
@@ -194,8 +194,8 @@ public class GlobalMatrixAuthorizationStrategy extends AuthorizationStrategy {
return "/help/security/global-matrix.html";
}
public List<Group> getAllGroups() {
List<Group> groups = new ArrayList<Group>(Permission.getAllGroups());
public List<PermissionGroup> getAllGroups() {
List<PermissionGroup> groups = new ArrayList<PermissionGroup>(PermissionGroup.getAll());
groups.remove(Permission.getGroup(Permission.class));
return groups;
}