Only in orig: build Only in orig: dist diff -u -r orig/src/org/openstreetmap/josm/gui/GettingStarted.java trunk/src/org/openstreetmap/josm/gui/GettingStarted.java --- orig/src/org/openstreetmap/josm/gui/GettingStarted.java 2009-01-11 11:16:42.000000000 +0100 +++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java 2009-01-17 04:50:16.156250000 +0100 @@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.io.IOException; +import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -43,87 +44,105 @@ } private void assignContent() { - if (content.length() == 0) { - String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); - WikiReader wr = new WikiReader(baseurl); - String motdcontent = ""; + if (content.length() > 0) return; + + String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); + WikiReader wr = new WikiReader(baseurl); + String motdcontent = ""; + try { + motdcontent = wr.read(baseurl + "/wiki/MessageOfTheDay?format=txt"); + } catch (IOException ioe) { + motdcontent = "\n

" + + "JOSM - " + tr("Java OpenStreetMap Editor") + + "

\n

(" + + tr ("Message of the day not available") + + ")

"; + } + + int myVersion = AboutAction.getVersionNumber(); + String languageCode = Main.getLanguageCodeU(); + + // Finds wiki links like (underscores inserted for readability): [wiki:LANGCODE:messageoftheday_CONDITON_REVISION LANGCODE] + // Langcode usually consists of two letters describing the language and may be omitted + // Condition may be one of the following: > < <= => + // Revision is the JOSM version + Pattern versionPattern = Pattern.compile("\\[wiki:(?:[A-Z]+:)?MessageOfTheDay(\\>\\=|\\<\\=|\\<|\\>)([0-9]+)\\s*([A-Z]*)\\]", Pattern.CASE_INSENSITIVE); + // 1=condition, 2=targetVersion, 3=lang + Matcher matcher = versionPattern.matcher(motdcontent); + matcher.reset(); + + ArrayList links = new ArrayList(); + String linksList=""; + while (matcher.find()) { + // Discards all but the selected locale and non-localized links + if(!(matcher.group(3)+":").equals(languageCode) && !matcher.group(3).equals("")) + continue; + + links.add(new String[] {matcher.group(1), matcher.group(2), matcher.group(3)}); + linksList += matcher.group(1)+matcher.group(2)+matcher.group(3)+": "; + } + + for(int i=0; i < links.size(); i++) { + String[] obj = (String[])links.get(i); + int targetVersion = Integer.parseInt(obj[1]); + String condition = obj[0]; + Boolean isLocalized = !obj[2].equals(""); + + // Prefer localized over non-localized links, if they're otherwise the same + if(!isLocalized && linksList.indexOf(condition+obj[1]+languageCode+" ") >= 0) + continue; + + boolean included = false; + + if(myVersion == 0) + included = true; + else if(condition.equals(">=")) + included=myVersion >= targetVersion; + else if(condition.equals(">")) + included = myVersion > targetVersion; + else if(condition.equals("<")) + included=myVersion < targetVersion; + else + included = myVersion <= targetVersion; + + if(!included) continue; + + Boolean isHelp = targetVersion == 1; + + String urlStart = baseurl + "/wiki/"; + String urlEnd = "MessageOfTheDay" + condition + targetVersion + (isHelp ? "" : "?format=txt"); + try { - motdcontent = wr.read(baseurl + "/wiki/MessageOfTheDay"); + // If we hit a non-localized link here, we already know there's no translated version available + String message = isLocalized ? wr.read(urlStart + languageCode + urlEnd) : ""; + // Look for non-localized version + if (message.equals("")) + message = wr.read(urlStart + urlEnd); + + if (!message.equals("")) + if(isHelp) + content += message; + else + content += ""; } catch (IOException ioe) { - motdcontent = "\n

" + - "JOSM - " + tr("Java OpenStreetMap Editor") + - "

\n

(" + - tr ("Message of the day not available") + - ")

"; - } - - int myVersion = AboutAction.getVersionNumber(); - - Pattern commentPattern = Pattern.compile("\\\\s*\\/\\*[^\\*]*\\*\\/\\s*\\<\\/p\\>", Pattern.CASE_INSENSITIVE|Pattern.DOTALL|Pattern.MULTILINE); - Matcher matcherComment = commentPattern.matcher(motdcontent); - motdcontent = matcherComment.replaceAll(""); - - /* look for hrefs of the form wiki/MessageOfTheDay>123 where > can also be <,<=,>= and the number is the revision number */ - int start = 0; - Pattern versionPattern = Pattern.compile("(?:\\\\s*)?\\]*href\\=\\\"([^\\\"]*\\/wiki\\/)(MessageOfTheDay(\\%3E%3D|%3C%3D|\\%3E|\\%3C)([0-9]+))\\\"[^\\>]*\\>[^\\<]*\\<\\/a\\>(?:\\s*\\)?", Pattern.CASE_INSENSITIVE|Pattern.DOTALL|Pattern.MULTILINE); - Matcher matcher = versionPattern.matcher(motdcontent); - matcher.reset(); - String languageCode = Main.getLanguageCodeU(); - while (matcher.find()) { - int targetVersion = Integer.parseInt(matcher.group(4)); - String condition = matcher.group(3); - boolean included = false; - if (condition.equals("%3E")) { - if ((myVersion == 0 || myVersion > targetVersion) - /* && ! Main.pref.getBoolean("motd.gt."+targetVersion) */) { - /* Main.pref.put("motd.gt."+targetVersion, true); */ - included = true; - } - } else if (condition.equals("%3E%3D")) { - if ((myVersion == 0 || myVersion >= targetVersion) - /* && ! Main.pref.getBoolean("motd.ge."+targetVersion) */) { - /* Main.pref.put("motd.ge."+targetVersion, true); */ - included = true; - } - } else if (condition.equals("%3C")) { - included = myVersion < targetVersion; - } else { - included = myVersion <= targetVersion; - } - if (matcher.start() > start) { - content += motdcontent.substring(start, matcher.start() - 1); - } - start = matcher.end(); - if (included) { - String url = matcher.group(1) + languageCode + matcher.group(2); - try { - String message = wr.read(url); - // a return containing the article name indicates that the page didn't - // exist in the Wiki. - String emptyIndicator = "Describe \"" + languageCode + "MessageOfTheDay"; - if (message.indexOf(emptyIndicator) >= 0) { - url = matcher.group(1) + matcher.group(2); - message = wr.read(url); - emptyIndicator = "Describe \"MessageOfTheDay"; - } - if (message.indexOf(emptyIndicator) == -1) { - content += message.replace("", "").replace("", "").replace("
", "").replace("
", ""); - } - } catch (IOException ioe) { - url = matcher.group(1) + matcher.group(2); - try { - content += wr.read(url).replace("", "").replace("", "").replace("
", "").replace("
", ""); - } catch (IOException ioe2) { - } - } + try { + if(isHelp) + content += wr.read(urlStart + urlEnd); + else + content += "
  • "+wr.read(urlStart + urlEnd).substring(8)+"
"; + } catch (IOException ioe2) { } } - content += motdcontent.substring(start); - content = content.replace("", ""); - /* replace the wiki title */ - content = content.replace("Java OpenStreetMap Editor", tr("Java OpenStreetMap Editor")); } + content = "\n"+ + "\n"+ + "

JOSM - " + tr("Java OpenStreetMap Editor") + "

\n"+ + content+"\n"+ + ""; } public GettingStarted() { diff -u -r orig/src/org/openstreetmap/josm/tools/WikiReader.java trunk/src/org/openstreetmap/josm/tools/WikiReader.java --- orig/src/org/openstreetmap/josm/tools/WikiReader.java 2009-01-06 15:16:18.000000000 +0100 +++ trunk/src/org/openstreetmap/josm/tools/WikiReader.java 2009-01-17 04:47:17.718750000 +0100 @@ -31,7 +31,7 @@ */ public String read(String url) throws IOException { BufferedReader in = new BufferedReader(new InputStreamReader(new URL(url).openStream(), "utf-8")); - if (url.startsWith(baseurl)) + if (url.startsWith(baseurl) && !url.endsWith("?format=txt")) return readFromTrac(in, url); return readNormal(in); }