From 15d6aa4bca49773da93a91d0415caa25af9d6a3f Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 15 Dec 2016 11:06:25 +0000 Subject: [PATCH] Added supported languages (from KernelConfig) to SiteBanner XML output. LanguageSelector in Foundry now uses these values. git-svn-id: https://svn.libreccm.org/ccm/trunk@4479 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/src/com/arsdigita/ui/SiteBanner.java | 14 ++++++++++++++ .../foundry/foundry/lib/template-tags/language.xsl | 3 +++ 2 files changed, 17 insertions(+) diff --git a/ccm-core/src/com/arsdigita/ui/SiteBanner.java b/ccm-core/src/com/arsdigita/ui/SiteBanner.java index 15fbef28f..e60805079 100755 --- a/ccm-core/src/com/arsdigita/ui/SiteBanner.java +++ b/ccm-core/src/com/arsdigita/ui/SiteBanner.java @@ -21,8 +21,10 @@ package com.arsdigita.ui; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.SimpleComponent; import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelConfig; import com.arsdigita.web.Web; import com.arsdigita.xml.Element; +import java.util.StringTokenizer; /** * @@ -40,6 +42,8 @@ public class SiteBanner extends SimpleComponent { content.addAttribute("hostname", getHostname()); content.addAttribute("sitename", getSiteName()); content.addAttribute("admin", getAdminContactEmail()); + + addSupportedLanguages(content); } protected String getHostname() { @@ -54,4 +58,14 @@ public class SiteBanner extends SimpleComponent { return Kernel.getSecurityConfig().getAdminContactEmail(); } + protected void addSupportedLanguages(final Element content) { + final Element supportedLangsElem = content.newChildElement("supportedLanguages"); + + final StringTokenizer languages = KernelConfig.getConfig().getSupportedLanguagesTokenizer(); + while(languages.hasMoreTokens()) { + final Element langElem = supportedLangsElem.newChildElement("language"); + langElem.addAttribute("locale", languages.nextToken()); + } + } + } diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl index bef94d417..2363e8c0b 100644 --- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl +++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/language.xsl @@ -105,6 +105,9 @@ + +