Skip to content

Commit 44b09fe

Browse files
authored
Merge branch 'master' into spanish-translation
2 parents 9e2c212 + c3116b7 commit 44b09fe

22 files changed

+1749
-59
lines changed

ISSUE_TEMPLATE

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
## Expected behavior
2+
3+
## Observed behavior
4+
5+
## Version of OTP used (exact commit hash or JAR name)
6+
7+
## Data sets in use (links to GTFS and OSM PBF files)
8+
9+
## Command line used to start OTP
10+
11+
## Router config and graph build config JSON
12+
13+
## Steps to reproduce the problem
14+

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ I18NEXT=./node_modules/.bin/i18next-conv
33
LOCALE_FOLDER=./src/client/i18n
44
BABEL_CFG=$(LOCALE_FOLDER)/babel.cfg
55
TEMPLATE_FILE=$(LOCALE_FOLDER)/messages.pot
6-
LANGS=sl en fr de it ca_ES pl es
6+
LANGS=sl en fr de it ca_ES pl pt es
77
JS_FILESPATH=./src/client/js/otp
88
JS_FILES = $(shell find $(JS_FILESPATH)/ -name '*.js')
99
LOCALE_FILES = $(shell find $(LOCALE_FOLDER)/ -name '*.po')

pom.xml

+9-4
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
<repository>
331331
<id>central2</id>
332332
<name>check central first to avoid a lot of not found warnings</name>
333-
<url>http://repo1.maven.org/maven2</url>
333+
<url>https://repo1.maven.org/maven2</url>
334334
</repository>
335335
<repository>
336336
<id>download.java.net</id>
@@ -345,12 +345,12 @@
345345
<repository>
346346
<id>axis</id>
347347
<name>axis</name>
348-
<url>http://people.apache.org/repo/m1-ibiblio-rsync-repository/org.apache.axis2/</url>
348+
<url>https://people.apache.org/repo/m1-ibiblio-rsync-repository/org.apache.axis2/</url>
349349
</repository>
350350
<repository>
351351
<id>conveyal</id>
352352
<name>Conveyal Maven Repository</name>
353-
<url>http://maven.conveyal.com/</url>
353+
<url>https://maven.conveyal.com/</url>
354354
</repository>
355355
<!-- Needed for graphql-java-->
356356
<repository>
@@ -359,7 +359,7 @@
359359
</snapshots>
360360
<id>bintray-andimarek-graphql-java</id>
361361
<name>bintray</name>
362-
<url>http://dl.bintray.com/andimarek/graphql-java</url>
362+
<url>https://dl.bintray.com/andimarek/graphql-java</url>
363363
</repository>
364364
</repositories>
365365

@@ -430,6 +430,11 @@
430430
<artifactId>gt-referencing</artifactId>
431431
<version>${geotools.version}</version>
432432
</dependency>
433+
<dependency>
434+
<groupId>org.geotools</groupId>
435+
<artifactId>gt-referencing3D</artifactId>
436+
<version>${geotools.version}</version>
437+
</dependency>
433438
<dependency>
434439
<groupId>org.geotools</groupId>
435440
<artifactId>gt-coverage</artifactId>

0 commit comments

Comments
 (0)