[Openutils-svn] SF.net SVN: openutils:[3424] trunk/openutils-elfunctions/src/main

[<fg...@us...>]

Revision: 3424
          http://openutils.svn.sourceforge.net/openutils/?rev=3424&view=rev
Author:   fgiust
Date:     2011-04-10 08:27:01 +0000 (Sun, 10 Apr 2011)

Log Message:
-----------
"cosmetic" change, from languageid to locale as parameter names

Modified Paths:
--------------
    trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java
    trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld

Modified: trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java
===================================================================
--- trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java	2011-04-10 08:04:23 UTC (rev 3423)
+++ trunk/openutils-elfunctions/src/main/java/net/sourceforge/openutils/elfunctions/DateElUtils.java	2011-04-10 08:27:01 UTC (rev 3424)
@@ -23,6 +23,7 @@
 import java.util.Calendar;
 import java.util.Locale;
 
+import org.apache.commons.lang.LocaleUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.FastDateFormat;
 import org.slf4j.Logger;
@@ -146,24 +147,24 @@
      * formats a date using the given pattern or built-in style
      * @param date the date to format
      * @param pattern a valid pattern, or one of "short", "medium", "long", "full" (case insensitive)
-     * @param languageId lowercase two-letter ISO-639 code.
+     * @param locale lowercase two-letter ISO-639 code.
      * @return the formatted date
      */
-    public static String formatDate(Calendar date, String pattern, String languageId)
+    public static String formatDate(Calendar date, String pattern, String locale)
     {
-        return format(date, pattern, true, false, new Locale(languageId));
+        return format(date, pattern, true, false, LocaleUtils.toLocale(locale));
     }
 
     /**
      * formats a time using the given pattern or built-in style
      * @param time the time to format
      * @param pattern a valid pattern, or one of "short", "medium", "long", "full" (case insensitive)
-     * @param languageId lowercase two-letter ISO-639 code.
+     * @param locale lowercase two-letter ISO-639 code.
      * @return the formatted time
      */
-    public static String formatTime(Calendar time, String pattern, String languageId)
+    public static String formatTime(Calendar time, String pattern, String locale)
     {
-        return format(time, pattern, false, true, new Locale(languageId));
+        return format(time, pattern, false, true, LocaleUtils.toLocale(locale));
     }
 
     /**
@@ -171,25 +172,26 @@
      * time with the syntax "date_format;time_format" (ex: "long;short")
      * @param dateTime the date and time
      * @param pattern date pattern
-     * @param languageId lowercase two-letter ISO-639 code.
+     * @param locale lowercase two-letter ISO-639 code.
      * @return formatted string
      */
-    public static String formatDateTime(Calendar dateTime, String pattern, String languageId)
+    public static String formatDateTime(Calendar dateTime, String pattern, String locale)
     {
-        return format(dateTime, pattern, true, true, new Locale(languageId));
+        return format(dateTime, pattern, true, true, LocaleUtils.toLocale(locale));
     }
 
     /**
      * Formats a date and/or time using the given pattern or built-in style - supports composite formats for date and
      * time with the syntax "date_format;time_format" (ex: "long;short") with locale
      * @param dateTime the date and time
-     * @param languageId lowercase two-letter ISO-639 code.
+     * @param locale lowercase two-letter ISO-639 code.
      * @param pattern date pattern
      * @return formatted string
      */
-    public static String formatDateTimeWithLocale(Calendar dateTime, String languageId, String pattern)
+    @Deprecated
+    public static String formatDateTimeWithLocale(Calendar dateTime, String locale, String pattern)
     {
-        return format(dateTime, pattern, true, true, new Locale(languageId));
+        return format(dateTime, pattern, true, true, LocaleUtils.toLocale(locale));
     }
 
     /**

Modified: trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld
===================================================================
--- trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld	2011-04-10 08:04:23 UTC (rev 3423)
+++ trunk/openutils-elfunctions/src/main/resources/META-INF/dateutils.tld	2011-04-10 08:27:01 UTC (rev 3424)
@@ -9,8 +9,9 @@
   <function>
     <name>formatDateTime</name>
     <description>
-      Format a date and time   based on a given pattern, or a builtin style (short, medium, long or full). Also supports
-      different styles for date and time with the syntax "date_style;time_style" (e.g. "short;long")
+      Format a date and time based on a given pattern, or a builtin style (short, medium, long or full). Also supports
+      different styles for date and time with the syntax "date_style;time_style" (e.g. "short;long").
+      Parameters: Calendar dateTime, String pattern, String locale
     </description>
     <function-class>net.sourceforge.openutils.elfunctions.DateElUtils</function-class>
     <function-signature>java.lang.String formatDateTime(java.util.Calendar, java.lang.String, java.lang.String)</function-signature>
@@ -18,7 +19,7 @@
   <function>
     <name>formatDateTimeWithLocale</name>
     <description>
-      Format a date and time with a specified language (lowercase two-letter ISO-639 code) based on a given pattern, or a builtin style (short, medium, long or full). Also supports
+      Format a date and time with a specified locale (lowercase two-letter ISO-639 code) based on a given pattern, or a builtin style (short, medium, long or full). Also supports
       different styles for date and time with the syntax "date_style;time_style" (e.g. "short;long")
     </description>
     <function-class>net.sourceforge.openutils.elfunctions.DateElUtils</function-class>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.