[Schmitzm-commits] r199 - in trunk/src: schmitzm/swing/resource/locales skrueger/swing skrueger/swing/resource

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-07-07 19:03:18 +0200 (Tue, 07 Jul 2009)
New Revision: 199

Removed:
   trunk/src/skrueger/swing/resource/locales/
Modified:
   trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties
   trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties
   trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_fr.properties
   trunk/src/skrueger/swing/TranslationAskJDialog.java
Log:
skrueger.swing ResourceBundle ins schmitzm.resource bundle integriert.

Modified: trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties
===================================================================
--- trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties	2009-07-07 16:44:37 UTC (rev 198)
+++ trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle.properties	2009-07-07 17:03:18 UTC (rev 199)
@@ -81,7 +81,7 @@
 OperationTreePanel.OpTooltip.trunc=Truncates the decimal places of a number.
 OperationTreePanel.OpTooltip.isNaN=Returns TRUE if value is not a number.
 OperationTreePanel.OpTooltip.NaN=The value of "NotANumber"
-OperationTreePanel.OpTooltip.random=Zufallszahl
+OperationTreePanel.OpTooltip.random=Returns a random number between 0 and 1.
 OperationTreePanel.OpTooltip.sin=Returns the sine of a number.
 OperationTreePanel.OpTooltip.cos=Returns the cosine of a number.
 OperationTreePanel.OpTooltip.tan=Returns the tangent of a number.
@@ -111,10 +111,10 @@
 OperationTreePanel.OpTooltip.gt=Greater
 OperationTreePanel.OpTooltip.ge=Greater or equal
 
+TranslationAskJDialog.Title=Please translate
+TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation = Sorry, but you must not use characters { and } in any text label.
 
 
 
 
 
-
-

Modified: trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties
===================================================================
--- trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties	2009-07-07 16:44:37 UTC (rev 198)
+++ trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_de.properties	2009-07-07 17:03:18 UTC (rev 199)
@@ -35,6 +35,7 @@
 OperationTreePanel.OpDesc.or=ODER
 OperationTreePanel.OpDesc.not=NICHT
 OperationTreePanel.OpDesc.abs=abs($NUMBER)
+OperationTreePanel.OpDesc.random=Zufallszahl
 
 OperationTreePanel.OpDesc.str=str($NUMBER)
 OperationTreePanel.OpDesc.val=val($TEXT)
@@ -58,6 +59,7 @@
 OperationTreePanel.OpTooltip.or=Liefert WAHR, sobald ein Argument WAHR ist.
 OperationTreePanel.OpTooltip.not=Invertiet WAHR zu FALSCH und FLASCH zu WAHR.
 OperationTreePanel.OpTooltip.abs=Absoluter Wert einer Zahl.
+OperationTreePanel.OpTooltip.random=Liefert eine Zufallszahl zwischen 0 und 1.
 
 OperationTreePanel.OpTooltip.str=Konvertiert eine Zahl in einen Text.
 OperationTreePanel.OpTooltip.val=Konvertiert einen Text in eine Zahl.
@@ -76,4 +78,7 @@
 OperationTreePanel.OpTooltip.lt=Kleiner als
 OperationTreePanel.OpTooltip.le=Kleiner oder gleich
 OperationTreePanel.OpTooltip.gt=Größer als 
-OperationTreePanel.OpTooltip.ge=Größer oder gleich
\ No newline at end of file
+OperationTreePanel.OpTooltip.ge=Größer oder gleich
+
+TranslationAskJDialog.Title=Bitte übersetzen
+TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation = Die Zeichen { und } dürfen Sie leider nicht benutzen.
\ No newline at end of file

Modified: trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_fr.properties
===================================================================
--- trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_fr.properties	2009-07-07 16:44:37 UTC (rev 198)
+++ trunk/src/schmitzm/swing/resource/locales/SwingResourceBundle_fr.properties	2009-07-07 17:03:18 UTC (rev 199)
@@ -30,3 +30,6 @@
 Operators=Opérateurs
 Start=Démarrage
 Calculate=Calculer
+
+TranslationAskJDialog.Title=Traduisez S.V.P.
+TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation = Vous ne pouvez malheureusement pas utiliser ces lettres { et }
\ No newline at end of file

Modified: trunk/src/skrueger/swing/TranslationAskJDialog.java
===================================================================
--- trunk/src/skrueger/swing/TranslationAskJDialog.java	2009-07-07 16:44:37 UTC (rev 198)
+++ trunk/src/skrueger/swing/TranslationAskJDialog.java	2009-07-07 17:03:18 UTC (rev 199)
@@ -23,6 +23,7 @@
 import javax.swing.JRootPane;
 import javax.swing.KeyStroke;
 
+import schmitzm.geotools.styling.StylingUtil;
 import schmitzm.lang.LangUtil;
 import schmitzm.lang.ResourceProvider;
 import schmitzm.swing.SwingUtil;
@@ -30,16 +31,6 @@
 
 public class TranslationAskJDialog extends JDialog {
 
-	/**
-	 * {@link ResourceProvider}, der die Lokalisation fuer GUI-Komponenten des
-	 * Package {@code skrueger.swing} zur Verfuegung stellt. Diese sind in
-	 * properties-Datein unter {@code skrueger.swing.resource.locales}
-	 * hinterlegt.
-	 */
-	public static ResourceProvider RESOURCE = new ResourceProvider(LangUtil
-			.extendPackagePath(TranslationAskJDialog.class,
-					"resource.locales.SwingResourceBundle"), Locale.ENGLISH);
-
 	private String[] backup = new String[50]; // Maximum 50 languages ;-)
 	private OkButton okButton;
 	private CancelButton cancelButton;
@@ -166,7 +157,7 @@
 		cp.add(getButtons(), BorderLayout.SOUTH);
 		setContentPane(cp);
 		
-		setTitle(RESOURCE.getString("translation_dialog_title")); // i8n
+		setTitle(SwingUtil.R("TranslationAskJDialog.Title")); 
 		setModal(true);
 		pack();
 	}
@@ -268,8 +259,7 @@
 						JOptionPane
 								.showMessageDialog(
 										this,
-										RESOURCE
-												.getString("ErrorMsg.InvalidCharacterInTranslation"));
+										SwingUtil.R("TranslationAskJDialog.ErrorMsg.InvalidCharacterInTranslation"));
 						return false;
 					}
 				}