Merge pull request #765 from zanata/update-copyright-2015

Update the copyright year to current year
zanata · Apr 28, 2015 · 23e51d6 · 23e51d6
2 parents 7a5769a + 300a693
commit 23e51d6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java b/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
@@ -23,6 +23,7 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -50,6 +51,7 @@
 import org.zanata.config.JaasConfig;
 import org.zanata.config.JndiBackedConfig;
 import org.zanata.events.ConfigurationChanged;
+import org.zanata.i18n.Messages;
 import org.zanata.log4j.ZanataHTMLLayout;
 import org.zanata.log4j.ZanataSMTPAppender;
 import org.zanata.security.AuthenticationType;
@@ -80,6 +82,8 @@ public class ApplicationConfiguration implements Serializable {
     private JndiBackedConfig jndiBackedConfig;
     @In
     private JaasConfig jaasConfig;
+    @In
+    private Messages msgs;
 
     private static final ZanataSMTPAppender smtpAppenderInstance =
             new ZanataSMTPAppender();
@@ -437,4 +441,9 @@ private int parseIntegerOrDefault(String value, int defaultValue) {
             return defaultValue;
         }
     }
+
+    public String copyrightNotice() {
+        return msgs.format("jsf.CopyrightNotice",
+                String.valueOf(Calendar.getInstance().get(Calendar.YEAR)));
+    }
 }
diff --git a/zanata-war/src/main/java/org/zanata/ZanataInit.java b/zanata-war/src/main/java/org/zanata/ZanataInit.java
@@ -29,6 +29,7 @@
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Properties;
 import java.util.jar.Attributes;
@@ -430,7 +431,8 @@ private void logBanner(VersionInfo ver, AppServerVersion appServerVersion) {
         }
         log.info("  AS version: " + appServerVersion.asVersion.orNull());
         log.info("  SCM: " + ver.getScmDescribe());
-        log.info("  Red Hat Inc 2008-2014");
+        log.info("  Red Hat Inc 2008-{}",
+                Calendar.getInstance().get(Calendar.YEAR));
         log.info("============================================");
     }
 

diff --git a/zanata-war/src/main/resources/messages.properties b/zanata-war/src/main/resources/messages.properties
@@ -110,7 +110,7 @@ jsf.SiteMap=Site map
 jsf.RunningVersionInfo=<a href="http://zanata.org/" target="_blank">{0}</a> {1} ({2})
 ! &#169; is a copyright symbol
 ! "Red Hat, Inc" should only be translated to an alternative legal name for the same entity. If in doubt, leave it as-is.
-jsf.CopyrightNotice=Copyright &#169; 2008-14 <a href="http://www.redhat.com/" target="_blank">Red Hat, Inc</a>
+jsf.CopyrightNotice=&#169; 2008-{0} <a href="http://www.redhat.com/" target="_blank">Red Hat, Inc</a>
 
 
 #------ [home] ------

diff --git a/zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
@@ -47,7 +47,7 @@
                 value="#{msgs.format('jsf.RunningVersionInfo',
                   msgs['jsf.Zanata'], applicationConfiguration.version,
                   applicationConfiguration.scmDescribe)}
-                  | #{msgs['jsf.CopyrightNotice']}"
+                  | #{applicationConfiguration.copyrightNotice()}"
                 escape="false"/>
             </p>
           </div>