diff --git a/src/locales/en.json b/src/locales/en.json index 15feae644..eea35cc53 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -95,6 +95,8 @@ "timeslider.month.october": "October", "timeslider.month.november": "November", "timeslider.month.december": "December", + "timeslider.unnamedauthor": "{{num}} unnamed author", + "timeslider.unnamedauthors": "{{num}} unnamed authors", "pad.savedrevs.marked": "This revision is now marked as a saved revision", "pad.userlist.entername": "Enter your name", "pad.userlist.unnamed": "unnamed", diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js index 83483537f..221666de0 100644 --- a/src/static/js/broadcast_slider.js +++ b/src/static/js/broadcast_slider.js @@ -193,7 +193,12 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) }); if (numAnonymous > 0) { - var anonymousAuthorString = numAnonymous + " unnamed author" + (numAnonymous > 1 ? "s" : "") + var anonymousAuthorString; + if(numAnonymous == 1) + anonymousAuthorString = html10n.get("timeslider.unnamedauthor", { num: numAnonymous }); + else + anonymousAuthorString = html10n.get("timeslider.unnamedauthors", { num: numAnonymous }); + if (numNamed !== 0){ authorsList.append(' + ' + anonymousAuthorString); } else { diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js index f4778802d..dd0cbbbb7 100644 --- a/src/static/js/pad_editor.js +++ b/src/static/js/pad_editor.js @@ -78,6 +78,16 @@ var padeditor = (function() html10n.bind('localized', function() { $("#languagemenu").val(html10n.getLanguage()); + // translate the value of 'unnamed' and 'Enter your name' textboxes in the userlist + // this does not interfere with html10n's normal value-setting because html10n just ingores s + // also, a value which has been set by the user will be not overwritten since a user-edited + // does *not* have the editempty-class + $('input[data-l10n-id]').each(function(key, input) + { + input = $(input); + if(input.hasClass("editempty")) + input.val(html10n.get(input.attr("data-l10n-id"))); + }); }) $("#languagemenu").val(html10n.getLanguage()); $("#languagemenu").change(function() { diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js index 40e87a4f7..d051182b9 100644 --- a/src/static/js/pad_userlist.js +++ b/src/static/js/pad_userlist.js @@ -118,7 +118,7 @@ var paduserlist = (function() } else { - nameHtml = ''; + nameHtml = ''; } return ['
 
', '', nameHtml, '', '', padutils.escapeHtml(data.activity), ''].join(''); @@ -710,8 +710,7 @@ var paduserlist = (function() { if (myUserInfo.name) { - $("#myusernameedit").removeClass("editempty").val( - myUserInfo.name); + $("#myusernameedit").removeClass("editempty").val(myUserInfo.name); } else { diff --git a/src/templates/pad.html b/src/templates/pad.html index 274a3b1a0..6b5b179a8 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -163,7 +163,7 @@
-
+