summaryrefslogtreecommitdiff
path: root/BKUCommonGUI/src
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-06-02 15:04:20 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-06-02 15:04:20 +0000
commite4b8cec0f43af3aa4272e56e8133cc70512149a2 (patch)
treec399b036fbd4fff036cd72b669daa6ac00518a16 /BKUCommonGUI/src
parent790f1a41dfda0a0040f085d0fed93acbfd143fbb (diff)
downloadmocca-e4b8cec0f43af3aa4272e56e8133cc70512149a2.tar.gz
mocca-e4b8cec0f43af3aa4272e56e8133cc70512149a2.tar.bz2
mocca-e4b8cec0f43af3aa4272e56e8133cc70512149a2.zip
default locale: en, help pages fixed
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@748 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUCommonGUI/src')
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java30
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DeafHelpListener.java67
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java70
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java24
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java24
-rw-r--r--BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties171
-rw-r--r--BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties110
-rw-r--r--BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties109
-rw-r--r--BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java2
9 files changed, 271 insertions, 336 deletions
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
index d806c5fa..578df527 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java
@@ -2290,26 +2290,20 @@ public class BKUGUIImpl implements BKUGUIFacade {
* @param locale
*/
protected void loadMessageBundle(Locale locale) {
- if (locale != null) {
- // see [#378] Ignoring post parameter 'locale': bundle resolve-order
+ if (locale != null) {
+ // see [#378] Ignoring post parameter 'locale': bundle resolve-order
// not correct?!
- Locale lang = new Locale(locale.getLanguage().substring(0, 2));
- log.debug("Loading message bundle for language: {}.", lang.toString());
- messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, lang);
- } else {
- log.debug("Loading default language message bundle.");
- messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
- }
+ log.debug("Loading message bundle for language: {}.", locale);
+ messages = ResourceBundle.getBundle(MESSAGES_BUNDLE, locale);
+ } else {
+ messages = ResourceBundle.getBundle(MESSAGES_BUNDLE);
+ }
- if (log.isDebugEnabled()) {
- if (messages.getLocale() == null
- || "".equals(messages.getLocale().getLanguage())) {
- log.info("Fallback to default locale message bundle.");
- } else {
- log.info("Applet message bundle loaded for {}.",
- messages.getLocale());
- }
- }
+ if ("".equals(messages.getLocale().getLanguage())) {
+ log.debug("Using locale 'default'.");
+ } else {
+ log.debug("Using locale '{}'.", messages.getLocale());
+ }
}
protected int initButtonSize() {
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DeafHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DeafHelpListener.java
deleted file mode 100644
index a4ce79b0..00000000
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DeafHelpListener.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package at.gv.egiz.bku.gui;
-
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import java.util.Locale;
-
-public class DeafHelpListener extends HelpListener {
-
- // localization in helpListener (pass message bundle, getLocale, add language to helpContext) or outside?
- public DeafHelpListener(String helpURL, Locale locale) {
- super(helpURL, locale);
- }
-
- @Override
- public boolean implementsListener() {
- return false;
- }
-
- @Override
- public void mouseClicked(MouseEvent arg0) {
- }
-
- @Override
- public void keyPressed(KeyEvent arg0) {
- }
-
- @Override
- public void mousePressed(MouseEvent e) {
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- }
-
- @Override
- public void mouseEntered(MouseEvent e) {
- }
-
- @Override
- public void mouseExited(MouseEvent e) {
- }
-
- @Override
- public void keyTyped(KeyEvent e) {
- }
-
- @Override
- public void keyReleased(KeyEvent e) {
- }
-
-}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java
index dc597656..2f6f1738 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java
@@ -16,14 +16,16 @@
*/
package at.gv.egiz.bku.gui;
+import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Locale;
import java.util.ResourceBundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class HelpListener implements MouseListener, KeyListener, HelpURLProvider {
+public class HelpListener implements MouseListener, KeyListener, HelpURLProvider {
public static final String MESSAGE_BUNDLE = "at/gv/egiz/bku/gui/Messages";
@@ -32,23 +34,22 @@ public abstract class HelpListener implements MouseListener, KeyListener, HelpUR
protected String helpTopic;
protected ResourceBundle messageBundle;
- // localization in helpListener (pass message bundle, getLocale, add language to helpContext) or outside?
- public HelpListener(String helpURL, Locale locale) {
-// this.codebase = codebase;
- this.helpURL = helpURL;
+ public HelpListener(String baseHelpURL, Locale locale) {
+
+ helpURL = baseHelpURL;
if (locale != null) {
- log.trace("Check for support of requested help locale {}.", locale.getLanguage().substring(0,2));
- messageBundle = ResourceBundle.getBundle(MESSAGE_BUNDLE,
- new Locale(locale.getLanguage().substring(0, 2)));
+ log.trace("Check for support of requested help locale {}.", locale);
+ messageBundle = ResourceBundle.getBundle(MESSAGE_BUNDLE, locale);
} else {
messageBundle = ResourceBundle.getBundle(MESSAGE_BUNDLE);
}
- if (!"".equals(messageBundle.getLocale().getLanguage())) {
- log.trace("Using help locale '{}'.", messageBundle.getLocale().getLanguage().substring(0,2));
- helpURL += messageBundle.getLocale().getLanguage().substring(0,2) + '/';
- } else {
+
+ if ("".equals(messageBundle.getLocale().getLanguage())) {
log.trace("Using help locale 'default'.");
+ } else {
+ log.trace("Using help locale '{}'.", messageBundle.getLocale());
+ helpURL += messageBundle.getLocale().getLanguage() + '/';
}
log.debug("Setting help context to {}.", helpURL);
@@ -66,9 +67,11 @@ public abstract class HelpListener implements MouseListener, KeyListener, HelpUR
log.debug("No help topic set, return index.");
return helpURL + "index.html";
}
- String url = helpURL + helpTopic + ".html";
- log.debug("Return help topic: {}.", url);
- return url;
+ StringBuilder url = new StringBuilder(helpURL);
+ url.append(helpTopic);
+ url.append(".html");
+ log.debug("Return help url: {}.", url.toString());
+ return url.toString();
}
/**
@@ -79,6 +82,39 @@ public abstract class HelpListener implements MouseListener, KeyListener, HelpUR
* (whether a help icon shall be included)
* @return true if this HelpListener implements the Mouse/KeyListeners
*/
- public abstract boolean implementsListener();
-
+ public boolean implementsListener() {
+ return false;
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+ }
+
+ @Override
+ public void keyPressed(KeyEvent arg0) {
+ }
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ }
+
+ @Override
+ public void keyTyped(KeyEvent e) {
+ }
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+ }
}
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
index bfd797e8..0322d5a6 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java
@@ -27,6 +27,7 @@ import java.awt.event.ActionListener;
import java.io.IOException;
import java.net.URL;
import java.text.MessageFormat;
+import java.util.Locale;
import java.util.ResourceBundle;
import javax.swing.GroupLayout;
import javax.swing.JButton;
@@ -49,6 +50,8 @@ import org.slf4j.LoggerFactory;
public class HelpViewer extends JDialog
implements ActionListener {
+ public static final String MESSAGE_BUNDLE = "at/gv/egiz/bku/gui/Messages";
+
private static final long serialVersionUID = 1L;
private final Logger log = LoggerFactory.getLogger(HelpViewer.class);
@@ -65,29 +68,24 @@ public class HelpViewer extends JDialog
* @param messages
*/
public static void showHelpDialog(AppletContext ctx,
- URL helpURL,
-// String helpTopic,
- ResourceBundle messages) {
- showHelpDialog(null, ctx, helpURL, messages); //helpTopic, messages);
+ URL helpURL, ResourceBundle messages) {
+ showHelpDialog(null, ctx, helpURL, messages);
}
- public static void showHelpDialog(URL helpURL,
-// String helpTopic,
- ResourceBundle messages) {
- showHelpDialog(null, null, helpURL, messages); // helpTopic, messages);
+ public static void showHelpDialog(URL helpURL, ResourceBundle messages) {
+ showHelpDialog(null, null, helpURL, messages);
}
public static void showHelpDialog(Component owner,
AppletContext ctx,
URL helpURL,
-// String helpTopic,
ResourceBundle messages) {
Frame frame = null;
if (owner != null) {
JOptionPane.getFrameForComponent(owner);
}
- dialog = new HelpViewer(frame, messages, ctx, helpURL); //, helpTopic);
+ dialog = new HelpViewer(frame, messages, ctx, helpURL);
dialog.setVisible(true);
dialog.toFront();
}
@@ -95,14 +93,12 @@ public class HelpViewer extends JDialog
private HelpViewer(Frame frame,
ResourceBundle messages,
AppletContext ctx,
- URL helpURL) { //, String helpTopic) {
+ URL helpURL) {
super(frame, messages.getString(BKUGUIFacade.WINDOWTITLE_HELP), true);
this.messages = messages;
this.ctx = ctx;
-// String p = messages.getString(BKUGUIFacade.MESSAGE_HELP);
-// String helpItem = messages.getString(helpTopic);
-// String viewerLabel = MessageFormat.format(p, new Object[]{helpItem});
+ log.trace("init help viewer for locale ", messages.getLocale());
JPanel helpPanel = createViewerPanel(helpURL); //viewerLabel, helpURL);
JPanel buttonPanel = createButtonPanel();
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java
index 4860756d..3d01c404 100644
--- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java
+++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/ViewerHelpListener.java
@@ -74,28 +74,4 @@ public class ViewerHelpListener extends HelpListener {
public void keyPressed(KeyEvent arg0) {
displayHelpViewer(getHelpURL());
}
-
- @Override
- public void mousePressed(MouseEvent e) {
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- }
-
- @Override
- public void mouseEntered(MouseEvent e) {
- }
-
- @Override
- public void mouseExited(MouseEvent e) {
- }
-
- @Override
- public void keyTyped(KeyEvent e) {
- }
-
- @Override
- public void keyReleased(KeyEvent e) {
- }
}
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
index ac8b2777..6381bdf9 100644
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages.properties
@@ -13,98 +13,97 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-title.welcome=<html>Willkommen</html>
-title.insertcard=<html>Keine B\u00FCrgerkarte gefunden</html>
-title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
-title.verify.pin=<html>Karte wird gelesen</html>
-title.sign=<html>Signatur erstellen</html>
-title.verify.pinpad=<html>PIN eingeben
-title.error=<html>Fehler</html>
-title.warning=<html>Achtung
-title.entry.timeout=<html>Zeit\u00FCberschreitung</html>
-title.retry=<html>Falsche PIN</html>
-title.wait=<html>Bitte warten</html>
-title.signature.data=<html>Signaturdaten</html>
-windowtitle.save=Signaturdaten speichern
-windowtitle.error=Fehler
-windowtitle.savedir=Signaturdaten in Verzeichnis speichern
-windowtitle.overwrite=Datei \u00FCberschreiben?
-windowtitle.viewer=Signaturdaten
-windowtitle.help=Hilfe zur B\u00FCrgerkarte
+title.welcome=<html>Welcome</html>
+title.insertcard=<html>No citizen card found</html>
+title.cardnotsupported=<html>This card is not supported</html>
+title.verify.pin=<html>Reading card</html>
+title.sign=<html>Create signature</html>
+title.verify.pinpad=<html>Enter PIN
+title.error=<html>Error</html>
+title.warning=<html>Warning
+title.entry.timeout=<html>Timeout</html>
+title.retry=<html>Wrong PIN</html>
+title.wait=<html>Please wait</html>
+title.signature.data=<html>Signature data</html>
+windowtitle.save=Save signature data
+windowtitle.error=Error
+windowtitle.savedir=Save signature data to directory
+windowtitle.overwrite=Overwrite file?
+windowtitle.viewer=Signature data
+windowtitle.help=Citizen card help
# removed message.* prefix to reuse keys as help keys
-welcome=<html>Bitte warten...</html>
-wait=<html>Bitte warten...</html>
-cardnotsupported=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
-insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
-enterpin=<html>{0} eingeben</html>
-enterpin.pinpad=<html>PIN am Kartenleser eingeben</html>
-enterpin.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben</html>
-hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
-hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
-hashdatalink.focus=<html><a href=\"anzeige\">[Signaturdaten anzeigen]</a></html>
-hashdatalink.tiny.focus=<html><a href=\"anzeige\">[Signaturdaten]</a></html>
-#message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
-#message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html>
-#verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung.
-hashdatalist=<html>{0} Signaturdaten:</html>
-hashdata.viewer=<html>Signaturdaten werden im Betrachter angezeigt
-unsupported.mimetype=<html>Signaturdaten speichern und mit einem geeigneten {0} Betrachter \u00F6ffnen.
-retries.last=<html>Letzter Versuch!</html>
-retries=<html>Noch {0} Versuche</html>
-retries.pinpad.last=<html>Eingabe wiederholen, letzter Versuch!</html>
-retries.pinpad=<html>Eingabe wiederholen, noch {0} Versuche</html>
-overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
-help=<html>Hilfe zu {0}</html>
+welcome=<html>Please wait...</html>
+wait=<html>Please wait...</html>
+insertcard=<html>Please insert your citizen card into the reader</html>
+cardnotsupported=<html>Please insert your citizen card into the reader</html>
+enterpin=<html>Enter {0}</html>
+enterpin.pinpad=<html>Enter PIN on card reader pinpad</html>
+enterpin.pinpad.direct=<html>Enter {0} ({1} digits) on card reader pinpad</html>
+hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
+hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
+hashdatalink.focus=<html><a href=\"anzeige\">[Display signature data]</a></html>
+hashdatalink.tiny.focus=<html><a href=\"anzeige\">[signature data]</a></html>
+#message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
+hashdatalist=<html>{0} signature data objects:</html>
+hashdata.viewer=<html>Signature data is being displayed in viewer
+unsupported.mimetype=<html>Save and open signature data with appropriate {0} viewer.
+retries.last=<html>Last try!</html>
+retries=<html>{0} tries left</html>
+retries.pinpad.last=<html>Re-enter pin, last try!</html>
+retries.pinpad=<html>Re-enter pin, {0} tries left</html>
+overwrite=<html>Overwrite {0}?</html>
+help=<html>Help topic {0}</html>
-warning.xhtml=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
+warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standard-compliant display see help.</html>
label.pin=<html>{0}:</html>
-label.pinsize=<html>({0} stellig)</html>
+label.pinsize=<html>({0} digits)</html>
button.ok=OK
-button.cancel=Abbrechen
-button.back=Zur\u00FCck
-button.sign=Signieren
-button.save=Speichern...
-button.close=Schlie\u00DFen
-mimetype.desc.xml=XML-Dateien (.xml)
-mimetype.desc.html=HTML-Dateien (.html, .htm)
-mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
-mimetype.desc.txt=Textdateien (.txt)
-mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
-mimetype.desc.bin=Bin\u00E4rdateien (.bin)
-mimetype.desc.doc=Microsoft Word-Dateien (.doc)
-mimetype.desc.unknown=Alle Dateien (.*)
-save.hashdatainput.prefix=Signaturdaten
-alt.help=Hilfe
-dialog.sigpin.infolabel.sigdata.tooltiptext=Signaturdaten in neuem Fenster anzeigen
+button.cancel=Cancel
+button.back=Back
+button.sign=Sign
+button.save=Save...
+button.close=Close
+mimetype.desc.xml=XML-files (.xml)
+mimetype.desc.html=HTML-files (.html, .htm)
+mimetype.desc.xhtml=XHTML-files (.xhtml)
+mimetype.desc.txt=Textfiles (.txt)
+mimetype.desc.pdf=Adobe PDF-files (.pdf)
+mimetype.desc.bin=Binary files (.bin)
+mimetype.desc.doc=Microsoft Word-files (.doc)
+mimetype.desc.unknown=All files (.*)
+save.hashdatainput.prefix=signaturedata
+alt.help=help
+dialog.sigpin.infolabel.sigdata.tooltiptext=Show signature data in new window
+
# Error Messages
-error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
-error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
-error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
-error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
-error.ws.unreachable=<html>Der Server ist nicht erreichbar</html>
-#error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
-error.pcsc=<html>Es konnte keine PC/SC Schnittstelle gefunden werden</html>
-error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden</html>
-error.unknown.param=<html>Ein Fehler trat auf: {0}</html>
-error.unknown=<html>Ein Fehler trat auf</html>
-error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
-error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
-error.card.notactivated=<html>Die B\u00FCrgerkarte ist nicht aktiviert</html>
-error.pin.timeout=<html>Zeit\u00FCberschreitung bei Eingabe der PIN</html>
-error.viewer=<html>Der Inhalt kann nicht dargestellt werden: {0}
-error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
-error.config=<html>Fehlerhafte Konfiguration des Systems: {0}</html>
+error.no.hashdata=<html>No signature data available: {0}</html>
+error.display.hashdata=<html>Could not display signature data: {0}</html>
+error.write.hashdata=<html>Could not save signature data: {0}</html>
+error.invalid.hash=<html>Invalid signature data: {0}</html>
+error.ws.unreachable=<html>Server unreachable</html>
+#error.ws.unreachable=<html>Web-service unreachable: {0}</html>
+error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
+error.cardterminal=<html>Could not find smartcard reader</html>
+error.unknown.param=<html>An error occured: {0}</html>
+error.unknown=<html>An error occured</html>
+error.test=<html>Error1 {0} - Error2 {1}</html>
+error.card.locked=<html>Citizen card is locked</html>
+error.card.notactivated=<html>Citizen card not activated</html>
+error.pin.timeout=<html>Timeout during PIN entry</html>
+error.viewer=<html>Failed to display contents: {0}
+error.external.link=<html>Cannot open external link {0}</html>
+error.config=<html>Incorrect system configuration: {0}</html>
# Help Topics
-help.welcome=Startseite
-help.wait=Bitte Warten Bildschirm
-help.cardnotsupported=Nicht unterst\u00FCtzte B\u00FCrgerkarte
-help.insertcard=Keine B\u00FCrgerkarte im Kartenleser
-help.cardpin=Pineingabe
-help.signpin=Signatur-Pineingabe
-help.retry=Falsche Pin
-help.hashdata=Signierte Inhalte
-help.hashdatalist=Signierte Inhalte
-help.hashdataviewer=Anzeige signierter Inhalte \ No newline at end of file
+help.welcome=Welcome page
+help.wait=Wait screen
+help.cardnotsupported=Unsupported citizen card
+help.insertcard=No citizen card found
+help.cardpin=Pin entry
+help.signpin=Signature pin entry
+help.retry=Wrong Pin
+help.hashdata=Signed contents
+help.hashdatalist=Signed contents
+help.hashdataviewer=Display of signed contents \ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
new file mode 100644
index 00000000..ac8b2777
--- /dev/null
+++ b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties
@@ -0,0 +1,110 @@
+# Copyright 2008 Federal Chancellery Austria and
+# Graz University of Technology
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+title.welcome=<html>Willkommen</html>
+title.insertcard=<html>Keine B\u00FCrgerkarte gefunden</html>
+title.cardnotsupported=<html>Die Karte wird nicht unterst\u00FCtzt</html>
+title.verify.pin=<html>Karte wird gelesen</html>
+title.sign=<html>Signatur erstellen</html>
+title.verify.pinpad=<html>PIN eingeben
+title.error=<html>Fehler</html>
+title.warning=<html>Achtung
+title.entry.timeout=<html>Zeit\u00FCberschreitung</html>
+title.retry=<html>Falsche PIN</html>
+title.wait=<html>Bitte warten</html>
+title.signature.data=<html>Signaturdaten</html>
+windowtitle.save=Signaturdaten speichern
+windowtitle.error=Fehler
+windowtitle.savedir=Signaturdaten in Verzeichnis speichern
+windowtitle.overwrite=Datei \u00FCberschreiben?
+windowtitle.viewer=Signaturdaten
+windowtitle.help=Hilfe zur B\u00FCrgerkarte
+
+# removed message.* prefix to reuse keys as help keys
+welcome=<html>Bitte warten...</html>
+wait=<html>Bitte warten...</html>
+cardnotsupported=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+insertcard=<html>Bitte die B\u00FCrgerkarte in den Kartenleser stecken</html>
+enterpin=<html>{0} eingeben</html>
+enterpin.pinpad=<html>PIN am Kartenleser eingeben</html>
+enterpin.pinpad.direct=<html>{0} ({1} stellig) am Kartenleser eingeben</html>
+hashdatalink=<html><a href=\"anzeige\">Signaturdaten anzeigen</a></html>
+hashdatalink.tiny=<html><a href=\"anzeige\">Signaturdaten</a></html>
+hashdatalink.focus=<html><a href=\"anzeige\">[Signaturdaten anzeigen]</a></html>
+hashdatalink.tiny.focus=<html><a href=\"anzeige\">[Signaturdaten]</a></html>
+#message.hashdata=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
+#message.hashdata=<html>Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i).</html>
+#verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung.
+hashdatalist=<html>{0} Signaturdaten:</html>
+hashdata.viewer=<html>Signaturdaten werden im Betrachter angezeigt
+unsupported.mimetype=<html>Signaturdaten speichern und mit einem geeigneten {0} Betrachter \u00F6ffnen.
+retries.last=<html>Letzter Versuch!</html>
+retries=<html>Noch {0} Versuche</html>
+retries.pinpad.last=<html>Eingabe wiederholen, letzter Versuch!</html>
+retries.pinpad=<html>Eingabe wiederholen, noch {0} Versuche</html>
+overwrite=<html>M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben?</html>
+help=<html>Hilfe zu {0}</html>
+
+warning.xhtml=<html>Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i).</html>
+label.pin=<html>{0}:</html>
+label.pinsize=<html>({0} stellig)</html>
+button.ok=OK
+button.cancel=Abbrechen
+button.back=Zur\u00FCck
+button.sign=Signieren
+button.save=Speichern...
+button.close=Schlie\u00DFen
+mimetype.desc.xml=XML-Dateien (.xml)
+mimetype.desc.html=HTML-Dateien (.html, .htm)
+mimetype.desc.xhtml=XHTML-Dateien (.xhtml)
+mimetype.desc.txt=Textdateien (.txt)
+mimetype.desc.pdf=Adobe PDF-Dateien (.pdf)
+mimetype.desc.bin=Bin\u00E4rdateien (.bin)
+mimetype.desc.doc=Microsoft Word-Dateien (.doc)
+mimetype.desc.unknown=Alle Dateien (.*)
+save.hashdatainput.prefix=Signaturdaten
+alt.help=Hilfe
+dialog.sigpin.infolabel.sigdata.tooltiptext=Signaturdaten in neuem Fenster anzeigen
+
+# Error Messages
+error.no.hashdata=<html>Keine Signaturdaten verf\u00FCgbar: {0}</html>
+error.display.hashdata=<html>Signaturdaten konnten nicht dargestellt werden: {0}</html>
+error.write.hashdata=<html>Die Signaturdaten konnten nicht gespeichert werden: {0}</html>
+error.invalid.hash=<html>Die Signaturdaten sind ung\u00FCltig: {0}</html>
+error.ws.unreachable=<html>Der Server ist nicht erreichbar</html>
+#error.ws.unreachable=<html>Das Web-Service ist nicht erreichbar: {0}</html>
+error.pcsc=<html>Es konnte keine PC/SC Schnittstelle gefunden werden</html>
+error.cardterminal=<html>Es konnte kein Smartcard-Leser gefunden werden</html>
+error.unknown.param=<html>Ein Fehler trat auf: {0}</html>
+error.unknown=<html>Ein Fehler trat auf</html>
+error.test=<html>Fehler1 {0} - Fehler2 {1}</html>
+error.card.locked=<html>B\u00FCrgerkarte ist gesperrt</html>
+error.card.notactivated=<html>Die B\u00FCrgerkarte ist nicht aktiviert</html>
+error.pin.timeout=<html>Zeit\u00FCberschreitung bei Eingabe der PIN</html>
+error.viewer=<html>Der Inhalt kann nicht dargestellt werden: {0}
+error.external.link=<html>Externer Link {0} wird nicht ge\u00F6ffnet</html>
+error.config=<html>Fehlerhafte Konfiguration des Systems: {0}</html>
+
+# Help Topics
+help.welcome=Startseite
+help.wait=Bitte Warten Bildschirm
+help.cardnotsupported=Nicht unterst\u00FCtzte B\u00FCrgerkarte
+help.insertcard=Keine B\u00FCrgerkarte im Kartenleser
+help.cardpin=Pineingabe
+help.signpin=Signatur-Pineingabe
+help.retry=Falsche Pin
+help.hashdata=Signierte Inhalte
+help.hashdatalist=Signierte Inhalte
+help.hashdataviewer=Anzeige signierter Inhalte \ No newline at end of file
diff --git a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties b/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
deleted file mode 100644
index 6381bdf9..00000000
--- a/BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2008 Federal Chancellery Austria and
-# Graz University of Technology
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-title.welcome=<html>Welcome</html>
-title.insertcard=<html>No citizen card found</html>
-title.cardnotsupported=<html>This card is not supported</html>
-title.verify.pin=<html>Reading card</html>
-title.sign=<html>Create signature</html>
-title.verify.pinpad=<html>Enter PIN
-title.error=<html>Error</html>
-title.warning=<html>Warning
-title.entry.timeout=<html>Timeout</html>
-title.retry=<html>Wrong PIN</html>
-title.wait=<html>Please wait</html>
-title.signature.data=<html>Signature data</html>
-windowtitle.save=Save signature data
-windowtitle.error=Error
-windowtitle.savedir=Save signature data to directory
-windowtitle.overwrite=Overwrite file?
-windowtitle.viewer=Signature data
-windowtitle.help=Citizen card help
-
-# removed message.* prefix to reuse keys as help keys
-welcome=<html>Please wait...</html>
-wait=<html>Please wait...</html>
-insertcard=<html>Please insert your citizen card into the reader</html>
-cardnotsupported=<html>Please insert your citizen card into the reader</html>
-enterpin=<html>Enter {0}</html>
-enterpin.pinpad=<html>Enter PIN on card reader pinpad</html>
-enterpin.pinpad.direct=<html>Enter {0} ({1} digits) on card reader pinpad</html>
-hashdatalink=<html><a href=\"anzeige\">Display signature data</a></html>
-hashdatalink.tiny=<html><a href=\"anzeige\">signature data</a></html>
-hashdatalink.focus=<html><a href=\"anzeige\">[Display signature data]</a></html>
-hashdatalink.tiny.focus=<html><a href=\"anzeige\">[signature data]</a></html>
-#message.hashdata=<html>Remark: This is a preview of the data to-be signed. For standards compliant display see help.</html>
-hashdatalist=<html>{0} signature data objects:</html>
-hashdata.viewer=<html>Signature data is being displayed in viewer
-unsupported.mimetype=<html>Save and open signature data with appropriate {0} viewer.
-retries.last=<html>Last try!</html>
-retries=<html>{0} tries left</html>
-retries.pinpad.last=<html>Re-enter pin, last try!</html>
-retries.pinpad=<html>Re-enter pin, {0} tries left</html>
-overwrite=<html>Overwrite {0}?</html>
-help=<html>Help topic {0}</html>
-
-warning.xhtml=<html>Remark: This is a preview of the data to-be signed. For standard-compliant display see help.</html>
-label.pin=<html>{0}:</html>
-label.pinsize=<html>({0} digits)</html>
-button.ok=OK
-button.cancel=Cancel
-button.back=Back
-button.sign=Sign
-button.save=Save...
-button.close=Close
-mimetype.desc.xml=XML-files (.xml)
-mimetype.desc.html=HTML-files (.html, .htm)
-mimetype.desc.xhtml=XHTML-files (.xhtml)
-mimetype.desc.txt=Textfiles (.txt)
-mimetype.desc.pdf=Adobe PDF-files (.pdf)
-mimetype.desc.bin=Binary files (.bin)
-mimetype.desc.doc=Microsoft Word-files (.doc)
-mimetype.desc.unknown=All files (.*)
-save.hashdatainput.prefix=signaturedata
-alt.help=help
-dialog.sigpin.infolabel.sigdata.tooltiptext=Show signature data in new window
-
-
-# Error Messages
-error.no.hashdata=<html>No signature data available: {0}</html>
-error.display.hashdata=<html>Could not display signature data: {0}</html>
-error.write.hashdata=<html>Could not save signature data: {0}</html>
-error.invalid.hash=<html>Invalid signature data: {0}</html>
-error.ws.unreachable=<html>Server unreachable</html>
-#error.ws.unreachable=<html>Web-service unreachable: {0}</html>
-error.pcsc=<html>No PC/SC interface for smartcard access provided</html>
-error.cardterminal=<html>Could not find smartcard reader</html>
-error.unknown.param=<html>An error occured: {0}</html>
-error.unknown=<html>An error occured</html>
-error.test=<html>Error1 {0} - Error2 {1}</html>
-error.card.locked=<html>Citizen card is locked</html>
-error.card.notactivated=<html>Citizen card not activated</html>
-error.pin.timeout=<html>Timeout during PIN entry</html>
-error.viewer=<html>Failed to display contents: {0}
-error.external.link=<html>Cannot open external link {0}</html>
-error.config=<html>Incorrect system configuration: {0}</html>
-
-# Help Topics
-help.welcome=Welcome page
-help.wait=Wait screen
-help.cardnotsupported=Unsupported citizen card
-help.insertcard=No citizen card found
-help.cardpin=Pin entry
-help.signpin=Signature pin entry
-help.retry=Wrong Pin
-help.hashdata=Signed contents
-help.hashdatalist=Signed contents
-help.hashdataviewer=Display of signed contents \ No newline at end of file
diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
index 64f7e744..b927aecd 100644
--- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
+++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/SecureViewerDialogTest.java
@@ -33,7 +33,7 @@ public class SecureViewerDialogTest {
@BeforeClass
public static void setUpClass() throws Exception {
messages = ResourceBundle.getBundle("at/gv/egiz/bku/gui/Messages");
- secureViewer = new SecureViewerDialog(null, messages,null, null, new DummyFontLoader(), new DeafHelpListener("../help", messages.getLocale()), 1f);
+ secureViewer = new SecureViewerDialog(null, messages,null, null, new DummyFontLoader(), new HelpListener("../help", messages.getLocale()), 1f);
}
@AfterClass