Merge branch 'dufferzafar/loading-preview'

metabrainz · Mar 15, 2015 · 50dae67 · 50dae67
2 parents 33c612c + 3b941d8
commit 50dae67
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/critiquebrainz/frontend/templates/review/edit.html b/critiquebrainz/frontend/templates/review/edit.html
@@ -121,18 +121,18 @@ <h2>{{ _('Editing review') }}</h2>
           if (e.target.hash.substring(1) == "preview") {
             var text = $("#review-content").val();
             if (!text) {
-              $("#preview").html('<em class="text-muted">{{ _('Review is empty.') }}</em>');
+              $("#preview").html('<em class="text-muted">' + {{ _('Review is empty.') | tojson }} + '</em>');
             } else {
               $.ajax({
                 type: "POST",
                 url: "{{ url_for('review.preview') }}",
                 data: { text: text },
                 success: function(data) { $("#preview").html(data); },
-                error: function() { $("#preview").html('<em class="text-danger">{{ _('Failed to load preview.') }}</em>'); }
+                error: function() { $("#preview").html('<em class="text-danger">' + {{ _('Failed to load preview.') | tojson }} + '</em>'); }
               });
             }
           } else {
-            $("#preview").html('<em class="text-muted">{{ _('Loading preview...') }}</em>');
+            $("#preview").html('<em class="text-muted">' + {{ _('Loading preview...') | tojson }} + '</em>');
           }
         });
       });

diff --git a/critiquebrainz/frontend/templates/review/entity.html b/critiquebrainz/frontend/templates/review/entity.html
@@ -153,13 +153,13 @@ <h3>{{ _('Review by %(user)s', user = ('<img class="avatar" src="%s&s=24" /> '|s
           success: function(result) {
             resultBlock.removeClass('text-muted');
             if (result.success) {
-              resultBlock.text("{{ _('Review reported!') }}");
+              resultBlock.text({{ _('Review reported!') | tojson }});
               resultBlock.addClass('text-success');
             } else {
               if (result.error == "reported") {
-                resultBlock.text("{{ _('You have already reported this review!') }}");
+                resultBlock.text({{ _('You have already reported this review!') | tojson }});
               } else {
-                resultBlock.text("{{ _('Unknown error occurred!') }}");
+                resultBlock.text({{ _('Unknown error occurred!') | tojson }});
                 console.log(result.error)
               }
               resultBlock.addClass('text-danger');

diff --git a/critiquebrainz/frontend/templates/review/write.html b/critiquebrainz/frontend/templates/review/write.html
@@ -111,18 +111,18 @@ <h2>{{ _('Write review') }}</h2>
           if (e.target.hash.substring(1) == "preview") {
             var text = $("#review-content").val();
             if (!text) {
-              $("#preview").html('<em class="text-muted">{{ _('Review is empty.') }}</em>');
+              $("#preview").html('<em class="text-muted">' + {{ _('Review is empty.') | tojson }} + '</em>');
             } else {
               $.ajax({
                 type: "POST",
                 url: "{{ url_for('review.preview') }}",
                 data: { text: text },
                 success: function(data) { $("#preview").html(data); },
-                error: function() { $("#preview").html('<em class="text-danger">{{ _('Failed to load preview.') }}</em>'); }
+                error: function() { $("#preview").html('<em class="text-danger">' + {{ _('Failed to load preview.') | tojson }} + '</em>'); }
               });
             }
           } else {
-            $("#preview").html('<em class="text-muted">{{ _('Loading preview...') }}</em>');
+            $("#preview").html('<em class="text-muted">' + {{ _('Loading preview...') | tojson }} + '</em>');
           }
         });
       });

diff --git a/critiquebrainz/frontend/templates/search/index.html b/critiquebrainz/frontend/templates/search/index.html
@@ -92,7 +92,7 @@ <h3>{{ _('Search') }}</h3>
               if (data.more === true) more_button.show();
             })
             .fail(function() {
-              alert("{{ _('Failed to load more search results!') }}");
+              alert({{ _('Failed to load more search results!') | tojson }});
             });
       }
     </script>

diff --git a/critiquebrainz/frontend/templates/search/selector.html b/critiquebrainz/frontend/templates/search/selector.html
@@ -82,7 +82,7 @@ <h3>{{ _('Release group selection') }}</h3>
               if (data.more === true) more_button.show();
             })
             .fail(function() {
-              alert("{{ _('Failed to load more search results!') }}");
+              alert({{ _('Failed to load more search results!') | tojson }});
             });
       }
     </script>