Return-Path: Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: (qmail 8583 invoked from network); 14 May 2007 14:34:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 May 2007 14:34:06 -0000 Received: (qmail 35018 invoked by uid 500); 14 May 2007 14:34:13 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 34935 invoked by uid 500); 14 May 2007 14:34:12 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 34924 invoked by uid 99); 14 May 2007 14:34:12 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 May 2007 07:34:12 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 May 2007 07:34:05 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 4D5421A983A; Mon, 14 May 2007 07:33:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r537856 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java Date: Mon, 14 May 2007 14:33:45 -0000 To: commits@myfaces.apache.org From: cagatay@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070514143345.4D5421A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cagatay Date: Mon May 14 07:33:44 2007 New Revision: 537856 URL: http://svn.apache.org/viewvc?view=rev&rev=537856 Log: Fixed TOMAHAWK-986, locale info is always used to create the header date string. Locale used here is the calculated locale for the current view other than just the default locale of the application. Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java?view=diff&rev=537856&r1=537855&r2=537856 ============================================================================== --- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java (original) +++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/schedule/renderer/AbstractScheduleRenderer.java Mon May 14 07:33:44 2007 @@ -39,6 +39,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; import java.util.Map; /** @@ -214,22 +215,15 @@ { DateFormat format; String pattern = getHeaderDateFormat(component); + Locale viewLocale = context.getViewRoot().getLocale(); if ((pattern != null) && (pattern.length() > 0)) { - format = new SimpleDateFormat(pattern); + format = new SimpleDateFormat(pattern, viewLocale); } else { - if (context.getApplication().getDefaultLocale() != null) - { - format = DateFormat.getDateInstance(DateFormat.MEDIUM, context - .getApplication().getDefaultLocale()); - } - else - { - format = DateFormat.getDateInstance(DateFormat.MEDIUM); - } + format = DateFormat.getDateInstance(DateFormat.MEDIUM, viewLocale); } return format.format(date);