Just curious, why did we put the locale back into the URL? Doesn't this
break bug #1265068 which was recently closed? Should I reopen it?
Thank you,
Gili
Johan Compagner wrote:
Update of /cvsroot/wicket/wicket/src/java/wicket
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27323/src/java/wicket
Modified Files:
ResourceReference.java
Log Message:
locale are added to the getPath() again
Index: ResourceReference.java
===================================================================
RCS file: /cvsroot/wicket/wicket/src/java/wicket/ResourceReference.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ResourceReference.java 27 Aug 2005 21:14:55 -0000 1.14
--- ResourceReference.java 28 Aug 2005 19:38:27 -0000 1.15
***************
*** 53,57 ****
{
/** The locale of the resource */
! private Locale locale;
/** The name of the resource */
--- 53,57 ----
{
/** The locale of the resource */
! protected Locale locale;
/** The name of the resource */
***************
*** 158,170 ****
final StringBuffer buffer = new StringBuffer();
buffer.append("resources/");
! Locale currentLocale = Session.get().getLocale();
! if(locale != null && !locale.equals(currentLocale))
! {
! buffer.append(SharedResources.path(application, scope,
name, locale, style));
! }
! else
! {
! buffer.append(SharedResources.path(application, scope,
name, null, style));
! }
return buffer.toString();
}
--- 158,162 ----
final StringBuffer buffer = new StringBuffer();
buffer.append("resources/");
! buffer.append(SharedResources.path(application, scope, name,
locale, style));
return buffer.toString();
}
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Wicket-autocvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/wicket-autocvs
--
http://www.desktopbeautifier.com/
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Wicket-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wicket-develop
