removed urls from the javascript locale and fixed one split message in all languages, and some work on russian js

2 files changed, 21 insertions, 118 deletions

diff --git a/askbot/skins/default/media/js/i18n.js b/askbot/skins/default/media/js/i18n.js
index 9c43262a..2922e761 100644
--- a/askbot/skins/default/media/js/i18n.js
+++ b/askbot/skins/default/media/js/i18n.js
@@ -23,8 +23,7 @@ var i18nZh = {
     'add a comment':"添加评论",
     'comments':"评论",
     'confirm delete comment':"真要删除此评论吗？",
-    'characters':'字符',
-    'can write':'还可写',
+    '{0} characters left': '还可写{0}字符',
     'click to close':'点击消息框关闭',
     'loading...':'读取中...',
     'tags cannot be empty':'标签不能为空。',
@@ -34,7 +33,7 @@ var i18nZh = {
     'please enter title':'请输入标题。',
     'title minchars':"请输入至少 {0} 字符。",
     'delete':'删除',
-    'undelete':	'取消',
+    'undelete':'取消',
     'bold':'粗体',
     'italic':'斜体',
     'link':'超链接',
@@ -76,8 +75,7 @@ var i18nZhtw = {
     'add a comment':"添加評論",
     'comments':"評論",
     'confirm delete comment':"刪除評論確認",
-    'characters':'字',
-    'can write':'還可寫',
+    '{0} characters left': '還可寫{0}字',
     'click to close':'點擊消息框關閉',
     'loading...':'讀取中...',
     'tags cannot be empty':'標籤不能為空白',
@@ -87,7 +85,7 @@ var i18nZhtw = {
     'please enter title':'請輸入標題。',
     'title minchars':"請輸入至少 {0} 字符。",
     'delete':'刪除',
-    'undelete':	'取消',
+    'undelete':'取消',
     'bold':'粗體',
     'italic':'斜體',
     'link':'超連接',
@@ -127,7 +125,6 @@ var i18nEn = {
     'post recovered':'your post is now restored!',
     'post deleted':'your post has been deleted',
     'confirm delete comment':'do you really want to delete this comment?',
-    'can write':' ',
     'tablimits info':'up to 5 tags, no more than 20 characters each',
     'content minchars': 'please enter more than {0} characters',
     'title minchars':"please enter at least {0} characters",
@@ -160,23 +157,11 @@ var i18nFi = {
     'post recovered':'postauksesi on palautettu!',
     'post deleted':'postauksesi on poistettu',
     'confirm delete comment':'oletko varma, että haluat poistaa tämän kommentin?',
-    'can write':'on ',
     'tablimits info':'maksimissaan 5 tagia, jotka ovat maksimissaan 20 merkkiä pitkiä',
     'content minchars': 'syötä vähintään {0} merkkiä',
     'title minchars':"syötä vähintään {0} merkkiä",
-    'characters':'merkkiä jäljellä',
+    '{0} characters left': '{0} merkkiä jäljellä',
     'cannot flag message as offensive twice':'ei voi merkata kahta kertaa ',
-    'questions/' : 'kysymykset/',
-    'answers/' : 'vastukset/',
-    'comments/' : 'kommentit/',
-    'vote/' : 'aanesta/',
-    'delete/' : 'poista/',
-    //'unmark-tag/':'/',
-    //'ignored/':'/',
-    //'mark-tag/':'/',
-    //'interesting/':'/',
-    'command/':'komento/',
-    'moderate-user/': 'muokkaa-kayttajaa/'
 };
 
 var i18nTr = {
@@ -204,8 +189,7 @@ var i18nTr = {
     'add a comment':"yorum ekle",
     'comments':"yorumlar",
     'confirm delete comment':"yorumu silmek istediğinizden emin misiniz?",
-    'characters':'karakter eksik',
-    'can write':'yazılabilir ',
+    '{0} characters left': 'yazılabilir {0} karakter eksik',
     'click to close':'kapatmak için tıklayın',
     'loading...':'yükleniyor...',
     'tags cannot be empty':'etiketler boş olamaz',
@@ -215,7 +199,7 @@ var i18nTr = {
     'please enter title':'lütfen bir başlık yazın',
     'title minchars':"Lütfen en az (0) karakter girin",
     'delete':'sil',
-    'undelete':	'geri al',
+    'undelete':'geri al',
     'bold': 'kalın',
     'italic':'italik',
     'link':'link',
@@ -231,17 +215,6 @@ var i18nTr = {
     'enter image url':'örnek resmin URLsini girin： <br />http://www.example.com/image.jpg   \"resim başlığı\"',
     'enter url':'web adresini girin： <br />http://www.cnprog.com/   \"başlık bağlantısı\"</p>"',
     'upload image':'resim yükle：',
-    'questions/' : 'sorular/',
-    'answers/' : 'cevaplar/',
-    'comments/' : 'yorumlar/',
-    'vote/' : 'oy/',
-    'delete/' : 'sil/',
-    'unmark-tag/':'etiket-işaretini-kaldır/',
-    'ignored/':'yoksayıldı/',
-    'mark-tag/':'etiket/',
-    'interesting/':'ilginç/',
-    'command/':'komut/',
-    'moderate-user/': 'yöneticiler/'
 };
 
 var i18nEs = {
@@ -269,8 +242,7 @@ var i18nEs = {
     'add a comment':"agregar comentarios",
     'comments':"comentarios",
     'confirm delete comment':"¿Realmente desea borrar este comentario?",
-    'characters':'caracteres faltantes',
-    'can write':'tiene ',
+    '{0} characters left': '{0} caracteres faltantes',
     'click to close':'haga click para cerrar',
     'loading...':'cargando...',
     'tags cannot be empty':'las etiquetas no pueden estar vacías',
@@ -296,17 +268,6 @@ 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/',
-    'answers/' : 'respuestas/',
-    'comments/' : 'comentarios/',
-    'vote/' : 'votar/',
-    'delete/' : 'eliminar/',
-    'unmark-tag/':'desmarcar-etiqueta/',
-    'ignored/':'ignorada/',
-    'mark-tag/':'marcar-etiqueta/',
-    'interesting/':'interesante/',
-    'command/':'comando/',
-    'moderate-user/': 'moderar-usuario/'
 };
 
 var i18nDe = {
@@ -318,10 +279,9 @@ var i18nDe = {
     'anonymous users cannot select favorite questions': 'Gastbenutzer können keine Fragen als Favoriten markieren', 
     'bold': 'Fett', 
     'bulleted list': 'Liste', 
-    'can write': 'Noch ', 
+    '{0} characters left': '{0} characters left',
     'cannot flag message as offensive twice': 'Beiträge können nicht doppelt gemeldet werden', 
     'cannot pick own answer as best': 'Eigene Antworten können nicht als die korrekte akzeptiert werden', 
-    'characters': 'Zeichen', 
     'click to close': 'Schließen mit Klick', 
     'comments': 'Kommentare', 
     'community karma points': ' Punkte erforderlich) - ', 
@@ -361,39 +321,24 @@ var i18nDe = {
     'undelete': 'wiederherstellen', 
     'undo': 'Rückgängig', 
     'upload image': 'Bild hochladen', 
-    'questions/': 'fragen/', 
-    'question/': 'frage/',
-    'delete/': 'loeschen/', 
-    'comments/': 'kommentare/', 
-    'answers/': 'antworten/', 
-    'vote/': 'abstimmen/',
-    'unmark-tag/':'tag-entfernen/',
-    'ignored/':'ignoriert/',
-    'mark-tag/':'tag-markieren/',
-    'interesting/':'interessant/',
-    'command/':'befehl/',
-    'moderate-user/': 'benutzer-moderieren/',
-    'account/': 'zugang/',
-    'signin/': 'einloggen/'
 };
 
 
 var i18nRu = {
-    "anonymous users cannot vote": "неавторизированные пользователи не могут голосовать ",
+    "anonymous users cannot vote": "Извините, но для того чтобы голосовать, ",
     'add a comment': 'добавить комментарий', 
     'add comment': 'добавить комментарий',
-    'save comment': 'save comment',
-    'anonymous users cannot delete/undelete': 'неавторизированные пользователи не могут восстанавливать и удалять сообщения', 
-    'anonymous users cannot flag offensive posts': 'неавторизированные пользователи не могут пожаловаться на сообщение', 
-    'anonymous users cannot select favorite questions': 'неавторизированные пользователи не могут добавлять вопросы в закладки', 
-    'Are you sure you want to remove your {provider} login?': 'oeuaou',
+    'save comment': 'сохранить комментарий',
+    'anonymous users cannot delete/undelete': 'неавторизированные пользователи не могут восстанавливать и удалять сообщения ', 
+    'anonymous users cannot flag offensive posts': 'Извините, но для того чтобы пожаловаться на сообщение, ', 
+    'anonymous users cannot select favorite questions': 'Извините, но для того чтобы добавть вопрос в закладки, ', 
+    'Are you sure you want to remove your {provider} login?': 'Вы действительно хотите удалить логин через {provider}?',
     'bold': 'жирный', 
-    'bulleted list': 'список', 
-    'can write': 'пишите', 
+    'bulleted list': 'маркированный список', 
     'cancel': 'cancel',
+    '{0} characters left': 'осталось место для {0} символов',
     'cannot flag message as offensive twice': 'нельзя отметить сообщение как спам два раза', 
     'cannot pick own answer as best': 'нельзя выбрать собственный ответ в качестве лучшего',
-    'characters': 'символы', 
     'Change password': 'Change password',
     'Change your {provider} password': 'Change your {provider} password',
     'click to close': 'нажмите, что бы закрыть', 
@@ -456,17 +401,6 @@ var i18nRu = {
     'upload image': 'загрузить изображение', 
     'upload file attachment': 'upload file attachment',
     'You don\'t have a method to log in right now, please add one or more by clicking any of the icons below.': 'You don\'t have a method to log in right now, please add one or more by clicking any of the icons below.',
-    'delete/': 'udalyaem/',
-    'answers/': 'otvety/',
-    'comments/': 'kommentarii/',
-    'questions/': 'voprosy/', 
-    'vote/': 'golosuem/',
-    'unmark-tag/':'otmenyaem-pometku-temy/',
-    'ignored/':'neinteresnaya/',
-    'mark-tag/':'pomechayem-temy/',
-    'interesting/':'interesnaya/',
-    'command/':'komanda/',
-    'moderate-user/': 'модерировать-пользователя/'
 };
 
 var i18nFr = {
@@ -478,10 +412,9 @@ var i18nFr = {
     'anonymous users cannot select favorite questions': 'Les utilisateurs anonymes ne peuvent pas sélectionner leurs questions favorites', 
     'bold': 'gras', 
     'bulleted list': 'liste', 
-    'can write': 'peut écrire ', 
+    '{0} characters left': '{0} characters left',
     'cannot flag message as offensive twice': 'Vous ne pouvez pas signaler deux fois un message à contenu abusif', 
     'cannot pick own answer as best': 'Vous ne pouvez pas désigner une de vos propres réponses comme étant la meilleure réponse', 
-    'characters': 'caractères', 
     'click to close': 'cliquez pour fermer', 
     'comments': 'commentaires', 
     'community karma points': ' Points de karma - ', 
@@ -521,20 +454,6 @@ var i18nFr = {
     'undelete': 'Restaurer', 
     'undo': 'Annuler', 
     'upload image': 'Charger une image', 
-    'questions/': 'questions/', 
-    'question/': 'question/',
-    'delete/': 'supprimer/', 
-    'comments/': 'commentaires/', 
-    'answers/': 'reponses/', 
-    'vote/': 'voter/',
-    'unmark-tag/':'retirer-un-tag/',
-    'ignored/':'ignoree/',
-    'mark-tag/':'marquer-avec-un-tag/',
-    'interesting/':'interessant/',
-    'command/':'commande/',
-    'moderate-user/': 'moderer-utilisateur/',
-    'account/': 'compte/',
-    'signin/': 'connexion/'
 };
 
 var i18nIt = {
@@ -546,10 +465,9 @@ var i18nIt = {
     'anonymous users cannot select favorite questions': 'Gli utenti anonimi non possono aggiungere domande ai preferiti',
     'bold': 'grassetto', 
     'bulleted list': 'Lista', 
-    'can write': 'può scrivere ', 
     'cannot flag message as offensive twice': 'non è possibile flaggare come offensivo più di una volta ',
     'cannot pick own answer as best': 'non è possibile assegnare come miglior risposta ad una propria domanda una propria risposta', 
-    'characters': 'caratteri rimanenti',
+    '{0} characters left': '{0} caratteri rimanenti',
     'click to close': 'clicca per chiudere', 
     'comments': 'commenti', 
     'community karma points': ' punti reputazione - ',
@@ -589,20 +507,6 @@ var i18nIt = {
     'undelete': 'elimina', 
     'undo': 'annulla', 
     'upload image': 'carica immagine', 
-    'questions/': 'domande/', 
-    'question/': 'domanda/',
-    'delete/': 'elimina/', 
-    'comments/': 'commenti/', 
-    'answers/': 'risposte/', 
-    'vote/': 'voti/',
-    'unmark-tag/':'unmark-tag/',
-    'ignored/':'ignorato/',
-    'mark-tag/':'mark-tag/',
-    'interesting/':'interessante/',
-    'command/':'command/',
-    'moderate-user/': 'modera-utente/',
-    'account/': 'account/',
-    'signin/': 'accedi/'
 };
 
 var i18n = {
diff --git a/askbot/skins/default/media/js/post.js b/askbot/skins/default/media/js/post.js
index 0709d66e..36a5f320 100644
--- a/askbot/skins/default/media/js/post.js
+++ b/askbot/skins/default/media/js/post.js
@@ -951,9 +951,8 @@ EditCommentForm.prototype.getCounterUpdater = function(){
         }
         else {
             color = length > length2 ? "#f00" : length > length1 ? "#f60" : "#999";
-            var feedback = $.i18n._('can write') + ' ' + 
-                    (maxCommentLength - length) + ' ' +
-                    $.i18n._('characters');
+            var feedback = $.i18n._('{0} characters left')
+                            .replace('{0}', maxCommentLength - length);
         }
         counter.html(feedback).css('color', color);
     };