archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trunk merge 5070 bug:1486

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@5075 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
ddtddt 2010-03-07 16:07:44 +00:00
commit 3467516675
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/permalinks.php
View file

@ -100,7 +100,7 @@ DELETE FROM '.OLD_PERMALINKS_TABLE.'
LIMIT 1';
pwg_query($query);
if (pwg_db_affected_rows()==0)
array_push($page['errors'], 'Cannot delete the old permalink !');
array_push($page['errors'], l10n('Cannot delete the old permalink !'));
}

6
admin/template/goto/permalinks.tpl
View file

@ -47,9 +47,9 @@
<td>Id {$SORT_OLD_CAT_ID}</td>
<td>{'Category'|@translate}</td>
<td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
<td>Deleted on {$SORT_OLD_DATE_DELETED}</td>
<td>Last hit {$SORT_OLD_LAST_HIT}</td>
<td style="width:20px;">Hit {$SORT_OLD_HIT}</td>
<td>{'Deleted on'|@translate} {$SORT_OLD_DATE_DELETED}</td>
<td>{'Last hit'|@translate} {$SORT_OLD_LAST_HIT}</td>
<td style="width:20px;">{'Hit'|@translate} {$SORT_OLD_HIT}</td>
<td style="width:5px;"></td>
</tr>
{foreach from=$deleted_permalinks item=permalink}

4
language/en_UK/admin.lang.php
View file

@ -661,4 +661,8 @@ $lang['Allow users to edit theirs owns comments'] = 'Allow users to edit theirs
$lang['Allow users to delete theirs owns comments'] = 'Allow users to delete theirs owns comments';
$lang['Email administrators when a comment is modified'] = 'Email administrators when a comment is modified';
$lang['Email administrators when a comment is deleted'] = 'Email administrators when a comment is deleted';
$lang['Cannot delete the old permalink !'] = 'Cannot delete the old permalink !';
$lang['Deleted on'] = 'Deleted on';
$lang['Last hit'] = 'Last hit';
$lang['Hit'] = 'Hit';
?>

4
language/fr_FR/admin.lang.php
View file

@ -662,4 +662,8 @@ $lang['Allow users to edit theirs owns comments'] = 'Autoriser les utilisateurs
$lang['Allow users to delete theirs owns comments'] = 'Autoriser les utilisateurs à supprimer leurs propres commentaires';
$lang['Email administrators when a comment is modified'] = 'Notifier les administrateurs quand un commentaire est modifié';
$lang['Email administrators when a comment is deleted'] = 'Notifier les administrateurs quand un commentaire est supprimé';
$lang['Cannot delete the old permalink !'] = 'Impossible de supprimer cet ancien lien permanent !';
$lang['Deleted on'] = 'Supprimés sur';
$lang['Last hit'] = 'dernier score';
$lang['Hit'] = 'score';
?>