Skip to content

Commit

Permalink
Revert "Remove double localization for Help Actions (see #154)"
Browse files Browse the repository at this point in the history
This reverts commit d960c01.
  • Loading branch information
matthiasgeiger committed Sep 14, 2015
1 parent 333bcad commit 7eb8206
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions src/main/java/net/sf/jabref/gui/JabRefFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,14 @@ void addAction(Action a) {
private final AbstractAction newSubDatabaseAction = new NewSubDatabaseAction(this);
private final AbstractAction integrityCheckAction = new IntegrityCheckAction(this);
private final AbstractAction forkMeOnGitHubAction = new ForkMeOnGitHubAction();
private final AbstractAction help = new HelpAction("JabRef help", helpDiag, GUIGlobals.baseFrameHelp, "JabRef help",
private final AbstractAction help = new HelpAction("JabRef help", helpDiag,
GUIGlobals.baseFrameHelp, Localization.lang("JabRef help"),
prefs.getKey("Help"));
private final AbstractAction contents = new HelpAction("Help contents", helpDiag,
GUIGlobals.helpContents, "Help contents",
GUIGlobals.helpContents, Localization.lang("Help contents"),
IconTheme.getImage("helpContents"));
private final AbstractAction about = new HelpAction("About JabRef", helpDiag,
GUIGlobals.aboutPage,"About JabRef",
GUIGlobals.aboutPage, Localization.lang("About JabRef"),
IconTheme.getImage("about"));
private final AbstractAction editEntry = new GeneralAction(Actions.EDIT, "Edit entry",
Localization.lang("Edit entry"),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sf/jabref/gui/preftabs/ExternalTab.java
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public void itemStateChanged(ItemEvent e) {
builder.append(regExpTextField);

HelpAction helpAction = new HelpAction(helpDialog, GUIGlobals.regularExpressionSearchHelp,
"Help on Regular Expression Search", IconTheme.getImage("helpSmall"));
Localization.lang("Help on Regular Expression Search"), IconTheme.getImage("helpSmall"));
builder.append(helpAction.getIconButton());
builder.nextLine();
builder.append(new JPanel());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public PreviewPrefsTab(JabRefPreferences prefs) {

{ // Help Button
HelpAction helpAction = new HelpAction(GUIGlobals.helpDiag, GUIGlobals.previewHelp,
"Help on Preview Settings", IconTheme.getImage("helpSmall"));
Localization.lang("Help on Preview Settings"), IconTheme.getImage("helpSmall"));
JButton help = helpAction.getIconButton();
pdfPreviewPanel.add(help, BorderLayout.EAST);
}
Expand Down

0 comments on commit 7eb8206

Please sign in to comment.