diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:27 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:27 -0600 |
| commit | a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf (patch) | |
| tree | 5bf13b5605e40c755e20edf9be45e3a20308d5dd /templates/content/js | |
| parent | fa30dc90be82aa0f818e14110e9b86373f7c8a35 (diff) | |
| parent | f15cb4dc7d9284a24f75dc8b56248916140ceb09 (diff) | |
| download | askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.tar.gz askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.tar.bz2 askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.zip | |
Merge branch 'evgenyfadeev/master'
Conflicts:
locale/en/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'templates/content/js')
| -rw-r--r-- | templates/content/js/com.cnprog.i18n.js | 2 | ||||
| -rw-r--r-- | templates/content/js/com.cnprog.post.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js index 848ad59e..6ba8b59d 100644 --- a/templates/content/js/com.cnprog.i18n.js +++ b/templates/content/js/com.cnprog.i18n.js @@ -140,6 +140,8 @@ var i18nEs = { 'enter image url':'introduzca la URL de la imagen, por ejemplo：<br />http://www.example.com/image.jpg \"titulo de imagen\"', 'enter url':'introduzca direcciones web, ejemplo：<br />http://www.cnprog.com/ \"titulo del enlace\"</p>"', 'upload image':'cargar imagen：', + 'questions/' : 'preguntas/', + 'vote/' : 'votar/', }; var i18n = { diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js index 546cf101..aa6c51b6 100644 --- a/templates/content/js/com.cnprog.post.js +++ b/templates/content/js/com.cnprog.post.js @@ -243,7 +243,7 @@ var Vote = function(){ type: "POST", cache: false, dataType: "json", - url: "/questions/" + questionId + "/vote/", + url: "/" + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"), data: { "type": voteType, "postId": postId }, error: handleFail, success: function(data){callback(object, voteType, data)}}); |