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

use properties notation

This commit is contained in:
Iván Eixarch 2012-12-09 08:56:58 +01:00
parent 854ed56037
commit 9f1872afc1
7 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/locales/en.ini
View File

@ -95,18 +95,18 @@ timeslider.month.october = October
timeslider.month.november = November timeslider.month.november = November
timeslider.month.december = December timeslider.month.december = December
;js ;js
pad_savedrevs.marked = This revision is now marked as a saved revision pad.savedrevs.marked = This revision is now marked as a saved revision
pad_userlist.entername = Enter your name pad.userlist.entername = Enter your name
pad_userlist.unnamed = unnamed pad.userlist.unnamed = unnamed
pad_userlist.guest = Guest pad.userlist.guest = Guest
pad_userlist.deny = Deny pad.userlist.deny = Deny
pad_userlist.approve = Approve pad.userlist.approve = Approve
pad_editbar.clearcolors = Clear authorship colors on entire document? pad.editbar.clearcolors = Clear authorship colors on entire document?
pad_impexp.importbutton = Import Now pad.impexp.importbutton = Import Now
pad_impexp.importing = Importing... pad.impexp.importing = Importing...
pad_impexp.confirmimport = Importing a file will overwrite the current text of the pad. Are you sure you want to proceed? pad.impexp.confirmimport = Importing a file will overwrite the current text of the pad. Are you sure you want to proceed?
pad_impexp.convertFailed = We were not able to import this file. Please use a different document format or copy paste manually pad.impexp.convertFailed = We were not able to import this file. Please use a different document format or copy paste manually
pad_impexp.uploadFailed = The upload failed, please try again pad.impexp.uploadFailed = The upload failed, please try again
pad_impexp.importfailed = Import failed pad.impexp.importfailed = Import failed
pad_impexp.copypaste = Please copy paste pad.impexp.copypaste = Please copy paste
pad_impexp.exportdisabled = Exporting as {{type}} format is disabled. Please contact your system administrator for details. pad.impexp.exportdisabled = Exporting as {{type}} format is disabled. Please contact your system administrator for details.

30
src/locales/es.ini
View File

@ -96,18 +96,18 @@ timeslider.month.october = Octubre
timeslider.month.november = Noviembre timeslider.month.november = Noviembre
timeslider.month.december = Diciembre timeslider.month.december = Diciembre
;js ;js
pad_savedrevs.marked = Revisión guardada pad.savedrevs.marked = Revisión guardada
pad_userlist.entername = Escribe tu nombre pad.userlist.entername = Escribe tu nombre
pad_userlist.unnamed = anónimo pad.userlist.unnamed = anónimo
pad_userlist.guest = Invitado pad.userlist.guest = Invitado
pad_userlist.deny = Denegar pad.userlist.deny = Denegar
pad_userlist.approve = Aprobar pad.userlist.approve = Aprobar
pad_editbar.clearcolors = ¿Desea borrar el color de los autores en todo el documento? pad.editbar.clearcolors = ¿Desea borrar el color de los autores en todo el documento?
pad_impexp.importbutton = Importar pad.impexp.importbutton = Importar
pad_impexp.importing = Importando... pad.impexp.importing = Importando...
pad_impexp.confirmimport = Al importar un fichero se borrará el contenido actual del documento. ¿Quiere continuar? pad.impexp.confirmimport = Al importar un fichero se borrará el contenido actual del documento. ¿Quiere continuar?
pad_impexp.convertFailed = No pudimos importar este fichero. Intentalo con otro formato diferente o copia y pega manualmente. pad.impexp.convertFailed = No pudimos importar este fichero. Intentalo con otro formato diferente o copia y pega manualmente.
pad_impexp.uploadFailed = El envío del fichero falló. Intentelo de nuevo. pad.impexp.uploadFailed = El envío del fichero falló. Intentelo de nuevo.
pad_impexp.importfailed = Fallo al importar pad.impexp.importfailed = Fallo al importar
pad_impexp.copypaste = Intente copiar y pegar pad.impexp.copypaste = Intente copiar y pegar
pad_impexp.exportdisabled = La exportación al formato {{type}} format está desactivada. Contacte con su administrador de sistemas. pad.impexp.exportdisabled = La exportación al formato {{type}} format está desactivada. Contacte con su administrador de sistemas.

2
src/static/js/chat.js
View File

@ -109,7 +109,7 @@ var chat = (function()
} }
/* End of new action */ /* End of new action */
var authorName = msg.userName == null ? _('pad_userlist.unnamed') : padutils.escapeHtml(msg.userName); var authorName = msg.userName == null ? _('pad.userlist.unnamed') : padutils.escapeHtml(msg.userName);
var html = "<p class='" + authorClass + "'><b>" + authorName + ":</b><span class='time " + authorClass + "'>" + timeStr + "</span> " + text + "</p>"; var html = "<p class='" + authorClass + "'><b>" + authorName + ":</b><span class='time " + authorClass + "'>" + timeStr + "</span> " + text + "</p>";
$("#chattext").append(html); $("#chattext").append(html);

2
src/static/js/pad_editbar.js
View File

@ -169,7 +169,7 @@ var padeditbar = (function()
{ {
if ((!(ace.ace_getRep().selStart && ace.ace_getRep().selEnd)) || ace.ace_isCaret()) if ((!(ace.ace_getRep().selStart && ace.ace_getRep().selEnd)) || ace.ace_isCaret())
{ {
if (window.confirm(_("pad_editbar.clearcolors"))) if (window.confirm(_("pad.editbar.clearcolors")))
{ {
ace.ace_performDocumentApplyAttributesToCharRange(0, ace.ace_getRep().alltext.length, [ ace.ace_performDocumentApplyAttributesToCharRange(0, ace.ace_getRep().alltext.length, [
['author', ''] ['author', '']

16
src/static/js/pad_impexp.js
View File

@ -69,7 +69,7 @@ var padimpexp = (function()
function fileInputSubmit() function fileInputSubmit()
{ {
$('#importmessagefail').fadeOut("fast"); $('#importmessagefail').fadeOut("fast");
var ret = window.confirm(_("pad_impexp.confirmimport")); var ret = window.confirm(_("pad.impexp.confirmimport"));
if (ret) if (ret)
{ {
hidePanelCall = paddocbar.hideLaterIfNoOtherInteraction(); hidePanelCall = paddocbar.hideLaterIfNoOtherInteraction();
@ -85,7 +85,7 @@ var padimpexp = (function()
$('#importsubmitinput').attr( $('#importsubmitinput').attr(
{ {
disabled: true disabled: true
}).val(_("pad_impexp.importing")); }).val(_("pad.impexp.importing"));
window.setTimeout(function() window.setTimeout(function()
{ {
$('#importfileinput').attr( $('#importfileinput').attr(
@ -106,7 +106,7 @@ var padimpexp = (function()
function importDone() function importDone()
{ {
$('#importsubmitinput').removeAttr('disabled').val(_("pad_impexp.importbutton")); $('#importsubmitinput').removeAttr('disabled').val(_("pad.impexp.importbutton"));
window.setTimeout(function() window.setTimeout(function()
{ {
$('#importfileinput').removeAttr('disabled'); $('#importfileinput').removeAttr('disabled');
@ -130,14 +130,14 @@ var padimpexp = (function()
var msg=""; var msg="";
if(status === "convertFailed"){ if(status === "convertFailed"){
msg = _("pad_impexp.convertFailed"); msg = _("pad.impexp.convertFailed");
} else if(status === "uploadFailed"){ } else if(status === "uploadFailed"){
msg = _("pad_impexp.uploadFailed"); msg = _("pad.impexp.uploadFailed");
} }
function showError(fade) function showError(fade)
{ {
$('#importmessagefail').html('<strong style="color: red">'+_('pad_impexp.importfailed')+':</strong> ' + (msg || _('pad_impexp.copypaste','')))[(fade ? "fadeIn" : "show")](); $('#importmessagefail').html('<strong style="color: red">'+_('pad.impexp.importfailed')+':</strong> ' + (msg || _('pad.impexp.copypaste','')))[(fade ? "fadeIn" : "show")]();
} }
if ($('#importexport .importmessage').is(':visible')) if ($('#importexport .importmessage').is(':visible'))
@ -198,7 +198,7 @@ var padimpexp = (function()
{ {
type = "this file"; type = "this file";
} }
alert(_("pad_impexp.exportdisabled", {type:type})); alert(_("pad.impexp.exportdisabled", {type:type}));
return false; return false;
} }
@ -215,7 +215,7 @@ var padimpexp = (function()
var pad_root_url = document.location.href.replace(document.location.pathname, pad_root_path) var pad_root_url = document.location.href.replace(document.location.pathname, pad_root_path)
//i10l buttom import //i10l buttom import
$('#importsubmitinput').val(_("pad_impexp.importbutton")); $('#importsubmitinput').val(_("pad.impexp.importbutton"));
// build the export links // build the export links
$("#exporthtmla").attr("href", pad_root_path + "/export/html"); $("#exporthtmla").attr("href", pad_root_path + "/export/html");

2
src/static/js/pad_savedrevs.js
View File

@ -18,7 +18,7 @@ var pad;
exports.saveNow = function(){ exports.saveNow = function(){
pad.collabClient.sendMessage({"type": "SAVE_REVISION"}); pad.collabClient.sendMessage({"type": "SAVE_REVISION"});
alert(_("pad_savedrevs.marked")); alert(_("pad.savedrevs.marked"));
} }
exports.init = function(_pad){ exports.init = function(_pad){

12
src/static/js/pad_userlist.js
View File

@ -113,12 +113,12 @@ var paduserlist = (function()
nameHtml = padutils.escapeHtml(data.name); nameHtml = padutils.escapeHtml(data.name);
if (isGuest && pad.getIsProPad()) if (isGuest && pad.getIsProPad())
{ {
nameHtml += ' ('+_(pad_userlist.guest)+')'; nameHtml += ' ('+_(pad.userlist.guest)+')';
} }
} }
else else
{ {
nameHtml = '<input type="text" class="editempty newinput" value="'+_('pad_userlist.unnamed')+'" ' + (isNameEditable(data) ? '' : 'disabled="disabled" ') + '/>'; nameHtml = '<input type="text" class="editempty newinput" value="'+_('pad.userlist.unnamed')+'" ' + (isNameEditable(data) ? '' : 'disabled="disabled" ') + '/>';
} }
return ['<td style="height:', height, 'px" class="usertdswatch"><div class="swatch" style="background:' + data.color + '">&nbsp;</div></td>', '<td style="height:', height, 'px" class="usertdname">', nameHtml, '</td>', '<td style="height:', height, 'px" class="activity">', padutils.escapeHtml(data.activity), '</td>'].join(''); return ['<td style="height:', height, 'px" class="usertdswatch"><div class="swatch" style="background:' + data.color + '">&nbsp;</div></td>', '<td style="height:', height, 'px" class="usertdname">', nameHtml, '</td>', '<td style="height:', height, 'px" class="activity">', padutils.escapeHtml(data.activity), '</td>'].join('');
@ -374,7 +374,7 @@ var paduserlist = (function()
if (!newName) if (!newName)
{ {
jnode.addClass("editempty"); jnode.addClass("editempty");
jnode.val(_('pad_userlist.unnamed')); jnode.val(_('pad.userlist.unnamed'));
} }
else else
{ {
@ -662,13 +662,13 @@ var paduserlist = (function()
if (box.length == 0) if (box.length == 0)
{ {
// make guest prompt box // make guest prompt box
box = $('<div id="'+padutils.escapeHtml('guestprompt-' + encodedUserId) + '" class="guestprompt"><div class="choices"><a href="' + padutils.escapeHtml('javascript:void(require('+JSON.stringify(module.id)+').paduserlist.answerGuestPrompt(' + JSON.stringify(encodedUserId) + ',false))')+'">'+_('pad_userlist.deny')+'</a> <a href="' + padutils.escapeHtml('javascript:void(require('+JSON.stringify(module.id)+').paduserlist.answerGuestPrompt(' + JSON.stringify(encodedUserId) + ',true))') + '">'+_('pad_userlist.approve')+'</a></div><div class="guestname"><strong>'+_('pad_userlist.guest')+':</strong> ' + padutils.escapeHtml(displayName) + '</div></div>'); box = $('<div id="'+padutils.escapeHtml('guestprompt-' + encodedUserId) + '" class="guestprompt"><div class="choices"><a href="' + padutils.escapeHtml('javascript:void(require('+JSON.stringify(module.id)+').paduserlist.answerGuestPrompt(' + JSON.stringify(encodedUserId) + ',false))')+'">'+_('pad.userlist.deny')+'</a> <a href="' + padutils.escapeHtml('javascript:void(require('+JSON.stringify(module.id)+').paduserlist.answerGuestPrompt(' + JSON.stringify(encodedUserId) + ',true))') + '">'+_('pad.userlist.approve')+'</a></div><div class="guestname"><strong>'+_('pad.userlist.guest')+':</strong> ' + padutils.escapeHtml(displayName) + '</div></div>');
$("#guestprompts").append(box); $("#guestprompts").append(box);
} }
else else
{ {
// update display name // update display name
box.find(".guestname").html('<strong>'+_('pad_userlist.guest')+':</strong> ' + padutils.escapeHtml(displayName)); box.find(".guestname").html('<strong>'+_('pad.userlist.guest')+':</strong> ' + padutils.escapeHtml(displayName));
} }
var hideLater = padutils.getCancellableAction(actionName, function() var hideLater = padutils.getCancellableAction(actionName, function()
{ {
@ -715,7 +715,7 @@ var paduserlist = (function()
} }
else else
{ {
$("#myusernameedit").addClass("editempty").val(_("pad_userlist.entername")); $("#myusernameedit").addClass("editempty").val(_("pad.userlist.entername"));
} }
if (colorPickerOpen) if (colorPickerOpen)
{ {