summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-04-17 18:01:46 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-04-17 18:01:46 -0400
commit75fcf423972d45af234632a6c922861fa89b7ff3 (patch)
treeee23faf248504b733c2e6c19e495b72c4ebd734c
parent793aa489ddf43032e64d8253a272d5f8c42e3427 (diff)
parentf8ca40ece6345f981637b97bf3ab0a491fdb094a (diff)
downloadaskbot-75fcf423972d45af234632a6c922861fa89b7ff3.tar.gz
askbot-75fcf423972d45af234632a6c922861fa89b7ff3.tar.bz2
askbot-75fcf423972d45af234632a6c922861fa89b7ff3.zip
Merge branch 'master-github'
-rwxr-xr-xforum/skins/default/media/js/com.cnprog.i18n.js3
-rwxr-xr-xforum/skins/default/media/js/com.cnprog.post.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/forum/skins/default/media/js/com.cnprog.i18n.js b/forum/skins/default/media/js/com.cnprog.i18n.js
index 56ea1062..23164aab 100755
--- a/forum/skins/default/media/js/com.cnprog.i18n.js
+++ b/forum/skins/default/media/js/com.cnprog.i18n.js
@@ -149,7 +149,8 @@ var i18nEs = {
'questions/' : 'preguntas/',
'answers/' : 'respuestas/',
'comments/' : 'comentarios/',
- 'vote/' : 'votar/'
+ 'vote/' : 'votar/',
+ 'delete/' : 'eliminar/'
};
var i18n = {
diff --git a/forum/skins/default/media/js/com.cnprog.post.js b/forum/skins/default/media/js/com.cnprog.post.js
index 38ff8df1..7c064acf 100755
--- a/forum/skins/default/media/js/com.cnprog.post.js
+++ b/forum/skins/default/media/js/com.cnprog.post.js
@@ -609,7 +609,7 @@ function createComments(type) {
$(this).children().each(
function(i){
var comment_id = $(this).attr('id').replace('comment-','');
- var delete_url = scriptUrl + objectType + 's/' + post_id + '/' +
+ var delete_url = scriptUrl + $.i18n._(objectType + 's/') + post_id + '/' +
$.i18n._('comments/') + comment_id + '/' + $.i18n._('delete/');
var html = $(this).html();
var CommentsClass;