projects / pnews.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
multi-language support
[pnews.git] / war / src / main / java / pnews / servlet / HTML.java
diff --git a/war/src/main/java/pnews/servlet/HTML.java b/war/src/main/java/pnews/servlet/HTML.java
index 321c5a7..a9ad838 100644 (file)
--- a/war/src/main/java/pnews/servlet/HTML.java
+++ b/war/src/main/java/pnews/servlet/HTML.java
@@ -8,6 +8,7 @@ import java.util.logging.Logger;
 
 import pnews.Article;
 import pnews.Category;
+import pnews.Language;
 
 public class HTML {
         private static final String CLASS_NAME= HTML.class.getName();
@@ -71,13 +72,16 @@ public class HTML {
                buf.append("</div>\n");         
        }
        
-       private static void appendMenu(StringBuffer buf, Category catActive, Category[] cats) {
+       private static void appendMenu(StringBuffer buf, Category catActive, Config cfg) {
                String cl;
                
                buf.append("<nav>\n");
                buf.append("<ul>\n");
 
-               for (Category cat: cats) {
+               for (Category cat: cfg.getCategories()) {
+                       if (!cat.getLanguage().equals(catActive.getLanguage()))
+                               continue;
+                       
                        buf.append("<li>");
                        
                        if (cat.equals(catActive))
@@ -88,16 +92,19 @@ public class HTML {
                        appendA(buf, cat.getLabel(), cat.getURL(), cl);
                        buf.append("</li>");
                }
-                buf.append("<li><a href='/en'>EN</a></li>");
-                buf.append("<li><a href='/fr'>FR</a></li>");           
+               
+               for (Language l: cfg.getLanguages())
+                       buf.append("<li><a href='" + l.toURL() + "'>" + l.getLabel() + "</a></li>");
+                
                buf.append("</ul>\n");
                
                buf.append("</nav>\n");
        }
        
-       public static String toHTML(List<Article> articles, Category catActive, Category[] cats) {
+       public static String toHTML(List<Article> articles, Category catActive, Config cfg) {
                StringBuffer buf;
                int i;
+               Category[] cats;
                
                buf = new StringBuffer();
                buf.append("<!DOCTYPE html>\n");
@@ -111,7 +118,9 @@ public class HTML {
                buf.append("</head>\n");
                buf.append("<body>\n");
                
-               appendMenu(buf, catActive, cats);
+               cats = cfg.getCategories();
+               
+               appendMenu(buf, catActive, cfg);
                
                i = 0;
                for (Article e: articles) {
pitchoune news