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}
#####################
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;
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) {