inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Daily merge.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-12 20:22:46 +00:00
parent 1250a0352c
commit 1dd2a7b72b
67 changed files with 1364 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/web/config/LanguagesConfigElement.java
View File

@@ -69,28 +69,28 @@ public class LanguagesConfigElement extends ConfigElementAdapter
*/
public ConfigElement combine(ConfigElement configElement)
{
LanguagesConfigElement existingElement = (LanguagesConfigElement)configElement;
LanguagesConfigElement newElement = new LanguagesConfigElement();
LanguagesConfigElement newElement = (LanguagesConfigElement)configElement;
LanguagesConfigElement combinedElement = new LanguagesConfigElement();
// add the languages from this config element
for (String locale : this.languages)
{
newElement.addLanguage(locale, this.localeMap.get(locale));
combinedElement.addLanguage(locale, this.localeMap.get(locale));
}
// now add the languages from the one to be combined (but
// only if they are not already in the list)
List<String> languages = existingElement.getLanguages();
List<String> languages = newElement.getLanguages();
for (String locale : languages)
{
if (newElement.getLabelForLanguage(locale) == null)
if (combinedElement.getLabelForLanguage(locale) == null)
{
String label = existingElement.getLabelForLanguage(locale);
newElement.addLanguage(locale, label);
String label = newElement.getLabelForLanguage(locale);
combinedElement.addLanguage(locale, label);
}
}
return newElement;
return combinedElement;
}
/**