Changeset 1412 in subversion

Timestamp:

May 21, 2008 3:45:54 AM (5 years ago)

Author:

alec

Message:

-localized pagetitle in Settings and Address book
-removed useless and not working code

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/addressbook/func.inc (modified) (1 diff)
• program/steps/settings/edit_identity.inc (modified) (2 diffs)
• program/steps/settings/func.inc (modified) (1 diff)
• program/steps/settings/identities.inc (modified) (1 diff)
• program/steps/settings/manage_folders.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/05/21 (alec)
+----------
+- Localized pagetitle in Settings 
 
 2008/05/19 (alec)

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -240 +240 @@
   return $out;
   }
-  
+
+$OUTPUT->set_pagetitle(rcube_label('addressbook'));
   
 // register UI objects

trunk/roundcubemail/program/steps/settings/edit_identity.inc

@@ -20 +20 @@
 */
 
+$OUTPUT->set_pagetitle(rcube_label('identities'));
+
 if (($_GET['_iid'] || $_POST['_iid']) && $RCMAIL->action=='edit-identity')
   {
@@ -26 +28 @@
   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'));
 
 

trunk/roundcubemail/program/steps/settings/func.inc

@@ -20 +20 @@
 */
 
-
-if ($USER->ID)
-  $OUTPUT->set_pagetitle(rcube_label('settingsfor') . " ". $USER->get_username());
-
+$OUTPUT->set_pagetitle(rcube_label('preferences'));
 
 

trunk/roundcubemail/program/steps/settings/identities.inc

@@ -20 +20 @@
 */
 
-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');

trunk/roundcubemail/program/steps/settings/manage_folders.inc

@@ -20 +20 @@
 */
 
+$OUTPUT->set_pagetitle(rcube_label('folders'));
+
 // init IMAP connection
 $RCMAIL->imap_init(true);