Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v diff -u -r1.83 -r1.84 --- lams_central/conf/language/lams/ApplicationResources.properties 28 Aug 2009 04:02:59 -0000 1.83 +++ lams_central/conf/language/lams/ApplicationResources.properties 28 Aug 2009 07:20:55 -0000 1.84 @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Aug 27 21:43:02 CST 2009 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon May 11 01:00:44 CST 2009 #=================== labels for LAMS Central =================# @@ -230,7 +230,6 @@ lessonsearch.title =Search learners in lesson lessonsearch.instuctions =Please enter the login, first or last name of the learner. As you type the name of the matching learners will appear. index.searchlesson =Learner Search -public.folder =Public Folder label.enable.lesson.sorting =Enable lesson sorting videorecorder.instructions.fck =Click the record button to start and stop recording. Once a recording is completed, you can review it by clicking the play button. When ready to add the video, click the tick button. index.coursegradebook.tooltip =Open course-wide Gradebook monitoring page Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.76 -r1.77 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 28 Aug 2009 04:02:59 -0000 1.76 +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 28 Aug 2009 07:20:56 -0000 1.77 @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Aug 27 21:43:02 CST 2009 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sun Jul 05 07:01:55 CST 2009 #=================== labels for LAMS Central =================# @@ -230,7 +230,6 @@ lessonsearch.title =Search learners in lesson lessonsearch.instuctions =Please enter the login, first or last name of the learner. As you type the name of the matching learners will appear. index.searchlesson =Learner Search -public.folder =Public Folder label.enable.lesson.sorting =Enable lesson sorting videorecorder.instructions.fck =Click the record button to start and stop recording. Once a recording is completed, you can review it by clicking the play button. When ready to add the video, click the tick button. index.coursegradebook.tooltip =Open course-wide Gradebook monitoring page Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java,v diff -u -r1.53 -r1.54 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 2 Jul 2009 08:19:15 -0000 1.53 +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java 28 Aug 2009 07:20:56 -0000 1.54 @@ -1220,7 +1220,6 @@ } if(publicFolder != null) { - publicFolder.setName(messageService.getMessage("public.folder")); Integer permissions = getPermissions(publicFolder, user); return new FolderContentDTO(publicFolder, permissions, user); } Index: lams_common/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources.properties,v diff -u -r1.28 -r1.29 --- lams_common/conf/language/lams/ApplicationResources.properties 5 Jul 2009 13:21:35 -0000 1.28 +++ lams_common/conf/language/lams/ApplicationResources.properties 28 Aug 2009 07:20:52 -0000 1.29 @@ -58,6 +58,6 @@ validation.error.first.activity =You need at least one activity in the sequence. validation.error.FloatingActivity.maximum =A maximum of {0} support activities is allow. Please remove one or more support activities. validation.error.FloatingActivity =If you are planning to have support activities you need at least one support activity in the container. +public.folder =Public Folder - #======= End labels: Exported 52 labels for en AU ===== Index: lams_common/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.24 -r1.25 --- lams_common/conf/language/lams/ApplicationResources_en_AU.properties 5 Jul 2009 13:21:35 -0000 1.24 +++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties 28 Aug 2009 07:20:52 -0000 1.25 @@ -58,6 +58,7 @@ validation.error.first.activity =You need at least one activity in the sequence. validation.error.FloatingActivity.maximum =A maximum of {0} support activities is allow. Please remove one or more support activities. validation.error.FloatingActivity =If you are planning to have support activities you need at least one support activity in the container. +public.folder =Public Folder #======= End labels: Exported 52 labels for en AU ===== Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml,v diff -u -r1.85 -r1.86 --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 20 Aug 2009 04:37:19 -0000 1.85 +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml 28 Aug 2009 07:20:52 -0000 1.86 @@ -494,6 +494,7 @@ + Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java,v diff -u -r1.20 -r1.21 --- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java 17 Aug 2009 02:35:23 -0000 1.20 +++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java 28 Aug 2009 07:20:52 -0000 1.21 @@ -27,6 +27,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import org.apache.commons.lang.StringUtils; @@ -35,6 +36,7 @@ import org.lamsfoundation.lams.config.Registration; import org.lamsfoundation.lams.config.dao.hibernate.ConfigurationDAO; import org.lamsfoundation.lams.config.dao.hibernate.RegistrationDAO; +import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; import org.springframework.beans.factory.InitializingBean; /** @@ -55,6 +57,8 @@ protected ConfigurationDAO configurationDAO; protected static RegistrationDAO registrationDAO; + + protected MessageService messageService; /** * @param configurationDAO @@ -157,9 +161,25 @@ // update ssl truststore path and password setSystemProperty(ConfigurationKeys.TRUSTSTORE_PATH, get(ConfigurationKeys.TRUSTSTORE_PATH)); setSystemProperty(ConfigurationKeys.TRUSTSTORE_PASSWORD, get(ConfigurationKeys.TRUSTSTORE_PASSWORD)); + updatePublicFolderName(); configurationDAO.insertOrUpdateAll(items.values()); } + private void updatePublicFolderName() { + // LDEV-2430 update public folder name according to default server locale + WorkspaceFolder publicFolder = null; + List list = configurationDAO.findByProperty(WorkspaceFolder.class, "workspaceFolderType", + WorkspaceFolder.PUBLIC_SEQUENCES); + + if (list != null && list.size() > 0) { + publicFolder = (WorkspaceFolder) list.get(0); + String[] langCountry = LanguageUtil.getDefaultLangCountry(); + Locale locale = new Locale(langCountry[0], langCountry[1]); + publicFolder.setName(messageService.getMessageSource().getMessage("public.folder", null, locale)); + configurationDAO.update(publicFolder); + } + } + public String toString() { return "Configuration items:" + (items != null ? items.toString() : "none"); } @@ -189,4 +209,12 @@ public void setRegistrationDAO(RegistrationDAO registrationDAO) { this.registrationDAO = registrationDAO; } + + public MessageService getMessageService() { + return messageService; + } + + public void setMessageService(MessageService messageService) { + this.messageService = messageService; + } }