-localized pagetitle in Settings and Address book

-removed useless and not working code

6 files changed, 12 insertions, 11 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 2af355160..3547c85c0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/05/21 (alec)
+----------
+- Localized pagetitle in Settings 
+
 2008/05/19 (alec)
 ----------
 - Fixed Mysql DDL for default identities creation (#1485070)
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index ea67ec247..6d0a3938c 100644
--- a/program/steps/addressbook/func.inc
+++ b/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/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 18c5078ed..43cbf3d17 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/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/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 18ec36f2f..d303565a8 100644
--- a/program/steps/settings/func.inc
+++ b/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/program/steps/settings/identities.inc b/program/steps/settings/identities.inc
index fe53ecc66..e24a5c4a9 100644
--- a/program/steps/settings/identities.inc
+++ b/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/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 4de8c2c9c..6c056a147 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -19,6 +19,8 @@
 
 */
 
+$OUTPUT->set_pagetitle(rcube_label('folders'));
+
 // init IMAP connection
 $RCMAIL->imap_init(true);