LDAP Wizard: l10n improvements

diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index c90efdf7e9e95bbc660e90cf1de43760d52c5be4..e580c0978673193a462d809a3e80a57326c9a111 100644 (file)
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -82,7 +82,8 @@ switch($action) {
                $setParameters = array();
                $configuration->setConfiguration($cfg, $setParameters);
                if(!in_array($key, $setParameters)) {
-                       \OCP\JSON::error(array('message' => $l->t($key.' Could not set configuration '.$setParameters[0])));
+                       \OCP\JSON::error(array('message' => $l->t($key.
+                               ' Could not set configuration %s', $setParameters[0])));
                        exit;
                }
                $configuration->saveConfiguration();

diff --git a/apps/user_ldap/templates/part.wizard-groupfilter.php b/apps/user_ldap/templates/part.wizard-groupfilter.php
index d36c171b6393936eb6a40ad870df37cd02883428..17ce815589a66550423df64375a204f1645b5e6e 100644 (file)
--- a/apps/user_ldap/templates/part.wizard-groupfilter.php
+++ b/apps/user_ldap/templates/part.wizard-groupfilter.php
@@ -1,7 +1,7 @@
 <fieldset id="ldapWizard4">
        <div>
                <p>
-                       <?php p($l->t('Limit the access to ownCloud to groups meeting this criteria:'));?>
+                       <?php p($l->t('Limit the access to %s to groups meeting this criteria:', $theme->getName()));?>
                </p>
                <p>
                        <label for="ldap_groupfilter_objectclass">
@@ -28,7 +28,7 @@
                        <input type="text" id="ldap_group_filter" name="ldap_group_filter"
                        class="lwautosave"
                        placeholder="<?php p($l->t('Raw LDAP filter'));?>"
-                       title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the ownCloud instance.'));?>"
+                       title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', $theme->getName()));?>"
                        />
                </p>
                <p>

diff --git a/apps/user_ldap/templates/part.wizard-loginfilter.php b/apps/user_ldap/templates/part.wizard-loginfilter.php
index 4cad6595449632987bad6480686c673893494cf4..d4a36eb0cb7bd2805b15763d5b07abce1338233d 100644 (file)
--- a/apps/user_ldap/templates/part.wizard-loginfilter.php
+++ b/apps/user_ldap/templates/part.wizard-loginfilter.php
@@ -13,7 +13,7 @@
                </p>
                <p>
                        <label for="ldap_loginfilter_email">
-                               <?php p($l->t('LDAP Email Adress:'));?>
+                               <?php p($l->t('LDAP Email Address:'));?>
                        </label>
 
                        <input type="checkbox" id="ldap_loginfilter_email"

diff --git a/apps/user_ldap/templates/part.wizard-userfilter.php b/apps/user_ldap/templates/part.wizard-userfilter.php
index 85c870b5de37721cca2c4377b485baadd7fdc141..146e6bb739a26e2919419359c595eaad6374f03f 100644 (file)
--- a/apps/user_ldap/templates/part.wizard-userfilter.php
+++ b/apps/user_ldap/templates/part.wizard-userfilter.php
@@ -1,7 +1,7 @@
 <fieldset id="ldapWizard2">
        <div>
                <p>
-                       <?php p($l->t('Limit the access to ownCloud to users meeting this criteria:'));?>
+                       <?php p($l->t('Limit the access to %s to users meeting this criteria:', $theme->getName()));?>
                </p>
                <p>
                        <label for="ldap_userfilter_objectclass">
@@ -28,7 +28,7 @@
                        <input type="text" id="ldap_userlist_filter" name="ldap_userlist_filter"
                        class="lwautosave"
                        placeholder="<?php p($l->t('Raw LDAP filter'));?>"
-                       title="<?php p($l->t('The filter specifies which LDAP users shall have access to the ownCloud instance.'));?>"
+                       title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>"
                        />
                </p>
                <p>