@@ -36,15 +36,15 @@
"<p>If you like fahrplan, I would appreciate a donation. <a href=\"https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DW3LGJ6VEKFVS\">Donate using PayPal</a></p>" +
"<p>If you encounter bugs or have feature requests visit the <a href=\"https://github.com/smurfy/fahrplan/issues\">Fahrplan issue tracker on GitHub</a>.</p>");
-var maintainers = ["Philipp Andreas (smurfy)", "Michael Stevens (stevensmi)", "Oleksii Serdiuk (leppa)"];
-var codeContributors = ["gri", "lorenzph", "CaCO3", "hcm", "thp", "qwerty12", "qbast", "Thomas Fischer", "Oleksii Serdiuk (leppa)", "Nekhelesh Ramananthan (nik90)", "NightShift79", "pirast", "Michael Zanetti (mzanetti)", "Chris Clime (balcy)", "dayrover", "shentok", "evansebire", "unsanded", "Morpog", "benni0815", "Erik Lundin"].sort();
+var maintainers = ["Mark Washeim (poetaster)", "Philipp Andreas (smurfy)", "Michael Stevens (stevensmi)", "Oleksii Serdiuk (leppa)"];
+var codeContributors = ["attah", "Thaodan", "gri", "lorenzph", "CaCO3", "hcm", "thp", "qwerty12", "qbast", "Thomas Fischer", "Oleksii Serdiuk (leppa)", "Nekhelesh Ramananthan (nik90)", "NightShift79", "pirast", "Michael Zanetti (mzanetti)", "Chris Clime (balcy)", "dayrover", "shentok", "evansebire", "unsanded", "Morpog", "benni0815", "Erik Lundin"].sort();
var translators = [
"Arabic - Sary AWAD (sary.1991)",
"Catalan - Felip Martí (FelipMarti)",
"Dutch - Heimen Stoffels (Vistaus), Nathan Follens (pljmn)",
"French - Jordi",
- "German - Philipp Andreas (smurfy), Florian Wittmann, DeadHorseRiding (Mee_Germany_Go)",
+ "German - Philipp Andreas (smurfy), wheelseal, Florian Wittmann, DeadHorseRiding (Mee_Germany_Go)",
"Greek - Wasilis Mandratzis-Walz (beonex)",
"Hungarian - ViBE",
"Norwegian Bokmål - Ari Börde Kröyer (abkro)",
|
@@ -461,6 +461,7 @@
// using this to add last walking times
int walkingTime = 0;
+ int firstWalkingTime = 0;
// evil chaning scope to keep 'last value'
QDateTime arrivalTime;
@@ -506,8 +507,10 @@
QDateTime departureTime = QDateTime::fromString(calls[0].toMap()["Departure"].toString(), Qt::ISODate);
- qWarning() << "dtype: " << calls[0].toMap()["CallType"].toString();
- qWarning() << "atype: " << calls[lastCall].toMap()["CallType"].toString();
+ qWarning() << "arrivalStation: " << arrivalStation;
+ qWarning() << "departureStation: " << departureStation;
+
+
// only set Arrival if we have it. not set for walk
if (calls[lastCall-1].toMap()["Arrival"].toString() != "")
@@ -546,8 +549,6 @@
item->setArrivalDateTime(arrivalTimeWalk);
} else {
item->setArrivalDateTime(arrivalTime);
- qWarning() << "dep: " << departureTime.toString("hh:mm");
- qWarning() << "arr: " << arrivalTime.toString("hh:mm");
}
item->setArrivalStation(arrivalStation);
@@ -564,11 +565,15 @@
if (detailCount == 0) {
detail->setDepartureStation(item->departureStation());
detail->setDepartureDateTime(item->departureDateTime());
+ // we need to record first walking to set it later and use if for departure.
+ firstWalkingTime = walkingTime;
} else if (detailCount == legs.count()-1){
detail->setArrivalDateTime(item->arrivalDateTime());
detail->setArrivalStation(item->arrivalStation());
}
-
+ // no ALWAYS set arrival :)
+ detail->setArrivalDateTime(item->arrivalDateTime());
+ detail->setArrivalStation(item->arrivalStation());
detail->appendItem(item);
detailCount ++;
}
@@ -597,30 +602,26 @@
}
QDateTime minutesBegin;
QDateTime minutesEnd;
- // we must calculate duration without first or final leg being a walk.
- if (detail->getItem(detail->itemcount()-1)->train().startsWith("walk") ) {
- // this is fixed above
- minutesEnd = detail->getItem(detail->itemcount()-1)->arrivalDateTime();
- response->setArrivalTime(detail->getItem(detail->itemcount()-1)->arrivalDateTime().toString("hh:mm"));
- // add walking time at end.
- //minutesEnd = detail->getItem(detail->itemcount()-2)->arrivalDateTime().addMSecs(walkingTime*60);
- //response->setArrivalTime(minutesEnd.toString("hh:mm"));
- } else {
- minutesEnd = detail->getItem(detail->itemcount()-1)->arrivalDateTime();
- response->setArrivalTime(detail->getItem(detail->itemcount()-1)->arrivalDateTime().toString("hh:mm"));
- //qWarning() << "arrivalDetail: " << detail->getItem(detail->itemcount()-1)->arrivalDateTime().toString("hh:mm") ;
- }
+
+ minutesEnd = detail->getItem(detail->itemcount()-1)->arrivalDateTime();
+
if (detail->getItem(0)->train().startsWith("walk") ) {
- minutesBegin = detail->getItem(1)->departureDateTime();
+ // this gets us around not having a start time for walk legs.
+ // anolog to how we set arrival date time above
+ QDateTime walkDepart = detail->getItem(1)->departureDateTime().addSecs( - firstWalkingTime * 60) ;
+ detail->getItem(0)->setDepartureDateTime(walkDepart);
+
+ response->setDepartureTime(walkDepart.toString("hh:mm"));
+ minutesBegin = detail->getItem(0)->departureDateTime();
response->setDate(detail->getItem(1)->departureDateTime().date());
- response->setDepartureTime(detail->getItem(1)->departureDateTime().toString("hh:mm"));
- //qWarning() << "wOne-dDetail: " << detail->getItem(1)->departureDateTime().toString("hh:mm") ;
+
} else {
minutesBegin = detail->getItem(0)->departureDateTime();
response->setDepartureTime(detail->getItem(0)->departureDateTime().toString("hh:mm"));
- //qWarning() << "departureDetail: " << detail->getItem(0)->departureDateTime().toString("hh:mm") ;
}
+ response->setArrivalTime(detail->getItem(detail->itemcount()-1)->arrivalDateTime().toString("hh:mm"));
+
int minutes = minutesBegin.secsTo(minutesEnd) / 60;
int hours = minutes / 60;
minutes = minutes % 60;
|
@@ -641,7 +641,7 @@
<location filename="../src/gui/sailfishos/pages/MainPage.qml" line="46"/>
<location filename="../src/gui/sailfishos/pages/MainPage.qml" line="65"/>
<source>Time Table</source>
- <translation>Gesammter Fahrplan</translation>
+ <translation>Gesamter Fahrplan</translation>
</message>
<message>
<location filename="../src/gui/sailfishos/pages/MainPage.qml" line="51"/>
@@ -729,47 +729,47 @@
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="25"/>
<source>getTimeTableForStation</source>
- <translation>getTimeTableForStation</translation>
+ <translation>Fahrplan für diese Haltestelle</translation>
</message>
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="32"/>
<source>findStationsByName</source>
- <translation>findStationsByName</translation>
+ <translation>Haltestelle über Namen finden</translation>
</message>
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="39"/>
<source>findStationsByCoordinates</source>
- <translation>findStationsByCoordinates</translation>
+ <translation>Haltestelle über Koordinaten finden</translation>
</message>
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="56"/>
<source>selectStation</source>
- <translation>selectStation</translation>
+ <translation>Haltestelle auswählen</translation>
</message>
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="79"/>
<source>searchJourney</source>
- <translation>searchJourney</translation>
+ <translation>Reise suchen</translation>
</message>
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="93"/>
<source>searchJourneyEarlier</source>
- <translation>searchJourneyEarlier</translation>
+ <translation>Frühere Reise suchen</translation>
</message>
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="100"/>
<source>searchJourneyLater</source>
- <translation>searchJourneyLater</translation>
+ <translation>Spätere Reise suchen</translation>
</message>
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="123"/>
<source>getJourneyDetails</source>
- <translation>getJourneyDetails</translation>
+ <translation>Reiseinformationen erhalten</translation>
</message>
<message>
<location filename="../src/gui/desktop-test/mainwindow.ui" line="150"/>
<source>cancelRequest</source>
- <translation>cancelRequest</translation>
+ <translation>Anfrage abbrechen</translation>
</message>
</context>
<context>
@@ -878,12 +878,12 @@
<message>
<location filename="../src/parser/parser_efa.cpp" line="685"/>
<source><span style="color:#b30;">%1 min late</span></source>
- <translation><span style="color:#b30;">%1 min Verspätung</span></translation>
+ <translation><span style="Farbe:#b30;">%1 min Verspätung</span></translation>
</message>
<message>
<location filename="../src/parser/parser_efa.cpp" line="688"/>
<source><span style="color:#093; font-weight: normal;">on time</span></source>
- <translation><span style="color:#093; font-weight: normal;">pünktlich</span></translation>
+ <translation><span style="Farbe:#093; font-weight: normal;">pünktlich</span></translation>
</message>
</context>
<context>
@@ -891,218 +891,218 @@
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="74"/>
<source>All</source>
- <translation type="unfinished">Alle</translation>
+ <translation>Alle</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="75"/>
<location filename="../src/parser/parser_finland_matka.cpp" line="1055"/>
<source>Bus</source>
- <translation type="unfinished">Bus</translation>
+ <translation>Bus</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="76"/>
<location filename="../src/parser/parser_finland_matka.cpp" line="1068"/>
<source>Train</source>
- <translation type="unfinished">Zug</translation>
+ <translation>Zug</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="77"/>
<source>Airplane</source>
- <translation type="unfinished"></translation>
+ <translation>Flugzeug</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="78"/>
<source>Bus and train</source>
- <translation type="unfinished"></translation>
+ <translation>Bus und Zug</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="79"/>
<source>Bus and airplane</source>
- <translation type="unfinished"></translation>
+ <translation>Bus und Flugzeug</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="80"/>
<source>Train and airplane</source>
- <translation type="unfinished"></translation>
+ <translation>Zug und Flugzeug</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="247"/>
<source>Timetables are only available for stops.</source>
- <translation type="unfinished"></translation>
+ <translation>Fahrpläne nur an Haltestellen verfügbar.</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="325"/>
<location filename="../src/parser/parser_finland_matka.cpp" line="340"/>
<source>Failed to parse timetable data.</source>
- <translation type="unfinished"></translation>
+ <translation>Fehler beim parsen der Fahrplandaten</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="691"/>
<source>Walk %1</source>
- <translation type="unfinished"></translation>
+ <translation>Fußweg %1</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="713"/>
<source>Arrivals</source>
- <translation type="unfinished">Ankünfte</translation>
+ <translation>Ankünfte</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="715"/>
<source>Departures</source>
- <translation type="unfinished">Abfahrten</translation>
+ <translation>Abfahrten</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="716"/>
<source>ddd MMM d, HH:mm</source>
- <translation type="unfinished">ddd MMM d, HH:mm</translation>
+ <translation>ddd MMM d, HH:mm</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="838"/>
<source>Walk</source>
- <translation type="unfinished"></translation>
+ <translation>Fußweg</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="889"/>
<source>Invalid transport type: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Unzulässiger Transport: %1</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="970"/>
<location filename="../src/parser/parser_finland_matka.cpp" line="972"/>
<source>km</source>
- <translation type="unfinished"></translation>
+ <translation>Km</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="975"/>
<source>m</source>
<extracomment>Meters</extracomment>
- <translation type="unfinished"></translation>
+ <translation>Meter</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="1002"/>
<source>Express train</source>
- <translation type="unfinished"></translation>
+ <translation>Schnellzug</translation>
</message>
<message>
<location filename="../src/parser/parser_finland_matka.cpp" line="1007"/>
<source>Regional train</source>
- <translation type="unfinished"></translation>
+ <translation>Regionalzug</translation>
|