gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-03-28 22:03:49 +01:00
commit 7f56ba8137
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/Util.class.php
View File

@ -3418,8 +3418,9 @@ class PMA_Util
$titles['NoExport'] = self::getIcon('bd_export.png', __('Export'));
$titles['Execute'] = self::getIcon('b_nextpage.png', __('Execute'));
$titles['NoExecute'] = self::getIcon('bd_nextpage.png', __('Execute'));
$titles['Favorite'] = self::getIcon('b_favorite.png', __('Remove from Favorites'));
$titles['NoFavorite']= self::getIcon('b_no_favorite.png', __('Add to Favorites'));
// For Favorite/NoFavorite, we need icon only.
$titles['Favorite'] = self::getIcon('b_favorite.png', '');
$titles['NoFavorite']= self::getIcon('b_no_favorite.png', '');
return $titles;
}

4
test/libraries/common/PMA_buildActionTitles_test.php
View File

@ -59,8 +59,8 @@ class PMA_BuildActionTitles_Test extends PHPUnit_Framework_TestCase
$titles['NoExport'] = PMA_Util::getIcon('bd_export.png', __('Export'));
$titles['Execute'] = PMA_Util::getIcon('b_nextpage.png', __('Execute'));
$titles['NoExecute'] = PMA_Util::getIcon('bd_nextpage.png', __('Execute'));
$titles['Favorite'] = PMA_Util::getIcon('b_favorite.png', __('Remove from Favorites'));
$titles['NoFavorite'] = PMA_Util::getIcon('b_no_favorite.png', __('Add to Favorites'));
$titles['Favorite'] = PMA_Util::getIcon('b_favorite.png', '');
$titles['NoFavorite'] = PMA_Util::getIcon('b_no_favorite.png', '');
$this->assertEquals($titles, PMA_Util::buildActionTitles());