From fd59389ca6fb288eb10eff1f22b8b5364225ca48 Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Wed, 26 Sep 2012 14:14:58 +1200
Subject: [PATCH] MDL-25290 cache: Plugins are now standard and strings tidied

---
 lang/en/cache.php  | 8 ++++----
 lang/en/plugin.php | 4 ++++
 lib/pluginlib.php  | 8 ++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lang/en/cache.php b/lang/en/cache.php
index ee557a8e3049f..df5c06e3070b5 100644
--- a/lang/en/cache.php
+++ b/lang/en/cache.php
@@ -43,14 +43,14 @@
 $string['cachestores'] = 'Cache stores';
 $string['component'] = 'Component';
 $string['confirmstoredeletion'] = 'Confirm store deletion';
-$string['defaultmappings'] = 'Default mappings';
+$string['defaultmappings'] = 'Stores used when no mapping is present';
 $string['defaultmappings_help'] = 'These are the default stores that will be used if you don\'t map one or more stores to the cache definition.';
 $string['defaultstoreactions'] = 'Default stores cannot be modified';
 $string['default_application'] = 'Default application store';
 $string['default_request'] = 'Default request store';
 $string['default_session'] = 'Default session store';
 $string['definition'] = 'Definition';
-$string['definitionsummaries'] = 'Definition summaries';
+$string['definitionsummaries'] = 'Known cache definitions';
 $string['delete'] = 'Delete';
 $string['deletestore'] = 'Delete store';
 $string['deletestoreconfirmation'] = 'Are you sure you want to delete the "{$a}" store?';
@@ -85,7 +85,7 @@
 $string['nativelocking'] = 'This plugin handles its own locking.';
 $string['none'] = 'None';
 $string['plugin'] = 'Plugin';
-$string['pluginsummaries'] = 'Plugin summaries';
+$string['pluginsummaries'] = 'Installed cache plugins';
 $string['purge'] = 'Purge';
 $string['purgestoresuccess'] = 'Successfully purged the requested store.';
 $string['requestcount'] = 'Test with {$a} requests';
@@ -106,7 +106,7 @@
 $string['store_default_application'] = 'Default file store for application caches';
 $string['store_default_request'] = 'Default static store for request caches';
 $string['store_default_session'] = 'Default session store for session caches';
-$string['storesummaries'] = 'Store summaries';
+$string['storesummaries'] = 'Configured plugin instances';
 $string['supports'] = 'Supports';
 $string['supports_multipleidentifiers'] = 'multiple identifiers';
 $string['supports_dataguarantee'] = 'data guarantee';
diff --git a/lang/en/plugin.php b/lang/en/plugin.php
index 3bba405afa6e1..9fd873a16bfc2 100644
--- a/lang/en/plugin.php
+++ b/lang/en/plugin.php
@@ -71,6 +71,10 @@
 $string['type_auth_plural'] = 'Authentication methods';
 $string['type_block'] = 'Block';
 $string['type_block_plural'] = 'Blocks';
+$string['type_cachelock'] = 'Cache lock handler';
+$string['type_cachelock_plural'] = 'Cache lock handlers';
+$string['type_cachestore'] = 'Cache store';
+$string['type_cachestore_plural'] = 'Cache stores';
 $string['type_coursereport'] = 'Course report';
 $string['type_coursereport_plural'] = 'Course reports';
 $string['type_editor'] = 'Editor';
diff --git a/lib/pluginlib.php b/lib/pluginlib.php
index c3a5456297b37..6c8d1fc6e9f75 100644
--- a/lib/pluginlib.php
+++ b/lib/pluginlib.php
@@ -405,6 +405,14 @@ public static function standard_plugins_list($type) {
                 'exportimscp', 'importhtml', 'print'
             ),
 
+            'cachelock' => array(
+                'file'
+            ),
+
+            'cachestore' => array(
+                'file', 'memcache', 'memcached', 'mongodb', 'session', 'static'
+            ),
+
             'coursereport' => array(
                 //deprecated!
             ),