[Yanel-commits] rev 25769 -
public/yanel/trunk/src/core/java/org/wyona/yanel/core
michi at wyona.com
michi at wyona.com
Wed Jul 4 15:43:06 CEST 2007
Author: michi
Date: 2007-07-04 15:43:05 +0200 (Wed, 04 Jul 2007)
New Revision: 25769
Modified:
public/yanel/trunk/src/core/java/org/wyona/yanel/core/Resource.java
Log:
differentiate between content language and localization
Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/Resource.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/Resource.java 2007-07-04 12:49:52 UTC (rev 25768)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/Resource.java 2007-07-04 13:43:05 UTC (rev 25769)
@@ -250,30 +250,51 @@
}
/**
- * Get language with the following priorization: <br><br>
+ * Get content language resp. the language of this translation (see getRequestedLanguage re localization)
+ */
+ public String getContentLanguage() throws Exception {
+ String language = null;
+ if (ResourceAttributeHelper.hasAttributeImplemented(this, "Translatable", "1")) {
+ language = ((TranslatableV1)this).getLanguage();
+ }
+ if (language != null) return language;
+
+ language = getResourceConfigProperty("language");
+ if (language != null) return language;
+
+ return language;
+ }
+
+ /**
+ * Get language (localization) with the following priorization: <br><br>
* 1) yanel.meta.language query string parameter<br>
- * 2) Translation Manager (if translatable)<br>
- * 3) Resource Configuration property<br>
- * 4) Accept-Language header<br>
- * 5) Realm default language<br>
- * 6) Default "en"<br>
+ * 2) Accept-Language header<br>
+ * 3) Realm default language<br>
+ * 4) Default "en"<br>
*/
public String getRequestedLanguage() throws Exception {
// TODO: Make this reusable. Also see org/wyona/yanel/servlet/YanelServlet.java
+ // TODO: Use user profile setting resp. session (allow switching the locale)
+
// (1)
String language = getRequest().getParameter("yanel.meta.language");
if (language != null) return language;
+/*
+ // TODO: Does this really belong here resp. shouldn't it be used with a different priority?
// (2)
if (ResourceAttributeHelper.hasAttributeImplemented(this, "Translatable", "1")) {
language = ((TranslatableV1)this).getLanguage();
}
if (language != null) return language;
+*/
+/*
// (3)
language = getResourceConfigProperty("language");
if (language != null) return language;
+*/
// (4)
language = getRequest().getHeader("Accept-Language");
More information about the Yanel-commits
mailing list