From 8884477e91e8b9e90b23440e0e82e4d455f39a17 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 07 Oct 2005 10:37:06 -0400
Subject: [PATCH] Latest updates for release
---
program/steps/settings/func.inc | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index c48f41c..a7571e0 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Provide functionality for user's settings & preferences |
@@ -44,24 +44,25 @@
// return the complete edit form as table
$out = "$form_start<table" . $attrib_str . ">\n\n";
- $a_show_cols = array('language' => array('type' => 'text'),
- 'pagesize' => array('type' => 'text'),
- 'timezone' => array('type' => 'text'));
+ $a_show_cols = array('language' => array('type' => 'text'),
+ 'pagesize' => array('type' => 'text'),
+ 'timezone' => array('type' => 'text'),
+ 'prettydate' => array('type' => 'text'));
// show language selection
$field_id = 'rcmfd_lang';
$select_lang = new select(array('name' => '_language', 'id' => $field_id));
- // $select_lang->add('Czech', 'cs');
$select_lang->add('Dansk', 'da');
$select_lang->add('Deutsch', 'de');
$select_lang->add('English', 'en');
$select_lang->add('Espanol', 'es');
- $select_lang->add('Fran�ais', 'fr');
+ $select_lang->add('Français', 'fr');
$select_lang->add('Italiano', 'it');
+ $select_lang->add('Nederlands', 'nl');
$out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
$field_id,
- rcube_label('language'),
+ rep_specialchars_output(rcube_label('language')),
$select_lang->show($sess_user_lang));
@@ -98,7 +99,7 @@
$out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
$field_id,
- rcube_label('timezone'),
+ rep_specialchars_output(rcube_label('timezone')),
$select_timezone->show($CONFIG['timezone']));
@@ -108,7 +109,7 @@
$out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
$field_id,
- rcube_label('pagesize'),
+ rep_specialchars_output(rcube_label('pagesize')),
$input_pagesize->show($CONFIG['pagesize']));
// show checkbox for HTML/plaintext messages
@@ -117,9 +118,18 @@
$out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
$field_id,
- rcube_label('preferhtml'),
+ rep_specialchars_output(rcube_label('preferhtml')),
$input_pagesize->show($CONFIG['prefer_html']?1:0));
+ // MM: Show checkbox for toggling 'pretty dates'
+ $field_id = 'rcmfd_prettydate';
+ $input_prettydate = new checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+
+ $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+ $field_id,
+ rep_specialchars_output(rcube_label('prettydate')),
+ $input_prettydate->show($CONFIG['prettydate']?1:0));
+
$out .= "\n</table>$form_end";
--
Gitblit v1.9.1