Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -rd065d513d8d620f940a0adb75935ebc5553cc276 -rcd23d6049521a39924d08fcaf816e85f0a51c017 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision d065d513d8d620f940a0adb75935ebc5553cc276) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision cd23d6049521a39924d08fcaf816e85f0a51c017) @@ -327,7 +327,7 @@ xCoord = parentAct.xCoord + _activity.xCoord; if(learner_X != null) - learner_X = (mm instanceof CanvasComplexView) ? : ? learner_X + parentAct.xCoord : null; + learner_X = (mm instanceof CanvasComplexView) ? learner_X + parentAct.xCoord : null; learner_Y = learner_Y + parentAct.yCoord; } else { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -rd065d513d8d620f940a0adb75935ebc5553cc276 -rcd23d6049521a39924d08fcaf816e85f0a51c017 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision d065d513d8d620f940a0adb75935ebc5553cc276) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision cd23d6049521a39924d08fcaf816e85f0a51c017) @@ -226,26 +226,26 @@ var URLToSend:String = _root.monitoringURL+"forceComplete&lessonID="+_root.lessonID+"&learnerID="+learnerObj.Learner.getLearnerId()+"&activityID="+cActivity.activity.activityID; var fnOk:Function = Proxy.create(this, this.reloadProgress, this, URLToSend); var fnCancel:Function = Proxy.create(this, this.activitySnapBack, learnerObj); - LFMessage.showMessageConfirm("Are you sure you want to force complete leaner '"+learnerObj.Learner.getFullName()+"' to the end of this branching sequence?", fnOk,fnCancel); + LFMessage.showMessageConfirm(Dictionary.getValue('al_confirm_forcecomplete_to_end_of_branching_seq',[learnerObj.Learner.getFullName()]), fnOk,fnCancel); } else if (_parent.isOptionalSequenceActivity(_grandParent) && !sameOptionalSequence) { // if the learner hit an activity within an optional sequence and they were initially outside of the target optional sequence var transObj:Object = _monitorModel.getMonitor().ddm.getTransitionsForActivityUIID(_grandParent.activityUIID); var previousAct = _monitorModel.getMonitor().ddm.getActivityByUIID(transObj.into.fromUIID); var URLToSend:String = _root.monitoringURL+"forceComplete&lessonID="+_root.lessonID+"&learnerID="+learnerObj.Learner.getLearnerId()+"&activityID="+previousAct.activityID; var fnOk:Function = Proxy.create(this, this.reloadProgress, this, URLToSend); var fnCancel:Function = Proxy.create(this, this.activitySnapBack, learnerObj); - LFMessage.showMessageConfirm("Are you sure you want to force complete leaner '"+learnerObj.Learner.getFullName()+"' to Optional Sequence?", fnOk,fnCancel); + LFMessage.showMessageConfirm(Dictionary.getValue('al_confirm_forcecomplete_toactivity',[learnerObj.Learner.getFullName(), _grandParent.title]), fnOk,fnCancel); } else if (_parent.isOptionalActivity()) { // if the learner hit an activity within an optional activity var transObj:Object = _monitorModel.getMonitor().ddm.getTransitionsForActivityUIID(_parent.activityUIID); var previousAct = _monitorModel.getMonitor().ddm.getActivityByUIID(transObj.into.fromUIID); var URLToSend:String = _root.monitoringURL+"forceComplete&lessonID="+_root.lessonID+"&learnerID="+learnerObj.Learner.getLearnerId()+"&activityID="+previousAct.activityID; var fnOk:Function = Proxy.create(this, this.reloadProgress, this, URLToSend); var fnCancel:Function = Proxy.create(this, this.activitySnapBack, learnerObj); - LFMessage.showMessageConfirm("Are you sure you want to force complete leaner '"+learnerObj.Learner.getFullName()+"' to Optional Activity?", fnOk,fnCancel); + LFMessage.showMessageConfirm(Dictionary.getValue('al_confirm_forcecomplete_toactivity',[learnerObj.Learner.getFullName(), _parent.title]), fnOk,fnCancel); } else { - LFMessage.showMessageAlert(learnerObj.Learner.getFullName() +" cannot be dropped on an activity that is in a different branch or sequence.", null, null); + LFMessage.showMessageAlert(Dictionary.getValue('al_error_forcecomplete_to_different_seq',[learnerObj.Learner.getFullName()]), null, null); } } Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -rd065d513d8d620f940a0adb75935ebc5553cc276 -rcd23d6049521a39924d08fcaf816e85f0a51c017 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -rd065d513d8d620f940a0adb75935ebc5553cc276 -rcd23d6049521a39924d08fcaf816e85f0a51c017 Binary files differ