# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1375131307 -7200
# Node ID 3851909cb730180eb22a7986faf98dc7d05a263f
# Parent  c7de7a56164dfef3436c2de576472fff1730ec02
better error management when editing wikipedia.
Correct the javascript when there is an error and correct the behaviour of the code when a null result is returned. (done when investigating bug #17630)

diff -r c7de7a56164d -r 3851909cb730 src/core/wp_utils.py
--- a/src/core/wp_utils.py	Mon Jul 29 21:04:05 2013 +0200
+++ b/src/core/wp_utils.py	Mon Jul 29 22:55:07 2013 +0200
@@ -192,7 +192,7 @@
     new_label = wp_res['new_label']
     alternative_label= wp_res['alternative_label']
     status =  wp_res['status']
-    url = wp_res['wikipedia_url'] + ("#"+fragment if label_is_url else "")    
+    url = wp_res['wikipedia_url'] + ("#"+fragment if label_is_url else "") if wp_res['wikipedia_url'] else None    
     alternative_url = wp_res['alternative_wikipedia_url']
     pageid = wp_res['pageid']
     alternative_pageid = wp_res['alternative_pageid']
diff -r c7de7a56164d -r 3851909cb730 src/jocondelab/locale/en/LC_MESSAGES/djangojs.mo
Binary file src/jocondelab/locale/en/LC_MESSAGES/djangojs.mo has changed
diff -r c7de7a56164d -r 3851909cb730 src/jocondelab/locale/en/LC_MESSAGES/djangojs.po
--- a/src/jocondelab/locale/en/LC_MESSAGES/djangojs.po	Mon Jul 29 21:04:05 2013 +0200
+++ b/src/jocondelab/locale/en/LC_MESSAGES/djangojs.po	Mon Jul 29 22:55:07 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-18 10:33+0200\n"
+"POT-Creation-Date: 2013-07-29 22:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,18 +30,22 @@
 msgstr ""
 "Do you confirm the deletion of the wikipedia link for the term \"%s\" ?"
 
-#: static/jocondelab/js/jocondelab.js:192
+#: static/jocondelab/js/jocondelab.js:211
 msgid "Confirmez-vous la validation de ce terme ?"
 msgstr "Do you confirm this term validation ?"
 
-#: static/jocondelab/js/jocondelab.js:195
+#: static/jocondelab/js/jocondelab.js:214
 msgid "Confirmez-vous l'invalidation de cette fiche ?"
 msgstr "Do you confirm this notice validation ?"
 
-#: static/jocondelab/js/jocondelab.js:326
+#: static/jocondelab/js/jocondelab.js:272
+msgid "error when treating request"
+msgstr "error when treating request"
+
+#: static/jocondelab/js/jocondelab.js:341
 msgid "Ok"
 msgstr "Ok"
 
-#: static/jocondelab/js/jocondelab.js:339
+#: static/jocondelab/js/jocondelab.js:354
 msgid "Cancel"
 msgstr "Cancel"
diff -r c7de7a56164d -r 3851909cb730 src/jocondelab/locale/fr/LC_MESSAGES/djangojs.mo
Binary file src/jocondelab/locale/fr/LC_MESSAGES/djangojs.mo has changed
diff -r c7de7a56164d -r 3851909cb730 src/jocondelab/locale/fr/LC_MESSAGES/djangojs.po
--- a/src/jocondelab/locale/fr/LC_MESSAGES/djangojs.po	Mon Jul 29 21:04:05 2013 +0200
+++ b/src/jocondelab/locale/fr/LC_MESSAGES/djangojs.po	Mon Jul 29 22:55:07 2013 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-18 10:33+0200\n"
+"POT-Creation-Date: 2013-07-29 22:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,18 +30,22 @@
 msgid "Confirmez-vous la suppression du lien Wikipédia pour le terme \"%s\" ?"
 msgstr "Confirmez-vous la suppression du lien Wikipédia pour le terme \"%s\" ?"
 
-#: static/jocondelab/js/jocondelab.js:192
+#: static/jocondelab/js/jocondelab.js:211
 msgid "Confirmez-vous la validation de ce terme ?"
 msgstr "Confirmez-vous la validation de ce terme ?"
 
-#: static/jocondelab/js/jocondelab.js:195
+#: static/jocondelab/js/jocondelab.js:214
 msgid "Confirmez-vous l'invalidation de cette fiche ?"
 msgstr "Confirmez-vous la validation de cette fiche ?"
 
-#: static/jocondelab/js/jocondelab.js:326
+#: static/jocondelab/js/jocondelab.js:272
+msgid "error when treating request"
+msgstr "Erreur lors du traitement de la requête"
+
+#: static/jocondelab/js/jocondelab.js:341
 msgid "Ok"
 msgstr "Ok"
 
-#: static/jocondelab/js/jocondelab.js:339
+#: static/jocondelab/js/jocondelab.js:354
 msgid "Cancel"
 msgstr "Annuler"
diff -r c7de7a56164d -r 3851909cb730 src/jocondelab/static/jocondelab/js/jocondelab.js
--- a/src/jocondelab/static/jocondelab/js/jocondelab.js	Mon Jul 29 21:04:05 2013 +0200
+++ b/src/jocondelab/static/jocondelab/js/jocondelab.js	Mon Jul 29 22:55:07 2013 +0200
@@ -266,15 +266,10 @@
             window.location.reload(true);
         },
         error: function(jqXHR, textStatus, errorThrown) {
-			resp = $.parseJSON(jqXHR.responseText);
-			console.log(resp.message);
-        },
-        complete: function(){
-            // We empty the input and hide the ok button
             $("#wp_search").val("");
             $("#wp_lang").val(wp_lang);
-            $("#ok_search").html("<b>OK</b>");
-        }
+			$("#ok_search").html("<em style='color: red'>"+gettext("error when treating request")+"</em>").delay(5000).hide(400,function() {$(this).html("<b>OK</b>").show();});
+        },
     });
 }