Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: opentripplanner/OpenTripPlanner
...
head fork: opentripplanner/OpenTripPlanner
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 19 files changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 30, 2012
@bobkarreman bobkarreman Add tripId to Legs e31228e
@bobkarreman bobkarreman Revert "Add tripId to Legs"
This reverts commit e31228e.
1d7dea3
Joel Haasnoot Fix date and time spinner localizations
Conflicts:

	opentripplanner-webapp/src/main/webapp/js/otp/locale/Dutch.js

g Please enter the commit message for your changes. Lines starting
655ca3e
Joel Haasnoot Merge branch 'master' of https://github.com/openplans/OpenTripPlanner
Conflicts:
	opentripplanner-webapp/src/main/webapp/js/otp/locale/Polish.js
983d52c
Commits on Mar 31, 2012
@joelhaasnoot joelhaasnoot Add favicon d1852d2
Showing with 38 additions and 9 deletions.
  1. +2 −1  opentripplanner-webapp/src/main/webapp/about.html
  2. BIN  opentripplanner-webapp/src/main/webapp/images/ui/favicon.ico
  3. +2 −1  opentripplanner-webapp/src/main/webapp/index.html
  4. +3 −1 opentripplanner-webapp/src/main/webapp/js/otp/locale/Dutch.js
  5. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/English.js
  6. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/French.js
  7. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/Gaelic.js
  8. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/German.js
  9. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/Hungarian.js
  10. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/Italian.js
  11. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/Marathi.js
  12. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/Polish.js
  13. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/Portuguese.js
  14. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/Spanish.js
  15. +2 −0  opentripplanner-webapp/src/main/webapp/js/otp/locale/Turkish.js
  16. +4 −4 opentripplanner-webapp/src/main/webapp/js/otp/planner/Forms.js
  17. +1 −0  opentripplanner-webapp/src/main/webapp/min.html
  18. +2 −1  opentripplanner-webapp/src/main/webapp/print-test.html
  19. +2 −1  opentripplanner-webapp/src/main/webapp/print.html
View
3  opentripplanner-webapp/src/main/webapp/about.html
@@ -1,5 +1,6 @@
<head>
<title>About OpenTripPlanner</title>
+<link rel="shortcut icon" href="images/ui/favicon.ico" />
</head>
<body>
<style>
@@ -48,4 +49,4 @@
</span>
</div> <!-- id="about_liq" -->
</div> <!-- id="about" -->
-</body>
+</body>
View
BIN  opentripplanner-webapp/src/main/webapp/images/ui/favicon.ico
Binary file not shown
View
3  opentripplanner-webapp/src/main/webapp/index.html
@@ -8,7 +8,8 @@
<meta name="keywords" content="interactive map, map, trip planner, bus, rail, transit, max, tripplanner, plan, trip, plans, itinerary, schedule planner, planning, planner, scheduler, assistant, wizard, travel, schedule, guide, map, route, times, plan a trip" />
<meta content="tripplanner v0.4 - May 2011 (FXP)"/>
<meta http-equiv="X-UA-Compatible" content="IE=8;FF=3;OtherUA=4" />
-
+
+ <link rel="shortcut icon" href="images/ui/favicon.ico" />
<link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all-notheme.css" />
<link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/xtheme-transit-extend.css" />
<link rel="stylesheet" type="text/css" href="js/lib/openlayers/theme/default/style.css" />
View
4 opentripplanner-webapp/src/main/webapp/js/otp/locale/Dutch.js
@@ -220,7 +220,9 @@ otp.locale.Dutch = {
minutes_abbrev : "mins",
second_abbrev : "s",
seconds_abbrev : "s",
- format : "F jS, Y @ H:i",
+ format : "j F Y @ H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
months : ['jan', 'feb', 'mar', 'apr', 'mei', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec']
},
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/English.js
@@ -223,6 +223,8 @@ otp.locale.English = {
second_abbrev : "sec",
seconds_abbrev : "secs",
format : "F jS, Y @ g:ia",
+ date_format : "m-d-Y",
+ time_format : "g:ia",
months : ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
},
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/French.js
@@ -202,6 +202,8 @@ otp.locale.French = {
time : {
format : "d.m.Y \\à H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
minute : "minute",
minutes : "minutes",
minute_abbrev : "min",
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/Gaelic.js
@@ -221,6 +221,8 @@ otp.locale.Gaelic = {
{
// TODO
format : "D, j M H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
minute : "nóiméad",
minutes : "nóiméid",
minute_abbrev : "nóiméad",
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/German.js
@@ -222,6 +222,8 @@ otp.locale.German = {
second_abbrev : "s.",
seconds_abbrev : "s.",
format : "D, j M H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
months : ['Jan.', 'Feb.', 'Mär.', 'Apr.', 'Mai.', 'Juni', 'Juli', 'Aug.', 'Sep.', 'Okt.', 'Nov.', 'Dez.']
},
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/Hungarian.js
@@ -221,6 +221,8 @@ otp.locale.Hungarian = {
{
// TODO
format : "D, j M H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
minute : "minute",
minutes : "minutes",
minute_abbrev : "perc",
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/Italian.js
@@ -219,6 +219,8 @@ otp.locale.Italian = {
second_abbrev : "sec",
seconds_abbrev : "sec",
format : "D, j M H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
months : ['Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Aug', 'Set', 'Ott', 'Nov', 'Dic']
},
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/Marathi.js
@@ -221,6 +221,8 @@ otp.locale.Marathi = {
{
// TODO
format : "D, j M H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
minute : "मिनिट",
minutes : "मिनिटस",
minute_abbrev : "मिनिट",
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/Polish.js
@@ -218,6 +218,8 @@ otp.locale.Polish = {
{
// TODO
format : "D, j M H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
minute : "minuta",
minutes : "minut",
minute_abbrev : "min",
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/Portuguese.js
@@ -220,6 +220,8 @@ otp.locale.Portuguese = {
second_abbrev : "sec",
seconds_abbrev : "secs",
format : "D, j M H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
months : ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic']
},
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/Spanish.js
@@ -220,6 +220,8 @@ otp.locale.Spanish = {
second_abbrev : "sec",
seconds_abbrev : "secs",
format : "D, j M H:i",
+ date_format : "d-m-Y",
+ time_format : "H:i",
months : ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic']
},
View
2  opentripplanner-webapp/src/main/webapp/js/otp/locale/Turkish.js
@@ -223,6 +223,8 @@ otp.locale.Turkish = {
second_abbrev : "san",
seconds_abbrev : "san",
format : "F jS, Y @ g:ia",
+ date_format : "d-m-Y",
+ time_format : "H:i",
months : ['Oca', 'Şub', 'Mar', 'Nis', 'May', 'Haz', 'Tem', 'Ağu', 'Eyl', 'Eki', 'Kas', 'Ara']
},
View
8 opentripplanner-webapp/src/main/webapp/js/otp/planner/Forms.js
@@ -1008,11 +1008,11 @@ otp.planner.StaticForms = {
id: 'trip-date-form',
fieldLabel: this.locale.tripPlanner.labels.date,
name: 'date',
- format: 'm/d/Y',
+ format: this.locale.time.date_format,
allowBlank: false,
msgTarget: 'qtip',
anchor: "87%",
- value: new Date().format('m/d/Y')
+ value: new Date().format(this.locale.time.date_format)
});
this.m_arriveByStore = otp.util.ExtUtils.makeStaticPullDownStore(this.locale.tripPlanner.arriveDepart);
@@ -1042,8 +1042,8 @@ otp.planner.StaticForms = {
accelerate : true,
width : 85,
msgTarget : 'qtip',
- value : new Date().format('g:i a'),
- strategy : new Ext.ux.form.Spinner.TimeStrategy({format:'g:i a'}),
+ value : new Date().format(this.locale.time.time_format),
+ strategy : new Ext.ux.form.Spinner.TimeStrategy({format:this.locale.time.time_format}),
name : 'time'
});
View
1  opentripplanner-webapp/src/main/webapp/min.html
@@ -8,6 +8,7 @@
<meta name="keywords" content="interactive map, map, trip planner, bus, rail, transit, max, tripplanner, plan, trip, plans, itinerary, schedule planner, planning, planner, scheduler, assistant, wizard, travel, schedule, guide, map, route, times, plan a trip" />
<meta content="tripplanner v0.4 - May 2011 (FXP)"/>
+ <link rel="shortcut icon" href="images/ui/favicon.ico" />
<link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all-notheme.css" />
<link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/xtheme-transit-extend.css" />
<link rel="stylesheet" type="text/css" href="js/lib/openlayers/theme/default/style.css" />
View
3  opentripplanner-webapp/src/main/webapp/print-test.html
@@ -1,7 +1,8 @@
<html>
<head>
<title>Print Trip</title>
-
+
+ <link rel="shortcut icon" href="images/ui/favicon.ico" />
<link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all-notheme.css" />
<link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/xtheme-transit-extend.css" />
<link rel="stylesheet" type="text/css" href="js/lib/openlayers/theme/default/style.css" />
View
3  opentripplanner-webapp/src/main/webapp/print.html
@@ -7,7 +7,8 @@
<meta name="description" content="The Open Trip Planner provides step-by-step directions for using multiple modes of travel, including transit, biking and walking. Find out more about this open source project at http://opentripplanner.org." />
<meta name="keywords" content="interactive map, map, trip planner, bus, rail, transit, max, tripplanner, plan, trip, plans, itinerary, schedule planner, planning, planner, scheduler, assistant, wizard, travel, schedule, guide, map, route, times, plan a trip" />
<meta content="tripplanner v0.5 - November 2011 (FXP)"/>
-
+
+ <link rel="shortcut icon" href="images/ui/favicon.ico" />
<link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/ext-all-notheme.css" />
<link rel="stylesheet" type="text/css" href="js/lib/ext/resources/css/xtheme-transit-extend.css" />
<link rel="stylesheet" type="text/css" href="planner.css" />

No commit comments for this range

Something went wrong with that request. Please try again.