From 763864539ffce2ed1b60be0e63bcb060deafe712 Mon Sep 17 00:00:00 2001 From: mluto Date: Fri, 25 Jan 2013 17:41:33 +0100 Subject: [PATCH] Use 'html10n' instead of '_', i10nzed "unnamed author(s)" --- src/locales/en.json | 2 ++ src/static/js/broadcast_slider.js | 7 ++++++- src/static/js/pad_editor.js | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 15feae64..eea35cc5 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 83483537..221666de 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 b828711e..553245ea 100644 --- a/src/static/js/pad_editor.js +++ b/src/static/js/pad_editor.js @@ -78,11 +78,12 @@ var padeditor = (function() html10n.bind('localized', function() { $("#languagemenu").val(html10n.getLanguage()); + // translate the value of 'unnamed' and 'Enter your name' textboxes in the userlist $('input[data-l10n-id]').each(function(key, input) { input = $(input); if(input.hasClass("editempty")) - input.val(_(input.attr("data-l10n-id"))); + input.val(html10n.get(input.attr("data-l10n-id"))); }); }) $("#languagemenu").val(html10n.getLanguage());