zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More I18n changes.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-30 16:26:31 -03:00
parent cc9f57a153
commit 8e103f44c8
9 changed files with 66 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wise-webapp/src/main/java/com/wisemapping/model/MindMap.java
View File

@@ -45,7 +45,6 @@ public class MindMap {
private Set<Collaboration> collaborations = new HashSet<Collaboration>();
private User creator;
private String properties;
private String tags;
private String title;
private byte[] xml;

4
wise-webapp/src/main/java/com/wisemapping/rest/model/RestErrors.java
View File

@@ -6,6 +6,7 @@ import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.jetbrains.annotations.NotNull;
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.validation.Errors;
import org.springframework.validation.FieldError;
import org.springframework.validation.ObjectError;
@@ -68,11 +69,12 @@ public class RestErrors {
}
public Map<String, String> getFieldErrors() {
Locale locale = LocaleContextHolder.getLocale();
final Map<String, String> result = new HashMap<String, String>();
if (errors != null) {
final List<FieldError> fieldErrors = errors.getFieldErrors();
for (FieldError fieldError : fieldErrors) {
result.put(fieldError.getField(), messageSource.getMessage(fieldError, Locale.ENGLISH));
result.put(fieldError.getField(), messageSource.getMessage(fieldError, locale));
}
}
return result;

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java
View File

@@ -71,7 +71,7 @@ public class RestMindmapInfo {
}
public String getCreator() {
return mindmap.getCreator().getUsername();
return mindmap.getCreator().getFullName();
}
public void setCreator() {