Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as (.../CompetenceContainer.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as (.../CompetenceContainer.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -100,11 +100,13 @@ //set the reference to the StyleManager themeManager = ThemeManager.getInstance(); - competence_title_lbl.text = "Title"; - competence_description_lbl.text = "Description"; + //dictionary keys vary for author/monitor and this class is shared between them; + competence_title_lbl.text = (Dictionary.getValue("pi_lbl_title") != null && Dictionary.getValue("pi_lbl_title") != undefined) ? Dictionary.getValue("pi_lbl_title") : Dictionary.getValue("competence_title_lbl"); + competence_description_lbl.text = (Dictionary.getValue("ws_dlg_description") != null && Dictionary.getValue("ws_dlg_description") != undefined) ? Dictionary.getValue("ws_dlg_description") : Dictionary.getValue("competence_desc_lbl"); - edit_competence_btn.label = "Edit"; - delete_competence_btn.label = "Delete"; + // author only buttons + edit_competence_btn.label = Dictionary.getValue("mnu_edit"); + delete_competence_btn.label = Dictionary.getValue("delete_btn"); competence_title_txt.editable = false; competence_description_txt.editable = false; @@ -151,7 +153,7 @@ var _isMapped:Boolean = isCompetenceMapped(); if (_isMapped) { - LFMessage.showMessageConfirm("The competence you are attempting to delete is currently mapped to one or more activities. Deleting this competence will remove it's mappings. Are you sure you want to proceed?", Proxy.create(this, deleteMappedCompetences, _competenceTitle), null); + LFMessage.showMessageConfirm(Dictionary.getValue("competence_editor_warning_competence_mapped"), null); } else { deleteCompetence(); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as (.../CompetenceDefinitionDialog.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as (.../CompetenceDefinitionDialog.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -101,13 +101,13 @@ fm = _container.getFocusManager(); //Set the text for buttons - close_btn.label = "Cancel"; + close_btn.label = Dictionary.getValue("prefs_dlg_cancel"); - competence_title_lbl.text = "Title"; - competence_description_lbl.text = "Description"; + competence_title_lbl.text = Dictionary.getValue("competence_title_lbl"); + competence_description_lbl.text = Dictionary.getValue("competence_desc_lbl"); - add_competence_btn.label = "Add"; - save_competence_btn.label = "Save"; + add_competence_btn.label = Dictionary.getValue("competence_editor_add_competence_btn"); + save_competence_btn.label = Dictionary.getValue("mnu_file_save"); editingCompetence = CompetenceEditorDialog(app.dialog.scrollContent).editingCompetence; @@ -202,11 +202,12 @@ var competenceDesc:String = StringUtils.trim(competence_description_txt.text); if (competenceName.length == 0) { - LFMessage.showMessageAlert("The competence title cannot be blank", null); + LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_blank"), null); + } else if (app.getDesignDataModel().competences.containsKey(competenceName)) { // entry already exists, do not add - LFMessage.showMessageAlert("A competence with the title '"+competenceName+"' already exists", null); + LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_exists", [competenceName]), null); } else { // add the new competence to the hashtable @@ -252,7 +253,7 @@ CompetenceEditorDialog(app.dialog.scrollContent).draw(); } else { - LFMessage.showMessageAlert("The competence title cannot be blank", null); + LFMessage.showMessageAlert(Dictionary.getValue("competence_editor_warning_title_blank"), null); } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as (.../CompetenceEditorDialog.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as (.../CompetenceEditorDialog.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -105,11 +105,10 @@ themeManager = ThemeManager.getInstance(); //Set the text for buttons - //close_btn.label = Dictionary.getValue('al_ok'); - competence_lbl.text = "Competences"; + competence_lbl.text = Dictionary.getValue('competences_lbl'); - add_competence_btn.label = "Add" - close_btn.label = "Close"; + add_competence_btn.label = Dictionary.getValue('competence_editor_add_competence_btn'); + close_btn.label = (Dictionary.getValue('mnu_file_close') != null && Dictionary.getValue('mnu_file_close') != undefined) ? Dictionary.getValue('mnu_file_close') : Dictionary.getValue('ls_win_learners_close_btn'); main_mc = competence_editor_scp.content; @@ -152,7 +151,7 @@ selectedActivityUIID = app.monitor.model.selectedItem.activity.activityUIID; if (app.monitor.ddm.activities.get(selectedActivityUIID) instanceof ToolActivity) { var activityTitle:String = ToolActivity(app.monitor.ddm.activities.get(selectedActivityUIID)).title; - competence_lbl.text = "Competences mapped to "+activityTitle; + competence_lbl.text = Dictionary.getValue("competences_mapped_to_act_lbl", [activityTitle]); } } else { Debugger.log("model type not recognized", Debugger.CRITICAL, "setUpContent", "CompetenceEditorDialog"); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as (.../CompetenceMappingDialog.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as (.../CompetenceMappingDialog.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -104,10 +104,9 @@ themeManager = ThemeManager.getInstance(); //Set the text for buttons - //close_btn.label = Dictionary.getValue('al_ok'); - competence_mapping_lbl.text = "Competences mapped to "+app.canvas.model.selectedItem.activity.title; + competence_mapping_lbl.text = Dictionary.getValue("competences_mapped_to_act_lbl", [app.canvas.model.selectedItem.activity.title]); - close_btn.label = "OK"; + close_btn.label = Dictionary.getValue("prefs_dlg_ok"); main_mc = competence_mapping_scp.content; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as (.../CanvasHelper.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -823,7 +823,7 @@ public function openCompetenceEditorWindow() { var controller:CanvasController = canvasView.getController(); - app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:"Competence Editor",closeButton:true, resize:false, scrollContentPath:'CompetenceEditorDialog'}); + app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('competence_editor_dlg'), closeButton:true, resize:false, scrollContentPath:'CompetenceEditorDialog'}); app.dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded)); } @@ -832,7 +832,7 @@ */ public function openCompetenceDefinitionWindow():MovieClip { var controller:CanvasController = canvasView.getController(); - var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:"Competence Definition Dialog", closeButton:true, scrollContentPath:'CompetenceDefinitionDialog'}); + var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue('competence_def_dlg'), closeButton:true, scrollContentPath:'CompetenceDefinitionDialog'}); dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded)); return dialog; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -195,7 +195,7 @@ _define_monitor_cb.label = Dictionary.getValue('pi_define_monitor_cb_lbl'); //TODO Internationalise - _map_competence_btn.label = "Map to competences"; + _map_competence_btn.label = Dictionary.getValue('map_comptence_btn'); // Branch _pi_defaultBranch_cb.label = Dictionary.getValue("pi_defaultBranch_cb_lbl"); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -1200,7 +1200,7 @@ private function onMapCompetenceClick(evt:Object){ // open group to competence mapping window - _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:"Competence Mappings", closeButton:true, resize:false, scrollContentPath:'CompetenceMappingDialog'}); + _app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue("competence_mappings_btn"), closeButton:true, resize:false, scrollContentPath:'CompetenceMappingDialog'}); } public function openConditionMatchDialog():Void { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as (.../ViewCompetencesDialog.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as (.../ViewCompetencesDialog.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -112,7 +112,7 @@ close_btn.label = Dictionary.getValue('ls_win_learners_close_btn'); //Set the labels - competences_lbl.text = "Competences in learning design: "+ app.monitor.ddm.title; + competences_lbl.text = Dictionary.getValue('view_competences_in_ld_lbl', [app.monitor.ddm.title]); //EVENTS //Add event listeners for ok, cancel and close buttons Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -215,7 +215,7 @@ public function showMappedCompetences() { var controller:MonitorController = monitorView.getController(); - var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:"Mapped Competences",closeButton:true,scrollContentPath:'CompetenceEditorDialog'}); + var dialog:MovieClip = PopUpManager.createPopUp(Application.root, LFWindow, true,{title:Dictionary.getValue("mapped_competences_lbl"),closeButton:true,scrollContentPath:'CompetenceEditorDialog'}); dialog.addEventListener('contentLoaded',Delegate.create(controller, controller.openDialogLoaded)); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -708,7 +708,7 @@ * Opens the view competences dialog */ public function showCompetencesDialog(mm:MonitorModel) { - var opendialog:MovieClip = PopUpManager.createPopUp(mm.getMonitor().root, LFWindow, false,{title:"View Competences",closeButton:true,scrollContentPath:'viewCompetencesDialog'}); + var opendialog:MovieClip = PopUpManager.createPopUp(mm.getMonitor().root, LFWindow, false,{title:Dictionary.getValue('view_competences_dlg'),closeButton:true,scrollContentPath:'viewCompetencesDialog'}); opendialog.addEventListener('contentLoaded',Delegate.create(_monitorController,testFunction)); } Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as (.../LFMenuBar.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as (.../LFMenuBar.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -177,8 +177,7 @@ tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_opt'), instanceName:"drawOptionalItem"}); tools_menu.addMenuItem({type:"separator"}); - tools_menu.addMenuItem({label:"Competence Editor", instanceName:"competenceEditor"}); - //tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_competence'), instanceName:"competenceEditor"}); + tools_menu.addMenuItem({label:Dictionary.getValue('competence_editor_dlg'), instanceName:"competenceEditor"}); //tools_menu.addMenuItem({type:"separator"}); //tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_prefs'), instanceName:"prefsItem", enabled:false}); @@ -225,8 +224,7 @@ view_menu = _mb.addMenu(Dictionary.getValue('mnu_view')); view_menu.addMenuItem({label:Dictionary.getValue('mnu_view_learners'), instanceName:"viewLearners", enabled:false}); - //view_menu.addMenuItem({label:Dictionary.getValue('mnu_view_competences'), instanceName:"viewCompetences", enabled:false}); - view_menu.addMenuItem({label:"View Competences", instanceName:"viewCompetences", enabled:true}); + view_menu.addMenuItem({label:Dictionary.getValue('view_competences_dlg'), instanceName:"viewCompetences", enabled:true}); /*================= GO MENU Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as =================================================================== diff -u -r6071623eaaab7f58e5c1befe499b0fc1c76850dc -r327655a8d92f9ed44f5662c92704ade48ec4c1ed --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as (.../CustomContextMenu.as) (revision 6071623eaaab7f58e5c1befe499b0fc1c76850dc) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as (.../CustomContextMenu.as) (revision 327655a8d92f9ed44f5662c92704ade48ec4c1ed) @@ -117,8 +117,7 @@ menuArr[5] = [Dictionary.getValue('ccm_paste_activity'),getPaste, false, v, authorC]; menuArr[6] = [Dictionary.getValue('ccm_pi'),getPI, true, true, authorC]; menuArr[7] = [Dictionary.getValue('ccm_author_activityhelp'),getHelp, false, v, authorC]; - //menuArr[8] = [Dictionary.getValue('ccm_author_activityhelp'),getHelp, false, v, authorC]; - menuArr[8] = ["View Mapped Competences",getMappedCompetences, false, v, monitorC]; + menuArr[8] = [Dictionary.getValue('view_act_mapped_competences'),getMappedCompetences, false, v, monitorC]; for (var i=0; i