Skip to content

Translate new messages#2341

Merged
koppor merged 1 commit into
JabRef:masterfrom
frithnanth:patch-8
Dec 6, 2016
Merged

Translate new messages#2341
koppor merged 1 commit into
JabRef:masterfrom
frithnanth:patch-8

Conversation

@frithnanth

Copy link
Copy Markdown
Contributor
  • Change in CHANGELOG.md described
  • Tests created for changes
  • Screenshots added (for bigger UI changes)
  • Manually tested changed features in running JabRef
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)
  • If you changed the localization: Did you run gradle localizationUpdate?

@koppor

koppor commented Dec 6, 2016

Copy link
Copy Markdown
Member

Thank you for the fast translations. 🔥

@koppor koppor merged commit d62315c into JabRef:master Dec 6, 2016
Siedlerchr added a commit that referenced this pull request Dec 6, 2016
* upstream/master:
  Translate new messages (#2341)
  Update gradle from 3.2 to 3.2.1
  Update com.github.johnrengelman.shadow from 1.2.3 to 1.2.4
  Introduce categories: DatabseTests, FetcherTests, GUITests
  Place oracle stub into src/main/java
  Move all tests into src/test/java

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Siedlerchr added a commit that referenced this pull request Dec 6, 2016
* upstream/master:
  Translate new messages (#2341)
  Update gradle from 3.2 to 3.2.1
  Update com.github.johnrengelman.shadow from 1.2.3 to 1.2.4
  Introduce categories: DatabseTests, FetcherTests, GUITests
  Place oracle stub into src/main/java
  Move all tests into src/test/java

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Siedlerchr added a commit that referenced this pull request Dec 6, 2016
* upstream/master:
  Translate new messages (#2341)
  Update gradle from 3.2 to 3.2.1
  Update com.github.johnrengelman.shadow from 1.2.3 to 1.2.4
  Introduce categories: DatabseTests, FetcherTests, GUITests
  Place oracle stub into src/main/java
  Move all tests into src/test/java
stefan-kolb pushed a commit that referenced this pull request Dec 7, 2016
* Create a new settings field for DirectoryPattern
ATM hardcoded to entrytype
Drag and Drop file now respects fileDirPattern

* Cleanup/Rename PDF now moves the file to the targetDir, too

* Cleanup operation now works, too
Rename getFileDirectory to getFileDirectories
Create new method for returning the firstExistingFileDir
TODO: Add tests
TODO: Add targetDir in dlg

* Change layout back to default
Fix imports after merge

* Add fileDirPattern to Prefs
Compatibily for old behaviour when no fileDirPattern is set
Use new prefs structure

* Fix NPE by settting BibLocation as primary Dir

* TearDown to @after

* Fix merge conflicts

* Fix failing tests
Use default setting of Empty string
fix layout

* Fix moving/creating directories files on every cleanup

* Fix: When fileDirPattern is Empty only rename the file (backwards compatibility)

* Fix Rename file only if no fileDirPattern is present in settings

* Moved return out of for-loop

* Reactivated test

* Fix failing test, set ImportFileDirPattern default to empty

* Fix whitespace

* Add some junit tests for fileDirPatterns

* Add localization, fix checkstyle

* Make junit test methods OS independent
Remove debug outputs

* Added changelog entry, fix lang error

* Fix empty lines and remove Sysouts
Reformat

* Remove settings prefs und fixed bug

* Fix empty lines and duplicate lang key

* Remove assumption to test ci build again

* Remove intialization, fix empty lines

* Merge remote-tracking branch 'upstream/master' into fileDirPattern

* upstream/master:
  Translate new messages (#2341)
  Update gradle from 3.2 to 3.2.1
  Update com.github.johnrengelman.shadow from 1.2.3 to 1.2.4
  Introduce categories: DatabseTests, FetcherTests, GUITests
  Place oracle stub into src/main/java
  Move all tests into src/test/java

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

* Merge remote-tracking branch 'upstream/master' into fileDirPattern

* upstream/master:
  Translate new messages (#2341)
  Update gradle from 3.2 to 3.2.1
  Update com.github.johnrengelman.shadow from 1.2.3 to 1.2.4
  Introduce categories: DatabseTests, FetcherTests, GUITests
  Place oracle stub into src/main/java
  Move all tests into src/test/java

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

* Fix conflict

* Merge branch 'fileDirPattern' of https://github.com/JabRef/jabref into fileDirPattern

* 'fileDirPattern' of https://github.com/JabRef/jabref:
  Merge remote-tracking branch 'upstream/master' into fileDirPattern

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

* Fix conflict

* Mock FileDirectoryPreferences to fix cleanup problems
Siedlerchr added a commit that referenced this pull request Dec 7, 2016
* upstream/master:
  Remove obsolete variable
  Translate new messages (#2341)
  Update gradle from 3.2 to 3.2.1
tobiasdiez pushed a commit to tobiasdiez/jabref that referenced this pull request Dec 10, 2016
tobiasdiez pushed a commit to tobiasdiez/jabref that referenced this pull request Dec 10, 2016
* Create a new settings field for DirectoryPattern
ATM hardcoded to entrytype
Drag and Drop file now respects fileDirPattern

* Cleanup/Rename PDF now moves the file to the targetDir, too

* Cleanup operation now works, too
Rename getFileDirectory to getFileDirectories
Create new method for returning the firstExistingFileDir
TODO: Add tests
TODO: Add targetDir in dlg

* Change layout back to default
Fix imports after merge

* Add fileDirPattern to Prefs
Compatibily for old behaviour when no fileDirPattern is set
Use new prefs structure

* Fix NPE by settting BibLocation as primary Dir

* TearDown to @after

* Fix merge conflicts

* Fix failing tests
Use default setting of Empty string
fix layout

* Fix moving/creating directories files on every cleanup

* Fix: When fileDirPattern is Empty only rename the file (backwards compatibility)

* Fix Rename file only if no fileDirPattern is present in settings

* Moved return out of for-loop

* Reactivated test

* Fix failing test, set ImportFileDirPattern default to empty

* Fix whitespace

* Add some junit tests for fileDirPatterns

* Add localization, fix checkstyle

* Make junit test methods OS independent
Remove debug outputs

* Added changelog entry, fix lang error

* Fix empty lines and remove Sysouts
Reformat

* Remove settings prefs und fixed bug

* Fix empty lines and duplicate lang key

* Remove assumption to test ci build again

* Remove intialization, fix empty lines

* Merge remote-tracking branch 'upstream/master' into fileDirPattern

* upstream/master:
  Translate new messages (JabRef#2341)
  Update gradle from 3.2 to 3.2.1
  Update com.github.johnrengelman.shadow from 1.2.3 to 1.2.4
  Introduce categories: DatabseTests, FetcherTests, GUITests
  Place oracle stub into src/main/java
  Move all tests into src/test/java

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

* Merge remote-tracking branch 'upstream/master' into fileDirPattern

* upstream/master:
  Translate new messages (JabRef#2341)
  Update gradle from 3.2 to 3.2.1
  Update com.github.johnrengelman.shadow from 1.2.3 to 1.2.4
  Introduce categories: DatabseTests, FetcherTests, GUITests
  Place oracle stub into src/main/java
  Move all tests into src/test/java

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

* Fix conflict

* Merge branch 'fileDirPattern' of https://github.com/JabRef/jabref into fileDirPattern

* 'fileDirPattern' of https://github.com/JabRef/jabref:
  Merge remote-tracking branch 'upstream/master' into fileDirPattern

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

* Fix conflict

* Mock FileDirectoryPreferences to fix cleanup problems
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants