Replace in localization by \n by koppor · Pull Request #7279 · JabRef/jabref

koppor · 2020-12-31T18:54:20Z

Triggered by #7232 (comment), I saw that we did not cover the RuntimeExceptions by test cases. This PR adds them.

This PR also adds a check for \n in Localization strings. I do not now anything about handling   and \n in JavaFX. It seems, that we cannot have line breaks in either way. Maybe, I should document that somewhere.

Change in CHANGELOG.md described (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 documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

Siedlerchr · 2020-12-31T19:38:00Z

I think only in the search the formatting html tool tip are replaced with javafx formatting for bold etc
Line breaks using \n must be outside the Localization.lang calls
e.g Localization.lang("first line") +\n + Localization.lang("second line")

Siedlerchr · 2020-12-31T19:43:07Z

But according to this thread https://stackoverflow.com/a/10285574/3450689

They should also work in the keys

koppor · 2021-01-01T12:58:47Z

I think only in the search the formatting html tool tip are replaced with javafx formatting for bold etc
Line breaks using \n must be outside the Localization.lang calls
e.g Localization.lang("first line") +\n + Localization.lang("second line")

We should never split up lines of localizations into different keys. Thank you for the \n pointer in the other message. I'll update the PR accordingly.

Fix checkstyle

…d-exception-test

koppor · 2021-01-01T21:01:32Z

Intermediate report: We had  hardcorded and replaced it by \n at

jabref/src/main/java/org/jabref/gui/search/GlobalSearchBar.java

Line 333 in afdb194

genericDescription = genericDescription.replace("", "\n");

.

I am trying to dig deeper there.

Siedlerchr · 2021-01-01T21:38:38Z

We should only keep the HTML tags for bold, italic and monospaced (See ToolTipTextUtil) because otherwise we can't indicate if the text is bold or not. As Javafx does not have HTML support, we must then use a TextFlow element with the CSS.

- Remove obsolete translation keys - Make use of <tt> feature of ToolTipTextUtil

- Introduce special constructors for the .java and the .properties case - Fix escaping - Remove nested sub class

tobiasdiez · 2021-01-03T14:16:47Z

It may also worthwhile to explore if the language keys still need to be escaped at all. If I remember correctly, that's actually not the case any longer.

- Change HashMap to more generic Map

…nches inside method)

koppor · 2021-06-07T00:19:55Z

Current result:

…ure is a GUI feature now

calixtus

Two questions.
Everything else looks good enough to me. ;-)

calixtus · 2021-06-07T19:09:49Z

Btw.: Error: eckstyle] [ERROR] /home/runner/work/jabref/jabref/src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java:3:8: Unused import - java.util.Arrays. [UnusedImports]

* upstream/main: Refactoring existing unit tests into parametrized tests (#7700) Replace in localization by \n (#7279) Bump byte-buddy-parent from 1.11.0 to 1.11.1 (#7800) Bump org.javamodularity.moduleplugin from 1.8.6 to 1.8.7 (#7799) Bump mockito-core from 3.10.0 to 3.11.0 (#7801) Bump classgraph from 4.8.106 to 4.8.108 (#7802) Update .markdownlint.yml Ignore slant.co links GitBook: [main] 3 pages and 17 assets modified GitBook: [main] one page modified GitBook: [main] one page modified GitBook: [main] 6 pages and 42 assets modified # Conflicts: # build.gradle

calixtus · 2022-04-22T11:30:47Z

ManageStudyDefinitionView.java

Add tests for RuntimeException (and rewrite to ParameterizedTests)

e967ab3

koppor and others added 4 commits January 1, 2021 14:17

Allow \n in Localization.lang calls

f02f169

Update LocalizationParserTest.java

34e9452

Fix checkstyle

WIP - tryping \n instead of 

4770381

Merge branch 'add-exception-test' of github.com:JabRef/jabref into ad…

a46a242

…d-exception-test

Fix checking for \n in tests

bc353b2

koppor changed the title ~~Add tests for RuntimeException (and rewrite to ParameterizedTests)~~ Replace in localization by \n Jan 1, 2021

Siedlerchr approved these changes Jan 1, 2021

View reviewed changes

Simplyfiy error output string generation code

6b3f3c1

koppor marked this pull request as draft January 2, 2021 00:43

koppor added 5 commits January 2, 2021 02:00

WIP: Fix \n parsing behavior

2e97452

- Remove obsolete translation keys - Make use of <tt> feature of ToolTipTextUtil

WIP: Fix \n and \\cite

39fc4a7

- Introduce special constructors for the .java and the .properties case - Fix escaping - Remove nested sub class

Add some test thing (needs to be removed)

1ba93fd

Reorder

78140c3

WIP - escapings still don't work properly

7eaa3d0

koppor added 9 commits January 3, 2021 16:07

WIP: Refactor LocalizationKey again

86e2a94

- Change HashMap to more generic Map

Fix escaping

bdcc83f

- Add getValueForEnglishPropertiesFile()

e078531

Fix escaping for Java keys

69778b6

Remove test strings

ff902c4

Add some more newlines for nicer output

8810dbc

Remove escapings in tests, too

cd2a85f

Fix checkstyle - and refine output message

f14ab14

Remove unused import

adfaa21

koppor assigned koppor and unassigned calixtus Jun 6, 2021

koppor added 9 commits June 7, 2021 00:27

Eliminate duplicate code

ea29111

Rename "tooltip" to "serachFieldToolTip" (and use updateHintVisibility)

ac2385b

Mve textToHTMLString very down

b896f96

Rename setHintTooltip to setSearchFieldHintTooltip (and switch if bra…

6b78b87

…nches inside method)

Try new string

0597734

Final text

0c3751b

Add CHANGELOG entry

22dfa20

Fix langugage file

92de1ca

Fix string

dbc4dcb

koppor added 2 commits June 7, 2021 02:35

Fix checkstyle

424377d

Hints are not included in the SearchRuleDescriber any more - the feat…

2f297e5

…ure is a GUI feature now

koppor added status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers and removed status: changes-required Pull requests that are not yet complete labels Jun 7, 2021

koppor marked this pull request as ready for review June 7, 2021 00:45

koppor requested a review from calixtus June 7, 2021 00:46

Merge branch 'main' into add-exception-test

5985568

calixtus reviewed Jun 7, 2021

View reviewed changes

Comment thread src/main/java/org/jabref/gui/util/TooltipTextUtil.java Outdated

Comment thread src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java Outdated

Address comments

1c6ce5b

koppor removed the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jun 7, 2021

monospaced really is tt (and not kbd). Also fix method name.

cf6abee

calixtus merged commit ffd623d into main Jun 7, 2021

calixtus deleted the add-exception-test branch June 7, 2021 21:10

koppor mentioned this pull request Apr 28, 2023

Change default File Chooser to show supported files extensions #9812

Merged

koppor mentioned this pull request Apr 21, 2024

[WIP] Implement copying cross-references #11228

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Replace <p> in localization by \n#7279

Replace <p> in localization by \n#7279
calixtus merged 39 commits into
mainfrom
add-exception-test

koppor commented Dec 31, 2020

Uh oh!

Siedlerchr commented Dec 31, 2020

Uh oh!

Siedlerchr commented Dec 31, 2020

Uh oh!

koppor commented Jan 1, 2021

Uh oh!

koppor commented Jan 1, 2021

Uh oh!

Siedlerchr commented Jan 1, 2021 •

edited

Loading

Uh oh!

tobiasdiez commented Jan 3, 2021

Uh oh!

koppor commented Jun 7, 2021

Uh oh!

calixtus left a comment

Uh oh!

Uh oh!

Uh oh!

calixtus commented Jun 7, 2021

Uh oh!

calixtus commented Apr 22, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

koppor commented Dec 31, 2020

Uh oh!

Siedlerchr commented Dec 31, 2020

Uh oh!

Siedlerchr commented Dec 31, 2020

Uh oh!

koppor commented Jan 1, 2021

Uh oh!

koppor commented Jan 1, 2021

Uh oh!

Siedlerchr commented Jan 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tobiasdiez commented Jan 3, 2021

Uh oh!

koppor commented Jun 7, 2021

Uh oh!

calixtus left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

calixtus commented Jun 7, 2021

Uh oh!

calixtus commented Apr 22, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Siedlerchr commented Jan 1, 2021 •

edited

Loading