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

Jump to bottom

Keep UTF-8 encoding header if present #8964

Merged
merged 2 commits into from
Jul 9, 2022
Merged

Keep UTF-8 encoding header if present #8964

merged 2 commits into from
Jul 9, 2022

Conversation

koppor
Copy link
Member

@koppor koppor commented Jul 9, 2022

Based on the forum post https://discourse.jabref.org/t/encoding-utf-8-not-in-bib-file/3438?u=koppor.

We should keep the header if it is in the file, because

I’ll need this first line of “% Encoding: UTF-8” when using my bib file in other programs

The deletion "feature" was introduced at #8506.

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

koppor and others added 2 commits July 9, 2022 23:40
@koppor @Siedlerchr @ThiloteE
Keep UTF-8 encoding header if present
775e140 
Co-authored-by: Christoph <siedlerkiller@gmail.com>
Co-authored-by: ThiloteE <73715071+ThiloteE@users.noreply.github.com>
@koppor
Add CHANGELOG.md entry
c5db124
@Siedlerchr Siedlerchr added status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers unicode unicode related issues labels Jul 9, 2022
@calixtus calixtus merged commit 3874aa3 into main Jul 9, 2022
@calixtus calixtus deleted the keep-encoding-header branch July 9, 2022 21:53
Siedlerchr added a commit that referenced this pull request Jul 10, 2022
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into detectCharset
cf59352 
* upstream/main:
  Keep UTF-8 encoding header if present (#8964)
  Cleanup index when opening a library (#8962)
  Refactor context menu entry types changing (#8957)
  Improvement on check for missing commas when importing or opening a .bib file (#8840)

# Conflicts:
#	src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
Siedlerchr added a commit that referenced this pull request Jul 14, 2022
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into improve-DOI-import-…
6b7dfa9 
…failure-dialog

* upstream/main: (76 commits)
  New Crowdin updates (#8972)
  New Crowdin updates (#8969)
  Fix .bat errorlevel handling with pwsh.exe check (#8965)
  revert jsoup version upgrade
  Fix charset detection with utf16 and others (#8947)
  Bump classgraph from 4.8.147 to 4.8.149 (#8968)
  Bump jsoup from 1.15.1 to 1.15.2 (#8967)
  Keep UTF-8 encoding header if present (#8964)
  Cleanup index when opening a library (#8962)
  Refactor context menu entry types changing (#8957)
  Improvement on check for missing commas when importing or opening a .bib file (#8840)
  Disable ResearchGateTest on CI (#8955)
  Bump checkstyle from 10.1 to 10.3.1 (#8950)
  Bump checkstyle from 10.1 to 10.3.1 (#8950)
  Bump mariadb-java-client from 2.7.5 to 2.7.6 (#8953)
  Add notification when adding previous entries to new group configuration (#8919)
  Remember Sidepane width after restart (#8936)
  move "Warn about duplicates on import" preferences option (#8937)
  Fix theme switching exception (#8939)
  fix merge conflict
  ...

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties
Siedlerchr added a commit to LIM0000/jabref that referenced this pull request Jul 15, 2022
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into fix-for-issue-8189
33de3cf 
* upstream/main: (28 commits)
  [Bot] Update CSL styles (JabRef#8978)
  New Crowdin updates (JabRef#8972)
  New Crowdin updates (JabRef#8969)
  Fix .bat errorlevel handling with pwsh.exe check (JabRef#8965)
  revert jsoup version upgrade
  Fix charset detection with utf16 and others (JabRef#8947)
  Bump classgraph from 4.8.147 to 4.8.149 (JabRef#8968)
  Bump jsoup from 1.15.1 to 1.15.2 (JabRef#8967)
  Keep UTF-8 encoding header if present (JabRef#8964)
  Cleanup index when opening a library (JabRef#8962)
  Refactor context menu entry types changing (JabRef#8957)
  Improvement on check for missing commas when importing or opening a .bib file (JabRef#8840)
  Disable ResearchGateTest on CI (JabRef#8955)
  Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950)
  Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950)
  Bump mariadb-java-client from 2.7.5 to 2.7.6 (JabRef#8953)
  Add notification when adding previous entries to new group configuration (JabRef#8919)
  Remember Sidepane width after restart (JabRef#8936)
  move "Warn about duplicates on import" preferences option (JabRef#8937)
  Fix theme switching exception (JabRef#8939)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
Siedlerchr added a commit to Ognimalf/jabref that referenced this pull request Jul 18, 2022
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into Ognimalf/main
658cbea 
* upstream/main: (25 commits)
  Update Gradle Wrapper from 7.4.2 to 7.5. (JabRef#8986)
  New translations JabRef_en.properties (Russian) (JabRef#8985)
  [Bot] Update CSL styles (JabRef#8978)
  New Crowdin updates (JabRef#8972)
  New Crowdin updates (JabRef#8969)
  Fix .bat errorlevel handling with pwsh.exe check (JabRef#8965)
  revert jsoup version upgrade
  Fix charset detection with utf16 and others (JabRef#8947)
  Bump classgraph from 4.8.147 to 4.8.149 (JabRef#8968)
  Bump jsoup from 1.15.1 to 1.15.2 (JabRef#8967)
  Keep UTF-8 encoding header if present (JabRef#8964)
  Cleanup index when opening a library (JabRef#8962)
  Refactor context menu entry types changing (JabRef#8957)
  Improvement on check for missing commas when importing or opening a .bib file (JabRef#8840)
  Disable ResearchGateTest on CI (JabRef#8955)
  Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950)
  Bump checkstyle from 10.1 to 10.3.1 (JabRef#8950)
  Bump mariadb-java-client from 2.7.5 to 2.7.6 (JabRef#8953)
  Add notification when adding previous entries to new group configuration (JabRef#8919)
  Remember Sidepane width after restart (JabRef#8936)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Siedlerchr Siedlerchr Siedlerchr approved these changes

@calixtus calixtus calixtus approved these changes

Assignees
No one assigned
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers unicode unicode related issues
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@koppor @Siedlerchr @calixtus