Display local Ottawa time even when server is not in that timezone

diff --git a/cov.sh b/cov.sh
index 4404b78a0513981d408cf24ec26dd37b67478831..c9fb54cbc110bcf011c01f3c9ac446a0c2c9b532 100755 (executable)
--- a/cov.sh
+++ b/cov.sh
@@ -39,6 +39,10 @@ do
     TESTS="${TEST_CLASS} ${TESTS}"
 done
 
+echo First run:  locale es_ES, timezone Europe/Madrid
+java -Duser.language=es -Duser.country=ES -Duser.timezone=Europe/Madrid -Djcov.template=${WEB_ROOT}/template.xml -Djcov.file=${WEB_ROOT}/result.xml -classpath "${INSTR_DIR}:${WEB_ROOT}/test:${CLASSPATH}:/usr/share/java/junit.jar:${WEB_ROOT}/jcov/jcov_file_saver.jar" org.junit.runner.JUnitCore ${TESTS}
+
+echo Second run:  server default locale and timezone
 java -Djcov.template=${WEB_ROOT}/template.xml -Djcov.file=${WEB_ROOT}/result.xml -classpath "${INSTR_DIR}:${WEB_ROOT}/test:${CLASSPATH}:/usr/share/java/junit.jar:${WEB_ROOT}/jcov/jcov_file_saver.jar" org.junit.runner.JUnitCore ${TESTS}
 
 #####################

diff --git a/prod/net/jaekl/frank/Schedule.java b/prod/net/jaekl/frank/Schedule.java
index c7fd70bfcd3a7b5ed991bdaf537b9bf762af6971..edd1b398a602afff7e23aa734d892ee5de6c8a1f 100644 (file)
--- a/prod/net/jaekl/frank/Schedule.java
+++ b/prod/net/jaekl/frank/Schedule.java
@@ -6,6 +6,7 @@ import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import net.jaekl.frank.octranspo.Route;
 import net.jaekl.frank.octranspo.StopInfo;
@@ -22,6 +23,14 @@ public class Schedule {
                m_bundle = FrankBundle.getInst(locale);
                m_hourMinFmt = new SimpleDateFormat("hh:mma", locale);
                m_hourMinSecFmt = new SimpleDateFormat("hh:mm:ssa", locale);
+               
+               // We always display times in Ottawa (local) time, because that's the only 
+               // time that makes sense for a user who wants to know when to catch a bus.
+               // In the (unlikely?) event that our server is in a different timezone,
+               // we need to explicitly specify the time zone that we want to use.
+               TimeZone tz = TimeZone.getTimeZone("America/Toronto");
+               m_hourMinFmt.setTimeZone(tz);
+               m_hourMinSecFmt.setTimeZone(tz);
        }
        
        String trans(String key) {