OFBiz › OFBiz - Commits

svn commit: r572375 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/includes/ framework/common/src/org/ofbiz/common/ framework/common/webcommon/includes/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 2 messages Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r572375 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/includes/ framework/common/src/org/ofbiz/common/ framework/common/webcommon/includes/

jleroux@apache.org
Author: jleroux
Date: Mon Sep  3 08:56:51 2007
New Revision: 572375

URL: http://svn.apache.org/viewvc?rev=572375&view=rev
Log:
A patch from Adrian Crum for an issue from Bilgin Ibryam"Changing the language in party manager is broken" (https://issues.apache.org/jira/browse/OFBIZ-1223)
This patch définitively corrects the problem David raised + some cosmetic UI changes

Modified:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl
    ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java
    ofbiz/trunk/framework/common/webcommon/includes/language.ftl
    ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl

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=572375&r1=572374&r2=572375&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl Mon Sep  3 08:56:51 2007
@@ -23,7 +23,7 @@
     </div>
     <div class="screenlet-body" style="text-align: center;">
         <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;">
-          <select name="locale" class="selectBox" style="width:95%">
+          <select name="newLocale" class="selectBox" style="width:95%">
             <#list availableLocales as availableLocale>
               <#assign langAttr = availableLocale.toString()?replace("_", "-")>
               <#assign langDir = "ltr">

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=572375&r1=572374&r2=572375&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java Mon Sep  3 08:56:51 2007
@@ -164,9 +164,10 @@
         return "success";                
     }
 
-    /** Simple event to set the users per-session locale setting */
+    /** Simple event to set the users per-session locale setting. The user's locale
+     * setting should be passed as a "newLocale" request parameter. */
     public static String setSessionLocale(HttpServletRequest request, HttpServletResponse response) {
-        String localeString = request.getParameter("locale");
+        String localeString = request.getParameter("newLocale");
         if (UtilValidate.isNotEmpty(localeString)) {
             UtilHttp.setLocale(request, localeString);
 
@@ -243,6 +244,8 @@
         return "success";
     }
 }
+
+
 
 
 

Modified: ofbiz/trunk/framework/common/webcommon/includes/language.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/language.ftl?rev=572375&r1=572374&r2=572375&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/language.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/language.ftl Mon Sep  3 08:56:51 2007
@@ -37,7 +37,7 @@
         <tr>
           <td align='center'>
             <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;">
-              <select name="locale" class="selectBox">
+              <select name="newLocale" class="selectBox">
                 <#assign initialDisplayName = locale.getDisplayName(locale)>
                 <#if 18 < initialDisplayName?length>
                   <assign initialDisplayName = initialDisplayName[0..15] + "...">

Modified: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl?rev=572375&r1=572374&r2=572375&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl Mon Sep  3 08:56:51 2007
@@ -50,7 +50,7 @@
         </#if>
         <tr <#if altRow>class="alternate-row"</#if>>
             <td lang="${langAttr}" dir="${langDir}">
-                <a href="<@ofbizUrl>setSessionLocale</@ofbizUrl>?locale=${availableLocale.toString()}">${availableLocale.getDisplayName(availableLocale)}</a>
+                <a href="<@ofbizUrl>setSessionLocale</@ofbizUrl>?newLocale=${availableLocale.toString()}">${availableLocale.getDisplayName(availableLocale)}</a>
             </td>
         </tr>
     </#list>


David E Jones-2
Reply | Threaded
Open this post in threaded view
♦
♦
|

Re: svn commit: r572375 - in /ofbiz/trunk: applications/ecommerce/webapp/ecommerce/includes/ framework/common/src/org/ofbiz/common/ framework/common/webcommon/includes/

David E Jones-2

Great, looks better this time. I think those lanugage.ftl files are the only ones out of the thirty-some-odd in the search results that needed to be changed.

-David


[hidden email] wrote:

> Author: jleroux
> Date: Mon Sep  3 08:56:51 2007
> New Revision: 572375
>
> URL: http://svn.apache.org/viewvc?rev=572375&view=rev
> Log:
> A patch from Adrian Crum for an issue from Bilgin Ibryam"Changing the language in party manager is broken" (https://issues.apache.org/jira/browse/OFBIZ-1223)
> This patch définitively corrects the problem David raised + some cosmetic UI changes
>
> Modified:
>     ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl
>     ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java
>     ofbiz/trunk/framework/common/webcommon/includes/language.ftl
>     ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl
>
> 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=572375&r1=572374&r2=572375&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl (original)
> +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/includes/language.ftl Mon Sep  3 08:56:51 2007
> @@ -23,7 +23,7 @@
>      </div>
>      <div class="screenlet-body" style="text-align: center;">
>          <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;">
> -          <select name="locale" class="selectBox" style="width:95%">
> +          <select name="newLocale" class="selectBox" style="width:95%">
>              <#list availableLocales as availableLocale>
>                <#assign langAttr = availableLocale.toString()?replace("_", "-")>
>                <#assign langDir = "ltr">
>
> Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java?rev=572375&r1=572374&r2=572375&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java (original)
> +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/CommonEvents.java Mon Sep  3 08:56:51 2007
> @@ -164,9 +164,10 @@
>          return "success";                
>      }
>  
> -    /** Simple event to set the users per-session locale setting */
> +    /** Simple event to set the users per-session locale setting. The user's locale
> +     * setting should be passed as a "newLocale" request parameter. */
>      public static String setSessionLocale(HttpServletRequest request, HttpServletResponse response) {
> -        String localeString = request.getParameter("locale");
> +        String localeString = request.getParameter("newLocale");
>          if (UtilValidate.isNotEmpty(localeString)) {
>              UtilHttp.setLocale(request, localeString);
>  
> @@ -243,6 +244,8 @@
>          return "success";
>      }
>  }
> +
> +
>  
>  
>  
>
> Modified: ofbiz/trunk/framework/common/webcommon/includes/language.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/language.ftl?rev=572375&r1=572374&r2=572375&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/webcommon/includes/language.ftl (original)
> +++ ofbiz/trunk/framework/common/webcommon/includes/language.ftl Mon Sep  3 08:56:51 2007
> @@ -37,7 +37,7 @@
>          <tr>
>            <td align='center'>
>              <form method="post" name="chooseLanguage" action="<@ofbizUrl>setSessionLocale</@ofbizUrl>" style="margin: 0;">
> -              <select name="locale" class="selectBox">
> +              <select name="newLocale" class="selectBox">
>                  <#assign initialDisplayName = locale.getDisplayName(locale)>
>                  <#if 18 < initialDisplayName?length>
>                    <assign initialDisplayName = initialDisplayName[0..15] + "...">
>
> Modified: ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl?rev=572375&r1=572374&r2=572375&view=diff
> ==============================================================================
> --- ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl (original)
> +++ ofbiz/trunk/framework/common/webcommon/includes/listLocales.ftl Mon Sep  3 08:56:51 2007
> @@ -50,7 +50,7 @@
>          </#if>
>          <tr <#if altRow>class="alternate-row"</#if>>
>              <td lang="${langAttr}" dir="${langDir}">
> -                <a href="<@ofbizUrl>setSessionLocale</@ofbizUrl>?locale=${availableLocale.toString()}">${availableLocale.getDisplayName(availableLocale)}</a>
> +                <a href="<@ofbizUrl>setSessionLocale</@ofbizUrl>?newLocale=${availableLocale.toString()}">${availableLocale.getDisplayName(availableLocale)}</a>
>              </td>
>          </tr>
>      </#list>
>
>
Free forum by Nabble Edit this page