SAK-31861 Validation error entering a grade (spanish language) (sakai…

…project#3492)
mmg-3 · Oct 17, 2016 · d3b2a2c · d3b2a2c
1 parent b3c4993
commit d3b2a2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java b/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
@@ -1975,17 +1975,18 @@ private boolean isGradeValid(String grade, int gradeEntryType, LetterGradePercen
 			  try {
 				  NumberFormat nbFormat = NumberFormat.getInstance(new ResourceLoader().getLocale());
 				  Double gradeAsDouble = new Double (nbFormat.parse(grade).doubleValue());
+				  String decSeparator =((DecimalFormat)nbFormat).getDecimalFormatSymbols().getDecimalSeparator()+"";
 				  // grade must be greater than or equal to 0
 				  if (gradeAsDouble.doubleValue() >= 0) {
-						String[] splitOnDecimal = grade.split("\\.");
+						String[] splitOnDecimal = grade.split("\\"+decSeparator);
 					  // check that there are no more than 2 decimal places
 					  if (splitOnDecimal == null) {
 						  gradeIsValid = true;
 
 					  // check for a valid score matching ##########.##
 					  // where integer is maximum of 10 integers in length
 					  // and maximum of 2 decimal places
-					  } else if (grade.matches("[0-9]{0,10}(\\.[0-9]{0,2})?")) {
+					  } else if (grade.matches("[0-9]{0,10}(\\"+decSeparator+"[0-9]{0,2})?")) {
 						  gradeIsValid = true;
 					  }
 				  }

diff --git a/...r/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java b/...r/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java
@@ -4501,7 +4501,8 @@ private void setUpGradeInformation(String gradebookUid, String selAssignmentName
 		  GradeDefinition gradeDef = gradebookService.getGradeDefinitionForStudentForItem(gradebookUid, assign.getId(), studentId);
 
 		  if (gradeDef.getGrade() != null) {
-		      gbItemScore = gradeDef.getGrade();
+		      String decSeparator = FormattedText.getDecimalSeparator();
+		      gbItemScore = StringUtils.replace(gradeDef.getGrade(), (",".equals(decSeparator)?".":","), decSeparator);
 		  }
 
 		  if (gradeDef.getGradeComment() != null) {