Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r0df738f4b22890470dd96c8ed2e8f67369c8e4a7 -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0df738f4b22890470dd96c8ed2e8f67369c8e4a7) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b) @@ -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 =================================================================== diff -u -r0df738f4b22890470dd96c8ed2e8f67369c8e4a7 -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0df738f4b22890470dd96c8ed2e8f67369c8e4a7) +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b) @@ -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 =================================================================== diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision acc8d2acf5b6b0002e0c8129947040a779ab4077) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b) @@ -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 =================================================================== diff -u -r670004f992e5ed484da927cae0fa9f21802da40d -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b --- lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 670004f992e5ed484da927cae0fa9f21802da40d) +++ lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b) @@ -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 =================================================================== diff -u -r670004f992e5ed484da927cae0fa9f21802da40d -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b --- lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 670004f992e5ed484da927cae0fa9f21802da40d) +++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b) @@ -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 =================================================================== diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b --- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a) +++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (.../commonContext.xml) (revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b) @@ -494,6 +494,7 @@ + Index: lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java =================================================================== diff -u -rbb4a11ad15e68ddd1be733bbc87e9fb415ad2867 -r9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b --- lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java (.../Configuration.java) (revision bb4a11ad15e68ddd1be733bbc87e9fb415ad2867) +++ lams_common/src/java/org/lamsfoundation/lams/util/Configuration.java (.../Configuration.java) (revision 9d84474e30e1301deb7d3f2e6fcf6bcad6aa1e8b) @@ -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; + } }