Fixed #017574: ezi18n() was depcreated, now removed (4.5) - still in …

…use in extensions
ezsystems · Nov 1, 2010 · 542ee4e · 542ee4e
1 parent a207062
commit 542ee4e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/classes/ezpaex.php b/classes/ezpaex.php
@@ -514,7 +514,7 @@ function sendExpiryNotification( $user )
         $mail->setSender( $emailSender );
         $mail->setReceiver( $receiver );
 
-        $subject = ezi18n( 'mbpaex/userpaex', 'Your password is about to expire' );
+        $subject = ezpI18n::tr( 'mbpaex/userpaex', 'Your password is about to expire' );
         if ( $tpl->hasVariable( 'subject' ) )
             $subject = $tpl->variable( 'subject' );
 

diff --git a/datatypes/ezpaex/ezpaextype.php b/datatypes/ezpaex/ezpaextype.php
@@ -21,7 +21,7 @@ class ezpaextype extends eZDataType
      */
     function ezpaextype()
     {
-        $this->eZDataType( self::DATA_TYPE_STRING, ezi18n( 'mbpaex/classes/datatypes', "Password Expiration", 'Datatype name' ),
+        $this->eZDataType( self::DATA_TYPE_STRING, ezpI18n::tr( 'mbpaex/classes/datatypes', "Password Expiration", 'Datatype name' ),
                            array( 'translation_allowed' => false,
                                   'serialize_supported' => true ) );
     }
@@ -70,7 +70,7 @@ function validateObjectAttributeHTTPInput( $http, $base, $contentObjectAttribute
         $statusPasswordlifetime = $integerValidator->validate( $passwordlifetime );
         if ( $statusPasswordlifetime != eZInputValidator::STATE_ACCEPTED && trim( $passwordlifetime ) )
         {
-            $contentObjectAttribute->setValidationError( ezi18n( 'mbpaex/classes/datatypes',
+            $contentObjectAttribute->setValidationError( ezpI18n::tr( 'mbpaex/classes/datatypes',
                                                                  'The password lifetime must be an integer >= 0' ) );
             return eZInputValidator::STATE_INVALID;
         }
@@ -80,7 +80,7 @@ function validateObjectAttributeHTTPInput( $http, $base, $contentObjectAttribute
         $statusExpirationnotification = $integerValidator->validate( $expirationnotification );
         if ( $statusExpirationnotification != eZInputValidator::STATE_ACCEPTED && trim( $expirationnotification ) )
         {
-            $contentObjectAttribute->setValidationError( ezi18n( 'mbpaex/classes/datatypes',
+            $contentObjectAttribute->setValidationError( ezpI18n::tr( 'mbpaex/classes/datatypes',
                                                                  'The expiration notification time must be an integer >= 86400' ) );
             return eZInputValidator::STATE_INVALID;
         }
@@ -119,7 +119,7 @@ function validateObjectAttributeHTTPInput( $http, $base, $contentObjectAttribute
                 }
                 if (!$paex->validatePassword($newPassword))
                 {
-                    $contentObjectAttribute->setValidationError( ezi18n( 'mbpaex/classes/datatypes',
+                    $contentObjectAttribute->setValidationError( ezpI18n::tr( 'mbpaex/classes/datatypes',
                                                                          "The password doesn't match the validation rule.
                                                                          Previous password will be preserved if there is any." ) );
                     return eZInputValidator::STATE_INVALID;
@@ -137,7 +137,7 @@ function validateObjectAttributeHTTPInput( $http, $base, $contentObjectAttribute
             $statusUpdatechildren = $integerValidator->validate($updatechildren);
             if ( $statusUpdatechildren != eZInputValidator::STATE_ACCEPTED && trim($updatechildren) )
             {
-                $contentObjectAttribute->setValidationError( ezi18n( 'mbpaex/classes/datatypes',
+                $contentObjectAttribute->setValidationError( ezpI18n::tr( 'mbpaex/classes/datatypes',
                                                                      'Wrong value in updatechildren field' ) );
                 return eZInputValidator::STATE_INVALID;
             }

diff --git a/modules/userpaex/forgotpassword.php b/modules/userpaex/forgotpassword.php
@@ -123,7 +123,7 @@
                 $emailSender = $ini->variable( 'MailSettings', 'AdminEmail' );
             $mail->setSender( $emailSender );
             $mail->setReceiver( $receiver );
-            $subject = ezi18n( 'kernel/user/register', 'Registration info' );
+            $subject = ezpI18n::tr( 'kernel/user/register', 'Registration info' );
             if ( $tpl->hasVariable( 'subject' ) )
                 $subject = $tpl->variable( 'subject' );
             $mail->setSubject( $subject );
@@ -228,9 +228,9 @@
 
 $Result = array();
 $Result['content'] = $tpl->fetch( 'design:userpaex/forgotpassword.tpl' );
-$Result['path'] = array( array( 'text' => ezi18n( 'kernel/user', 'User' ),
+$Result['path'] = array( array( 'text' => ezpI18n::tr( 'kernel/user', 'User' ),
                                 'url' => false ),
-                         array( 'text' => ezi18n( 'kernel/user', 'Forgot password' ),
+                         array( 'text' => ezpI18n::tr( 'kernel/user', 'Forgot password' ),
                                 'url' => false ) );
 
 if ( $ini->variable( 'SiteSettings', 'LoginPage' ) == 'custom' )

diff --git a/modules/userpaex/password.php b/modules/userpaex/password.php
@@ -166,9 +166,9 @@
 $tpl->setVariable( "message", $message );
 
 $Result = array();
-$Result['path'] = array( array( 'text' => ezi18n( 'kernel/user', 'User' ),
+$Result['path'] = array( array( 'text' => ezpI18n::tr( 'kernel/user', 'User' ),
                                 'url' => false ),
-                         array( 'text' => ezi18n( 'kernel/user', 'Change password' ),
+                         array( 'text' => ezpI18n::tr( 'kernel/user', 'Change password' ),
                                 'url' => false ) );
 $Result['content'] = $tpl->fetch( "design:userpaex/password.tpl" );