diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-05-21 07:45:54 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-05-21 07:45:54 +0000 |
| commit | 6ce34bc3ecf5ef980584ffa601e1716a6644bcf0 (patch) | |
| tree | 3054dd47098a7fc7f4e64aa6ae01df6f620ef752 /roundcubemail/program/steps | |
| parent | c7219c680446e7843eaecae11b7302ff33ed61a5 (diff) | |
-localized pagetitle in Settings and Address book
-removed useless and not working code
git-svn-id: https://svn.roundcube.net/trunk@1412 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps')
5 files changed, 8 insertions, 11 deletions
diff --git a/roundcubemail/program/steps/addressbook/func.inc b/roundcubemail/program/steps/addressbook/func.inc index ea67ec247..6d0a3938c 100644 --- a/roundcubemail/program/steps/addressbook/func.inc +++ b/roundcubemail/program/steps/addressbook/func.inc @@ -239,7 +239,8 @@ function rcmail_get_rowcount_text() return $out; } - + +$OUTPUT->set_pagetitle(rcube_label('addressbook')); // register UI objects $OUTPUT->add_handlers(array( diff --git a/roundcubemail/program/steps/settings/edit_identity.inc b/roundcubemail/program/steps/settings/edit_identity.inc index 18c5078ed..43cbf3d17 100644 --- a/roundcubemail/program/steps/settings/edit_identity.inc +++ b/roundcubemail/program/steps/settings/edit_identity.inc @@ -19,17 +19,15 @@ */ +$OUTPUT->set_pagetitle(rcube_label('identities')); + if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity') { $IDENTITY_RECORD = $USER->get_identity(get_input_value('_iid', RCUBE_INPUT_GPC)); if (is_array($IDENTITY_RECORD)) $OUTPUT->set_env('iid', $IDENTITY_RECORD['identity_id']); - - $OUTPUT->set_pagetitle(rcube_label('edititem')); } -else - $OUTPUT->set_pagetitle(rcube_label('newitem')); $OUTPUT->include_script('list.js'); diff --git a/roundcubemail/program/steps/settings/func.inc b/roundcubemail/program/steps/settings/func.inc index 18ec36f2f..d303565a8 100644 --- a/roundcubemail/program/steps/settings/func.inc +++ b/roundcubemail/program/steps/settings/func.inc @@ -19,10 +19,7 @@ */ - -if ($USER->ID) - $OUTPUT->set_pagetitle(rcube_label('settingsfor') . " ". $USER->get_username()); - +$OUTPUT->set_pagetitle(rcube_label('preferences')); function rcmail_user_prefs_form($attrib) diff --git a/roundcubemail/program/steps/settings/identities.inc b/roundcubemail/program/steps/settings/identities.inc index fe53ecc66..e24a5c4a9 100644 --- a/roundcubemail/program/steps/settings/identities.inc +++ b/roundcubemail/program/steps/settings/identities.inc @@ -19,8 +19,7 @@ */ -if ($USER_DATA = $DB->fetch_assoc($sql_result)) - $OUTPUT->set_pagetitle(sprintf('%s (%s@%s)', rcube_label('identities'), $USER_DATA['username'], $USER_DATA['mail_host'])); +$OUTPUT->set_pagetitle(rcube_label('identities')); $OUTPUT->include_script('list.js'); diff --git a/roundcubemail/program/steps/settings/manage_folders.inc b/roundcubemail/program/steps/settings/manage_folders.inc index 4de8c2c9c..6c056a147 100644 --- a/roundcubemail/program/steps/settings/manage_folders.inc +++ b/roundcubemail/program/steps/settings/manage_folders.inc @@ -19,6 +19,8 @@ */ +$OUTPUT->set_pagetitle(rcube_label('folders')); + // init IMAP connection $RCMAIL->imap_init(true); |