summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/content/js/com.cnprog.i18n.js1
-rw-r--r--templates/content/js/com.cnprog.post.js8
2 files changed, 0 insertions, 9 deletions
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js
index d2356abc..7562628b 100644
--- a/templates/content/js/com.cnprog.i18n.js
+++ b/templates/content/js/com.cnprog.i18n.js
@@ -57,7 +57,6 @@ var i18nZh = {
};
var i18nEn = {
- '/':'/',
'need >15 points to report spam':'need >15 points to report spam ',
'>15 points requried to upvote':'>15 points required to upvote ',
'tags cannot be empty':'please enter at least one tag',
diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js
index 0ddc8f74..5d58ff21 100644
--- a/templates/content/js/com.cnprog.post.js
+++ b/templates/content/js/com.cnprog.post.js
@@ -256,11 +256,7 @@ var Vote = function(){
showMessage(object, acceptOwnAnswerMessage);
}
else if(data.status == "1"){
-<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
- object.attr("src", $.i18n._("/") + "content/images/vote-accepted.png");
-=======
object.attr("src", scriptUrl + "content/images/vote-accepted.png");
->>>>>>> private:templates/content/js/com.cnprog.post.js
$("#"+answerContainerIdPrefix+postId).removeClass("accepted-answer");
$("#"+commentLinkIdPrefix+postId).removeClass("comment-link-accepted");
}
@@ -573,11 +569,7 @@ function createComments(type) {
//todo fix url translations!!!
$.ajax({
type: "POST",
-<<<<<<< HEAD:templates/content/js/com.cnprog.post.js
- url: $.i18n._("/") + objectType + "s/" + id + "/" + $.i18n._("comments/"),
-=======
url: scriptUrl + objectType + "s/" + id + "/" + $.i18n._("comments/"),
->>>>>>> private:templates/content/js/com.cnprog.post.js
dataType: "json",
data: { comment: textarea.val() },
success: function(json) {