summaryrefslogtreecommitdiff
path: root/actions/profilesettings.php
diff options
context:
space:
mode:
authormikec <mikec@mikenz.geek.nz>2008-07-21 09:56:37 -0400
committermikec <mikec@mikenz.geek.nz>2008-07-21 09:56:37 -0400
commita4fa34cecbd038fb2cc323aefd2b32739aaee7d5 (patch)
tree040f9ea3ee60f79c814d6732e5360a0dc687428d /actions/profilesettings.php
parentd48609ac51f9f7aa5b57df1e9ab9aa7353721c00 (diff)
Resolve conflicts after pull from evan
darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
Diffstat (limited to 'actions/profilesettings.php')
-rw-r--r--actions/profilesettings.php15
1 files changed, 15 insertions, 0 deletions
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index cfa4db0d7..f2fe89826 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -52,6 +52,18 @@ class ProfilesettingsAction extends SettingsAction {
common_input('location', _('Location'),
($this->arg('location')) ? $this->arg('location') : $profile->location,
_('Where you are, like "City, State (or Region), Country"'));
+
+ $language = common_language();
+ common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), TRUE, $language);
+ $timezone = common_timezone();
+ $timezones = array();
+ foreach(DateTimeZone::listIdentifiers() as $k => $v) {
+ $timezones[$v] = $v;
+ }
+ common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), TRUE, $timezone);
+
+ common_checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
+ ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe);
common_submit('submit', _('Save'));
common_element_end('form');
common_show_footer();
@@ -64,6 +76,9 @@ class ProfilesettingsAction extends SettingsAction {
$homepage = $this->trimmed('homepage');
$bio = $this->trimmed('bio');
$location = $this->trimmed('location');
+ $autosubscribe = $this->boolean('autosubscribe');
+ $language = $this->trimmed('language');
+ $timezone = $this->trimmed('timezone');
# Some validation