summaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js28
-rw-r--r--apps/files/js/files.js16
2 files changed, 23 insertions, 21 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 870437ae672..6b49f622668 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -140,8 +140,8 @@ var FileList={
input=$('<input class="filename"></input>').val(name);
form=$('<form></form>');
form.append(input);
- td.children('a.name').text('');
- td.children('a.name').append(form);
+ td.children('a.name').hide();
+ td.append(form);
input.focus();
form.submit(function(event){
event.stopPropagation();
@@ -169,13 +169,15 @@ var FileList={
} else {
var basename=newname;
}
- td.children('a.name').empty();
- var span=$('<span class="nametext"></span>');
- span.text(basename);
- td.children('a.name').append(span);
+ td.find('a.name span.nametext').text(basename);
if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
- span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
+ if (td.find('a.name span.extension').length == 0 ) {
+ td.find('a.name span.nametext').append('<span class="extension"></span>');
+ }
+ td.find('a.name span.extension').text(newname.substr(newname.lastIndexOf('.')));
}
+ form.remove();
+ td.children('a.name').show();
return false;
});
input.click(function(event){
@@ -189,9 +191,9 @@ var FileList={
checkName:function(oldName, newName, isNewFile) {
if (isNewFile || $('tr').filterAttr('data-file', newName).length > 0) {
if (isNewFile) {
- $('#notification').html(escapeHTML(newName)+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+ $('#notification').html(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
} else {
- $('#notification').html(escapeHTML(newName)+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+ $('#notification').html(t('files', '{new_name} already exists', {new_name: escapeHTML(newName)})+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
}
$('#notification').data('oldName', oldName);
$('#notification').data('newName', newName);
@@ -238,9 +240,9 @@ var FileList={
FileList.finishReplace();
};
if (isNewFile) {
- $('#notification').html(t('files', 'replaced')+' '+newName+'<span class="undo">'+t('files', 'undo')+'</span>');
+ $('#notification').html(t('files', 'replaced {new_name}', {new_name: newName})+'<span class="undo">'+t('files', 'undo')+'</span>');
} else {
- $('#notification').html(t('files', 'replaced')+' '+newName+' '+t('files', 'with')+' '+oldName+'<span class="undo">'+t('files', 'undo')+'</span>');
+ $('#notification').html(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
}
$('#notification').fadeIn();
},
@@ -272,9 +274,9 @@ var FileList={
} else {
// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
if ($('#dir').val() == '/Shared') {
- $('#notification').html(t('files', 'unshared')+' '+ escapeHTML(files) +'<span class="undo">'+t('files', 'undo')+'</span>');
+ $('#notification').html(t('files', 'unshared {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
} else {
- $('#notification').html(t('files', 'deleted')+' '+ escapeHTML(files)+'<span class="undo">'+t('files', 'undo')+'</span>');
+ $('#notification').html(t('files', 'deleted {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
}
$('#notification').fadeIn();
}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index fe89b8105ac..549204e8572 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -262,7 +262,7 @@ $(document).ready(function() {
uploadtext.text(t('files', '1 file uploading'));
uploadtext.show();
} else {
- uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+ uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
}
}
}
@@ -307,7 +307,7 @@ $(document).ready(function() {
uploadtext.text('');
uploadtext.hide();
} else {
- uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+ uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
}
})
.error(function(jqXHR, textStatus, errorThrown) {
@@ -322,7 +322,7 @@ $(document).ready(function() {
uploadtext.text('');
uploadtext.hide();
} else {
- uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
+ uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
}
$('#notification').hide();
$('#notification').text(t('files', 'Upload cancelled.'));
@@ -678,7 +678,7 @@ function scanFiles(force,dir){
var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource);
scannerEventSource.listen('scanning',function(data){
- $('#scan-count').text(data.count + ' ' + t('files', 'files scanned'));
+ $('#scan-count').text(t('files', '{count} files scanned', {count: data.count}));
$('#scan-current').text(data.file+'/');
});
scannerEventSource.listen('success',function(success){
@@ -788,9 +788,9 @@ function procesSelection(){
var selection='';
if(selectedFolders.length>0){
if(selectedFolders.length==1){
- selection+='1 '+t('files','folder');
+ selection+=t('files','1 folder');
}else{
- selection+=selectedFolders.length+' '+t('files','folders');
+ selection+=t('files','{count} folders',{count: selectedFolders.length});
}
if(selectedFiles.length>0){
selection+=' & ';
@@ -798,9 +798,9 @@ function procesSelection(){
}
if(selectedFiles.length>0){
if(selectedFiles.length==1){
- selection+='1 '+t('files','file');
+ selection+=t('files','1 file');
}else{
- selection+=selectedFiles.length+' '+t('files','files');
+ selection+=t('files','{count} files',{count: selectedFiles.length});
}
}
$('#headerName>span.name').text(selection);
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 16:35:03 +0000