Merge pull request #6935 from nextcloud/12-5780

Backport of translation string fixes

3 files changed, 4 insertions, 11 deletions

diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 85284a63381..b86b42bdb9a 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -971,9 +971,9 @@ OC.Uploader.prototype = _.extend({
 					$('#uploadprogressbar').progressbar({value: 0});
 					$('#uploadprogressbar .ui-progressbar-value').
 						html('<em class="label inner"><span class="desktop">'
-							+ t('files', 'Uploading...')
+							+ t('files', 'Uploading …')
 							+ '</span><span class="mobile">'
-							+ t('files', '...')
+							+ t('files', '…')
 							+ '</span></em>');
 					$('#uploadprogressbar').tooltip({placement: 'bottom'});
 					self._showProgressBar();
@@ -1023,7 +1023,7 @@ OC.Uploader.prototype = _.extend({
 					var h = moment.duration(smoothRemainingSeconds, "seconds").humanize();
 					if (!(smoothRemainingSeconds >= 0 && smoothRemainingSeconds < 14400)) {
 						// show "Uploading ..." for durations longer than 4 hours
-						h = t('files', 'Uploading...');
+						h = t('files', 'Uploading …');
 					}
 					$('#uploadprogressbar .label .mobile').text(h);
 					$('#uploadprogressbar .label .desktop').text(h);
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index d66f12f4aff..34600cfc6ec 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -2,7 +2,7 @@
 		<div class="actions creatable hidden">
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar">
-					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading...'));?></span><span class="mobile"><?php p($l->t('...'));?></span></em>
+					<em class="label outer" style="display:none"><span class="desktop"><?php p($l->t('Uploading …'));?></span><span class="mobile"><?php p($l->t('…'));?></span></em>
 				</div>
 				<input type="button" class="stop icon-close" style="display:none" value="" />
 			</div>
diff --git a/core/vendor/core.js b/core/vendor/core.js
index bda270892ad..8cdb203aacd 100644
--- a/core/vendor/core.js
+++ b/core/vendor/core.js
@@ -5551,9 +5551,6 @@ dav.Client.prototype = {
             '  <d:prop>\n';
 
         for(var ii in properties) {
-            if (!properties.hasOwnProperty(ii)) {
-                continue;
-            }
 
             var property = this.parseClarkNotation(properties[ii]);
             if (this.xmlNamespaces[property.namespace]) {
@@ -5599,10 +5596,6 @@ dav.Client.prototype = {
             '   <d:prop>\n';
 
         for(var ii in properties) {
-            if (!properties.hasOwnProperty(ii)) {
-                continue;
-            }
-
             var property = this.parseClarkNotation(ii);
             var propName;
             var propValue = properties[ii];