Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fusiondirectory
fusiondirectory
Commits
d6a219f7
Commit
d6a219f7
authored
Dec 12, 2016
by
Côme Chilliet
Browse files
Fixes
#5278
Information is a "mass noun" and have no plural
parent
8edfb540
Changes
8
Hide whitespace changes
Inline
Side-by-side
contrib/bin/fusiondirectory-setup
View file @
d6a219f7
...
...
@@ -772,7 +772,7 @@ sub get_ldap_connexion {
# if can't find fusiondirectory.conf
}
else
{
if
(
ask_yn_question
("
Can't find fusiondirectory.conf, do you want to specify LDAP's information
s
yourself ?:
")
)
{
if
(
ask_yn_question
("
Can't find fusiondirectory.conf, do you want to specify LDAP's information yourself ?:
")
)
{
$uri
=
ask_user_input
("
LDAP server's URI
");
$base
=
ask_user_input
("
Search base
");
$hash_result
{
base
}
=
$base
;
...
...
ihtml/themes/breezy/recovery.tpl
View file @
d6a219f7
...
...
@@ -29,7 +29,7 @@
{
if
$step
==
3
}
<p
class=
"infotext"
>
{
t
1
=
$uid
2
=
$email_address
}
Information
s
to reset password for %1 ha
ve
been sent to email address %2
{/
t
}
<br/>
{
t
1
=
$uid
2
=
$email_address
}
Information to reset password for %1 ha
s
been sent to email address %2
{/
t
}
<br/>
<span
class=
"warning"
>
{
t
1
=
$delay_allowed
}
Warning : this email is only valid for %1 minutes.
{/
t
}
</span>
</p>
</div>
...
...
include/class_msgPool.inc
View file @
d6a219f7
...
...
@@ -665,11 +665,11 @@ class msgPool {
}
/*!
* \brief Display : Click the 'Edit' button below to change information
s
in this dialog
* \brief Display : Click the 'Edit' button below to change information in this dialog
*/
public
static
function
clickEditToChange
()
{
return
_
(
"Click the 'Edit' button below to change information
s
in this dialog"
);
return
_
(
"Click the 'Edit' button below to change information in this dialog"
);
}
/*!
...
...
include/simpleplugin/class_simplePlugin.inc
View file @
d6a219f7
...
...
@@ -521,7 +521,7 @@ class simplePlugin extends plugin
$group
->
renderAttributes
(
TRUE
);
$smarty
->
assign
(
"hiddenPostedInput"
,
get_class
(
$this
)
.
"_posted"
);
return
"<h1>Inherited information
s
:</h1><div></div>
\n
"
.
$smarty
->
fetch
(
$this
->
templatePath
);
return
"<h1>Inherited information:</h1><div></div>
\n
"
.
$smarty
->
fetch
(
$this
->
templatePath
);
}
/*! \brief This function allows you to open a dialog
...
...
plugins/addons/dashboard/class_dashBoard.inc
View file @
d6a219f7
...
...
@@ -26,7 +26,7 @@ class dashboard extends simplePlugin
return
array
(
'plShortName'
=>
_
(
'Dashboard'
),
'plTitle'
=>
_
(
'Dashboard'
),
'plDescription'
=>
_
(
'Statistics and various information
s
'
),
'plDescription'
=>
_
(
'Statistics and various information'
),
'plIcon'
=>
'geticon.php?context=applications&icon=utilities-system-monitor&size=48'
,
'plObjectType'
=>
array
(
'dashboard'
=>
array
(
...
...
plugins/admin/groups/class_roleGeneric.inc
View file @
d6a219f7
...
...
@@ -79,7 +79,7 @@ class roleGeneric extends simplePlugin
{
return
array
(
'main'
=>
array
(
'name'
=>
_
(
'Information
s
'
),
'name'
=>
_
(
'Information'
),
'attrs'
=>
array
(
new
BaseSelectorAttribute
(
get_ou
(
'roleRDN'
)),
new
StringAttribute
(
...
...
plugins/config/class_recoveryConfig.inc
View file @
d6a219f7
...
...
@@ -91,7 +91,7 @@ class recoveryConfig extends simplePlugin
_
(
'Body of the first email, sent when the user ask for a new password. Use %s for the login and the recovery link.'
),
'fdPasswordRecoveryMailBody'
,
TRUE
,
_
(
"Hello,
\n\n
Here
are
your information
s
:
\n
- Login : %s
\n
- Link : %s
\n\n
This link is only valid for 10 minutes."
)
_
(
"Hello,
\n\n
Here
is
your information:
\n
- Login : %s
\n
- Link : %s
\n\n
This link is only valid for 10 minutes."
)
)
)
),
...
...
setup/class_setupStep_Migrate.inc
View file @
d6a219f7
...
...
@@ -23,7 +23,7 @@
* FUNCTIONS
Step_Migrate - Constructor.
update_strings - Used to update the displayed step information
s
.
update_strings - Used to update the displayed step information.
initialize_checks - Initialize migration steps.
check_ldap_permissions - Check if the used admin account has full access to the ldap database.
check_gosaAccounts - Check if there are users without the required objectClasses.
...
...
tbp
@tbp
mentioned in issue #1679
·
Sep 02, 2017
mentioned in issue #1679
mentioned in issue #1679
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment