aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVicDeo <dubiniuk@owncloud.com>2013-10-05 02:32:28 -0700
committerVicDeo <dubiniuk@owncloud.com>2013-10-05 02:32:28 -0700
commit485bb100b3993af46f6c6be66bd79c563dbffaed (patch)
tree818491f6a7630feee12085f8c7c8111d562baddc
parente0fb794a873d8f4295e00adeb7b195712a838115 (diff)
parent85f63d4f777bf8a170333101fe9e28aba5c9319b (diff)
downloadnextcloud-server-485bb100b3993af46f6c6be66bd79c563dbffaed.tar.gz
nextcloud-server-485bb100b3993af46f6c6be66bd79c563dbffaed.zip
Merge pull request #5131 from owncloud/fix-5130
Allow "Finishing..." button on setup page to be translated.
-rw-r--r--core/js/setup.js2
-rw-r--r--core/templates/installation.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/js/setup.js b/core/js/setup.js
index c0df1ed96b0..62f313fc501 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -54,7 +54,7 @@ $(document).ready(function() {
var post = $(this).serializeArray();
// Disable inputs
- $(':submit', this).attr('disabled','disabled').val('Finishing …');
+ $(':submit', this).attr('disabled','disabled').val($(':submit', this).data('finishing'));
$('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
$('#selectDbType').buttonset('disable');
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 8b087706801..8b3ee8f120f 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -172,5 +172,5 @@
<?php endif; ?>
</fieldset>
- <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" /></div>
+ <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
</form>