Replaced "committed" with "authored" on activity page

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 9f4b3c628f2b5a0db4f1099d136ead5acc01e6e0..9ce4df5df671e93955956b5ace6e4e9d71287d08 100644 (file)
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -214,4 +214,6 @@ gb.pages = pages
 gb.workingCopy = working copy\r
 gb.workingCopyWarning = this repository has a working copy and can not receive pushes\r
 gb.query = query\r
-gb.queryHelp = write brief explanation of Lucene syntax here
\ No newline at end of file
+gb.queryHelp = write brief explanation of Lucene syntax here\r
+gb.authored = authored\r
+gb.committed = committed
\ No newline at end of file

diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.html b/src/com/gitblit/wicket/panels/ActivityPanel.html
index 3a603bfbc43e6c5fdd21c7ae022167f2391eb02d..7c6305564888ab3e32178e3292c6bdda3fa01767 100644 (file)
--- a/src/com/gitblit/wicket/panels/ActivityPanel.html
+++ b/src/com/gitblit/wicket/panels/ActivityPanel.html
@@ -23,7 +23,7 @@
                <td style="vertical-align: middle;">\r
                        <img wicket:id="commitIcon" style="vertical-align: middle;"></img>\r
                        <span wicket:id="message">[shortlog commit link]</span><br/>\r
-                       <span wicket:id="author" style="padding-left:20px;">[author link]</span> committed <span wicket:id="commitid">[commit id]</span> to <span wicket:id="branch"></span>\r
+                       <span wicket:id="author" style="padding-left:20px;">[author link]</span> <wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span> on <span wicket:id="branch"></span>\r
                </td>\r
                <td style="text-align:right;vertical-align: middle;">\r
                        <div wicket:id="commitRefs">[commit refs]</div>\r