summaryrefslogtreecommitdiff
path: root/src/static/js
diff options
context:
space:
mode:
Diffstat (limited to 'src/static/js')
-rw-r--r--src/static/js/chat.js2
-rw-r--r--src/static/js/pad_editbar.js2
-rw-r--r--src/static/js/pad_impexp.js16
-rw-r--r--src/static/js/pad_savedrevs.js2
-rw-r--r--src/static/js/pad_userlist.js12
5 files changed, 17 insertions, 17 deletions
diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 225657c2..79224e80 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -109,7 +109,7 @@ var chat = (function()
}
/* 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>";
$("#chattext").append(html);
diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index f600ff09..6a7f6ee1 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -169,7 +169,7 @@ var padeditbar = (function()
{
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, [
['author', '']
diff --git a/src/static/js/pad_impexp.js b/src/static/js/pad_impexp.js
index 4fafd884..0199b346 100644
--- a/src/static/js/pad_impexp.js
+++ b/src/static/js/pad_impexp.js
@@ -69,7 +69,7 @@ var padimpexp = (function()
function fileInputSubmit()
{
$('#importmessagefail').fadeOut("fast");
- var ret = window.confirm(_("pad_impexp.confirmimport"));
+ var ret = window.confirm(_("pad.impexp.confirmimport"));
if (ret)
{
hidePanelCall = paddocbar.hideLaterIfNoOtherInteraction();
@@ -85,7 +85,7 @@ var padimpexp = (function()
$('#importsubmitinput').attr(
{
disabled: true
- }).val(_("pad_impexp.importing"));
+ }).val(_("pad.impexp.importing"));
window.setTimeout(function()
{
$('#importfileinput').attr(
@@ -106,7 +106,7 @@ var padimpexp = (function()
function importDone()
{
- $('#importsubmitinput').removeAttr('disabled').val(_("pad_impexp.importbutton"));
+ $('#importsubmitinput').removeAttr('disabled').val(_("pad.impexp.importbutton"));
window.setTimeout(function()
{
$('#importfileinput').removeAttr('disabled');
@@ -130,14 +130,14 @@ var padimpexp = (function()
var msg="";
if(status === "convertFailed"){
- msg = _("pad_impexp.convertFailed");
+ msg = _("pad.impexp.convertFailed");
} else if(status === "uploadFailed"){
- msg = _("pad_impexp.uploadFailed");
+ msg = _("pad.impexp.uploadFailed");
}
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'))
@@ -198,7 +198,7 @@ var padimpexp = (function()
{
type = "this file";
}
- alert(_("pad_impexp.exportdisabled", {type:type}));
+ alert(_("pad.impexp.exportdisabled", {type:type}));
return false;
}
@@ -215,7 +215,7 @@ var padimpexp = (function()
var pad_root_url = document.location.href.replace(document.location.pathname, pad_root_path)
//i10l buttom import
- $('#importsubmitinput').val(_("pad_impexp.importbutton"));
+ $('#importsubmitinput').val(_("pad.impexp.importbutton"));
// build the export links
$("#exporthtmla").attr("href", pad_root_path + "/export/html");
diff --git a/src/static/js/pad_savedrevs.js b/src/static/js/pad_savedrevs.js
index 14fa1b6e..e1552c27 100644
--- a/src/static/js/pad_savedrevs.js
+++ b/src/static/js/pad_savedrevs.js
@@ -18,7 +18,7 @@ var pad;
exports.saveNow = function(){
pad.collabClient.sendMessage({"type": "SAVE_REVISION"});
- alert(_("pad_savedrevs.marked"));
+ alert(_("pad.savedrevs.marked"));
}
exports.init = function(_pad){
diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js
index fe017912..40e87a4f 100644
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@@ -113,12 +113,12 @@ var paduserlist = (function()
nameHtml = padutils.escapeHtml(data.name);
if (isGuest && pad.getIsProPad())
{
- nameHtml += ' ('+_(pad_userlist.guest)+')';
+ nameHtml += ' ('+_(pad.userlist.guest)+')';
}
}
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('');
@@ -374,7 +374,7 @@ var paduserlist = (function()
if (!newName)
{
jnode.addClass("editempty");
- jnode.val(_('pad_userlist.unnamed'));
+ jnode.val(_('pad.userlist.unnamed'));
}
else
{
@@ -662,13 +662,13 @@ var paduserlist = (function()
if (box.length == 0)
{
// 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);
}
else
{
// 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()
{
@@ -715,7 +715,7 @@ var paduserlist = (function()
}
else
{
- $("#myusernameedit").addClass("editempty").val(_("pad_userlist.entername"));
+ $("#myusernameedit").addClass("editempty").val(_("pad.userlist.entername"));
}
if (colorPickerOpen)
{