--- a/web/hdalab/views/ajax.py	Sat Sep 08 03:52:24 2012 +0200
+++ b/web/hdalab/views/ajax.py	Sun Sep 09 21:35:10 2012 +0200
@@ -202,9 +202,9 @@
                 qs = qs.filter( label__icontains = q )
         else:
             if lang in stemming_langs:
-                qs = qs.filter(dbpedia_fields__translations__label__iregex=qrx, dbpedia_fields__translations__language_code=lang)
+                qs = qs.filter(dbpedia_fields__translations__label__iregex=qrx, dbpedia_fields__translations__language_code=lang, dbpedia_fields__translations__is_label_translated = True)
             else:
-                qs = qs.filter(dbpedia_fields__translations__label__icontains=q, dbpedia_fields__translations__language_code=lang)
+                qs = qs.filter(dbpedia_fields__translations__label__icontains=q, dbpedia_fields__translations__language_code=lang, dbpedia_fields__translations__is_label_translated = True)
     else:
         qs = Tag.objects.filter(~Q(dbpedia_uri = None))
            
@@ -215,8 +215,8 @@
     if lang in no_translate_langs:
         translations = {}
     else:
-        transqs = DbpediaFieldsTranslation.objects.filter(master__tag__in = qslist, language_code=lang).select_related("master")
-        translations = dict([(tr.master.tag_id, {'label':tr.label,'abstract':tr.abstract}) for tr in transqs])
+        transqs = DbpediaFieldsTranslation.objects.filter(master__tag__in = qslist, language_code=lang, is_label_translated=True).select_related("master")
+        translations = dict([(tr.master.tag_id, {'label':tr.label,'abstract':tr.abstract, 'is_label_translated': tr.is_label_translated}) for tr in transqs])
     
     res = []
     
@@ -224,6 +224,9 @@
         dbfields = t.dbpedia_fields
         resobj = {'original_label':t.label,'nb':t.nb}
         resobj['thumbnail'] = dbfields.thumbnail if dbfields is not None else None
+        
+#        if t.id in translations and not translations[t.id].get('is_label_translated', True):
+#            continue
         if t.id in translations:
             resobj['value'] = translations[t.id]['label']
             resobj['abstract'] = translations[t.id]['abstract']