Author: olamy
Date: Mon Mar 12 11:35:48 2012
New Revision: 1299634
URL: http://svn.apache.org/viewvc?rev=1299634&view=rev
Log:
[MRM-1580] system status page add i18n.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1299634&r1=1299633&r2=1299634&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Mon Mar 12 11:35:48 2012
@@ -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=Ma
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.
+
+
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1299634&r1=1299633&r2=1299634&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Mon Mar 12 11:35:48 2012
@@ -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);
}
