From e4b8cec0f43af3aa4272e56e8133cc70512149a2 Mon Sep 17 00:00:00 2001 From: clemenso Date: Wed, 2 Jun 2010 15:04:20 +0000 Subject: default locale: en, help pages fixed git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@748 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java | 30 ++-- .../java/at/gv/egiz/bku/gui/DeafHelpListener.java | 67 -------- .../main/java/at/gv/egiz/bku/gui/HelpListener.java | 70 +++++++-- .../main/java/at/gv/egiz/bku/gui/HelpViewer.java | 24 ++- .../at/gv/egiz/bku/gui/ViewerHelpListener.java | 24 --- .../at/gv/egiz/bku/gui/Messages.properties | 171 ++++++++++----------- .../at/gv/egiz/bku/gui/Messages_de.properties | 110 +++++++++++++ .../at/gv/egiz/bku/gui/Messages_en.properties | 109 ------------- .../at/gv/egiz/bku/gui/SecureViewerDialogTest.java | 2 +- 9 files changed, 271 insertions(+), 336 deletions(-) delete mode 100644 BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/DeafHelpListener.java create mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_de.properties delete mode 100644 BKUCommonGUI/src/main/resources/at/gv/egiz/bku/gui/Messages_en.properties (limited to 'BKUCommonGUI') 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=Willkommen -title.insertcard=Keine B\u00FCrgerkarte gefunden -title.cardnotsupported=Die Karte wird nicht unterst\u00FCtzt -title.verify.pin=Karte wird gelesen -title.sign=Signatur erstellen -title.verify.pinpad=PIN eingeben -title.error=Fehler -title.warning=Achtung -title.entry.timeout=Zeit\u00FCberschreitung -title.retry=Falsche PIN -title.wait=Bitte warten -title.signature.data=Signaturdaten -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=Welcome +title.insertcard=No citizen card found +title.cardnotsupported=This card is not supported +title.verify.pin=Reading card +title.sign=Create signature +title.verify.pinpad=Enter PIN +title.error=Error +title.warning=Warning +title.entry.timeout=Timeout +title.retry=Wrong PIN +title.wait=Please wait +title.signature.data=Signature data +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=Bitte warten... -wait=Bitte warten... -cardnotsupported=Bitte die B\u00FCrgerkarte in den Kartenleser stecken -insertcard=Bitte die B\u00FCrgerkarte in den Kartenleser stecken -enterpin={0} eingeben -enterpin.pinpad=PIN am Kartenleser eingeben -enterpin.pinpad.direct={0} ({1} stellig) am Kartenleser eingeben -hashdatalink=Signaturdaten anzeigen -hashdatalink.tiny=Signaturdaten -hashdatalink.focus=[Signaturdaten anzeigen] -hashdatalink.tiny.focus=[Signaturdaten] -#message.hashdata=Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i). -#message.hashdata=Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i). -#verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. -hashdatalist={0} Signaturdaten: -hashdata.viewer=Signaturdaten werden im Betrachter angezeigt -unsupported.mimetype=Signaturdaten speichern und mit einem geeigneten {0} Betrachter \u00F6ffnen. -retries.last=Letzter Versuch! -retries=Noch {0} Versuche -retries.pinpad.last=Eingabe wiederholen, letzter Versuch! -retries.pinpad=Eingabe wiederholen, noch {0} Versuche -overwrite=M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben? -help=Hilfe zu {0} +welcome=Please wait... +wait=Please wait... +insertcard=Please insert your citizen card into the reader +cardnotsupported=Please insert your citizen card into the reader +enterpin=Enter {0} +enterpin.pinpad=Enter PIN on card reader pinpad +enterpin.pinpad.direct=Enter {0} ({1} digits) on card reader pinpad +hashdatalink=Display signature data +hashdatalink.tiny=signature data +hashdatalink.focus=[Display signature data] +hashdatalink.tiny.focus=[signature data] +#message.hashdata=Remark: This is a preview of the data to-be signed. For standards compliant display see help. +hashdatalist={0} signature data objects: +hashdata.viewer=Signature data is being displayed in viewer +unsupported.mimetype=Save and open signature data with appropriate {0} viewer. +retries.last=Last try! +retries={0} tries left +retries.pinpad.last=Re-enter pin, last try! +retries.pinpad=Re-enter pin, {0} tries left +overwrite=Overwrite {0}? +help=Help topic {0} -warning.xhtml=Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i). +warning.xhtml=Remark: This is a preview of the data to-be signed. For standard-compliant display see help. label.pin={0}: -label.pinsize=({0} stellig) +label.pinsize=({0} digits) 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=Keine Signaturdaten verf\u00FCgbar: {0} -error.display.hashdata=Signaturdaten konnten nicht dargestellt werden: {0} -error.write.hashdata=Die Signaturdaten konnten nicht gespeichert werden: {0} -error.invalid.hash=Die Signaturdaten sind ung\u00FCltig: {0} -error.ws.unreachable=Der Server ist nicht erreichbar -#error.ws.unreachable=Das Web-Service ist nicht erreichbar: {0} -error.pcsc=Es konnte keine PC/SC Schnittstelle gefunden werden -error.cardterminal=Es konnte kein Smartcard-Leser gefunden werden -error.unknown.param=Ein Fehler trat auf: {0} -error.unknown=Ein Fehler trat auf -error.test=Fehler1 {0} - Fehler2 {1} -error.card.locked=B\u00FCrgerkarte ist gesperrt -error.card.notactivated=Die B\u00FCrgerkarte ist nicht aktiviert -error.pin.timeout=Zeit\u00FCberschreitung bei Eingabe der PIN -error.viewer=Der Inhalt kann nicht dargestellt werden: {0} -error.external.link=Externer Link {0} wird nicht ge\u00F6ffnet -error.config=Fehlerhafte Konfiguration des Systems: {0} +error.no.hashdata=No signature data available: {0} +error.display.hashdata=Could not display signature data: {0} +error.write.hashdata=Could not save signature data: {0} +error.invalid.hash=Invalid signature data: {0} +error.ws.unreachable=Server unreachable +#error.ws.unreachable=Web-service unreachable: {0} +error.pcsc=No PC/SC interface for smartcard access provided +error.cardterminal=Could not find smartcard reader +error.unknown.param=An error occured: {0} +error.unknown=An error occured +error.test=Error1 {0} - Error2 {1} +error.card.locked=Citizen card is locked +error.card.notactivated=Citizen card not activated +error.pin.timeout=Timeout during PIN entry +error.viewer=Failed to display contents: {0} +error.external.link=Cannot open external link {0} +error.config=Incorrect system configuration: {0} # 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=Willkommen +title.insertcard=Keine B\u00FCrgerkarte gefunden +title.cardnotsupported=Die Karte wird nicht unterst\u00FCtzt +title.verify.pin=Karte wird gelesen +title.sign=Signatur erstellen +title.verify.pinpad=PIN eingeben +title.error=Fehler +title.warning=Achtung +title.entry.timeout=Zeit\u00FCberschreitung +title.retry=Falsche PIN +title.wait=Bitte warten +title.signature.data=Signaturdaten +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=Bitte warten... +wait=Bitte warten... +cardnotsupported=Bitte die B\u00FCrgerkarte in den Kartenleser stecken +insertcard=Bitte die B\u00FCrgerkarte in den Kartenleser stecken +enterpin={0} eingeben +enterpin.pinpad=PIN am Kartenleser eingeben +enterpin.pinpad.direct={0} ({1} stellig) am Kartenleser eingeben +hashdatalink=Signaturdaten anzeigen +hashdatalink.tiny=Signaturdaten +hashdatalink.focus=[Signaturdaten anzeigen] +hashdatalink.tiny.focus=[Signaturdaten] +#message.hashdata=Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i). +#message.hashdata=Dies ist eine Voransicht des zu signierenden Inhaltes. F\u00FCr Details siehe Hilfe (i). +#verwenden sie bitte die von ihrem System zur Verf\u00FCgung gestellte {0} Anwendung. +hashdatalist={0} Signaturdaten: +hashdata.viewer=Signaturdaten werden im Betrachter angezeigt +unsupported.mimetype=Signaturdaten speichern und mit einem geeigneten {0} Betrachter \u00F6ffnen. +retries.last=Letzter Versuch! +retries=Noch {0} Versuche +retries.pinpad.last=Eingabe wiederholen, letzter Versuch! +retries.pinpad=Eingabe wiederholen, noch {0} Versuche +overwrite=M\u00F6chten Sie das existierende Dokument {0} \u00FCberschreiben? +help=Hilfe zu {0} + +warning.xhtml=Hinweis: Dies ist eine Voransicht des zu signierenden Inhalts. F\u00FCr eine standardkonforme Darstellung siehe Hilfe (i). +label.pin={0}: +label.pinsize=({0} stellig) +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=Keine Signaturdaten verf\u00FCgbar: {0} +error.display.hashdata=Signaturdaten konnten nicht dargestellt werden: {0} +error.write.hashdata=Die Signaturdaten konnten nicht gespeichert werden: {0} +error.invalid.hash=Die Signaturdaten sind ung\u00FCltig: {0} +error.ws.unreachable=Der Server ist nicht erreichbar +#error.ws.unreachable=Das Web-Service ist nicht erreichbar: {0} +error.pcsc=Es konnte keine PC/SC Schnittstelle gefunden werden +error.cardterminal=Es konnte kein Smartcard-Leser gefunden werden +error.unknown.param=Ein Fehler trat auf: {0} +error.unknown=Ein Fehler trat auf +error.test=Fehler1 {0} - Fehler2 {1} +error.card.locked=B\u00FCrgerkarte ist gesperrt +error.card.notactivated=Die B\u00FCrgerkarte ist nicht aktiviert +error.pin.timeout=Zeit\u00FCberschreitung bei Eingabe der PIN +error.viewer=Der Inhalt kann nicht dargestellt werden: {0} +error.external.link=Externer Link {0} wird nicht ge\u00F6ffnet +error.config=Fehlerhafte Konfiguration des Systems: {0} + +# 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=Welcome -title.insertcard=No citizen card found -title.cardnotsupported=This card is not supported -title.verify.pin=Reading card -title.sign=Create signature -title.verify.pinpad=Enter PIN -title.error=Error -title.warning=Warning -title.entry.timeout=Timeout -title.retry=Wrong PIN -title.wait=Please wait -title.signature.data=Signature data -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=Please wait... -wait=Please wait... -insertcard=Please insert your citizen card into the reader -cardnotsupported=Please insert your citizen card into the reader -enterpin=Enter {0} -enterpin.pinpad=Enter PIN on card reader pinpad -enterpin.pinpad.direct=Enter {0} ({1} digits) on card reader pinpad -hashdatalink=Display signature data -hashdatalink.tiny=signature data -hashdatalink.focus=[Display signature data] -hashdatalink.tiny.focus=[signature data] -#message.hashdata=Remark: This is a preview of the data to-be signed. For standards compliant display see help. -hashdatalist={0} signature data objects: -hashdata.viewer=Signature data is being displayed in viewer -unsupported.mimetype=Save and open signature data with appropriate {0} viewer. -retries.last=Last try! -retries={0} tries left -retries.pinpad.last=Re-enter pin, last try! -retries.pinpad=Re-enter pin, {0} tries left -overwrite=Overwrite {0}? -help=Help topic {0} - -warning.xhtml=Remark: This is a preview of the data to-be signed. For standard-compliant display see help. -label.pin={0}: -label.pinsize=({0} digits) -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=No signature data available: {0} -error.display.hashdata=Could not display signature data: {0} -error.write.hashdata=Could not save signature data: {0} -error.invalid.hash=Invalid signature data: {0} -error.ws.unreachable=Server unreachable -#error.ws.unreachable=Web-service unreachable: {0} -error.pcsc=No PC/SC interface for smartcard access provided -error.cardterminal=Could not find smartcard reader -error.unknown.param=An error occured: {0} -error.unknown=An error occured -error.test=Error1 {0} - Error2 {1} -error.card.locked=Citizen card is locked -error.card.notactivated=Citizen card not activated -error.pin.timeout=Timeout during PIN entry -error.viewer=Failed to display contents: {0} -error.external.link=Cannot open external link {0} -error.config=Incorrect system configuration: {0} - -# 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 -- cgit v1.2.3