svn commit: r686622 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/includes/ framework/common/webcommon/includes/ framework/widget/src/org/ofbiz/widget/cache/ framework/widget/src/org/ofbiz/widget/screen/

[adrianc]

Author: adrianc
Date: Sun Aug 17 09:37:42 2008
New Revision: 686622

URL: http://svn.apache.org/viewvc?rev=686622&view=rev
Log:
Removed availableLocales and availableTimeZones from screen rendering context - they are not needed anymore. Also deleted an unused ftl file.

Removed:
    ofbiz/trunk/framework/common/webcommon/includes/language.ftl
Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl
    ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl
    ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java

Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl?rev=686622&r1=686621&r2=686622&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl Sun Aug 17 09:37:42 2008
@@ -24,6 +24,7 @@
     <div class="screenlet-body" style="text-align: center;">
         <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;">
           <select name="newLocale" class="selectBox" style="width:95%" onchange="submit()">
+            <#assign availableLocales = Static["org.ofbiz.base.util.UtilMisc"].availableLocales()/>
             <#list availableLocales as availableLocale>
               <#assign langAttr = availableLocale.toString()?replace("_", "-")>
               <#assign langDir = "ltr">

Modified: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl?rev=686622&r1=686621&r2=686622&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl Sun Aug 17 09:37:42 2008
@@ -41,6 +41,7 @@
   </div>
   <table cellspacing="0" class="basic-table hover-bar">
     <#assign altRow = true>
+    <#assign availableLocales = Static["org.ofbiz.base.util.UtilMisc"].availableLocales()/>
     <#list availableLocales as availableLocale>
         <#assign altRow = !altRow>
         <#assign langAttr = availableLocale.toString()?replace("_", "-")>

Modified: ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl?rev=686622&r1=686621&r2=686622&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/listTimezones.ftl Sun Aug 17 09:37:42 2008
@@ -42,6 +42,7 @@
   <table cellspacing="0" class="basic-table hover-bar">
     <#assign altRow = true>
     <#assign displayStyle = Static["java.util.TimeZone"].LONG>
+    <#assign availableTimeZones = Static["org.ofbiz.base.util.UtilDateTime"].availableTimeZones()/>
     <#list availableTimeZones as availableTz>
       <#assign altRow = !altRow>
       <tr<#if altRow> class="alternate-row"</#if>>

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java?rev=686622&r1=686621&r2=686622&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/cache/WidgetContextCacheKey.java Sun Aug 17 09:37:42 2008
@@ -45,8 +45,6 @@
         fieldNamesToSkip.add("userLogin");
         fieldNamesToSkip.add("screens");
         fieldNamesToSkip.add("nullField");
-        fieldNamesToSkip.add("availableLocales");
-        fieldNamesToSkip.add("availableTimeZones");
         fieldNamesToSkip.add("autoUserLogin");
         fieldNamesToSkip.add("person");
         fieldNamesToSkip.add("partyGroup");

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java?rev=686622&r1=686621&r2=686622&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ScreenRenderer.java Sun Aug 17 09:37:42 2008
@@ -150,10 +150,6 @@
         // make sure the "nullField" object is in there for entity ops; note this is nullField and not null because as null causes problems in FreeMarker and such...
         context.put("nullField", GenericEntity.NULL_FIELD);
 
-        // get all locale & time zone information
-        context.put("availableLocales", UtilMisc.availableLocales());
-        context.put("availableTimeZones", UtilDateTime.availableTimeZones());
-
         context.put("parameters", parameters);
         context.put("delegator", delegator);
         context.put("dispatcher", dispatcher);