From b8e1291c300c59443b294c91028b17c05a1aa7ca Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Mon, 23 Oct 2017 18:37:39 +0200 Subject: [PATCH] Remove underscore in Localized messages --- CHANGELOG.md | 2 +- src/main/java/org/jabref/cli/ArgumentProcessor.java | 2 +- src/main/java/org/jabref/gui/EntryTypeDialog.java | 2 +- src/main/java/org/jabref/gui/desktop/JabRefDesktop.java | 2 +- .../java/org/jabref/gui/entryeditor/RelatedArticlesTab.java | 2 +- .../java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java | 2 +- .../java/org/jabref/gui/shared/SharedDatabaseUIManager.java | 4 ++-- src/main/java/org/jabref/logic/auxparser/AuxParserResult.java | 2 +- .../jabref/logic/formatter/bibtexfields/RegexFormatter.java | 2 +- .../jabref/logic/importer/fetcher/AbstractIsbnFetcher.java | 2 +- .../java/org/jabref/logic/importer/fetcher/DoiFetcher.java | 2 +- .../java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a5b8c89c03..e1f173523dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We improved the way metadata is updated in remote databases. [#3235](https://github.com/JabRef/jabref/issues/3235) - We improved font rendering of the Entry Editor for Linux based systems [#3295](https://github.com/JabRef/jabref/issues/3295) - We fixed an issue where JabRef would freeze when trying to replace the original entry after a merge with new information from identifiers like DOI/ISBN etc. [3294](https://github.com/JabRef/jabref/issues/3294) - + - We fixed an issue where JabRef would not show the translated content at some points, although there existed a translation ### Removed diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java index 8ddcb93dd52..b5079bbcb1c 100644 --- a/src/main/java/org/jabref/cli/ArgumentProcessor.java +++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java @@ -519,7 +519,7 @@ private void regenerateBibtexKeys(List loaded) { database, entry, Globals.prefs.getBibtexKeyPatternPreferences()); } } else { - LOGGER.info(Localization.lang("No meta data present in BIB_file. Cannot regenerate BibTeX keys")); + LOGGER.info(Localization.lang("No meta data present in BIB file. Cannot regenerate BibTeX keys")); } } } diff --git a/src/main/java/org/jabref/gui/EntryTypeDialog.java b/src/main/java/org/jabref/gui/EntryTypeDialog.java index 13b711f284d..7a082facf61 100644 --- a/src/main/java/org/jabref/gui/EntryTypeDialog.java +++ b/src/main/java/org/jabref/gui/EntryTypeDialog.java @@ -331,7 +331,7 @@ protected void done() { } else if (searchID.trim().isEmpty()) { JOptionPane.showMessageDialog(frame, Localization.lang("The given search ID was empty."), Localization.lang("Empty search ID"), JOptionPane.WARNING_MESSAGE); } else if (!fetcherException) { - JOptionPane.showMessageDialog(frame, Localization.lang("Fetcher_'%0'_did_not_find_an_entry_for_id_'%1'.", fetcher.getName(), searchID) + "\n" + fetcherExceptionMessage, Localization.lang("No files found."), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(frame, Localization.lang("Fetcher '%0' did not find an entry for id '%1'.", fetcher.getName(), searchID) + "\n" + fetcherExceptionMessage, Localization.lang("No files found."), JOptionPane.WARNING_MESSAGE); } else { JOptionPane.showMessageDialog(frame, Localization.lang("Error while fetching from %0", fetcher.getName()) + "." + "\n" + fetcherExceptionMessage, diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java index db8e820adc8..0d93ede3330 100644 --- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java +++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java @@ -290,7 +290,7 @@ public static void openBrowserShowPopup(String url) { LOGGER.error("Could not open browser", exception); String couldNotOpenBrowser = Localization.lang("Could not open browser."); String openManually = Localization.lang("Please open %0 manually.", url); - String copiedToClipboard = Localization.lang("The_link_has_been_copied_to_the_clipboard."); + String copiedToClipboard = Localization.lang("The link has been copied to the clipboard."); JabRefGUI.getMainFrame().output(couldNotOpenBrowser); JOptionPane.showMessageDialog(JabRefGUI.getMainFrame(), couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard, couldNotOpenBrowser, JOptionPane.ERROR_MESSAGE); diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java index efda59424b9..1888967306f 100644 --- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java +++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java @@ -73,7 +73,7 @@ private String convertToHtml(List list) { htmlContent.append("
"); htmlContent.append( ""); - htmlContent.append(Localization.lang("What_is_Mr._DLib?")); + htmlContent.append(Localization.lang("What is Mr. DLib?")); htmlContent.append("
"); htmlContent.append(""); return htmlContent.toString(); diff --git a/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java index 28bc7ebce77..d4cd0788b13 100644 --- a/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java +++ b/src/main/java/org/jabref/gui/preftabs/EntryEditorPrefsTab.java @@ -56,7 +56,7 @@ public EntryEditorPrefsTab(JabRefPreferences prefs) { emacsRebindCtrlA = new JCheckBox(Localization.lang("Rebind C-a, too")); emacsRebindCtrlF = new JCheckBox(Localization.lang("Rebind C-f, too")); autoComplete = new JCheckBox(Localization.lang("Enable word/name autocompletion")); - recommendations = new JCheckBox(Localization.lang("Show 'Related_Articles' tab")); + recommendations = new JCheckBox(Localization.lang("Show 'Related Articles' tab")); // allowed name formats autoCompFF = new JRadioButton(Localization.lang("Autocomplete names in 'Firstname Lastname' format only")); diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java index e775aa6bfc7..9851104cb7c 100644 --- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java +++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java @@ -111,7 +111,7 @@ public BasePanel openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnectio dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer(); dbmsSynchronizer.openSharedDatabase(dbmsConnectionProperties); dbmsSynchronizer.registerListener(this); - frame.output(Localization.lang("Connection_to_%0_server_established.", dbmsConnectionProperties.getType().toString())); + frame.output(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString())); return frame.addTab(bibDatabaseContext, true); } @@ -140,6 +140,6 @@ public void openSharedDatabaseFromParserResult(ParserResult parserResult) dbmsSynchronizer.openSharedDatabase(dbmsConnectionProperties); dbmsSynchronizer.registerListener(this); parserResult.setDatabaseContext(bibDatabaseContext); - frame.output(Localization.lang("Connection_to_%0_server_established.", dbmsConnectionProperties.getType().toString())); + frame.output(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString())); } } diff --git a/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java b/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java index 92abff72901..d30eb65875f 100644 --- a/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java +++ b/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java @@ -92,7 +92,7 @@ public String getInformation(boolean includeMissingEntries) { } } if (nestedAuxCount > 0) { - result.append(Localization.lang("nested_AUX_files")).append(' ').append(nestedAuxCount); + result.append(Localization.lang("nested AUX files")).append(' ').append(nestedAuxCount); } return result.toString(); } diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java index 3ad3b763676..870deeffbb1 100644 --- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java +++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java @@ -40,7 +40,7 @@ public class RegexFormatter implements Formatter { @Override public String getName() { - return Localization.lang("regular_expression"); + return Localization.lang("regular expression"); } @Override diff --git a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java index 11ed55e316e..4c5476bf359 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java @@ -25,7 +25,7 @@ public HelpFile getHelpPage() { protected void ensureThatIsbnIsValid(String identifier) throws FetcherException { ISBN isbn = new ISBN(identifier); if (!isbn.isValid()) { - throw new FetcherException(Localization.lang("Invalid_ISBN:_'%0'.", identifier)); + throw new FetcherException(Localization.lang("Invalid ISBN: '%0'.", identifier)); } } diff --git a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java index 1c7a1587395..ed229d87c66 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java @@ -59,7 +59,7 @@ public Optional performSearchById(String identifier) throws FetcherExc fetchedEntry.ifPresent(this::doPostCleanup); return fetchedEntry; } else { - throw new FetcherException(Localization.lang("Invalid_DOI:_'%0'.", identifier)); + throw new FetcherException(Localization.lang("Invalid DOI: '%0'.", identifier)); } } catch (IOException e) { throw new FetcherException(Localization.lang("Connection error"), e); diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java index c51becf055c..9acaba3ad5f 100644 --- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java +++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java @@ -59,7 +59,7 @@ public List performSearch(BibEntry entry) throws FetcherException { // For displaying An ErrorMessage BibEntry errorBibEntry = new BibEntry(); errorBibEntry.setField("html_representation", - Localization.lang("Error_while_fetching_from_%0", "Mr.DLib")); + Localization.lang("Error while fetching from %0", "Mr.DLib")); BibDatabase errorBibDataBase = new BibDatabase(); errorBibDataBase.insertEntry(errorBibEntry); parserResult = new ParserResult(errorBibDataBase);