LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sprachunabhängige Items 

Config-Parameter für den Language Code der Sprachunabhängigen Content Items

TimeParameter: Weitere Anpassung an der Speicherung des Stundenwerts

git-svn-id: https://svn.libreccm.org/ccm/trunk@1210 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2011-10-27 19:18:53 +00:00
parent c8fb7a4e7a
commit b6b6b98a52
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ccm-core/src/com/arsdigita/bebop/parameters/TimeParameter.java
View File

@ -90,9 +90,17 @@ public class TimeParameter extends ParameterModel
if (!StringUtils.emptyString(hour)) { if (!StringUtils.emptyString(hour)) {
int hourInt = Integer.parseInt(hour); int hourInt = Integer.parseInt(hour);
/* Das ist alles Blödsinn. Beim 24-Stundenformat brauchen wir das sowieso nicht.
Beim 12-Stunden-Formato müßte es, wenn überhaupt, anderherum sein: Aus einer
eingetragenen 0 in den Stunden muß eine 12 werden. ABER: Die Informationen
werden in einem Calendar-Object gespeichert, das intern immer 24-Stunden-Format
verwendet. Das 12-Stunden-Format ist eine Frage der Formatierung und somit
hier irrelevant. Es bleibt zu testet, ob ein 12:00 AM im Caendar-Object tatsächlich
zu 0:00 Uhr wird.
if ((hourInt == 12) && has12HourClock()) { if ((hourInt == 12) && has12HourClock()) {
hourInt = 0; hourInt = 0;
} }
*/
c.set(Calendar.HOUR, hourInt); c.set(Calendar.HOUR, hourInt);
} }

2
ccm-core/src/com/arsdigita/globalization/GlobalizationHelper.java
View File

@ -20,7 +20,7 @@ import javax.servlet.http.HttpSession;
*/ */
public class GlobalizationHelper { public class GlobalizationHelper {
public static final String LANG_INDEPENDENT = "--"; public static final String LANG_INDEPENDENT = Kernel.getConfig().getLanguagesIndependentCode();
private static final String LANG_PARAM = "lang"; private static final String LANG_PARAM = "lang";
// Don't instantiate // Don't instantiate

11
ccm-core/src/com/arsdigita/kernel/KernelConfig.java
View File

@ -81,6 +81,9 @@ public final class KernelConfig extends AbstractConfig {
"en,de,fr,nl,it,pt,es"); "en,de,fr,nl,it,pt,es");
private final Parameter m_languageIndependentItems = new BooleanParameter private final Parameter m_languageIndependentItems = new BooleanParameter
("waf.kernel.language_independent_items", Parameter.REQUIRED, Boolean.FALSE); ("waf.kernel.language_independent_items", Parameter.REQUIRED, Boolean.FALSE);
private final Parameter m_languageIndependentCode = new StringParameter
("waf.kernel.languages_independent_code", Parameter.OPTIONAL,
"--");
public KernelConfig() { public KernelConfig() {
@ -104,6 +107,7 @@ public final class KernelConfig extends AbstractConfig {
register(m_secureLogin); register(m_secureLogin);
register(m_supportedLanguages); register(m_supportedLanguages);
register(m_languageIndependentItems); register(m_languageIndependentItems);
register(m_languageIndependentCode);
loadInfo(); loadInfo();
} }
@ -179,6 +183,13 @@ public final class KernelConfig extends AbstractConfig {
return new StringTokenizer(this.getSupportedLanguages(), ",", false); return new StringTokenizer(this.getSupportedLanguages(), ",", false);
} }
/**
* Returns the languagesIndependentCode as String.
*/
public final String getLanguagesIndependentCode() {
return (String) get(m_languageIndependentCode);
}
/** /**
* Return true, if language lang is part of supported langs * Return true, if language lang is part of supported langs
*/ */

4
ccm-core/src/com/arsdigita/kernel/KernelConfig_parameter.properties
View File

@ -30,3 +30,7 @@ waf.kernel.language_independent_items.title=Allow language independent content i
waf.kernel.language_independent_items.purpose=Allow language independent content items waf.kernel.language_independent_items.purpose=Allow language independent content items
waf.kernel.language_independent_items.example=false waf.kernel.language_independent_items.example=false
waf.kernel.language_independent_items.format=true|false waf.kernel.language_independent_items.format=true|false
waf.kernel.language_independent_code.title=Select language independent code
waf.kernel.language_independent_code.purpose=Allow language independent code
waf.kernel.language_independent_code.example=--
waf.kernel.language_independent_code.format=[string]