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.

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

Remove underscore in Localized messages #3336

Merged
merged 1 commit into from
Oct 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/cli/ArgumentProcessor.java
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ private void regenerateBibtexKeys(List<ParserResult> 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"));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/EntryTypeDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private String convertToHtml(List<BibEntry> list) {
htmlContent.append("<br><div style='margin-left: 5px'>");
htmlContent.append(
"<a href='http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/#' target=\"_blank\">");
htmlContent.append(Localization.lang("What_is_Mr._DLib?"));
htmlContent.append(Localization.lang("What is Mr. DLib?"));
htmlContent.append("</a></div>");
htmlContent.append("</body></html>");
return htmlContent.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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()));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class RegexFormatter implements Formatter {

@Override
public String getName() {
return Localization.lang("regular_expression");
return Localization.lang("regular expression");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public Optional<BibEntry> 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public List<BibEntry> 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);
Expand Down