Changeset 29328 in osm for applications/editors

Timestamp:

2013-03-03T14:05:45+01:00 (12 years ago)

Author:

simon04

Message:

JOSM/wikipedia: update dialog title when changing language (correctly handle the context)

File:

• applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java (modified) (4 diffs)

applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java

@@ -52 +52 @@
         updateTitle();
     }
+    /** A string describing the context (use-case) for determining the dialog title */
+    String titleContext = null;
     final StringProperty wikipediaLang = new StringProperty("wikipedia.lang", LanguageInfo.getJOSMLocaleCode().substring(0, 2));
     final Set<String> articles = new HashSet<String>();
@@ -108 +110 @@
 
     private void updateTitle() {
-        setTitle(/* I18n: [language].Wikipedia.org: coordinates */ tr("{0}.Wikipedia.org: coordinates", wikipediaLang.get()));
+        if (titleContext == null) {
+            setTitle(/* I18n: [language].Wikipedia.org */ tr("{0}.Wikipedia.org", wikipediaLang.get()));
+        } else {
+            setTitle(/* I18n: [language].Wikipedia.org: [context] */ tr("{0}.Wikipedia.org: {1}", wikipediaLang.get(), titleContext));
+        }
     }
 
@@ -128 +134 @@
                 // add entries to list model
                 setWikipediaEntries(entries);
+                titleContext = tr("coordinates");
                 updateTitle();
             } catch (Exception ex) {
@@ -153 +160 @@
                     wikipediaLang.get(), category, Main.pref.getInteger("wikipedia.depth", 3));
             setWikipediaEntries(entries);
-            setTitle(/* I18n: [language].Wikipedia.org: [category] */ tr("{0}.Wikipedia.org: {1}", wikipediaLang.get(), category));
+            titleContext = category;
+            updateTitle();
         }
     }