Changeset 2492 in subversion

Timestamp:

May 16, 2009 10:28:47 AM (4 years ago)

Author:

alec

Message:

• set pagetitle in php not js, hu_HU locale

Location:

trunk/roundcubemail/plugins/password

Files:

• localization/hu_HU.inc (added)
• password.js (modified) (1 diff)
• password.php (modified) (4 diffs)

trunk/roundcubemail/plugins/password/password.js

@@ -34 +34 @@
     }, true);
   })
-
-    // set page title
-    if (rcmail.env.action == 'plugin.password' && rcmail.env.task == 'settings') {
-      var title = rcmail.gettext('changepasswd','password')
-      if (rcmail.env.product_name)
-        title = rcmail.env.product_name + ' :: ' + title;
-      rcmail.set_pagetitle(title);
-    }
 }

trunk/roundcubemail/plugins/password/password.php

@@ -98 +98 @@
   {
     $this->add_texts('localization/');
-    rcmail::get_instance()->output->send('plugin');
+    $rcmail = rcmail::get_instance();
+    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
+    $rcmail->output->send('plugin');
   }
   
@@ -105 +107 @@
     $rcmail = rcmail::get_instance();
 
+    $this->add_texts('localization/');
     $confirm = $rcmail->config->get('password_confirm_current');
-    $this->add_texts('localization/');
+    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
 
     if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd']))
@@ -124 +127 @@
 
     rcmail_overwrite_action('plugin.password');
-    rcmail::get_instance()->output->send('plugin');
+    $rcmail->output->send('plugin');
   }
 
@@ -136 +139 @@
         'password.nopassword',
         'password.nocurpassword',
-        'password.passwordinconsistency',
-        'password.changepasswd'
+        'password.passwordinconsistency'
     );
-//    $rcmail->output->set_pagetitle($this->gettext('changepasswd'));
+
     $rcmail->output->set_env('product_name', $rcmail->config->get('product_name'));