Index: content-bundles/resources/content.properties =================================================================== --- content-bundles/resources/content.properties (revision 120) +++ content-bundles/resources/content.properties (working copy) @@ -560,3 +560,18 @@ items = items calendar.title = Popup date selector + +#CONDITIONAL RELEASE MCP 20101122 + +conditional.duedate_passed=due date has passed. +conditional.duedate_notpassed=due date has not passed. +conditional.released_to_students=is released to students. +conditional.not_released_to_students=is not released to students. +conditional.included_in_course_grade=is included in course grade. +conditional.not_included_in_course_grade=is included in course grade. +conditional.grade_blank=grade is blank. +conditional.grade_non_blank=grade is non-blank. +conditional.grade_less_than=grade is less than: +conditional.grade_greather_or_equal=grade is greater than or equal to: + + \ No newline at end of file Index: content-bundles/resources/content_es.properties =================================================================== --- content-bundles/resources/content_es.properties (revision 120) +++ content-bundles/resources/content_es.properties (working copy) @@ -503,4 +503,22 @@ calendar.title = Popup selector fechas -dav.setup= Instalar un cliente de WebDAV en su ordenador \ No newline at end of file +dav.setup= Instalar un cliente de WebDAV en su ordenador + +#CONDITIONAL RELEASE MCP 20101122 + +#Conditional Release +conditions.disable.error = No se puede eliminar la condici\u00F3n asociada. Contacte con el personal de soporte. +conditions.invalid.condition.argument = El valor de la condici\u00F3n seleccionada debe ser un n\u00FAmero. +conditions.condition.argument.outofrange = El valor de la condici\u00F3n seleccionada debe ser entre 0 y + +conditional.duedate_passed=la fecha de vencimiento ha pasado. +conditional.duedate_notpassed=la fecha de vencimiento no ha pasado. +conditional.released_to_students=se publica a los estudiantes. +conditional.not_released_to_students=no se publica a los estudiantes. +conditional.included_in_course_grade=se incluye en la nota del curso. +conditional.not_included_in_course_grade=no se incluye en la nota del curso. +conditional.grade_blank=la nota es en blanco. +conditional.grade_non_blank=la nota no es en blanco. +conditional.grade_less_than=la nota es menor que: +conditional.grade_greather_or_equal=la nota es mayor o igual a: \ No newline at end of file Index: content-bundles/resources/types.properties =================================================================== --- content-bundles/resources/types.properties (revision 120) +++ content-bundles/resources/types.properties (working copy) @@ -292,4 +292,8 @@ viewing = Viewing of = of items = items + +#CONDITIONAL RELEASE MCP 20101122 +conditional.only_if_condition_is_met=Only if the following condition is met: +conditional.gradebook_tool_name=Gradebook Index: content-bundles/resources/types_es.properties =================================================================== --- content-bundles/resources/types_es.properties (revision 120) +++ content-bundles/resources/types_es.properties (working copy) @@ -281,3 +281,7 @@ no.gradebook.assignments= A\u00F1ada al menos un elemento a Calificaciones para acceder a las condiciones. of=de viewing=Viendo + +#CONDITIONAL RELEASE MCP 20101122 +conditional.only_if_condition_is_met=Solo si la siguiente condici\u00F3n se cumple: +conditional.gradebook_tool_name=Calificaciones Index: content-tool/tool/src/java/org/sakaiproject/content/tool/ResourceConditionsHelper.java =================================================================== --- content-tool/tool/src/java/org/sakaiproject/content/tool/ResourceConditionsHelper.java (revision 120) +++ content-tool/tool/src/java/org/sakaiproject/content/tool/ResourceConditionsHelper.java (working copy) @@ -189,16 +189,16 @@ //TODO look this data up //Using LinkedHashMap to maintain order Map conditionSelections = new LinkedHashMap(); - conditionSelections.put("1|gradebook.updateAssignment|dueDateHasPassed|no_operator","due date has passed."); - conditionSelections.put("2|gradebook.updateAssignment|dueDateHasNotPassed|no_operator","due date has not passed."); - conditionSelections.put("3|gradebook.updateAssignment|isReleasedToStudents|no_operator","is released to students."); - conditionSelections.put("4|gradebook.updateAssignment|isNotReleasedToStudents|no_operator","is not released to students."); - conditionSelections.put("5|gradebook.updateAssignment|isIncludedInCourseGrade|no_operator","is included in course grade."); - conditionSelections.put("6|gradebook.updateAssignment|isNotIncludedInCourseGrade|no_operator","is not included in course grade."); - conditionSelections.put("7|gradebook.updateItemScore|isScoreBlank|no_operator", "grade is blank."); - conditionSelections.put("8|gradebook.updateItemScore|isScoreNonBlank|no_operator", "grade is non-blank."); - conditionSelections.put("9|gradebook.updateItemScore|getScore|less_than","grade is less than:"); - conditionSelections.put("10|gradebook.updateItemScore|getScore|greater_than_equal_to","grade is greater than or equal to:"); + conditionSelections.put("1|gradebook.updateAssignment|dueDateHasPassed|no_operator",rb.getString("conditional.duedate_passed")); + conditionSelections.put("2|gradebook.updateAssignment|dueDateHasNotPassed|no_operator",rb.getString("conditional.duedate_notpassed")); + conditionSelections.put("3|gradebook.updateAssignment|isReleasedToStudents|no_operator",rb.getString("conditional.released_to_students")); + conditionSelections.put("4|gradebook.updateAssignment|isNotReleasedToStudents|no_operator",rb.getString("conditional.not_released_to_students")); + conditionSelections.put("5|gradebook.updateAssignment|isIncludedInCourseGrade|no_operator",rb.getString("conditional.included_in_course_grade")); + conditionSelections.put("6|gradebook.updateAssignment|isNotIncludedInCourseGrade|no_operator",rb.getString("conditional.not_included_in_course_grade")); + conditionSelections.put("7|gradebook.updateItemScore|isScoreBlank|no_operator", rb.getString("conditional.grade_blank")); + conditionSelections.put("8|gradebook.updateItemScore|isScoreNonBlank|no_operator", rb.getString("conditional.grade_non_blank")); + conditionSelections.put("9|gradebook.updateItemScore|getScore|less_than",rb.getString("conditional.grade_less_than")); + conditionSelections.put("10|gradebook.updateItemScore|getScore|greater_than_equal_to",rb.getString("conditional.grade_greather_or_equal")); //This isn't the final resting place for this data..see the buildReviseMetadataContext method in this class state.setAttribute("resourceSelections", resourceSelections); Index: content-tool/tool/src/webapp/vm/resources/sakai_properties.vm =================================================================== --- content-tool/tool/src/webapp/vm/resources/sakai_properties.vm (revision 120) +++ content-tool/tool/src/webapp/vm/resources/sakai_properties.vm (working copy) @@ -390,7 +390,7 @@ @@ -409,7 +409,7 @@ #if($resourceSelections.size() == 0) $tlang.getString("no.gradebook.assignments") #else - Gradebook + $tlang.getString("conditional.gradebook_tool_name")