aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-02-16 23:13:01 +0000
committerrub <rub@piwigo.org>2007-02-16 23:13:01 +0000
commit856f707fe60d64b0e7a6a8748ed847f72284287c (patch)
tree55b4dd0d579dc2ceceb1c83e38fc9bb998f3cbee
parent92192fdd7c1030dc43dae6d0df02d80b6e327227 (diff)
Fix Issue 0000605: Not linked elements failure with no virtual categories galleries
Add missing translations git-svn-id: http://piwigo.org/svn/trunk@1831 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/element_set.php19
-rw-r--r--language/en_UK.iso-8859-1/admin.lang.php16
-rw-r--r--language/fr_FR.iso-8859-1/admin.lang.php17
3 files changed, 45 insertions, 7 deletions
diff --git a/admin/element_set.php b/admin/element_set.php
index 530bbd5f5..ee9884e31 100644
--- a/admin/element_set.php
+++ b/admin/element_set.php
@@ -147,20 +147,27 @@ SELECT id
;';
$virtual_categories = array_from_query($query, 'id');
- $query = '
+ if (!empty($virtual_categories))
+ {
+ $query = '
SELECT DISTINCT(image_id)
FROM '.IMAGE_CATEGORY_TABLE.'
;';
- $all_elements = array_from_query($query, 'image_id');
-
- $query = '
+ $all_elements = array_from_query($query, 'image_id');
+
+ $query = '
SELECT DISTINCT(image_id)
FROM '.IMAGE_CATEGORY_TABLE.'
WHERE category_id IN ('.implode(',', $virtual_categories).')
;';
- $linked_to_virtual = array_from_query($query, 'image_id');
+ $linked_to_virtual = array_from_query($query, 'image_id');
- $page['cat_elements_id'] = array_diff($all_elements, $linked_to_virtual);
+ $page['cat_elements_id'] = array_diff($all_elements, $linked_to_virtual);
+ }
+ else
+ {
+ $page['cat_elements_id'] = array();
+ }
}
else if ('duplicates' == $_GET['cat'])
{
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 9a0addeee..2d95aaf0c 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -550,5 +550,21 @@ $lang['FORUM'] = 'FORUM';
$lang['BUGS'] = 'BUGS';
$lang['EXTENSIONS'] = 'EXTENSIONS';
$lang['WIKI / DOC'] = 'WIKI / DOC';
+$lang['Export data'] = 'Export data';
+$lang['Overall'] = 'Overall';
+$lang['Year'] = 'Year';
+$lang['Month'] = 'Month';
+$lang['Day'] = 'Day';
+$lang['Pages seen'] = 'Pages seen';
+//$lang['only'] = 'only';
+$lang['Pictures'] = 'Pictures';
+$lang['High quality'] = 'High quality';
+$lang['time'] = 'time';
+$lang['user'] = 'user';
+$lang['IP'] = 'IP';
+$lang['image'] = '';
+$lang['high quality'] = 'high quality';
+$lang['section'] = 'section';
+$lang['tags'] = 'tags';
?>
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index fdbdfc033..08b1c1e92 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -549,5 +549,20 @@ $lang['FORUM'] = 'FORUM';
$lang['BUGS'] = 'BOGUES';
$lang['EXTENSIONS'] = 'EXTENSIONS';
$lang['WIKI / DOC'] = 'WIKI / DOC';
-
+$lang['Export data'] = 'Exporter les données';
+$lang['Overall'] = 'Vue globale';
+$lang['Year'] = 'Année';
+$lang['Month'] = 'Mois';
+$lang['Day'] = 'Jour';
+$lang['Pages seen'] = 'Pages vues';
+//$lang['only'] = 'uniquement';
+$lang['Pictures'] = 'Images';
+$lang['High quality'] = 'Haute résolution';
+$lang['time'] = 'heure';
+$lang['user'] = 'utilisateur';
+$lang['IP'] = 'IP';
+$lang['image'] = 'images';
+$lang['high quality'] = 'haute résolution';
+$lang['section'] = 'section';
+$lang['tags'] = 'tags';
?>