fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'ether/develop' into develop

This commit is contained in:
Iván Eixarch 2012-11-28 03:13:04 +01:00
parent 7280376a26 182ea62de9
commit 523c7aebe5
4 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/locales/en.ini
View File

@ -74,4 +74,19 @@ timeslider.pageTitle = {{appTitle}} Timeslider
timeslider.toolbar.returnbutton = Return to pad
timeslider.toolbar.authors = Authors:
timeslider.toolbar.authorsList = No Authors
timeslider.exportCurrent = Export current version as:
timeslider.exportCurrent = Export current version as:
timeslider.version = Version {{version}}
timeslider.saved = Saved {{month}} {{day}}, {{year}}
timeslider.dateformat = {{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}
timeslider.month.january = January
timeslider.month.february = February
timeslider.month.march = March
timeslider.month.april = April
timeslider.month.may = May
timeslider.month.june = June
timeslider.month.july = July
timeslider.month.august = August
timeslider.month.september = September
timeslider.month.october = October
timeslider.month.november = November
timeslider.month.december = December

10
src/static/js/ace2_inner.js
View File

@ -333,14 +333,6 @@ function Ace2Inner(){
return colorutils.triple2css(color);
}
function doAlert(str)
{
scheduler.setTimeout(function()
{
alert(str);
}, 0);
}
editorInfo.ace_getRep = function()
{
return rep;
@ -1624,7 +1616,7 @@ function Ace2Inner(){
if (linesWrapped > 0)
{
doAlert("Editor warning: " + linesWrapped + " long line" + (linesWrapped == 1 ? " was" : "s were") + " hard-wrapped into " + ccData.numLinesAfter + " lines.");
// console.log("Editor warning: " + linesWrapped + " long line" + (linesWrapped == 1 ? " was" : "s were") + " hard-wrapped into " + ccData.numLinesAfter + " lines.");
}
if (ss[0] >= 0) selStart = [ss[0] + a + netNumLinesChangeSoFar, ss[1]];

28
src/static/js/broadcast.js
View File

@ -304,7 +304,14 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
var hours = zpad(date.getHours(), 2);
var minutes = zpad(date.getMinutes(), 2);
var seconds = zpad(date.getSeconds(), 2);
return ([month, '/', day, '/', year, ' ', hours, ':', minutes, ':', seconds].join(""));
return (document.webL10n.get("timeslider.dateformat", {
"day": day,
"month": month,
"year": year,
"hours": hours,
"minutes": minutes,
"seconds": seconds
}));
}
@ -313,7 +320,24 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
$('#timer').html(dateFormat());
var revisionDate = ["Saved", ["Jan", "Feb", "March", "April", "May", "June", "July", "Aug", "Sept", "Oct", "Nov", "Dec"][date.getMonth()], date.getDate() + ",", date.getFullYear()].join(" ")
var revisionDate = document.webL10n.get("timeslider.saved", {
"day": date.getDate(),
"month": [
document.webL10n.get("timeslider.month.january"),
document.webL10n.get("timeslider.month.february"),
document.webL10n.get("timeslider.month.march"),
document.webL10n.get("timeslider.month.april"),
document.webL10n.get("timeslider.month.may"),
document.webL10n.get("timeslider.month.june"),
document.webL10n.get("timeslider.month.july"),
document.webL10n.get("timeslider.month.august"),
document.webL10n.get("timeslider.month.september"),
document.webL10n.get("timeslider.month.october"),
document.webL10n.get("timeslider.month.november"),
document.webL10n.get("timeslider.month.december")
][date.getMonth()],
"year": date.getFullYear()
});
$('#revision_date').html(revisionDate)
}

6
src/static/js/broadcast_slider.js
View File

@ -112,7 +112,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
{
$(this).attr('href', $(this).attr('thref').replace("%revision%", newpos));
});
$("#revision_label").html("Version " + newpos);
$("#revision_label").html(document.webL10n.get("timeslider.version", { "version": newpos}));
if (newpos == 0)
{
@ -215,7 +215,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
}
if (authors.length == 0)
{
authorsList.append("No Authors");
authorsList.append(document.webL10n.get("timeslider.toolbar.authorsList"));
}
fixPadHeight();
@ -346,7 +346,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
var newloc = self.currentLoc + (evt2.clientX - self.startLoc);
if (newloc < 0) newloc = 0;
if (newloc > ($("#ui-slider-bar").width() - 2)) newloc = ($("#ui-slider-bar").width() - 2);
$("#revision_label").html("Version " + Math.floor(newloc * sliderLength / ($("#ui-slider-bar").width() - 2)));
$("#revision_label").html(document.webL10n.get("timeslider.version", { "version": Math.floor(newloc * sliderLength / ($("#ui-slider-bar").width() - 2))}));
$(self).css('left', newloc);
if (getSliderPosition() != Math.floor(newloc * sliderLength / ($("#ui-slider-bar").width() - 2))) _callSliderCallbacks(Math.floor(newloc * sliderLength / ($("#ui-slider-bar").width() - 2)))
});