UPD: change date format to YYYY-MM-DD for consistence.

diff --git a/src/org/cacert/gigi/output/DateSelector.java b/src/org/cacert/gigi/output/DateSelector.java
index 43654b7a9451c2aaf021d9aaee9bc7dc21711fb4..e4e66f6f4c4f92e316f2cf186f486e1830f45dff 100644 (file)
--- a/src/org/cacert/gigi/output/DateSelector.java
+++ b/src/org/cacert/gigi/output/DateSelector.java
@@ -40,7 +40,15 @@ public class DateSelector implements Outputable {
 
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
 
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {

-        out.print("<nobr><select name=\"");
+        out.print("<nobr>");
+        outputYear(out);
+        outputMonth(out, l);
+        outputDay(out);
+        out.print("</nobr>");
+    }
+
+    private void outputDay(PrintWriter out) {
+        out.print("<select name=\"");

         out.print(names[0]);
         out.println("\">");
         for (int i = 1; i <= 31; i++) {
         out.print(names[0]);
         out.println("\">");
         for (int i = 1; i <= 31; i++) {


@@ -51,6 +59,9 @@ public class DateSelector implements Outputable {
             out.println(">" + i + "</option>");
         }
         out.println("</select>");
             out.println(">" + i + "</option>");
         }
         out.println("</select>");

+    }
+
+    private void outputMonth(PrintWriter out, Language l) {

         SimpleDateFormat sdf = new SimpleDateFormat("MMMM", l.getLocale());
         out.print("<select name=\"");
         out.print(names[1]);
         SimpleDateFormat sdf = new SimpleDateFormat("MMMM", l.getLocale());
         out.print("<select name=\"");
         out.print(names[1]);


@@ -65,13 +76,16 @@ public class DateSelector implements Outputable {
             out.println(">" + sdf.format(c.getTime()) + " (" + i + ")</option>");
         }
         out.println("</select>");
             out.println(">" + sdf.format(c.getTime()) + " (" + i + ")</option>");
         }
         out.println("</select>");

+    }
+
+    private void outputYear(PrintWriter out) {

         out.print("<input type=\"text\" name=\"");
         out.print(names[2]);
         out.print("\" value=\"");
         if (year != 0) {
             out.print(year);
         }
         out.print("<input type=\"text\" name=\"");
         out.print(names[2]);
         out.print("\" value=\"");
         if (year != 0) {
             out.print(year);
         }

-        out.print("\" size=\"4\" autocomplete=\"off\"></nobr>");
+        out.print("\" size=\"4\" autocomplete=\"off\">");

     }
 
     public void update(HttpServletRequest r) {
     }
 
     public void update(HttpServletRequest r) {