Changeset 5295 in josm

Timestamp:

Jun 22, 2012 11:04:52 PM (11 months ago)

Author:

stoecker

Message:

fix #7752, change language link in EULA to follow wiki syntax

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -86 +86 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 public class ImageryPreference extends DefaultTabPreferenceSetting {
@@ -869 +870 @@
             URL url = null;
             try {
-                url = new URL(eulaUrl.replaceAll("\\{lang\\}", Locale.getDefault().toString()));
+                url = new URL(eulaUrl.replaceAll("\\{lang\\}", LanguageInfo.getWikiLanguagePrefix()));
                 JEditorPane htmlPane = null;
                 try {
@@ -876 +877 @@
                     // give a second chance with a default Locale 'en'
                     try {
-                        url = new URL(eulaUrl.replaceAll("\\{lang\\}", "en"));
+                        url = new URL(eulaUrl.replaceAll("\\{lang\\}", ""));
                         htmlPane = new JEditorPane(url);
                     } catch (IOException e2) {