Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into sharelatex
Browse files Browse the repository at this point in the history
* upstream/master: (121 commits)
  Fix fetcher tests (#3583)
  Convert entry preview panel to JavaFX (#3574)
  Remove dependency for JUnit4 (#3580)
  Update tracis cache config as recommned by the docs (#3575)
  fix typo
  Show development information
  Release v4.1
  Add new authors to mailMap (#3567)
  Fix build
  Really fix changelog
  Fix changelog
  Minor changes
  Disable the autocompletion as default (#3569)
  Add update exception for applicationinsights 2.0.0-BETA (#3571)
  Install4j jres 152 (#3570)
  Fix grammar mistake
  Downgrade applicationinsights. Fixes #3561
  Adapt scripts/prepare-install4j.sh to JRE1.8.0_152 (#3568)
  ExportFormats: Use FileExtension enum (#3565)
  Update guava from 23.5-jre -> 23.6-jre
  ...

# Conflicts:
#	build.gradle
  • Loading branch information
Siedlerchr committed Dec 28, 2017
2 parents 74151de + 64c774b commit c91fe49
Show file tree
Hide file tree
Showing 114 changed files with 2,414 additions and 10,449 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ AUTHORS eol=lf

# disable after a release
# CHANGELOG.md merge=union

src/main/resources/l10n/*.properties merge=union
7 changes: 6 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,9 @@ Berk Gureken <berkgureken@gmail.com>
Abhishek Rai <abhisheksavitarai@gmail.com>
Abhishek Rai <betheunique@users.noreply.github.com>
Stéphane Curet <stephane.curet@orange.fr>
Erdem Derebasoglu <erdemderebasoglu@hotmail.com>
Erdem Derebasoglu <erdemderebasoglu@hotmail.com>
Domenico Cufalo <cufalo@gmail.com>
Tobias Bouschen <tobias.bouschen@googlemail.com>
József Pallagi <pallagijoe@gmail.com>
Mattia Bunel <MBunel@users.noreply.github.com>
Waida Fan <31742543+weidafan@users.noreply.github.com>
15 changes: 11 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ language: java
dist: trusty
sudo: required

git:
depth: 1

services:
- postgresql
- mysql
Expand All @@ -20,12 +23,14 @@ env:
- TEST_SUITE=guiTest
- TEST_SUITE=checkstyle
- TEST_SUITE=codecov
- DEPENDENCY_UPDATES=check

matrix:
fast_finish: true
allow_failures:
- env: TEST_SUITE=fetcherTest
- env: TEST_SUITE=codecov
- env: DEPENDENCY_UPDATES=check

# JavaFX localization tests need a running X environment
before_install:
Expand All @@ -46,20 +51,22 @@ script:
- if [ "$TEST_SUITE" == "checkstyle" ]; then ./gradlew checkstyleMain checkstyleTest checkstyleJmh; fi
- if [ "$TEST_SUITE" == "guiTest" ]; then ./buildres/gui-tests.sh; fi
- if [ "$TEST_SUITE" == "codecov" ]; then ./gradlew jacocoJunit5TestReport; bash <(curl -s https://codecov.io/bash); fi
- if [ "$DEPENDENCY_UPDATES" == "check" ]; then ./gradlew -q checkOutdatedDependencies; fi

after_failure:
# show test results if build fails
- $TRAVIS_BUILD_DIR/scripts/after-failure.sh

branches:
only:
only:
- master

# cache gradle dependencies
# https://docs.travis-ci.com/user/languages/java#Caching
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
12 changes: 12 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Anh Nghia Tran
Anita Armbruster
Antonio Ribeiro
Arno Blouin
Bartosz J. Kaczkowski
Behrouz Javanmardi
Benjamin Köhler
Berk Gureken
Expand All @@ -44,15 +45,18 @@ Daniel Svärd
David Gleich
David Weitzman
Dennis Tschechlov
Domenico Cufalo
Dominik Waßenhoven
Douglas Nassif Roma Junior
Eduard Braun
Eduardo Greco
Egon Willighagen
Ellen Reitmayr
Erdem Derebasoglu
Erdem Derebaşoğlu
Erik Putrycz
Ervin Kolenovic
Ethan Harris
Fabian Bauer
Fabian Bieker
Fabrice Dessaint
Expand Down Expand Up @@ -90,6 +94,8 @@ Jonathan Powell
Jong-Ho Shinn
Jorge Tornero
Joshua Ramon Enslin
Julian Pfeifer
József Pallagi
Jörg Lenhard
Jörg Wegner
Jörg Zieren
Expand Down Expand Up @@ -117,12 +123,14 @@ Martin Kähmer
Martin Stolle
Mathias Walter
Matthias Geiger
Mattia Bunel
Mattias Ulbrich
mcmoody
Meltem Demirköprü
Michael
Michael Beckmann
Michael Falkenthal
Michael Lass
Michael Spiegel
Michael Wrighton
Michel Baylac
Expand All @@ -143,6 +151,7 @@ Oliver Beckmann
Oliver Kopp
Oscar Gustafsson
Owen Huang
Patrick Scheibe
Paul Martin
payload
Peter Ansell
Expand Down Expand Up @@ -184,6 +193,7 @@ Thorsten Dahlheimer
Tim van Rossum
Tim Würtele
Tobias Boceck
Tobias Bouschen
Tobias Denkinger
Tobias Diez
tokkot
Expand All @@ -194,6 +204,7 @@ Ulrich Stärk
Ulrik Stervbo
Uwe Kuehn
Vincent W. Yang
Waida Fan
Waluyo Adi Siswanto
Ward Poelmans
Wenbo Yang
Expand All @@ -202,3 +213,4 @@ Yang Zongze
Yara Grassi Gouffon
Yifan Peng
zacmks
Zhang Liang
118 changes: 67 additions & 51 deletions CHANGELOG.md

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ because <additional rationale>.

### When adding a new Localization.lang entry
Add new `Localization.lang("KEY")` to Java file.
Tests fail. In the test output a snippet is generated which must be added to the English translation file. There is also a snippet generated for the non-English files, but this is irrelevant.
Add snippet to English translation file located at `src/main/resources/l10n/JabRef_en.properties`
With `gradlew localizationUpdate` the "KEY" is added to the other translation files as well.
Tests are green again.
Tests fail. In the test output a snippet is generated which must be added to the English translation file.
Add snippet to English translation file located at `src/main/resources/l10n/JabRef_en.properties`.
[Crowdin](http://translate.jabref.org/) will automatically pick up the new string and add it to the other translations.

You can also directly run the specific test in your IDE. The test "LocalizationConsistencyTest" is placed under `src/test/java/net.sf.jabref.logic.l10n/LocalizationConsistencyTest.java`
Find more information in the [JabRef Wiki](https://github.com/JabRef/jabref/wiki/Code-Howtos#using-localization-correctly).
Expand Down
Loading

0 comments on commit c91fe49

Please sign in to comment.