Skip to content

[stable12] Backport translation fixes #5759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 7 commits into from
Jul 20, 2017
Merged

[stable12] Backport translation fixes #5759

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
40eeaf4
Spelling: Shortening and binding
comradekingu Jul 14, 2017
79e9f0a
command-line, Consider narrowing
comradekingu Jul 14, 2017
9eb5eeb
: Bigversal and LDAP
comradekingu Jul 14, 2017
ee3c7fc
log out, : Bigversal
comradekingu Jul 14, 2017
8bc18a1
sent, an invitation, - successful
comradekingu Jul 14, 2017
f29d8bd
- your
comradekingu Jul 15, 2017
a91ce85
: Bigversal
comradekingu Jul 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
: Bigversal and LDAP
  • Loading branch information
@comradekingu @MorrisJobke
comradekingu authored and MorrisJobke committed Jul 18, 2017
commit 9eb5eebfad8e2243e55a65197322b0951db1c5d0
4 changes: 2 additions & 2 deletions apps/user_ldap/lib/Wizard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function countEntries($filter, $type) {
} else if ($type === 'objects') {
$result = $this->access->countObjects($limit);
} else {
throw new \Exception('internal error: invalid object type', 500);
throw new \Exception('Internal error: Invalid object type', 500);
}

return $result;
Expand Down Expand Up @@ -244,7 +244,7 @@ public function detectUserDisplayNameAttribute() {
}
};

throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.'));
throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced LDAP settings.'));
}

/**
Expand Down