Skip to content

Commit

Permalink
Fixed #017574: ezi18n() was depcreated, now removed (4.5) - still in …
Browse files Browse the repository at this point in the history 
…use in extensions
  • Loading branch information
Christian Pfeffer Gjengedal committed Nov 1, 2010
1 parent bf32ba0 commit e0fdd1d
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions classes/ezfindelevateconfiguration.php
View file
Expand Up @@ -367,7 +367,7 @@ public static function synchronizeWithSolr( $shard = null )
}
else
{
$message = ezi18n( 'extension/ezfind/elevate', "Error while generating the configuration XML" );
$message = ezpI18n::tr( 'extension/ezfind/elevate', "Error while generating the configuration XML" );
self::$lastSynchronizationError = $message;
eZDebug::writeError( $message, __METHOD__ );
return false;
Expand Down Expand Up @@ -482,7 +482,7 @@ protected static function pushConfigurationToSolr( $shard = null )

if ( ! $result )
{
$message = ezi18n( 'extension/ezfind/elevate', 'An unknown error occured in updating Solr\'s elevate configuration.' );
$message = ezpI18n::tr( 'extension/ezfind/elevate', 'An unknown error occured in updating Solr\'s elevate configuration.' );
eZDebug::writeError( $message, __METHOD__ );
throw new Exception( $message );
}
Expand Down
14 changes: 7 additions & 7 deletions classes/ezfmodulefunctioncollection.php
View file
Expand Up @@ -269,31 +269,31 @@ public function getDefaultSearchFacets()
$limit = 5;
$facets = array();
$facets[] = array( 'field' => 'class',
'name' => ezi18n( 'extension/ezfind/facets', 'Content type' ),
'name' => ezpI18n::tr( 'extension/ezfind/facets', 'Content type' ),
'limit' => $limit );
$facets[] = array( 'field' => 'author',
'name' => ezi18n( 'extension/ezfind/facets', 'Author' ),
'name' => ezpI18n::tr( 'extension/ezfind/facets', 'Author' ),
'limit' => $limit );
/*$facets[] = array( 'field' => 'published',
'name' => ezi18n( 'extension/ezfind/facets', 'Creation time' ),
'name' => ezpI18n::tr( 'extension/ezfind/facets', 'Creation time' ),
'limit' => $limit );
$facets[] = array( 'field' => 'modified',
'name' => ezi18n( 'extension/ezfind/facets', 'Last modified' ),
'name' => ezpI18n::tr( 'extension/ezfind/facets', 'Last modified' ),
'limit' => $limit );*/
$facets[] = array( 'field' => 'article/tags',
'name' => ezi18n( 'extension/ezfind/facets', 'Keywords' ),
'name' => ezpI18n::tr( 'extension/ezfind/facets', 'Keywords' ),
'limit' => $limit );

// Date facets
/*$facets[] = array( 'field' => 'published',
'name' => ezi18n( 'extension/ezfind/facets', 'Creation time' ),
'name' => ezpI18n::tr( 'extension/ezfind/facets', 'Creation time' ),
'limit' => $limit );
*/
/*$facets[] = array( 'date' => 'modified',
'date.start' => 'NOW-1MONTH',
'date.end' => 'NOW',
'date.gap' => '%2B1DAY',
'name' => ezi18n( 'extension/ezfind/facets', 'Last modified' ),
'name' => ezpI18n::tr( 'extension/ezfind/facets', 'Last modified' ),
'limit' => $limit );*/

// @TODO : location ( in the content tree )
Expand Down
4 changes: 2 additions & 2 deletions modules/ezfind/elevate.php
View file
Expand Up @@ -243,8 +243,8 @@
$Result['content'] = $tpl->fetch( "design:ezfind/elevate.tpl" );
$Result['left_menu'] = "design:ezfind/backoffice_left_menu.tpl";
$Result['path'] = array( array( 'url' => false,
'text' => ezi18n( 'extension/ezfind', 'eZFind' ) ),
'text' => ezpI18n::tr( 'extension/ezfind', 'eZFind' ) ),
array( 'url' => false,
'text' => ezi18n( 'extension/ezfind', 'Elevation' ) ) );
'text' => ezpI18n::tr( 'extension/ezfind', 'Elevation' ) ) );

?>
4 changes: 2 additions & 2 deletions modules/ezfind/elevation_detail.php
View file
Expand Up @@ -133,9 +133,9 @@
$Result = array();
$Result['content'] = $tpl->fetch( "design:ezfind/elevation_detail.tpl" );
$Result['path'] = array( array( 'url' => false,
'text' => ezi18n( 'extension/ezfind', 'eZFind' ) ),
'text' => ezpI18n::tr( 'extension/ezfind', 'eZFind' ) ),
array( 'url' => 'ezfind/elevate',
'text' => ezi18n( 'extension/ezfind', 'Elevation' ) ) );
'text' => ezpI18n::tr( 'extension/ezfind', 'Elevation' ) ) );

if ( $object instanceof eZContentObject )
{
Expand Down
4 changes: 2 additions & 2 deletions modules/ezfind/remove_elevation.php
View file
Expand Up @@ -113,7 +113,7 @@
$Result['content'] = $tpl->fetch( "design:ezfind/remove_elevation.tpl" );
$Result['left_menu'] = "design:ezfind/backoffice_left_menu.tpl";
$Result['path'] = array( array( 'url' => false,
'text' => ezi18n( 'extension/ezfind', 'eZFind' ) ),
'text' => ezpI18n::tr( 'extension/ezfind', 'eZFind' ) ),
array( 'url' => false,
'text' => ezi18n( 'extension/ezfind', 'Remove Elevation' ) ) );
'text' => ezpI18n::tr( 'extension/ezfind', 'Remove Elevation' ) ) );
?>
6 changes: 3 additions & 3 deletions search/plugins/ezsolr/ezsolr.php
View file
Expand Up @@ -794,7 +794,7 @@ function search( $searchText, $params = array(), $searchTypes = array() )
'SearchResult' => false,
'SearchCount' => 0,
'StopWordArray' => array(),
'SearchExtras' => new ezfSearchResultInfo( array( 'error' => ezi18n( 'ezfind', $error ) ) ) );
'SearchExtras' => new ezfSearchResultInfo( array( 'error' => ezpI18n::tr( 'ezfind', $error ) ) ) );
}

$highLights = array();
Expand Down Expand Up @@ -996,7 +996,7 @@ function moreLikeThis( $queryType, $queryValue, $params = array() )
'SearchResult' => false,
'SearchCount' => 0,
'StopWordArray' => array(),
'SearchExtras' => new ezfSearchResultInfo( array( 'error' => ezi18n( 'ezfind', $error ) ) ) );
'SearchExtras' => new ezfSearchResultInfo( array( 'error' => ezpI18n::tr( 'ezfind', $error ) ) ) );
}
$objectRes = array();
if ( isset( $resultArray['response'] ) && is_array( $resultArray['response'] ) )
Expand Down Expand Up @@ -1262,7 +1262,7 @@ public function supportedSearchTypes()
*/
static function engineText()
{
return ezi18n( 'ezfind', 'eZ Find 2.3 search plugin © 1999-2010 eZ Systems AS, powered by Apache Solr 1.5-dev' );
return ezpI18n::tr( 'ezfind', 'eZ Find 2.3 search plugin © 1999-2010 eZ Systems AS, powered by Apache Solr 1.5-dev' );
}

/**
Expand Down

0 comments on commit e0fdd1d

Please sign in to comment.