Index: trunk/core/units/phrases/phrases_config.php =================================================================== diff -u -r1636 -r2210 --- trunk/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 1636) +++ trunk/core/units/phrases/phrases_config.php (.../phrases_config.php) (revision 2210) @@ -69,7 +69,7 @@ 'CalculatedFields' => Array( '' => Array( - 'PrimaryValue' => 'pri.Translation', + 'PrimaryTranslation' => 'pri.Translation', ), ), @@ -78,7 +78,9 @@ FROM %1$s LEFT JOIN '.TABLE_PREFIX.'Phrase pri ON (%1$s.Phrase = pri.Phrase) AND (pri.LanguageId = 1)'), - 'ItemSQLs' => Array( ''=>'SELECT *, 0 AS PrimaryValue FROM %s',), + 'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s + FROM %1$s + LEFT JOIN '.TABLE_PREFIX.'Phrase pri ON (%1$s.Phrase = pri.Phrase) AND (pri.LanguageId = 1)',), 'ListSortings' => Array( '' => Array( @@ -104,7 +106,7 @@ ), 'VirtualFields' => Array( - 'PrimaryValue' => Array(), + 'PrimaryTranslation' => Array(), 'LangFile' => Array(), 'ImportOverwrite' => Array(), ), @@ -115,7 +117,7 @@ 'Fields' => Array( 'Phrase' => Array( 'title'=>'la_col_Label', 'data_block' => 'grid_checkbox_td'), 'Translation' => Array( 'title'=>'la_col_Translation' ), - 'PrimaryValue' => Array( 'title'=>'la_col_PrimaryValue' ), + 'PrimaryTranslation' => Array( 'title'=>'la_col_PrimaryValue' ), 'PhraseType' => Array( 'title'=>'la_col_PhraseType' ), 'LastChanged' => Array( 'title'=>'la_col_LastChanged' ), 'Module' => Array( 'title'=>'la_col_Module' ),