Changeset 111 in josm for src

Timestamp:

2006-07-16T23:48:40+02:00 (19 years ago)

Author:

imi

Message:

added i18n (thanks to Sven Anders)

Location:

src/org/openstreetmap/josm

Files:

• actions/DownloadIncompleteAction.java (modified) (2 diffs)
• gui/PleaseWaitRunnable.java (modified) (2 diffs)
• io/OsmReader.java (modified) (1 diff)
• tools/I18n.java (modified) (2 diffs)

src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.event.ActionEvent;
@@ -44 +45 @@
 
                 private DownloadTask(Collection<OsmPrimitive> toDownload) {
-                        super(tr("Downloading {0} segments", toDownload.size()));
+                        super(trn("Downloading {0} segments", "Downloading {0} segment", toDownload.size(), toDownload.size()));
                         reader = new ObjectListDownloader(toDownload);
                         reader.setProgressInformation(currentAction, progress);

src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java

@@ -23 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.I18n;
 import org.xml.sax.SAXException;
 
@@ -39 +40 @@
         private boolean closeDialogCalled = false;
 
-        protected final JLabel currentAction = new JLabel(tr("Contacting the OSM server..."));
+        protected final JLabel currentAction = new JLabel(I18n.tr("Contacting the OSM server..."));
         protected final BoundedRangeModel progress = progressBar.getModel();
 

src/org/openstreetmap/josm/io/OsmReader.java

@@ -6 +6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.HashMap;

src/org/openstreetmap/josm/tools/I18n.java

@@ -1 +1 @@
 package org.openstreetmap.josm.tools;
 
-import java.text.MessageFormat;
+import org.openstreetmap.josm.Main;
+import org.xnap.commons.i18n.I18nFactory;
 
 /**
@@ -9 +10 @@
  */
 public class I18n {
+        private static org.xnap.commons.i18n.I18n i18n = I18nFactory.getI18n(Main.class);
+        
         public static String tr(String text, Object... objects) {
-                MessageFormat mf = new MessageFormat(text);
-                return mf.format(objects);
+                return i18n.tr(text, objects);
         }
 
         public static String tr(String text) {
-                return text;
+                return i18n.tr(text);
         }
 
         public static String trn(String text, String pluralText, long n, Object... objects) {
-                return n==1 ? tr(text,objects) : tr(pluralText,objects);
+                return i18n.trn(text, pluralText, n, objects);
         }
 
         public static String trn(String text, String pluralText, long n) {
-                return n==1 ? text : pluralText;
+                return i18n.trn(text, pluralText, n);
         }
 }