Changeset 123 in josm

Timestamp:

2006-07-23T20:21:05+02:00 (19 years ago)

Author:

imi

Message:

• added en_GB as language (thanks Bruce Cowan)
• added default_values - property to <combo> tag for annotation presets.
• fixed NPE in AnnotationTester

Files:

• build.xml (modified) (1 diff)
• po/en_GB.po (added)
• po/en_gb.po (added)
• po/fr.po (modified) (17 diffs)
• po/org/openstreetmap/josm/Translation_de$1.class (modified) ( previous)
• po/org/openstreetmap/josm/Translation_de.class (modified) ( previous)
• po/org/openstreetmap/josm/Translation_en_GB$1.class (added)
• po/org/openstreetmap/josm/Translation_en_GB.class (added)
• po/org/openstreetmap/josm/Translation_fr$1.class (modified) ( previous)
• po/org/openstreetmap/josm/Translation_fr.class (modified) ( previous)
• src/org/openstreetmap/josm/Main.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/PreferenceDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/dialogs/AnnotationTester.java (modified) (1 diff)

build.xml

@@ -80 +80 @@
                 <arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -lfr ${po}/fr.po"/>
         </exec>
+        <exec executable="msgfmt">
+                <arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -len_GB ${po}/en_GB.po"/>
+        </exec>
     </target>
 

po/fr.po

@@ -7 +7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-21 00:28+0200\n"
-"PO-Revision-Date: 2006-07-19 16:23+0200\n"
+"POT-Creation-Date: 2006-07-23 18:02+0200\n"
+"PO-Revision-Date: 2006-07-21 21:36+0200\n"
 "Last-Translator: Frederic Bonifas <fredericbonifas@gmail.com>\n"
 "Language-Team: French <josm-fr@eigenheimstrasse.de>\n"
@@ -374 +374 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "Java Version {0}"
-msgstr "Java OpenStreetMap Editor Version {0}"
+msgstr "Java Version {0}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70
@@ -400 +400 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79
-#, fuzzy
 msgid "Contribution"
-msgstr "Connexion"
+msgstr "Contribution"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:83
@@ -778 +777 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:156
 msgid "Please enter a search string."
-msgstr "Merci d'entrer le texte à rechercher."
+msgstr "Entrer le texte à rechercher."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:158
@@ -902 +901 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:145
 msgid "Please select a key"
-msgstr "Merci de sélectionner une clé"
+msgstr "Sélectionner une clé"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
 msgid "Please select a value"
-msgstr "Merci de sélectionner une valeur"
+msgstr "Sélectionner une valeur"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:210
@@ -917 +916 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:228
-#, fuzzy, java-format
+#, java-format
 msgid "Could not read annotation preset source: {0}"
-msgstr "Impossible de lire quelque chose depuis l'URL : \"{0}\""
+msgstr "Impossible de lire le fichier d'annotations : {0}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid "Error parsing {0}: "
-msgstr "Erreur pendant le traitement {0}"
+msgstr "Erreur de traitement {0}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:250
@@ -959 +958 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:304
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:323
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:185
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:190
 msgid "Edit"
 msgstr "Éditer"
@@ -974 +973 @@
 #, java-format
 msgid "Unknown annotation object {0} at line {1} column {2}"
-msgstr ""
+msgstr "Objet d'annotation inconnu : {0} à la ligne {1} colonne {2}"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java:220
-#, fuzzy
 msgid "Change Properties"
-msgstr "Propriétés"
+msgstr "Changer les propriétés"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:153
@@ -1469 +1467 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:329
 msgid "Annotation preset source"
-msgstr ""
+msgstr "Source du fichier d'annotations"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:354
@@ -1524 +1522 @@
 "http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."
 msgstr ""
+"Sources (URL ou fichier) des fichiers d'annotations prédéfinies. Voir http://"
+"josm.eigenheimstrasse.de/wiki/AnnotationPresets pour de l'aide (en anglais)."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:368
 msgid "Add a new annotation preset source to the list."
-msgstr ""
+msgstr "Ajouter un nouveau fichier d'annotations à la liste."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:369
-#, fuzzy
 msgid "Delete the selected source from the list."
-msgstr "Supprimer le calque sélectionné."
+msgstr "Supprimer la source sélectionné de la liste."
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374
@@ -1549 +1548 @@
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:378
-#, fuzzy
 msgid "Language"
-msgstr "usage"
+msgstr "Langue"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:385
@@ -1608 +1606 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:417
 msgid "Annotation preset sources"
-msgstr ""
+msgstr "Sources des annotations prédéfinies"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/io/ObjectListDownloader.java:40
@@ -1820 +1818 @@
 #: /home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139
 msgid "scale"
-msgstr ""
+msgstr "mesure"
 
 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77
@@ -1851 +1849 @@
 msgstr[1] "objets"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:163
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:168
 msgid "Files"
 msgstr "Fichiers"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:173
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:178
 msgid "Connection"
 msgstr "Connexion"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:180
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:185
 msgid "Layer"
 msgstr "Calque"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:194
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:199
 msgid "Help"
 msgstr "Aide"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:237
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:242
 msgid "unnamed"
 msgstr "sans-nom"
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:287
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:292
 msgid "The projection could not be read from preferences. Using EPSG:4263."
 msgstr ""
@@ -1877 +1875 @@
 "utilisé."
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:343
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:348
 #, java-format
 msgid "Ignoring malformed url: \"{0}\""
 msgstr "Ignore l'URL malformé : \"{0}\""
 
-#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:353
+#: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:358
 #, java-format
 msgid "Ignoring malformed file url: \"{0}\""
@@ -1888 +1886 @@
 
 #~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Impossible d'ouvrir le répertoire des préférences : {0}"
+#~ msgstr "Impossible d'ouvrir le répertoire des préférences : {0}"
 
 #~ msgid ""
 #~ "Preferences could not be loaded. Write default preference file to \"{0}\"."
 #~ msgstr ""
-#~ "Les préférences pourraient ne pas être chargées. Écrivez les préférences "
-#~ "par défaut dans \"{0}\"."
+#~ "Les préférences pourraient ne pas être chargées. Écrivez les "
+#~ "préférences par défaut dans \"{0}\"."
 
 #~ msgid ""
@@ -1933 +1931 @@
 #~ "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 #~ msgstr ""
-#~ "Java·OpenStreetMap·Editor\n"
+#~ "Java·OpenStreetMap·Editor\n"
 #~ "\n"
 #~ "usage:\n"
-#~ "\tjava·-jar·josm.jar·<option>·<option>·<option>...\n"
+#~ "\tjava·-jar·josm."
+#~ "jar·<option>·<option>·<option>...\n"
 #~ "\n"
 #~ "options:\n"
 #~ "\t--help|-?|-"
-#~ "h······························Montre "
+#~ "h······························Montre "
 #~ "cette aide\n"
 #~ "\t--geometry=widthxheight(+|-)x(+|-)"
-#~ "y·······Argument de géométrie "
-#~ "standard d'UNIX\n"
-#~ "\t[--download=]minlat,minlon,maxlat,maxlon··Télécharge la "
-#~ "boîte de coordonnées\n"
+#~ "y·······Argument "
+#~ "de géométrie standard d'UNIX\n"
+#~ "\t[--download=]minlat,minlon,maxlat,"
+#~ "maxlon··Télécharge "
+#~ "la boîte de coordonnées\n"
 #~ "\t[--download=]"
-#~ "<url>························Télécharge "
-#~ "ce qui ce situe à l'URL·(avec·lat=x&lon=y&zoom=z)\n"
+#~ "<url>························Télécharge "
+#~ "ce qui ce situe à l'URL·"
+#~ "(avec·lat=x&lon=y&zoom=z)\n"
 #~ "\t[--download=]"
-#~ "<nomdufichier>··················ouvrir "
-#~ "un fichier·(en GPS brut si·.gpx·ou·.csv)\n"
-#~ "\t--downloadgps=minlat,minlon,maxlat,maxlon·Télécharge la "
-#~ "boîte de coordonnées en GPS brut.\n"
+#~ "<nomdufichier>··················ouvrir "
+#~ "un fichier·(en GPS brut si·."
+#~ "gpx·ou·.csv)\n"
+#~ "\t--downloadgps=minlat,minlon,maxlat,"
+#~ "maxlon·Télécharge la "
+#~ "boîte de coordonnées en GPS brut.\n"
 #~ "\t--"
-#~ "selection=<texte>················Sélectionne "
+#~ "selection=<texte>················Sélectionne "
 #~ "en fonction de l'objet de recherche\n"
 #~ "\t--no-"
-#~ "fullscreen···························Ne "
-#~ "pas lancer en mode plein écran\n"
+#~ "fullscreen···························Ne "
+#~ "pas lancer en mode plein écran\n"
 #~ "\t--reset-"
-#~ "preferences······················ "
-#~ "Préférences par défaut\n"
+#~ "preferences······················ "
+#~ "Préférences par défaut\n"
 #~ "\n"
 #~ "examples:\n"
-#~ "\tjava·-jar·josm.jar·track1.gpx·track2.gpx·london."
-#~ "osm\n"
-#~ "\tjava·-jar·josm.jar·http://www.openstreetmap.org/index.html?"
+#~ "\tjava·-jar·josm."
+#~ "jar·track1.gpx·track2."
+#~ "gpx·london.osm\n"
+#~ "\tjava·-jar·josm."
+#~ "jar·http://www.openstreetmap.org/index.html?"
 #~ "lat=43.2&lon=11.1&zoom=13\n"
-#~ "\tjava·-jar·josm.jar·london.osm·--selection=http://www."
+#~ "\tjava·-jar·josm."
+#~ "jar·london.osm·--selection=http://www."
 #~ "ostertag.name/osm/OSM_errors_node-duplicate.xml\n"
-#~ "\tjava·-jar·josm.jar·43.2,11.1,43.4,11.4\n"
+#~ "\tjava·-jar·josm."
+#~ "jar·43.2,11.1,43.4,11.4\n"
 #~ "\n"
-#~ "Les paramètres sont lus dans l'ordre dans lequel ils sont "
-#~ "spécifiés, soyez donc sur d'avoir des données avant --"
-#~ "selection\n"
+#~ "Les paramètres sont lus dans l'ordre dans lequel ils sont "
+#~ "spécifiés, soyez donc sur d'avoir des "
+#~ "données avant --selection\n"
 #~ "\n"
-#~ "Au lieu de --download=<bbox>·vous pouvez spécifier·osm://"
-#~ "<bbox>\n"
+#~ "Au lieu de --download=<bbox>·vous pouvez "
+#~ "spécifier·osm://<bbox>\n"

src/org/openstreetmap/josm/Main.java

@@ -147 +147 @@
                 final Action annotationTesterAction = new AbstractAction(){
                         public void actionPerformed(ActionEvent e) {
-                                String[] args = pref.get("annotation.sources").split(";");
+                                String annotationSources = pref.get("annotation.sources");
+                                if (annotationSources.equals("")) {
+                                        JOptionPane.showMessageDialog(Main.parent, "You have to specify annotation sources in the preferences first.");
+                                        return;
+                                }
+                                String[] args = annotationSources.split(";");
                                 new AnnotationTester(args);
                         }

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

@@ -132 +132 @@
          */
         private JComboBox lafCombo = new JComboBox(UIManager.getInstalledLookAndFeels());
-        private JComboBox languages = new JComboBox(new Locale[]{Locale.ENGLISH, Locale.GERMAN, Locale.FRENCH});
+        private JComboBox languages = new JComboBox(new Locale[]{new Locale("en", "US"), new Locale("en", "GB"), Locale.GERMAN, Locale.FRENCH});
         /**
          * The main tab panel.

src/org/openstreetmap/josm/gui/dialogs/AnnotationPreset.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.GridBagLayout;
@@ -84 +85 @@
                 String label;
                 JComboBox combo;
+                private final String[] values;
 
                 public void addToPanel(JPanel p) {
@@ -89 +91 @@
                         p.add(combo, GBC.eol().fill(GBC.HORIZONTAL));
                 }
-                public Combo(String key, String label, String def, String[] values, boolean editable) {
+                public Combo(String key, String label, String def, String[] values, String[] displayedValues, boolean editable) {
                         this.key = key;
                         this.label = label;
-                        combo = new JComboBox(values);
+                        this.values = values;
+                        combo = new JComboBox(displayedValues);
                         combo.setEditable(editable);
                         combo.setSelectedItem(def);
                 }
                 public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
-                        String str = combo.isEditable()?combo.getEditor().getItem().toString() : combo.getSelectedItem().toString();
+                        String v = combo.getSelectedIndex() == -1 ? null : values[combo.getSelectedIndex()];
+                        String str = combo.isEditable()?combo.getEditor().getItem().toString() : v;
                         cmds.add(new ChangePropertyCommand(sel, key, str));
                 }
@@ -164 +168 @@
                                 String[] values = a.getValue("values").split(",");
                                 String s = a.getValue("readonly");
-                                boolean editable = s == null || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
-                                current.add(new Combo(a.getValue("key"), a.getValue("text"), a.getValue("default"), values, editable));
+                                String dvstr = a.getValue("display_values");
+                                boolean editable = s == null  || s.equals("0") || s.startsWith("off") || s.startsWith("false") || s.startsWith("no");
+                                if (dvstr != null) {
+                                        if (editable && s != null)
+                                                throw new SAXException(tr("Cannot have a writable combobox with default values (line {0})", getLineNumber()));
+                                        editable = false; // for combos with display_value readonly default to false
+                                }
+                                String[] displayValues = dvstr == null ? values : dvstr.split(",");
+                                if (displayValues.length != values.length)
+                                        throw new SAXException(tr("display_values ({0}) and values ({1}) must be of same number of elements.",
+                                                        displayValues.length+" "+trn("element", "elements", displayValues.length),
+                                                        values.length+" "+trn("element", "elements", values.length)));
+                                current.add(new Combo(a.getValue("key"), a.getValue("text"), a.getValue("default"), values, displayValues, editable));
                         } else if (qname.equals("key"))
                                 current.add(new Key(a.getValue("key"), a.getValue("value")));

src/org/openstreetmap/josm/gui/dialogs/AnnotationTester.java

@@ -59 +59 @@
                 annotationPanel.removeAll();
                 AnnotationPreset preset = (AnnotationPreset)annotationPresets.getSelectedItem();
+                if (preset == null)
+                        return;
                 JPanel p = preset.createPanel();
                 p.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));