Merge branch 'hotfix/JAL-1521' into Release_2_8_2_Branch

[jalview.git] / src / jalview / gui / BlogReader.java

diff --git a/src/jalview/gui/BlogReader.java b/src/jalview/gui/BlogReader.java
index 50d1e83..7a1065d 100644 (file)
--- a/src/jalview/gui/BlogReader.java
+++ b/src/jalview/gui/BlogReader.java
@@ -1,11 +1,34 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import jalview.bin.Cache;
+import jalview.util.MessageManager;
+
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Rectangle;
+import java.awt.Dialog.ModalExclusionType;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -105,11 +128,12 @@ public class BlogReader extends JPanel
     @Override
     public void actionPerformed(ActionEvent arg0)
     {
-      if (xf!=null)
+      if (xf != null)
       {
         xf.dispose();
       }
-      xf=null;jd=null;
+      xf = null;
+      jd = null;
       if (parent != null)
       {
         parent.showNews(false);
@@ -175,7 +199,7 @@ public class BlogReader extends JPanel
         if (parent != null)
         {
           Cache.log.info("News window closed.");
-          jd=null;
+          jd = null;
           parent.showNews(false);
         }
       }
@@ -307,8 +331,9 @@ public class BlogReader extends JPanel
         {
           createDialog();
           bounds = new Rectangle(5, 5, 550, 350);
-          jd.initDialogFrame(me, true, false, "News from www.jalview.org",
+          jd.initDialogFrame(me, false, false, MessageManager.getString("label.news_from_jalview"),
                   bounds.width, bounds.height);
+          jd.frame.setModalExclusionType(ModalExclusionType.NO_EXCLUDE);
           Cache.log.info("Displaying news.");
           jd.waitForInput();
         }
@@ -415,7 +440,7 @@ public class BlogReader extends JPanel
     topBottomSplitPane.setBottomComponent(bottomPanel);
     JScrollPane spTextDescription = new JScrollPane(textDescription);
     textDescription.setText("");
-    statusBar.setText(" [Status] ");
+    statusBar.setText(new StringBuffer("[").append(MessageManager.getString("label.status")).append("]").toString());
     buttonRefresh.addActionListener(new ActionListener()
     {
 
@@ -457,7 +482,7 @@ public class BlogReader extends JPanel
             _popupChannels);
     listItems.addMouseListener(popupAdapter);
     listItems.setCellRenderer(new ItemsRenderer());
-    lblChannels.setText("Channels");
+    lblChannels.setText(MessageManager.getString("label.channels"));
   }
 
   private void postInit()
@@ -767,7 +792,7 @@ public class BlogReader extends JPanel
       {
         lastread.add(Calendar.MONTH, 1);
       }
-      
+
     }
   }
 
@@ -791,8 +816,14 @@ class ChannelsRenderer extends DefaultListCellRenderer
     if (value instanceof Channel)
     {
       Channel channel = (Channel) value;
-      component.setText(channel.getTitle() + " ("
-              + channel.getUnreadItemCount() + ")");
+      component
+              .setText(MessageManager.formatMessage(
+                      "label.channel_title_item_count",
+                      new String[]
+                      {
+                          channel.getTitle(),
+                          Integer.valueOf(channel.getUnreadItemCount())
+                                  .toString() }));
       component.setToolTipText(channel.getURL());
     }
     return component;
@@ -815,9 +846,15 @@ class ItemsRenderer extends DefaultListCellRenderer
       Item item = (Item) value;
       if (item.getPublishDate() != null)
       {
-        component.setText(DateFormat.getDateInstance().format(
-                item.getPublishDate())
-                + " " + item.getTitle());
+        component.setText(MessageManager.formatMessage(
+                "label.blog_item_published_on_date",
+                new String[]
+                {
+                    DateFormat
+                            .getDateInstance(DateFormat.LONG,
+                                    MessageManager.getLocale())
+                            .format(item.getPublishDate()).toString(),
+                    item.getTitle() }));
       }
       component.setToolTipText(item.getLink());
       if (!item.isRead())