Changeset 1562 in josm for trunk

Timestamp:

2009-04-28T19:37:14+02:00 (15 years ago)

Author:

stoecker

Message:

fix #2419 - MOTD language not changing - patch by xeen

Location:

trunk

Files:

• LICENSE (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/GettingStarted.java (modified) (3 diffs)

trunk/LICENSE

@@ -31 +31 @@
 ==========================
 
-JOSM was written by Immanuel Scholz <imi@eigenheimstrasse.de>.
+JOSM was written by Immanuel Scholz <imi AT eigenheimstrasse.de>.
 
 Major code contributions from (in alphabetical order):
 
-David Earl <david@frankieandshadow.com>
-Gabriel Ebner <ge@gabrielebner.at>
-Ulf Lamping <ulf.lamping@web.de>
-Raphael Mack <ramack@raphael-mack.de>
-Frederik Ramm <frederik@remote.org>
+David Earl <david AT frankieandshadow.com>
+Gabriel Ebner <ge AT gabrielebner.at>
+Ulf Lamping <ulf.lamping AT web.de>
+Raphael Mack <ramack AT raphael-mack.de>
+Frederik Ramm <frederik AT remote.org>
+Dirk Stöcker <openstreetmap AT dstoecker.de>
 
 Please add your name liberally if you think you have made a major
@@ -47 +48 @@
 at http://josm.openstreetmap.de/svn/ for details.
 
-The current JOSM maintainer is Frederik Ramm <frederik@remote.org>.
+The current JOSM maintainer is Dirk Stöcker.
 
 Copyright rests with the contributors.

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -61 +61 @@
 
         final private int myVersion = AboutAction.getVersionNumber();
+        final private String myLang = Main.getLanguageCodeU();
 
         /**
@@ -83 +84 @@
             // Save this to prefs in case JOSM is updated so MOTD can be refreshed
             Main.pref.putInteger("cache.motd.html.version", myVersion);
+            Main.pref.put("cache.motd.html.lang", myLang);
 
             return motd.getBytes();
@@ -96 +98 @@
             // 2. Cannot be written (e.g. while developing). Obviously we don't want to update
             //    everytime because of something we can't read.
-            return Main.pref.getInteger("cache.motd.html.version", myVersion) == myVersion;
+            return (Main.pref.getInteger("cache.motd.html.version", myVersion) == myVersion)
+                                         && Main.pref.get("cache.motd.html.lang").equals(myLang);
         }
     }