make user_ldap fully translatable

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index fca2dc13d1518e7a5a30b92cb1b398f1fc625b41..15a02abb065e05a45bf0a5c933d8cd50d43dea88 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">'+$('#ldap_serverconfig_chooser option').length+'. Server</option>';
+                                       var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nbServer}. Server', {nbServer: $('#ldap_serverconfig_chooser option').length})+'</option>';
                                        $('#ldap_serverconfig_chooser option:last').before(html);
                                        LdapWizard.init();
                                } else {

diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 7acc997e288e3668c49d2e7562f8734c0b1ee96e..fcde5df37168a299d66329dde289f428fabeb251 100644 (file)
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -46,11 +46,13 @@ $wControls = $wControls->fetchPage();
 $sControls = new OCP\Template('user_ldap', 'part.settingcontrols');
 $sControls = $sControls->fetchPage();
 
+$l = \OC_L10N::get('user_ldap');
+
 $wizTabs = array();
-$wizTabs[] = array('tpl' => 'part.wizard-server',      'cap' => 'Server');
-$wizTabs[] = array('tpl' => 'part.wizard-userfilter',  'cap' => 'User Filter');
-$wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => 'Login Filter');
-$wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => 'Group Filter');
+$wizTabs[] = array('tpl' => 'part.wizard-server',      'cap' => $l->t('Server'));
+$wizTabs[] = array('tpl' => 'part.wizard-userfilter',  'cap' => $l->t('User Filter'));
+$wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => $l->t('Login Filter'));
+$wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => $l->t('Group Filter'));
 
 for($i = 0; $i < count($wizTabs); $i++) {
        $tab = new OCP\Template('user_ldap', $wizTabs[$i]['tpl']);

diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index 0cdb8ccf16f8ad43de1e40bfb821a1b1decb75b4..dfc495490322d91297a509f59f9fcba53f1c85ed 100644 (file)
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -3,10 +3,10 @@
        <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/5.0/admin_manual/auth_ldap.html"
+       <a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
                target="_blank">
                <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
                        style="height:1.75ex" />
                <?php p($l->t('Help'));?>
        </a>
-</div>
\ No newline at end of file
+</div>

diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 0312c17ab7b4e3d2e3b7680cb1c9ee87600d9ece..3d4b0feead964fd05a31945eb514064ed281d2e1 100644 (file)
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -3,14 +3,14 @@
                <select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser">
                <?php if(count($_['serverConfigurationPrefixes']) === 0 ) {
                        ?>
-                               <option value="" selected>1. Server</option>');
+                               <option value="" selected><?php p($l->t('1. Server'));?></option>');
                        <?php
                } else {
                        $i = 1;
                        $sel = ' selected';
                        foreach($_['serverConfigurationPrefixes'] as $prefix) {
                                ?>
-                               <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($i++); ?>. Server: <?php p($_['serverConfigurationHosts'][$prefix]); ?></option>
+                               <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option>
                                <?php
                        }
                }
@@ -18,7 +18,7 @@
                <option value="NEW"><?php p($l->t('Add Server Configuration'));?></option>
                </select>
                <button id="ldap_action_delete_configuration"
-                       name="ldap_action_delete_configuration">Delete Configuration</button>
+                       name="ldap_action_delete_configuration"><?php p($l->t('Delete Configuration'));?></button>
                </p>
 
                <div class="hostPortCombinator">
@@ -68,4 +68,4 @@
                        </div>
                </div>
                <?php print_unescaped($_['wizardControls']); ?>
-       </fieldset>
\ No newline at end of file
+       </fieldset>

diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index f17b362c737336ca2d34d3fdd437eee0dd3c6e5e..862e10bdd128a88edd74986611dd355b4b0f5183 100644 (file)
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -7,10 +7,10 @@
        <button class="ldap_action_continue" name="ldap_action_continue" type="button">
                <?php p($l->t('Continue'));?>
        </button>
-       <a href="<?php p($theme->getDocBaseUrl()); ?>/server/5.0/admin_manual/auth_ldap.html"
+       <a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
                target="_blank">
                <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
                        style="height:1.75ex" />
                <span class="ldap_grey"><?php p($l->t('Help'));?></span>
        </a>
-</div>
\ No newline at end of file
+</div>

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 03f2b8db090ae98d7e6d81a72c74b03be98b44ff..38043fb34a801ae869f93843fcf3f69ef9b05102 100644 (file)
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,8 +4,8 @@
                <?php foreach($_['toc'] as $id => $title) { ?>
                        <li id="<?php p($id); ?>"><a href="<?php p($id); ?>"><?php p($title); ?></a></li>
                <?php } ?>
-               <li class="ldapSettingsTabs"><a href="#ldapSettings-2">Expert</a></li>
-               <li class="ldapSettingsTabs"><a href="#ldapSettings-1">Advanced</a></li>
+               <li class="ldapSettingsTabs"><a href="#ldapSettings-2"><?php p($l->t('Expert'));?></a></li>
+               <li class="ldapSettingsTabs"><a href="#ldapSettings-1"><?php p($l->t('Advanced'));?></a></li>
        </ul>
                <?php if(OCP\App::isEnabled('user_webdavauth')) {
                        print_unescaped('<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'</p>');