Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r7067bfdadf476c8032a38071ec7d431bb87dd281 -r8794fa416164738d1e1a4954081f6e5e1db00c6b --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7067bfdadf476c8032a38071ec7d431bb87dd281) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8794fa416164738d1e1a4954081f6e5e1db00c6b) @@ -506,6 +506,8 @@ sysadmin.maintain.session =Logged in users sysadmin.maintain.session.login =Login sysadmin.maintain.session.id =Session ID +sysadmin.maintain.session.access =Last access +sysadmin.maintain.session.created =Started on: error.portrait.removal.failed =Unable to delete portrait. See error file for details label.delete.portrait =Delete portrait sysadmin.maintain.session.delete =Delete Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java =================================================================== diff -u -r05ee2c7dd09e64ad4d37ca911aec7b70a7c595ef -r8794fa416164738d1e1a4954081f6e5e1db00c6b --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision 05ee2c7dd09e64ad4d37ca911aec7b70a7c595ef) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision 8794fa416164738d1e1a4954081f6e5e1db00c6b) @@ -40,7 +40,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.authoring.service.IAuthoringFullService; import org.lamsfoundation.lams.authoring.template.AssessMCAnswer; @@ -466,14 +465,10 @@ Integer useNumGroups = (numGroups != null && numGroups > 0) ? numGroups : 2; for (int orderId = 0, groupNum = 1; orderId < useNumGroups; orderId++, groupNum++) { ObjectNode group = JsonNodeFactory.instance.objectNode(); - String groupName = TextUtil.getText(appBundle, formatter, "authoring.label.group.name", - new String[] { groupNumberFormatter.format(groupNum) }); - if (StringUtils.isBlank(groupName)) { - // fallback if proper group name was not found - groupName = "Group " + groupNum; - } - group.put(AuthoringJsonTags.GROUP_NAME, groupName); + String groupName = TextUtil.getText(appBundle, "authoring.fla.default.group.prefix") + " " + + groupNumberFormatter.format(groupNum); + group.put(AuthoringJsonTags.GROUP_NAME, groupName); group.put(AuthoringJsonTags.ORDER_ID, orderId); group.put(AuthoringJsonTags.GROUP_UIID, uiid.incrementAndGet()); groups.add(group);