Merge pull request #15485 from nextcloud/backport/15478/stable15

MorrisJobke · web-flow · commit bb94888f3338 · 2019-05-09T16:12:58.000+02:00
[stable15] Update file-upload.js
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
@@ -779,8 +779,8 @@ OC.Uploader.prototype = _.extend({
 			return;
 		}
 
-		$('#uploadprogressbar .label .mobile').text(t('core', '…'));
-		$('#uploadprogressbar .label .desktop').text(t('core', 'Processing files …'));
+		$('#uploadprogressbar .label .mobile').text(t('files', '…'));
+		$('#uploadprogressbar .label .desktop').text(t('files', 'Processing files …'));
 
 		// Nothing is being uploaded at this point, and the pending operations
 		// can not be cancelled, so the cancel button should be hidden.

Original file line number	Diff line number	Diff line change
`@@ -779,8 +779,8 @@ OC.Uploader.prototype = _.extend({`
`779`	`779`	`return;`
`780`	`780`	`}`
`781`	`781`
`782`		`- $('#uploadprogressbar .label .mobile').text(t('core', '…'));`
`783`		`- $('#uploadprogressbar .label .desktop').text(t('core', 'Processing files …'));`
	`782`	`+ $('#uploadprogressbar .label .mobile').text(t('files', '…'));`
	`783`	`+ $('#uploadprogressbar .label .desktop').text(t('files', 'Processing files …'));`
`784`	`784`
`785`	`785`	`// Nothing is being uploaded at this point, and the pending operations`
`786`	`786`	`// can not be cancelled, so the cancel button should be hidden.`