Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r6a7dac4d3b037cda4dd56f36ddbd455e8526bdb7 -r3a8e071f2571e1cbad37de3843294e216e72ea7b Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r6a7dac4d3b037cda4dd56f36ddbd455e8526bdb7 -r3a8e071f2571e1cbad37de3843294e216e72ea7b Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as =================================================================== diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r3a8e071f2571e1cbad37de3843294e216e72ea7b --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as (.../Activity.as) (revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as (.../Activity.as) (revision 3a8e071f2571e1cbad37de3843294e216e72ea7b) @@ -172,10 +172,10 @@ private var _stopAfterActivity:Boolean; private var _readOnly:Boolean; - private var _viewID:Boolean; private var _branchView:CanvasBranchView; + private var _i18nActivityTypeString:String; /** * Constructor @@ -588,11 +588,18 @@ public function set title(a:String):Void{ _title = a; + if (_i18nActivityTypeString == null || _i18nActivityTypeString == undefined) { + _i18nActivityTypeString = _title; + } } public function get title():String{ return _title; } + public function get i18nActivityTypeString():String { + return _i18nActivityTypeString; + } + public function set description(a:String):Void{ _description = a; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r9d5eeace842b7971ad47f350fef71c0e11a352c0 -r3a8e071f2571e1cbad37de3843294e216e72ea7b --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 9d5eeace842b7971ad47f350fef71c0e11a352c0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 3a8e071f2571e1cbad37de3843294e216e72ea7b) @@ -278,8 +278,7 @@ if ( !(ca.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE) ) { activitySnapBack(ca); - //var msg:String = "Activities of this type cannot be added as a support activity"; - var msg:String = Dictionary.getValue("support_msg_invalid_child", [ca.activity.objectType]); + var msg:String = Dictionary.getValue("support_msg_invalid_child", [ca.activity.i18nActivityTypeString]); LFMessage.showMessageAlert(msg); } else if (_canvasModel.getCanvas().ddm.getTransitionsForActivityUIID(ca.activity.activityUIID).hasTrans){