fully translatable user_webdav

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 8c18cc4c58c6005e1b9e685ee048d3e58d813121..87d755697cb19974c3c0ff1dcfdc1b1e64031965 100644 (file)
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -90,7 +90,7 @@ var LdapConfiguration = {
                                                );
                                        }
                                        $('#ldap_serverconfig_chooser option:selected').removeAttr('selected');
-                                       var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nbServer}. Server', {nbServer: $('#ldap_serverconfig_chooser option').length})+'</option>';
+                                       var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nthServer}. Server', {nthServer: $('#ldap_serverconfig_chooser option').length})+'</option>';
                                        $('#ldap_serverconfig_chooser option:last').before(html);
                                        LdapWizard.init();
                                } else {

diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index dfc495490322d91297a509f59f9fcba53f1c85ed..298e5fc3945c3bb05181e997df7304739998d1e3 100644 (file)
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -3,7 +3,7 @@
        <button class="ldap_action_test_connection" name="ldap_action_test_connection">
                <?php p($l->t('Test Configuration'));?>
        </button>
-       <a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
+       <a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/go.php?to=admin-ldap"
                target="_blank">
                <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
                        style="height:1.75ex" />

diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index 862e10bdd128a88edd74986611dd355b4b0f5183..c141c6027f98278d806623240b1c13cd0213c8d2 100644 (file)
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -7,7 +7,7 @@
        <button class="ldap_action_continue" name="ldap_action_continue" type="button">
                <?php p($l->t('Continue'));?>
        </button>
-       <a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
+       <a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/go.php?to=admin-ldap"
                target="_blank">
                <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
                        style="height:1.75ex" />

diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index 4596fdf3c78959d902cfc725e0830d111d4e5bf8..a87c0ad159a868a80e33e181a4582d521d19a707 100755 (executable)
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,7 +1,7 @@
 <form id="webdavauth" class="section" action="#" method="post">
        <h2><?php p($l->t('WebDAV Authentication'));?></h2>
-       <p><label for="webdav_url"><?php p($l->t('Address: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
+       <p><label for="webdav_url"><?php p($l->t('Address:').' ');?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
         <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
-       <input type="submit" value="Save" />
+       <input type="submit" value="<?php p($l->t('Save')); ?>" />
        <br /><?php p($l->t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>
 </form>