updated the display to show system cache language

diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php
index d4796ea7de7fc46ba44b4f8d90fc94c72035507f..23d622a62a28887ca8ae8d556617df9cfc2bb56a 100644 (file)
--- a/actions/admin/site/update_advanced.php
+++ b/actions/admin/site/update_advanced.php
@@ -25,7 +25,7 @@ if ($site = elgg_get_site_entity()) {
                elgg_disable_simplecache();
        }
 
-       if (get_input('viewpath_cache_enabled')) {
+       if (get_input('system_cache_enabled')) {
                elgg_enable_system_cache();
        } else {
                elgg_disable_system_cache();

diff --git a/languages/en.php b/languages/en.php
index 97867f922ad11d296444b0bed4df3b354385dab0..76ef07b4def262d6e0a18ea9ff54062ea021ce89 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -1032,8 +1032,8 @@ Once you have logged in, we highly recommend that you change your password.
        'installation:simplecache:description' => "The simple cache increases performance by caching static content including some CSS and JavaScript files. Normally you will want this on.",
        'installation:simplecache:label' => "Use simple cache (recommended)",
 
-       'installation:viewpathcache:description' => "The view filepath cache decreases the loading times of plugins by caching the location of their views.",
-       'installation:viewpathcache:label' => "Use view filepath cache (recommended)",
+       'installation:systemcache:description' => "The system cache decreases the loading time of the Elgg engine by caching data to files.",
+       'installation:systemcache:label' => "Use system cache (recommended)",
 
        'upgrading' => 'Upgrading...',
        'upgrade:db' => 'Your database was upgraded.',

diff --git a/mod/developers/actions/developers/settings.php b/mod/developers/actions/developers/settings.php
index 6249821a22a5710e167490bc94a9da2b84bbe25c..7c91e2f5f9192703205934ce0d698450064b5522 100644 (file)
--- a/mod/developers/actions/developers/settings.php
+++ b/mod/developers/actions/developers/settings.php
@@ -11,7 +11,7 @@ if (get_input('simple_cache')) {
        elgg_disable_simplecache();
 }
 
-if (get_input('view_path_cache')) {
+if (get_input('system_cache')) {
        elgg_enable_system_cache();
 } else {
        elgg_disable_system_cache();

diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php
index 812f779fa15999860153e63614d56fa9c2ff619b..262759e23bed7f72b76cb8337d3a2412c4fa2b73 100644 (file)
--- a/mod/developers/languages/en.php
+++ b/mod/developers/languages/en.php
@@ -16,9 +16,9 @@ $english = array(
        // settings
        'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.',
        'developers:label:simple_cache' => 'Use simple cache',
-       'developers:help:simple_cache' => 'Turn off the file cache when developing. Otherwise, changes to your views (including css) will be ignored.',
-       'developers:label:view_path_cache' => 'Use view path cache',
-       'developers:help:view_path_cache' => 'Turn this off when developing. Otherwise, new views in your plugins will not be registered.',
+       'developers:help:simple_cache' => 'Turn off this cache when developing. Otherwise, changes to your CSS and JavaScript will be ignored.',
+       'developers:label:system_cache' => 'Use system cache',
+       'developers:help:system_cache' => 'Turn this off when developing. Otherwise, changes in your plugins will not be registered.',
        'developers:label:debug_level' => "Trace level",
        'developers:help:debug_level' => "This controls the amount of information logged. See elgg_log() for more information.",
        'developers:label:display_errors' => 'Display fatal PHP errors',

diff --git a/mod/developers/views/default/admin/developers/settings.php b/mod/developers/views/default/admin/developers/settings.php
index dcc0a3e4ff68a8cd7f894732c7092a695746c1a6..519364fe1c1a2105b8dd275a6d94a5cf8bb49d14 100644 (file)
--- a/mod/developers/views/default/admin/developers/settings.php
+++ b/mod/developers/views/default/admin/developers/settings.php
@@ -10,7 +10,7 @@ $data = array(
                'checked' => elgg_get_config('simplecache_enabled') == 1,
        ),
 
-       'view_path_cache' => array(
+       'system_cache' => array(
                'type' => 'checkbox',
                'value' => 1,
                'checked' => elgg_get_config('viewpath_cache_enabled') == 1,

diff --git a/views/default/forms/admin/site/update_advanced.php b/views/default/forms/admin/site/update_advanced.php
index f79a235b5ca342688a8a23f5507aacd5cff146d4..786feb10166ba336bef6dd19d1a98d2916a81c34 100644 (file)
--- a/views/default/forms/admin/site/update_advanced.php
+++ b/views/default/forms/admin/site/update_advanced.php
@@ -40,11 +40,11 @@ $form_body .= elgg_view("input/checkboxes", array(
        'name' => 'simplecache_enabled',
        'value' => (elgg_get_config('simplecache_enabled') ? elgg_echo('installation:simplecache:label') : ""),
 )) . "</div>";
-$form_body .= "<div>" . elgg_echo('installation:viewpathcache:description') . "<br />";
+$form_body .= "<div>" . elgg_echo('installation:systemcache:description') . "<br />";
 $form_body .= elgg_view("input/checkboxes", array(
-       'options' => array(elgg_echo('installation:viewpathcache:label') => elgg_echo('installation:viewpathcache:label')),
-       'name' => 'viewpath_cache_enabled',
-       'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:viewpathcache:label') : ""),
+       'options' => array(elgg_echo('installation:systemcache:label') => elgg_echo('installation:systemcache:label')),
+       'name' => 'system_cache_enabled',
+       'value' => (elgg_get_config('viewpath_cache_enabled') ? elgg_echo('installation:systemcache:label') : ""),
 )) . "</div>";
 
 $debug_options = array('0' => elgg_echo('installation:debug:none'), 'ERROR' => elgg_echo('installation:debug:error'), 'WARNING' => elgg_echo('installation:debug:warning'), 'NOTICE' => elgg_echo('installation:debug:notice'));