Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u
--- lams_admin/conf/language/ApplicationResources.properties (revision 0)
+++ lams_admin/conf/language/ApplicationResources.properties (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -0,0 +1,29 @@
+# CVS ID: $Id$
+# Language strings for the Admin classes and screens.
+
+#=========================List jobs in Quartz===========================#
+title.job.list = Jobs
+lable.job.name= Job name
+lable.job.start.date=Job start date
+lable.job.description=Job description
+
+#=========================Error Messages===========================#
+error.authorisation=You are not authorised to do this.
+error.newpassword.mismatch=Your new passwords don't match each other.
+error.oldpassword.mismatch=Your old password is not correct.
+
+#===================== Main Sysadmin Screen ======================#
+sysadmin.manage.config.file=Manage Configuration File
+sysadmin.batch.heading=Batch Tasks
+sysadmin.batch.description=These need to be converted to batch jobs, able to be run from cron.
+sysadmin.batch.temp.file.delete=Delete old temporary files
+sysadmin.batch.preview.delete=Delete old Preview lessons
+
+#===================== Cache Screen ==============================#
+cache.title=Cache Management
+cache.entries.title=Cache Nodes
+cache.explanation1=Listed below are the current nodes in the cache. This keeps certain common objects in memory to speed up LAMS. It is managed automatically and should not require any intervention. However, if the system appears to be keeping "old values" e.g. an old first name, try clearing all the nodes in the cache. Once cleared, LAMS will reload the objects from the database.
+cache.explanation2=Warning: Removing nodes will reduce the performance of the LAMS server. After a while, the cache will build up again and LAMS will run as usual.
+cache.explanation3=Warning: If you remove a node, you will remove the node and all its child nodes.
+cache.button.remove=Remove
+
Fisheye: Tag a7766445094c16b343aa56dc1f73fd3051cef1db refers to a dead (removed) revision in file `lams_admin/conf/language/applicationResources.properties'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_admin/conf/xdoclet/struts-message-resources.xml
===================================================================
diff -u -r001568fdeabd68c6ba46398e0ae42328fe64f5db -ra7766445094c16b343aa56dc1f73fd3051cef1db
--- lams_admin/conf/xdoclet/struts-message-resources.xml (.../struts-message-resources.xml) (revision 001568fdeabd68c6ba46398e0ae42328fe64f5db)
+++ lams_admin/conf/xdoclet/struts-message-resources.xml (.../struts-message-resources.xml) (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -1 +1 @@
-
+
Index: lams_admin/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8 -ra7766445094c16b343aa56dc1f73fd3051cef1db
--- lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8)
+++ lams_admin/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -216,7 +216,7 @@
-
+
-
+ SystemSessionFilter
org.lamsfoundation.lams.web.session.SystemSessionFilter
@@ -48,7 +48,7 @@
-
+ SystemSessionFilter/*
Index: lams_central/conf/language/ApplicationResources.properties
===================================================================
diff -u
--- lams_central/conf/language/ApplicationResources.properties (revision 0)
+++ lams_central/conf/language/ApplicationResources.properties (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -0,0 +1,58 @@
+# CVS ID: $Id$
+# Language strings for the Authoring and Workspace classes. Mostly error messages.
+
+#=========================Error Messages===========================#
+error.authorisation=You are not authorised to do this.
+error.newpassword.mismatch=Your new passwords don't match each other.
+error.oldpassword.mismatch=Your old password is not correct.
+
+# Flash related messages
+
+flash.validation.error.other=Other Error
+flash.validation.error.transitionNoActivityBeforeOrAfter=A Transition must have an activity before or after the transition
+flash.validation.error.activityWithNoTransition=An activity must have an input or output transition
+flash.validation.error.inputTransitionType1=There is more than one activity with no input transition
+flash.validation.error.inputTransitionType2=No activities are missing their input transition.
+flash.validation.error.outputTransitionType1=There is more than one activity with no output transition
+flash.validation.error.outputTransitionType2=No activities are missing their output transition.
+flash.validation.error.GroupingRequired=Grouping is required
+flash.validation.error.GroupingNotRequired=Grouping is not supported
+flash.validation.error.GroupingSelected=Grouping is selected but does not exist
+flash.validation.error.OptionalActivity=An Optional Activity must have one or more activities
+flash.validation.error.OptionalActivityOrderId=This Optional Activity has invalid order ids
+flash.validation.error.illegalScheduleGateOffsetsType1=A Schedule Gate cannot have equal start and end time offsets.
+flash.validation.error.illegalScheduleGateOffsetsType2=A Schedule Gate cannot have the start time offset greater than end time offset
+#
+invalid.wddx.packet=Invalid Object in WDDX packet. Error was {0}.
+no.such.learningdesign.exist=No Learning Design with learning_design_id of:{0} exists.
+no.such.user.exist=No such User with a user_id of: {0} exists.
+no.such.workspace.exist=No such WorkspaceFolder with workspace_folder_id of:{0} exists.
+#====================================================================#
+#=========================WorkingSpace labels===========================#
+#====================================================================#
+delete.resource.error=Cannot delete the resource: {0}
+delete.resource.error.value.miss=deleteResource(Long resourceID, String resourceType, Integer userID) requires a value for resourceID, resourceType and userID.
+delete.lesson.error=LAMS does not support deleting a lesson via the workspace interface.
+delete.folder.error=Cannot delete this folder as it is the Root folder.
+delete.learningdesign.error=Cannot delete design with learning_design_id of : {0} as it is READ ONLY.
+folder.delete=Folder deleted:{0}
+copy.resource.error=Cannot copy the resource:{0}
+copy.resource.error.value.miss=copyResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID
+copy.no.support=LAMS does not support copying a file via the workspace interface.
+unable.copy=Unable to copy learning design due to an error{0}.
+no.such.user=No such user with a userID of {0} exists.
+no.such.workspace=No such workspaceFolder with a workspace_folder_id of {0} exists.
+learningdesign.delete=Learning Design deleted:{0}
+learningdesign.readonly=Cannot delete design with learning_design_id of:{0} as it is READ ONLY.
+move.resource.error=Cannot move the resource:{0}
+move.resrouce.error.value.miss=moveResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID
+unsupport.move=LAMS does not support moving a file via the workspace interface.
+creating.workspace.folder.error= Exception occured while creating workspaceFolderContent:{0}.
+resource.already.exist="The resource {0} already exists in the repository: {1}.
+no.such.content="No such content with versionID of {0} found in repository {1}.
+content.delete.success=Content Successfully deleted.
+rename.resource.error=Cannot rename the resource: {0}
+rename.resource.error.miss.vaue=renameResource(Long resourceID,Integer newName, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID.
+rename.resource.unspport=LAMS does not support renaming a file via the workspace interface.
+folder.already.exist=A folder with given name '{0}' already exists.
+can.not.rename.root.folder=Cannot rename the ROOT folder.
\ No newline at end of file
Fisheye: Tag a7766445094c16b343aa56dc1f73fd3051cef1db refers to a dead (removed) revision in file `lams_central/conf/language/applicationResources.properties'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_central/conf/xdoclet/struts-message-resources.xml
===================================================================
diff -u -r0a36c0354f963276da36884d497ee30cdbdc34c0 -ra7766445094c16b343aa56dc1f73fd3051cef1db
--- lams_central/conf/xdoclet/struts-message-resources.xml (.../struts-message-resources.xml) (revision 0a36c0354f963276da36884d497ee30cdbdc34c0)
+++ lams_central/conf/xdoclet/struts-message-resources.xml (.../struts-message-resources.xml) (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
===================================================================
diff -u -r01a4035d52575ebe0a8467b4e589998196353962 -ra7766445094c16b343aa56dc1f73fd3051cef1db
--- lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (.../authoringApplicationContext.xml) (revision 01a4035d52575ebe0a8467b4e589998196353962)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (.../authoringApplicationContext.xml) (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -13,7 +13,7 @@
- org.lamsfoundation.lams.central.applicationResources
+ org.lamsfoundation.lams.central.ApplicationResources
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -rde1940e60766f8901436c6ab567c692685d5b35c -ra7766445094c16b343aa56dc1f73fd3051cef1db
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision de1940e60766f8901436c6ab567c692685d5b35c)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -559,16 +559,17 @@
+" message file "+activity.getLanguageFile()+". Activity Message source not available");
}
- // update the tool field
- languageFilename = activity.getToolLanguageFile();
- toolMessageSource = toolActMessageService.getMessageService(languageFilename);
- if ( toolMessageSource != null ) {
- activity.setToolDisplayName(toolMessageSource.getMessage(Tool.I18N_DISPLAY_NAME,null,activity.getToolDisplayName(),locale));
- } else {
- log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle()
+ // update the tool field - note only tool activities have a tool entry.
+ if ( activity.getActivityTypeID()!=null && Activity.TOOL_ACTIVITY_TYPE == activity.getActivityTypeID().intValue() ) {
+ languageFilename = activity.getToolLanguageFile();
+ toolMessageSource = toolActMessageService.getMessageService(languageFilename);
+ if ( toolMessageSource != null ) {
+ activity.setToolDisplayName(toolMessageSource.getMessage(Tool.I18N_DISPLAY_NAME,null,activity.getToolDisplayName(),locale));
+ } else {
+ log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle()
+" message file "+activity.getLanguageFile()+". Tool Message source not available");
+ }
}
-
} else {
log.warn("Unable to internationalise the library activity "+activity.getActivityID()+" "+activity.getTitle()
+". No message file supplied.");
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r25ca503e49d83e167cf7661d8b67b4547ee0cb87 -ra7766445094c16b343aa56dc1f73fd3051cef1db
--- lams_central/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 25ca503e49d83e167cf7661d8b67b4547ee0cb87)
+++ lams_central/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -159,7 +159,7 @@
-
+
- org.lamsfoundation.lams.applicationResources
+ org.lamsfoundation.lams.ApplicationResources
Index: lams_contentrepository/conf/language/ApplicationResources.properties
===================================================================
diff -u
--- lams_contentrepository/conf/language/ApplicationResources.properties (revision 0)
+++ lams_contentrepository/conf/language/ApplicationResources.properties (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -0,0 +1,13 @@
+# CVS ID: $Id$
+# Language strings for the Admin classes and screens.
+
+# Used for the demo pages - not used for the standard LAMS application.
+errors.mandatory={0} must not be empty.
+errors.filedirmandatory=Either a file must be uploaded or a directory selected.
+error.login=Unable to login to repository. Error: {0}.
+error.noTicket=The ticket is missing from the session. Unable to access the repository.
+error.entryStringNeeded=The file that "starts" the content is required when there is a zip file to be unpacked.
+error.uuidMissing=No node has been selected.
+error.repositoryUnexpected=The repository has returned an unexpected value. {0}
+exception.repository=An error occured involving the repository. {0}
+
Fisheye: Tag a7766445094c16b343aa56dc1f73fd3051cef1db refers to a dead (removed) revision in file `lams_contentrepository/conf/language/applicationResources.properties'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_contentrepository/conf/xdoclet/struts-message-resources.xml
===================================================================
diff -u -r41de4a8b5ff40c43e8eaadc76a33ebce112d6801 -ra7766445094c16b343aa56dc1f73fd3051cef1db
--- lams_contentrepository/conf/xdoclet/struts-message-resources.xml (.../struts-message-resources.xml) (revision 41de4a8b5ff40c43e8eaadc76a33ebce112d6801)
+++ lams_contentrepository/conf/xdoclet/struts-message-resources.xml (.../struts-message-resources.xml) (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -1 +1 @@
-
+
Index: lams_learning/conf/language/ApplicationResources.properties
===================================================================
diff -u
--- lams_learning/conf/language/ApplicationResources.properties (revision 0)
+++ lams_learning/conf/language/ApplicationResources.properties (revision a7766445094c16b343aa56dc1f73fd3051cef1db)
@@ -0,0 +1,28 @@
+# CVS ID: $Id$
+# Language strings for the Progress Engine related classes and screens. Mostly error messages.
+
+message.activity.loading=The next task is loading. Please wait....
+message.lesson.finished=Congratulations, you have finished.
+message.lesson.finishedCont=You have now completed your learning activity. Please log out or select a new session from the Available Sessions Panel
+message.activity.parallel.partialComplete=You have to complete the other task before progressing to the next activity....
+message.activity.parallel.noFrames=Your browser does not handle frames!
+message.activity.options.noActivitySelected=Please select an activity from the list
+message.activity.options.activityCount=You must complete at least {0} of these {1} activities.
+message.activity.options.note=Note: Once you finish any of the above activities you can revisit them by using the progress bar on the left.
+
+label.activity.options.choose=Choose
+label.activity.finish=Finish
+
+## Export Portfolio Functionality
+error.system.exportPortfolio=An internal error has occurred with the Export Portfolio Functionality. If reporting this error, please report: {0}
+error.system.learner=An internal error has occurred with the Learner Environment. If reporting this error, please report: {0}
+error.system.export=A system exception has occured and the portfolio could not be generated. Please contact Lams International technical support.
+error.message.404=The page you have requested can not be found.
+
+# HTML used to create main export page. The lesson name is inserted at {0} and the list of activities are inserted at {1}
+export.html.mainPage=Export Portfolio
Export Portfolio
Lesson: {0}
Activities
{1}
+# HTML used to create main export page when an portfolio is not available due to system constraints.
+export.html.exportFailed=Export Portfolio
Export Portfolio Failed
This sequence does not support portfolio exports
+# HTML used to create the export portfolio activity page when an activity does not support export portfolio (stops it being just a blank page)
+export.html.exportNotSupported=Export Portfolio Unsupported