[Svn] r2492 - in trunk/roundcubemail/plugins/password: . localization

trac at roundcube.net trac at roundcube.net
Sat May 16 16:28:47 CEST 2009


Author: alec
Date: 2009-05-16 09:28:47 -0500 (Sat, 16 May 2009)
New Revision: 2492

Added:
   trunk/roundcubemail/plugins/password/localization/hu_HU.inc
Modified:
   trunk/roundcubemail/plugins/password/password.js
   trunk/roundcubemail/plugins/password/password.php
Log:
- set pagetitle in php not js, hu_HU locale


Added: trunk/roundcubemail/plugins/password/localization/hu_HU.inc
===================================================================
--- trunk/roundcubemail/plugins/password/localization/hu_HU.inc	                        (rev 0)
+++ trunk/roundcubemail/plugins/password/localization/hu_HU.inc	2009-05-16 14:28:47 UTC (rev 2492)
@@ -0,0 +1,18 @@
+<?php
+
+$labels = array();
+$labels['changepasswd']  = 'Jelszóváltás';
+$labels['curpasswd']  = 'Jelenlegi jelszó:';
+$labels['newpasswd']  = 'Új jelszó:';
+$labels['confpasswd']  = 'Új jelszó mégegyszer:';
+
+$messages = array();
+$messages['nopassword'] = 'Kérjük adja meg az új jelszót.';
+$messages['nocurpassword'] = 'Kérjük adja meg a jelenlegi jelszót.';
+$messages['passwordincorrect'] = 'Érvénytelen a jelenlegi jelszó.';
+$messages['passwordinconsistency'] = 'A két új jelszó nem egyezik.';
+$messages['nocryptfunction'] = 'Hiba történt a kérés feldolgozása során.';
+$messages['internalerror'] = 'Hiba történt a kérés feldolgozása során.';
+$messages['errorsaving'] = 'Hiba történt a kérés feldolgozása során.';
+
+?>

Modified: trunk/roundcubemail/plugins/password/password.js
===================================================================
--- trunk/roundcubemail/plugins/password/password.js	2009-05-16 13:01:49 UTC (rev 2491)
+++ trunk/roundcubemail/plugins/password/password.js	2009-05-16 14:28:47 UTC (rev 2492)
@@ -33,12 +33,4 @@
 	}
     }, 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);
-    }
 }

Modified: trunk/roundcubemail/plugins/password/password.php
===================================================================
--- trunk/roundcubemail/plugins/password/password.php	2009-05-16 13:01:49 UTC (rev 2491)
+++ trunk/roundcubemail/plugins/password/password.php	2009-05-16 14:28:47 UTC (rev 2492)
@@ -97,15 +97,18 @@
   function password_init()
   {
     $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');
   }
   
   function password_save()
   {
     $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']))
       $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error');
@@ -123,7 +126,7 @@
     }
 
     rcmail_overwrite_action('plugin.password');
-    rcmail::get_instance()->output->send('plugin');
+    $rcmail->output->send('plugin');
   }
 
   function password_form()
@@ -135,10 +138,9 @@
     $rcmail->output->add_label(
 	'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'));
 
     // allow the following attributes to be added to the <table> tag

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn


More information about the Svn mailing list