aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-25 11:42:06 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-25 11:42:06 +0000
commitcb4dd43dd5ead9bd48df91051dcb753eaac992ff (patch)
tree2e328201b37e9456fa070910c445b67ae018fb87
parent1894d4e19fe7acb5fcd042b25abc2de9d8ee57fa (diff)
downloadelgg-cb4dd43dd5ead9bd48df91051dcb753eaac992ff.tar.gz
elgg-cb4dd43dd5ead9bd48df91051dcb753eaac992ff.tar.bz2
Moving to laptop
git-svn-id: https://code.elgg.org/elgg/trunk@1527 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--languages/en.php4
-rw-r--r--views/default/settings/system.php40
2 files changed, 27 insertions, 17 deletions
diff --git a/languages/en.php b/languages/en.php
index dfecfb4bf..b5d1737b4 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -484,7 +484,9 @@ Alternatively, you can enter your database settings below and we will try and do
'dataroot' => "The full path to the directory where uploaded files will be stored, followed by a trailing slash:",
'language' => "The default language for your site:",
'debug' => "Debug mode provides extra information which can be used to diagnose faults, however it can slow your system down so should only be used if you are having problems:",
- 'debug:label' => "Turn on debug mode",
+ 'debug:label' => "Turn on debug mode",
+ 'usage' => "This option lets Elgg send anonymous usage statistics back to Curverider",
+ 'usage:label' => "Send anonymous usage statistics",
'view' => "Enter the view which will be used as the default for your site (e.g. 'mobile') or leave this blank for the default view:",
/**
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index f29f0606b..27b610fb7 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -41,25 +41,33 @@
}
-?>
- <p>
- <?php echo elgg_echo('language'); ?>
- <?php
- $languages = get_installed_translations();
-
- echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages));
- ?>
- </p>
-
- <p>
- <?php echo elgg_echo('debug'); ?><br />
- <?php
- echo elgg_view("input/checkboxes", array('options' => array(elgg_echo('debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('debug:label') : "") ));
- ?>
+?>
+ <p>
+ <?php echo elgg_echo('language'); ?>
+ <?php
+ $languages = get_installed_translations();
+
+ echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages));
+ ?>
+ </p>
+
+ <p>
+ <?php echo elgg_echo('debug'); ?><br />
+ <?php
+ echo elgg_view("input/checkboxes", array('options' => array(elgg_echo('debug:label')), 'internalname' => 'debug', 'value' => ($vars['config']->debug ? elgg_echo('debug:label') : "") ));
+ ?>
</p>
+
+ <p>
+ <?php echo elgg_echo('usage'); ?><br />
+ <?php
+ echo elgg_view("input/checkboxes", array('options' => array(elgg_echo('usage:label')), 'internalname' => 'usage', 'value' => ($vars['config']->site_ping ? elgg_echo('usage') : "") ));
+ ?>
+ </p>
+
<p>
<input type="hidden" name="settings" value="go" />
<input type="submit" value="<?php echo elgg_echo("save"); ?>" />
</p>
- </form> \ No newline at end of file
+ </form>