diff options
| -rw-r--r-- | languages/en.php | 6 | ||||
| -rw-r--r-- | views/default/notifications/settings/usersettings.php | 4 | ||||
| -rw-r--r-- | views/default/settings/system.php | 11 | ||||
| -rw-r--r-- | views/default/user/settings/language.php | 15 |
4 files changed, 25 insertions, 11 deletions
diff --git a/languages/en.php b/languages/en.php index a77dc9d16..13d2ce306 100644 --- a/languages/en.php +++ b/languages/en.php @@ -361,8 +361,8 @@ 'resetpassword' => "Reset password", - 'yes' => "Yes", - 'no' => "No",
+ 'option:yes' => "Yes", + 'option:no' => "No",
/**
* Generic data words
@@ -451,7 +451,7 @@ Alternatively, you can enter your database settings below and we will try and do 'wwwroot' => "The site URL, followed by a trailing slash:",
'path' => "The full path to your site root on your disk, followed by a trailing slash:",
'dataroot' => "The full path to the directory where uploaded files will be stored, followed by a trailing slash:", - 'language' => "The default language code for your site, e.g. 'en' for English, 'fr' for French, 'ru' for Russian:", + '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", '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/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php index af7c6cf54..edbaf5584 100644 --- a/views/default/notifications/settings/usersettings.php +++ b/views/default/notifications/settings/usersettings.php @@ -27,8 +27,8 @@ <td><?php echo $k; ?>: </td> <td> - <input type="radio" name="method[<?php echo $k; ?>]" value="yes" <?php if ($notification_settings->$k) echo "checked=\"yes\" "; ?>/><?php echo elgg_echo("yes"); ?><br /> - <input type="radio" name="method[<?php echo $k; ?>]" value="no" <?php if (!$notification_settings->$k) echo "checked=\"yes\" "; ?>/><?php echo elgg_echo("no"); ?> + <input type="radio" name="method[<?php echo $k; ?>]" value="yes" <?php if ($notification_settings->$k) echo "checked=\"yes\" "; ?>/><?php echo elgg_echo("option:yes"); ?><br /> + <input type="radio" name="method[<?php echo $k; ?>]" value="no" <?php if (!$notification_settings->$k) echo "checked=\"yes\" "; ?>/><?php echo elgg_echo("option:no"); ?> </td> </tr> <?php diff --git a/views/default/settings/system.php b/views/default/settings/system.php index 7fba20947..ad509724a 100644 --- a/views/default/settings/system.php +++ b/views/default/settings/system.php @@ -27,7 +27,7 @@ <?php
- foreach(array('sitename','wwwroot','path','dataroot', 'language', 'view') as $field) {
+ foreach(array('sitename','wwwroot','path','dataroot', 'view') as $field) {
?>
<p>
@@ -43,6 +43,15 @@ ?> <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') : "") )); diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php index dcc20e8ef..0d478ac95 100644 --- a/views/default/user/settings/language.php +++ b/views/default/user/settings/language.php @@ -17,12 +17,17 @@ ?> <h2><?php echo elgg_echo('user:set:language'); ?></h2> <p> - <?php echo elgg_echo('user:language:label'); ?> : <input type="text" name="language" value="<?php + + <?php echo elgg_echo('user:language:label'); ?> : <?php + + $value = $CONFIG->language; if ($user->language) - echo $user->language; - else - echo $CONFIG->language; - ?>" /> + $value = $user->language; + + echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations())); + + ?> + </p> <?php } ?>
\ No newline at end of file |