Skip to content
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

Respect OS language at NativeDesktop#getDefaultFileChooserDirectory #9837

Merged
merged 14 commits into from
May 18, 2023
Merged

Respect OS language at NativeDesktop#getDefaultFileChooserDirectory #9837

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
13ee62b
Respect OS language at NativeDesktop#getDefaultFileChooserDirectory
koppor May 2, 2023
70fc205
Fix tests
koppor May 2, 2023
d66a1b0
Incorporate user feedback
koppor May 4, 2023
e869e92
Check for existance
koppor May 7, 2023
b1deae1
Fix formatting
koppor May 7, 2023
e4bd3d1
Add xdg-user-dirs call to Linux.java
koppor May 7, 2023
b6767e7
Merge branch 'main' into fix-8010
koppor May 7, 2023
61f5616
Fix IOUtils usage
koppor May 7, 2023
32655cd
More error handling
koppor May 7, 2023
a840449
Fixed command name
calixtus May 11, 2023
817f675
Merge branch 'main' into fix-8010
koppor May 12, 2023
f33c540
Update tinylog.properties
koppor May 12, 2023
76c776f
Merge remote-tracking branch 'upstream/main' into fix-8010
Siedlerchr May 18, 2023
8a27d9a
checkstyle
Siedlerchr May 18, 2023
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
4 changes: 2 additions & 2 deletions src/main/java/org/jabref/gui/desktop/os/Linux.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.jabref.gui.util.StreamGobbler;
import org.jabref.logic.l10n.Localization;

import com.microsoft.applicationinsights.core.dependencies.apachecommons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -182,7 +181,8 @@ public Path getDefaultFileChooserDirectory() {
// See https://www.freedesktop.org/wiki/Software/xdg-user-dirs/ for details
try {
Process process = new ProcessBuilder("xdg-user-dirs", "DOCUMENTS").start();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the script is called xdg-user-dir without the s. Its a mess i know. The ""Toolkit"" is called -dirs but the script that you actually run is called -dir

Copy link

@dermalikmann dermalikmann May 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested it anyways by copying the script with the modified name into my path, and it successfully puts /home/<USER>/Dokumente into the "Main file directory" field.

List<String> strings = IOUtils.readLines(process.getInputStream(), StandardCharsets.UTF_8);
List<String> strings = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8))
.lines().toList();
String documentsPath = strings.get(0);
koppor marked this conversation as resolved.
Show resolved Hide resolved
LOGGER.debug("Got documents path {}", documentsPath);
return Path.of(documentsPath);
Expand Down