Skip to content

Conversation

@davitol
Copy link
Contributor

@davitol davitol commented Feb 16, 2017

@mention-bot
Copy link

@davitol, thanks for your PR! By analyzing the history of the files in this pull request, we identified @blizzz, @LukasReschke and @jancborchardt to be potential reviewers.

<p><label for="ldap_email_attr"><?php p($l->t('Email Field'));?></label><input type="text" id="ldap_email_attr" name="ldap_email_attr" data-default="<?php p($_['ldap_email_attr_default']); ?>" /></p>
<p><label for="ldap_quota_attr"><?php p($l->t('Quota Field'));?></label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" data-default="<?php p($_['ldap_quota_attr_default']); ?>" title="<?php p($l->t('Leave empty for ownCloud quota. Otherwise, specify an LDAP/AD attribute.'));?>" /></p>
<p><label for="ldap_quota_def"><?php p($l->t('Quota Default'));?></label><input type="text" id="ldap_quota_def" name="ldap_quota_def" data-default="<?php p($_['ldap_quota_def_default']); ?>" title="<?php p($l->t('Override ownCloud default quota for LDAP users who do not have a quota set in the Quota Field.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra lines are ugly

@jvillafanez
Copy link
Member

Tested 👍

It might need a second review for the texts.

<p><label for="ldap_quota_def"><?php p($l->t('Quota Default'));?></label><input type="text" id="ldap_quota_def" name="ldap_quota_def" data-default="<?php p($_['ldap_quota_def_default']); ?>" title="<?php p($l->t('in bytes'));?>" /></p>
<p><label for="ldap_email_attr"><?php p($l->t('Email Field'));?></label><input type="text" id="ldap_email_attr" name="ldap_email_attr" data-default="<?php p($_['ldap_email_attr_default']); ?>" /></p>
<p><label for="ldap_quota_attr"><?php p($l->t('Quota Field'));?></label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" data-default="<?php p($_['ldap_quota_attr_default']); ?>" title="<?php p($l->t('Leave empty for ownCloud quota. Otherwise, specify an LDAP/AD attribute.'));?>" /></p>
<p><label for="ldap_quota_def"><?php p($l->t('Quota Default'));?></label><input type="text" id="ldap_quota_def" name="ldap_quota_def" data-default="<?php p($_['ldap_quota_def_default']); ?>" title="<?php p($l->t('Override ownCloud default quota for LDAP users who do not have a quota set in the Quota Field.'));?>" /></p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

never use ownCloud in a visible text. Should use the product name variable from the theme.

But here I suggest to just remove "ownCloud" from the text.

@PVince81
Copy link
Contributor

@settermjd can you check the wording ?

@davitol
Copy link
Contributor Author

davitol commented Mar 10, 2017

@settermjd Kindly remember

@davitol
Copy link
Contributor Author

davitol commented Mar 22, 2017

Last train to get this merged in oC10 🚆

@DeepDiver1975 DeepDiver1975 added this to the 10.0 milestone Mar 22, 2017
@PVince81
Copy link
Contributor

Let's merge this anyway, even if the wording might not be perfect it's better than nothing.

If changes are required, please submit a separate PR.

@PVince81 PVince81 merged commit 3ad99b1 into master Mar 22, 2017
@PVince81 PVince81 deleted the ldapTooltips branch March 22, 2017 16:01
@settermjd
Copy link

Sorry, not sure how I missed this.

@settermjd
Copy link

fwiw, looks fine.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants