You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/07/27 00:04:45 UTC
svn commit: r425870 - in /incubator/roller/branches/roller_3.0:
src/org/apache/roller/ui/core/ src/org/apache/roller/ui/rendering/model/
src/org/apache/roller/ui/rendering/velocity/deprecated/
tests/org/apache/roller/ui/
Author: agilliland
Date: Wed Jul 26 15:04:44 2006
New Revision: 425870
URL: http://svn.apache.org/viewvc?rev=425870&view=rev
Log:
ripping out old LanguageUtil stuff which is no longer valid.
- deleted LanguageUtil and LanguageUtilTest
- updated old ContextLoader with final tweak to pass down locale from weblog request where needed.
- EOLed old getSupportedLanguages() method from old page helper, that method is no longer applicable, so it just returns null now.
Removed:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/LanguageUtil.java
incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/LanguageUtilTest.java
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarModel.java?rev=425870&r1=425869&r2=425870&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/CalendarModel.java Wed Jul 26 15:04:44 2006
@@ -27,7 +27,6 @@
import org.apache.roller.RollerException;
import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
import org.apache.roller.ui.core.tags.calendar.BigWeblogCalendarModel;
-import org.apache.roller.ui.core.LanguageUtil;
import org.apache.roller.ui.core.tags.calendar.CalendarTag;
import org.apache.roller.ui.core.tags.calendar.WeblogCalendarModel;
import org.apache.roller.ui.rendering.util.WeblogPageRequest;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java?rev=425870&r1=425869&r2=425870&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/ContextLoader.java Wed Jul 26 15:04:44 2006
@@ -51,7 +51,6 @@
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
import org.apache.roller.pojos.wrapper.WebsiteDataWrapper;
import org.apache.roller.ui.authoring.struts.formbeans.CommentFormEx;
-import org.apache.roller.ui.core.LanguageUtil;
import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.core.RollerSession;
import org.apache.roller.ui.rendering.newsfeeds.NewsfeedCache;
@@ -213,7 +212,7 @@
ctx.put("pageHelper", pageHelper);
// Load standard Roller objects and values into the context
- loadWeblogValues(ctx, weblog, request);
+ loadWeblogValues(ctx, weblog, pageRequest.getLocaleInstance(), request);
loadPathValues(ctx, request, rollerCtx, weblog);
loadRssValues(ctx, request, weblog, category);
loadUtilityObjects(ctx, request, rollerCtx, weblog, page);
@@ -236,6 +235,7 @@
private static void loadWeblogValues(
Map ctx,
WebsiteData weblog,
+ Locale locale,
HttpServletRequest request) throws RollerException {
// weblog cannot be null
@@ -266,9 +266,8 @@
String siteShortName = ((RollerPropertyData)props.get("site.shortName")).getValue();
ctx.put("siteShortName", siteShortName);
- // add language of the session (using locale of viewer set by Struts)
- // TODO 3.0: this will probably need tweaking for multi-lang support
- ctx.put("viewLocale", LanguageUtil.getViewLocale(request));
+ // add language of the session (using locale specified by request)
+ ctx.put("viewLocale", locale);
mLogger.debug("context viewLocale = "+ctx.get( "viewLocale"));
// alternative display pages - customization
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java?rev=425870&r1=425869&r2=425870&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/velocity/deprecated/OldPageHelper.java Wed Jul 26 15:04:44 2006
@@ -42,7 +42,6 @@
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.pojos.wrapper.RefererDataWrapper;
import org.apache.roller.pojos.wrapper.WeblogEntryDataWrapper;
-import org.apache.roller.ui.core.LanguageUtil;
import org.apache.roller.ui.core.RequestConstants;
import org.apache.roller.ui.core.RollerContext;
import org.apache.roller.ui.core.RollerSession;
@@ -390,43 +389,15 @@
/**
- * This method returns an array of Locales for each supported
- * language available, with the exeception of the language of the
- * current locale, if that language is supported.
+ * This method used to return an array of supported locales based on some
+ * of the old i18n work done in Roller, however, as of Roller 3.0 there is
+ * no longer a list of supported languages. The languages available to a
+ * weblog are unbounded and are purely determined by the weblog author.
*
- * So, if English and Dutch are supported, and the current Locale is Dutch,
- * only English is returned. If the current Locale is Spanish, both English and Dutch are
- * returned.
- *
- * TODO 3.0: decide what to do with this method
- *
- * @return
+ * This method always returns null.
*/
public Locale[] getSupportedLanguages() {
- Locale currentLocale =
- (Locale) mRequest.getSession().getAttribute(Globals.LOCALE_KEY);
- if (currentLocale==null) {
- currentLocale = mRequest.getLocale();
- }
-
- Locale[] supportedLanguages =
- LanguageUtil.getSupportedLanguages(RollerContext.getServletContext());
- if (supportedLanguages==null) {
- return null;
- }
-
- // filter out the current selected language
- Vector result = new Vector();
- for (int i = 0; i < supportedLanguages.length; i++) {
- if (currentLocale == null
- || (!supportedLanguages[i].equals(currentLocale)
- && !supportedLanguages[i].equals(
- new Locale(currentLocale.getLanguage())))
- ) {
- result.add(supportedLanguages[i]);
- }
- }
- return (Locale[]) result.toArray(new Locale[result.size()]);
+ return null;
}