From ed5d2e635dbe1de09e10c223e82f9b10ef77a975 Mon Sep 17 00:00:00 2001 From: Honfika Date: Thu, 30 Jan 2014 21:29:49 +0100 Subject: [PATCH] #496 French date format fixed --- .../flash/gui/NewVersionDialog.java | 23 ++++++++++++++++++- .../gui/locales/NewVersionDialog.properties | 5 +++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java index d2e693eb7..eff92b430 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java @@ -25,7 +25,13 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; import java.net.URISyntaxException; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JLabel; @@ -55,10 +61,25 @@ public class NewVersionDialog extends AppDialog implements ActionListener { changesText.setEditable(false); changesText.setFont(UIManager.getFont("TextField.font")); String changesStr = ""; + SimpleDateFormat serverFormatter = new SimpleDateFormat("MM/dd/yyyy"); + DateFormat formatter; + String customFormat = translate("customDateFormat"); + if (customFormat.equals("default")) { + formatter = DateFormat.getDateInstance(); + } else { + formatter = new SimpleDateFormat(customFormat); + } for (Version v : versions) { changesStr += translate("version") + " " + v.versionName + "\r\n"; changesStr += "-----------------------\r\n"; - changesStr += translate("releasedate") + v.releaseDate + "\r\n"; + String releaseDate = v.releaseDate; + try { + Date date = serverFormatter.parse(releaseDate); + releaseDate = formatter.format(date); + } catch (ParseException ex) { + Logger.getLogger(NewVersionDialog.class.getName()).log(Level.SEVERE, null, ex); + } + changesStr += translate("releasedate") + " " + releaseDate + "\r\n"; for (String type : v.changes.keySet()) { changesStr += type + ":" + "\r\n"; for (String ch : v.changes.get(type)) { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/locales/NewVersionDialog.properties b/trunk/src/com/jpexs/decompiler/flash/gui/locales/NewVersionDialog.properties index 665a45d22..45b004b30 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/locales/NewVersionDialog.properties +++ b/trunk/src/com/jpexs/decompiler/flash/gui/locales/NewVersionDialog.properties @@ -22,4 +22,7 @@ button.ok = OK button.cancel = Cancel dialog.title = New version available newversion = New version -newvermessage = New version of %oldAppName% is available: %newAppName%.\r\nPlease go to %projectPage% to download it. \ No newline at end of file +newvermessage = New version of %oldAppName% is available: %newAppName%.\r\nPlease go to %projectPage% to download it. +#change this only when the date format is wrong in the changelog +#you can use any java date format string, e.g: yyyy.MM.dd +customDateFormat = default \ No newline at end of file