diff options
| -rw-r--r-- | apps/files/js/file-upload.js | 2 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index d1f2dabf831..b52221ac1fc 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -365,7 +365,7 @@ $(document).ready(function() { } else if (result[0].status !== 'success') { //delete data.jqXHR; data.textStatus = 'servererror'; - data.errorThrown = t('files', result.data.message); + data.errorThrown = result.data.message; // error message has been translated on server var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); fu._trigger('fail', e, data); } diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index d661a871a5f..d6453d2d56c 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -342,7 +342,13 @@ var OCdialogs = { var conflicts = $(dialog_id+ ' .conflicts'); addConflict(conflicts, original, replacement); - var title = t('files','{count} file conflicts',{count:$(dialog_id+ ' .conflict').length}); + var count = $(dialog_id+ ' .conflict').length; + var title = n('files', + 'One file conflict', + '{count} file conflicts', + count, + {count:count} + ); $(dialog_id).parent().children('.oc-dialog-title').text(title); //recalculate dimensions |