diff --git a/public/language/en-GB/admin/advanced/cache.json b/public/language/en-GB/admin/advanced/cache.json new file mode 100644 index 0000000000..5a954f1232 --- /dev/null +++ b/public/language/en-GB/admin/advanced/cache.json @@ -0,0 +1,11 @@ +{ + "post-cache": "Post Cache", + "posts-in-cache": "Posts in Cache", + "average-post-size": "Average Post Size", + "length-to-max": "Length / Max", + "percent-full": "%1% Full", + "post-cache-size": "Post Cache Size", + "items-in-cache": "Items in Cache", + "control-panel": "Control Panel", + "update-settings": "Update Cache Settings" +} \ No newline at end of file diff --git a/public/language/en-GB/admin/advanced/database.json b/public/language/en-GB/admin/advanced/database.json new file mode 100644 index 0000000000..f7db6220ee --- /dev/null +++ b/public/language/en-GB/admin/advanced/database.json @@ -0,0 +1,35 @@ +{ + "x-b": "%1 b", + "x-mb": "%1 mb", + "uptime-seconds": "Uptime in Seconds", + "uptime-days": "Uptime in Days", + + "mongo": "Mongo", + "mongo.version": "MongoDB Version", + "mongo.storage-engine": "Storage Engine", + "mongo.collections": "Collections", + "mongo.objects": "Objects", + "mongo.avg-object-size": "Avg. Object Size", + "mongo.data-size": "Data Size", + "mongo.storage-size": "Storage Size", + "mongo.index-size": "Index Size", + "mongo.file-size": "File Size", + "mongo.resident-memory": "Resident Memory", + "mongo.virtual-memory": "Virtual Memory", + "mongo.mapped-memory": "Mapped Memory", + "mongo.raw-info": "MongoDB Raw Info", + + "redis": "Redis", + "redis.version": "Redis Version", + "redis.connected-clients": "Connected Clients", + "redis.connected-slaves": "Connected Slaves", + "redis.blocked-clients": "Blocked Clients", + "redis.used-memory": "Used Memory", + "redis.memory-frag-ratio": "Memory Fragmentation Ratio", + "redis.total-connections-recieved": "Total Connections Received", + "redis.total-commands-processed": "Total Commands Processed", + "redis.iops": "Instantaneous Ops. Per Second", + "redis.keyspace-hits": "Keyspace Hits", + "redis.keyspace-misses": "Keyspace Misses", + "redis.raw-info": "Redis Raw Info" +} \ No newline at end of file diff --git a/public/language/en-GB/admin/advanced/errors.json b/public/language/en-GB/admin/advanced/errors.json new file mode 100644 index 0000000000..dc9425b4c4 --- /dev/null +++ b/public/language/en-GB/admin/advanced/errors.json @@ -0,0 +1,12 @@ +{ + "figure-x": "Figure %1", + "error-events-per-day": "%1 events per day", + "error.404": "404 Not Found", + "error.503": "503 Service Unavailable", + "manage-error-log": "Manage Error Log", + "export-error-log": "Export Error Log (CSV)", + "clear-error-log": "Clear Error Log", + "route": "Route", + "count": "Count", + "no-routes-not-found": "Hooray! There are no routes that were not found." +} \ No newline at end of file diff --git a/public/language/en-GB/admin/advanced/events.json b/public/language/en-GB/admin/advanced/events.json new file mode 100644 index 0000000000..766eb5e951 --- /dev/null +++ b/public/language/en-GB/admin/advanced/events.json @@ -0,0 +1,6 @@ +{ + "events": "Events", + "no-events": "There are no events", + "control-panel": "Events Control Panel", + "delete-events": "Delete Events" +} \ No newline at end of file diff --git a/public/language/en-GB/admin/advanced/logs.json b/public/language/en-GB/admin/advanced/logs.json new file mode 100644 index 0000000000..7426b14a36 --- /dev/null +++ b/public/language/en-GB/admin/advanced/logs.json @@ -0,0 +1,6 @@ +{ + "logs": "Logs", + "control-panel": "Logs Control Panel", + "reload": "Reload Logs", + "clear": "Clear Logs" +} \ No newline at end of file diff --git a/src/views/admin/advanced/cache.tpl b/src/views/admin/advanced/cache.tpl index bd01bf99e0..70f82ab5db 100644 --- a/src/views/admin/advanced/cache.tpl +++ b/src/views/admin/advanced/cache.tpl @@ -2,25 +2,25 @@
-
Post Cache
+
[[admin/advanced/cache:post-cache]]
-
+
{postCache.itemCount}
-
+
{postCache.avgPostSize}
-
+
{postCache.length} / {postCache.max}
- {postCache.percentFull}% Full + [[admin/advanced/cache:percent-full, {postCache.percentFull}]]
- +
@@ -30,15 +30,15 @@
Group Cache
-
+
{groupCache.itemCount}
-
+
{groupCache.length} / {groupCache.max}
- {groupCache.percentFull}% Full + [[admin/advanced/cache:percent-full, {groupCache.percentFull}]]
@@ -51,9 +51,9 @@
-
Control Panel
+
[[admin/advanced/cache:control-panel]]
- +
diff --git a/src/views/admin/advanced/database.tpl b/src/views/admin/advanced/database.tpl index 4ebd277f55..0773a27adc 100644 --- a/src/views/admin/advanced/database.tpl +++ b/src/views/admin/advanced/database.tpl @@ -2,27 +2,27 @@
-
Mongo
+
[[admin/advanced/database:mongo]]
- MongoDB Version {mongo.version}
+ [[admin/advanced/database:mongo.version]] {mongo.version}
- Uptime in Seconds {mongo.uptime}
- Storage Engine {mongo.storageEngine}
- Collections {mongo.collections}
- Objects {mongo.objects}
- Avg. Object Size {mongo.avgObjSize} b
+ [[admin/advanced/database:uptime-seconds]] {mongo.uptime}
+ [[admin/advanced/database:mongo.storage-engine]] {mongo.storageEngine}
+ [[admin/advanced/database:mongo.collections]] {mongo.collections}
+ [[admin/advanced/database:mongo.objects]] {mongo.objects}
+ [[admin/advanced/database:mongo.avg-object-size]] [[admin/advanced/database:x-b, {mongo.avgObjSize}]]
- Data Size {mongo.dataSize} mb
- Storage Size {mongo.storageSize} mb
- Index Size {mongo.indexSize} mb
+ [[admin/advanced/database:mongo.data-size]] [[admin/advanced/database:x-mb, {mongo.dataSize}]]
+ [[admin/advanced/database:mongo.storage-size]] [[admin/advanced/database:x-mb, {mongo.storageSize}]]
+ [[admin/advanced/database:mongo.index-size]] [[admin/advanced/database:x-mb, {mongo.indexSize}]]
- File Size {mongo.fileSize} mb
+ [[admin/advanced/database:mongo.file-size]] [[admin/advanced/database:x-mb, {mongo.fileSize}]]
- Resident Memory {mongo.mem.resident} mb
- Virtual Memory {mongo.mem.virtual} mb
- Mapped Memory {mongo.mem.mapped} mb
+ [[admin/advanced/database:mongo.resident-memory]] [[admin/advanced/database:x-mb, {mongo.mem.resident}]]
+ [[admin/advanced/database:mongo.virtual-memory]] [[admin/advanced/database:x-mb, {mongo.mem.virtual]]
+ [[admin/advanced/database:mongo.mapped-memory]] [[admin/advanced/database:x-mb, {mongo.mem.mapped}]]
@@ -30,28 +30,28 @@
-
Redis
+
[[admin/advanced/database:redis]]
- Redis Version {redis.redis_version}
+ [[admin/advanced/database:redis.version]] {redis.redis_version}
- Uptime in Seconds {redis.uptime_in_seconds}
- Uptime in Days {redis.uptime_in_days}
+ [[admin/advanced/database:uptime-seconds]] {redis.uptime_in_seconds}
+ [[admin/advanced/database:uptime-days]] {redis.uptime_in_days}
- Connected Clients {redis.connected_clients}
- Connected Slaves {redis.connected_slaves}
- Blocked Clients {redis.blocked_clients}
+ [[admin/advanced/database:redis.connected-clients]] {redis.connected_clients}
+ [[admin/advanced/database:redis.connected-slaves]] {redis.connected_slaves}
+ [[admin/advanced/database:redis.blocked-clients]] {redis.blocked_clients}
- Used Memory {redis.used_memory_human}
- Memory Fragmentation Ratio {redis.mem_fragmentation_ratio}
+ [[admin/advanced/database:redis.used-memory]] {redis.used_memory_human}
+ [[admin/advanced/database:redis.memory-frag-ratio]] {redis.mem_fragmentation_ratio}
- Total Connections Received {redis.total_connections_received}
- Total Commands Processed {redis.total_commands_processed}
- Instantaneous Ops. Per Second {redis.instantaneous_ops_per_sec}
+ [[admin/advanced/database:redis.total-connections-recieved]] {redis.total_connections_received}
+ [[admin/advanced/database:redis.total-commands-processed]] {redis.total_commands_processed}
+ [[admin/advanced/database:redis.iops]] {redis.instantaneous_ops_per_sec}
- Keyspace Hits {redis.keyspace_hits}
- Keyspace Misses {redis.keyspace_misses}
+ [[admin/advanced/database:redis.keyspace-hits]] {redis.keyspace_hits}
+ [[admin/advanced/database:redis.keyspace-misses]] {redis.keyspace_misses}
@@ -60,7 +60,7 @@
-

MongoDB Raw Info

+

[[admin/advanced/database:mongo.raw-info]]

@@ -74,7 +74,7 @@
-

Redis Raw Info

+

[[admin/advanced/database:redis.raw-info]]

diff --git a/src/views/admin/advanced/errors.tpl b/src/views/admin/advanced/errors.tpl index d3c23e78b7..f5f0838c31 100644 --- a/src/views/admin/advanced/errors.tpl +++ b/src/views/admin/advanced/errors.tpl @@ -6,7 +6,10 @@
-
Figure 1 – 404 Not Found events per day
+
+ [[admin/advanced/errors:figure-x, 1]] – + [[admin/advanced/errors:error-events-per-day, [[admin/advanced/errors:error.404]]]] +
@@ -14,18 +17,25 @@
-
Figure 2 – 503 Service Unavailable events per day
+
+ [[admin/advanced/errors:figure-x, 2]] – + [[admin/advanced/errors:error-events-per-day, [[admin/advanced/errors:error.503]]]] +
-
Manage Error Log
+
[[admin/advanced/errors:manage-error-log]]
- Export Error Log (CSV) - + + [[admin/advanced/errors:export-error-log]] + +
@@ -35,12 +45,14 @@
-
404 Not Found
+
+ [[admin/advanced/errors:error.404]] +
- - + + @@ -53,7 +65,7 @@ diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index f1c0973501..b80f56ed6e 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -1,10 +1,10 @@
-
Events
+
[[admin/advanced/events:events]]
-
There are no events
+
[[admin/advanced/events:no-events]]
@@ -30,9 +30,11 @@
-
Events Control Panel
+
- +
diff --git a/src/views/admin/advanced/logs.tpl b/src/views/admin/advanced/logs.tpl index 9eda8fc383..a8f8a501a3 100644 --- a/src/views/admin/advanced/logs.tpl +++ b/src/views/admin/advanced/logs.tpl @@ -1,7 +1,7 @@
-
Logs
+
[[admin/advanced/logs:logs]]
{data}
@@ -9,10 +9,14 @@
-
Logs Control Panel
+
[[admin/advanced/logs:control-panel]]
- - + +
RouteCount[[admin/advanced/errors:route]][[admin/advanced/errors:count]]
- Hooray! There are no routes that were not found. + [[admin/advanced/errors:no-routes-not-found]]