From 2b9a8630f1cc7889d43b50b89b297da548910e15 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 12 Mar 2012 11:35:48 +0000 Subject: [PATCH] [MRM-1580] system status page add i18n. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1299634 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/i18n/default.properties | 13 +++++++++++++ .../src/main/webapp/js/archiva/general-admin.js | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties index dae818032..15cd72c6e 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties @@ -129,6 +129,7 @@ menu.artifacts.browse=Browse menu.topbar.quicksearch=Quick Search menu.legacy-artifact-support=Legacy Support menu.repository-scanning=Repository Scanning +menu.system-status=System Status #user user.change.password.required=Change password required @@ -284,4 +285,16 @@ network-configuration.maxTotalPerHost=Max Total Http Connections per host network-configuration.usePooling=Use http connection pooling network-configuration.updated=Network Configuration updated. +# system status +system-status.header.memory=Server Memory Usage +system-status.header.current.time=Current Time +system-status.header.caches=Caches +system-status.header.version.buildNumber=Build number +system-status.header.queues=Queues +system-status.header.version.info=Version Information +system-status.header.version.timestampStr=Build Timestamp +system-status.header.scanning=Repository Scans Currently in Progress +system-status.header.scanning.inprogress.none=No scans in progress. + + diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js index 1b1ebe1fb..b04bd841d 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js @@ -585,7 +585,8 @@ $(function() { } }); - var versionInfo="Build number: "+window.archivaRuntimeInfo.buildNumber+" - Build Timestamp: "+window.archivaRuntimeInfo.timestampStr; + var versionInfo=$.i18n.prop('system-status.header.version.buildNumber')+": "+window.archivaRuntimeInfo.buildNumber + +" - "+$.i18n.prop('system-status.header.version.timestampStr')+": "+window.archivaRuntimeInfo.timestampStr; mainContent.find("#status_version_info").html(versionInfo); } -- 2.39.5