From: Patrick Plitzner Date: Tue, 25 Aug 2015 06:36:27 +0000 (+0200) Subject: Externalize Strings X-Git-Tag: 3.8.0^2~45 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/221a1f2e77c3bf57a2afda2377ff96788bbed0ba?hp=75ebabd08659d1671161f22bda37619f473b0571 Externalize Strings --- diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties index 3c21795a8..f7a01268f 100644 --- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties +++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages.properties @@ -17,3 +17,6 @@ LanguageEditorPreferencePage_RestartRequired=After changing the default language OrderPreferencePage_NewNavigatorWindowRequired=After changing the order of the taxon nodes, closing and reopen of the taxon navigator is required. OrderPreferencePage_PleaseReopenNavigator=Please close and reopen the taxon navigator. UriWithLabelElement_URL_NOT_SAVED=URL won't be saved\! +UriWithLabelElement_COULD_NOT_OPEN_BROWSER=Could not open external browser. URL is invalid. +UriWithLabelElement_INVALID_URL=Invalid URL +UriWithLabelElement_OPEN_EXTERNAL_BROWSER=Open in external browser diff --git a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties index d03d93e32..51409eb7a 100644 --- a/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties +++ b/eu.etaxonomy.taxeditor.store/OSGI-INF/l10n/messages_de.properties @@ -15,4 +15,7 @@ LanguageEditorPreferencePage_EditorHasToRestart=Der Anwendung muss neu gestartet LanguageEditorPreferencePage_PleaseRestart=Bitte neu starten LanguageEditorPreferencePage_RestartRequired=Nach dem Wechsel der Standardsprache ist ein Neustart erforderlich. OrderPreferencePage_NewNavigatorWindowRequired=Nach dem Ändern der Taxon Sortierung, ist das Schließen und erneute Öffnen des taxon Navigators erforderlich. -UriWithLabelElement_URL_NOT_SAVED=URL wird nicht gespeichert\! \ No newline at end of file +UriWithLabelElement_URL_NOT_SAVED=URL wird nicht gespeichert\! +UriWithLabelElement_COULD_NOT_OPEN_BROWSER=Externer Browser konnt nicht geöffnet werden. URL is ung\u00FCtlig. +UriWithLabelElement_INVALID_URL=Ung\u00FCltiger URL +UriWithLabelElement_OPEN_EXTERNAL_BROWSER=Im Browser öffnen \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java index b583632dc..0aa1e9c64 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/Messages.java @@ -36,6 +36,9 @@ public class Messages extends NLS { public static String CdmDataSourceViewPart_7; public static String CdmDataSourceViewPart_8; public static String CdmDataSourceViewPart_9; + public static String UriWithLabelElement_COULD_NOT_OPEN_BROWSER; + public static String UriWithLabelElement_INVALID_URL; + public static String UriWithLabelElement_OPEN_EXTERNAL_BROWSER; public static String UriWithLabelElement_URL_NOT_SAVED; static { // initialize resource bundle diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java index e7c1e2e7b..40a55fa89 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/UriWithLabelElement.java @@ -59,14 +59,14 @@ public class UriWithLabelElement extends TextWithLabelElement { initText(formFactory, null, textHeight, null, false, style, textAndButton); //button - btnOpenBrowser = formFactory.createButton(textAndButton, "", SWT.NONE); + btnOpenBrowser = formFactory.createButton(textAndButton, "", SWT.NONE); //$NON-NLS-1$ btnOpenBrowser.setImage(ImageResources.getImage(ImageResources.WEB)); - btnOpenBrowser.setToolTipText("Open in external browser"); + btnOpenBrowser.setToolTipText(Messages.UriWithLabelElement_OPEN_EXTERNAL_BROWSER); btnOpenBrowser.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - String errorTitle = "Invalid URL"; - String errorText = "Could not open external browser. URL is invalid"; + String errorTitle = Messages.UriWithLabelElement_INVALID_URL; + String errorText = Messages.UriWithLabelElement_COULD_NOT_OPEN_BROWSER; URI uri = getUri(); if(uri!=null){ @@ -80,11 +80,14 @@ public class UriWithLabelElement extends TextWithLabelElement { MessagingUtils.informationDialog(errorTitle, new Status(IStatus.WARNING, TaxeditorStorePlugin.PLUGIN_ID, errorText, iae)); } } + else{ + MessagingUtils.informationDialog(errorTitle, new Status(IStatus.WARNING, TaxeditorStorePlugin.PLUGIN_ID, errorText, null)); + } } }); btnOpenBrowser.setLayoutData(LayoutConstants.RIGHT()); - labelException = formFactory.createLabel(getLayoutComposite(), "", SWT.WRAP); + labelException = formFactory.createLabel(getLayoutComposite(), "", SWT.WRAP); //$NON-NLS-1$ int numColumns = AbstractFormSection.DEFAULT_NUM_COLUMNS; if(getLayoutComposite().getLayout() instanceof TableWrapLayout){ numColumns = ((TableWrapLayout)getLayoutComposite().getLayout()).numColumns;