Skip to content

Fix authors UTF8 display #1954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 11, 2016
Merged

Fix authors UTF8 display #1954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58cbadb
Add filteringCharset = 'UTF-8'
Siedlerchr Sep 9, 2016
2707a54
Read properties file with UTF8 encoding
Siedlerchr Sep 11, 2016
1581dd9
Merge branch 'master' into gradleEncoding
Siedlerchr Sep 11, 2016
d9583d8
Joerg->Jörg
Siedlerchr Sep 11, 2016
4b2228e
Unified spaces
Siedlerchr Sep 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions DEVELOPERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Oliver Kopp (since 2011)
Simon Harrer (since 2014)
Joerg Lenhard (since 2015)
Stefan Kolb (since 2015)
Jörg Lenhard (since 2015)
Stefan Kolb (since 2015)
Matthias Geiger (since 2015)
Oscar Gustafsson (since 2015)
Tobias Diez (since 2015)
Tobias Diez (since 2015)
Christoph Schwentker (since 2016)
3 changes: 2 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ install4j {
installDir = file(project.ext.install4jDir)
}


repositories {
jcenter()
}
Expand Down Expand Up @@ -151,9 +152,9 @@ processResources {
"year": String.valueOf(Calendar.getInstance().get(Calendar.YEAR)),
"authors": new File('AUTHORS').readLines().findAll { !it.startsWith("#") }.join(", "),
"developers": new File('DEVELOPERS').readLines().findAll { !it.startsWith("#") }.join(", "))

filteringCharset = 'UTF-8'
}
filteringCharset = 'UTF-8'

filesMatching("resource/**/meta.xml") {
expand version: project.version
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/net/sf/jabref/logic/util/BuildInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Properties;

public class BuildInfo {
Expand All @@ -18,16 +20,19 @@ public class BuildInfo {
private final String developers;
private final String year;


public BuildInfo() {
this("/build.properties");
}

public BuildInfo(String path) {
Properties properties = new Properties();

try (InputStream stream = getClass().getResourceAsStream(path)) {
if(stream != null) {
properties.load(stream);
try (InputStream stream = BuildInfo.class.getResourceAsStream(path)) {
if (stream != null) {
try (InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
properties.load(reader);
}
}
} catch (IOException ignored) {
// nothing to do -> default already set
Expand Down