diff --git a/admin/scripts/autocomplete.js b/admin/scripts/autocomplete.js index 2e28d07..9154ad7 100644 --- a/admin/scripts/autocomplete.js +++ b/admin/scripts/autocomplete.js @@ -309,7 +309,8 @@ DAV.ACDB.prototype.search = function (searchString) { } }, error: function (xmlhttp) { - alert('An HTTP error '+ xmlhttp.status +' occured.\n'+ db.uri); + alert(intl.translate("A HTTP error %s occured.\n%s", + [xmlhttp.status, db.uri])); } }); }, this.delay); diff --git a/admin/scripts/directories.js b/admin/scripts/directories.js index 76d6800..09b2a62 100644 --- a/admin/scripts/directories.js +++ b/admin/scripts/directories.js @@ -25,18 +25,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA. */ -function handleerror(xmldata) { - if ($('error', xmldata).size()) { - var msg = intl.translate('An error occured:\n'); - $('error', xmldata).find('errormsg').each(function(i) { - msg += $(this).text(); - }); - alert(msg); - return true; - } - return false; - $('#content').show(); -} function updateDirectories(xmldata) { var dirname = $('dirname', xmldata).text(); @@ -74,7 +62,7 @@ function updateDirectories(xmldata) { } function getDirectoryForm(title, dirname, groups) { - return '
'; + return ''; } function displaydirectoryeditor(title, dirname, groups) { @@ -89,7 +77,7 @@ function displaydirectoryeditor(title, dirname, groups) { }); $('#dirform').submit(function() { if (!this.dirname.value.match(/^[a-zA-Z0-9 -_.]+$/)) { - alert("Ungültiger Verzeichnisname."); + alert(intl.translate("Invalid directory name.")); this.dirname.focus(); return false; } @@ -119,20 +107,20 @@ function editdirectory(dirname) { var dirname, groups; dirname = $("dirname:first", retval).text(); groups = $("groups:first", retval).text(); - displaydirectoryeditor("Verzeichnisdaten bearbeiten", + displaydirectoryeditor(intl.translate("Edit directory data"), dirname, groups); } }); } function newdirectory() { - displaydirectoryeditor('Neues Verzeichnis anlegen', '', ''); + displaydirectoryeditor(intl.translate("Create new directory"), '', ''); } function deletedirectorydialog(dirname) { $("#direditor").hide().empty(); - var msg = 'Soll das Verzeichnis ' + dirname + - ' wirklich gelöscht werden?'; + var msg = intl.translate("Should the directory %s really get deleted?", + [dirname]); if (confirm(msg) == true) { $.post( "directories.php", diff --git a/admin/scripts/helper.js b/admin/scripts/helper.js index ef88ab2..81b922d 100644 --- a/admin/scripts/helper.js +++ b/admin/scripts/helper.js @@ -49,3 +49,16 @@ DAV.encodeURIComponent = function (item, uri) { item = encodeURIComponent(item).replace('%2F', '/'); return uri.indexOf('?q=') ? item : item.replace('%26', '%2526').replace('%23', '%2523'); }; + +function handleerror(xmldata) { + if ($('error', xmldata).size()) { + var msg = intl.translate("An error occured:\n"); + $('error', xmldata).find('errormsg').each(function(i) { + msg += $(this).text(); + }); + alert(msg); + return true; + } + return false; + $('#content').show(); +} diff --git a/admin/scripts/users.js b/admin/scripts/users.js index fe8daa6..18e5d5c 100644 --- a/admin/scripts/users.js +++ b/admin/scripts/users.js @@ -25,18 +25,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA. */ -function handleerror(xmldata) { - if ($('error', xmldata).size()) { - var msg = 'Es ist ein Fehler aufgetreten:\n'; - $('error', xmldata).find('errormsg').each(function(i) { - msg += $(this).text(); - }); - alert(msg); - $('#content').show(); - return true; - } - return false; -} function updateusers(xmldata) { var uid = $(xmldata).find('uid').text(); @@ -44,9 +32,9 @@ function updateusers(xmldata) { var firstname = $(xmldata).find('firstname').text(); var lastname = $(xmldata).find('lastname').text(); var loggedin = $(xmldata).find('loggedin').text(); - var htmltext = '