WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

translation update

This commit is contained in:
Roland Gruber 2012-02-08 19:12:00 +00:00
parent c15501c4b4
commit cf43372f72
8 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lam/lib/modules/dhcp_settings.inc
View File

@ -138,7 +138,7 @@ class dhcp_settings extends baseModule {
), ),
'dns' => array( 'dns' => array(
"Headline" => _("DNS (Domain Name System)"), "Headline" => _("DNS (Domain Name System)"),
"Text" => _("The IP address(es) of the DNS servers. Multiple addresses are separated by \",\". Example: 192.168.0.10, 192.168.0.11") "Text" => _("The IP addresses of the DNS servers. Multiple addresses are separated by \",\". Example: 192.168.0.10, 192.168.0.11")
), ),
'gateway' => array( 'gateway' => array(
"Headline" => _("Default gateway"), "Headline" => _("Default gateway"),
@ -376,7 +376,7 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
if (strlen($_POST['domainname'])<3) { if (strlen($_POST['domainname'])<3) {
$errors[] = $this->messages['domainname'][1]; $errors[] = $this->messages['domainname'][1];
} }
elseif (!preg_match("/^[A-Za-z0-9\._-]*$/", $_POST['domainname'])) { elseif (!preg_match("/^[A-Za-z0-9\\._-]*$/", $_POST['domainname'])) {
$errors[] = $this->messages['domainname'][2]; $errors[] = $this->messages['domainname'][2];
} }
} }

4
lam/lib/modules/ieee802device.inc
View File

@ -76,7 +76,7 @@ class ieee802Device extends baseModule {
); );
// available PDF fields // available PDF fields
$return['PDF_fields'] = array( $return['PDF_fields'] = array(
'macAddress' => _('MAC address(es)') 'macAddress' => _('MAC addresses')
); );
return $return; return $return;
} }
@ -203,7 +203,7 @@ class ieee802Device extends baseModule {
function get_pdfEntries() { function get_pdfEntries() {
$return = array(); $return = array();
if (sizeof($this->attributes['macAddress']) > 0) { if (sizeof($this->attributes['macAddress']) > 0) {
$return['ieee802Device_macAddress'][0] = '<block><key>' . _('MAC address(es)') . '</key><value>' . implode(', ', $this->attributes['macAddress']) . '</value></block>'; $return['ieee802Device_macAddress'][0] = '<block><key>' . _('MAC addresses') . '</key><value>' . implode(', ', $this->attributes['macAddress']) . '</value></block>';
} }
return $return; return $return;
} }

3
lam/templates/3rdParty/pla/htdocs/add_oclass_form.php vendored
View File

@ -61,8 +61,7 @@ if (count($ldap['attrs']['need']) > 0) {
$request['page']->drawSubTitle(); $request['page']->drawSubTitle();
echo '<div style="text-align: center">'; echo '<div style="text-align: center">';
printf('<small>' . _('In order to add these objectClass(es) to this entry, you must specify <b>%s</b> new attributes that this object class requires.') . '</small>', echo '<small>' . _('This change requires to add new attributes.') . '</small>';
count($ldap['attrs']['need']));
echo '<br /><br />'; echo '<br /><br />';

2
lam/templates/3rdParty/pla/htdocs/add_value_form.php vendored
View File

@ -122,7 +122,7 @@ if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST'
if ($_SESSION[APPCONFIG]->getValue('appearance','show_hints')) if ($_SESSION[APPCONFIG]->getValue('appearance','show_hints'))
printf('<tr><td colspan="2"><small><br /><img src="%s/light.png" alt="Hint" /><span class="hint">%s</span></small></td></tr>', printf('<tr><td colspan="2"><small><br /><img src="%s/light.png" alt="Hint" /><span class="hint">%s</span></small></td></tr>',
IMGDIR,_('Note: You may be required to enter new attributes that these objectClass(es) require')); IMGDIR,_('Note: You may be required to enter new attributes that these object classes require'));
echo '</table>'; echo '</table>';
echo '</form>'; echo '</form>';

2
lam/templates/3rdParty/pla/lib/PageRender.php vendored
View File

@ -442,7 +442,7 @@ class PageRender extends Visitor {
} }
if ($required_by) if ($required_by)
return sprintf('<acronym title="%s %s">%s</acronym>',_('Required attribute for objectClass(es)'),$required_by,_('required')); return sprintf('<acronym title="%s: %s">%s</acronym>',_('Required attribute for object classes'),$required_by,_('required'));
else else
return ''; return '';
} }

2
lam/templates/3rdParty/pla/lib/TemplateRender.php vendored
View File

@ -1455,7 +1455,7 @@ class TemplateRender extends PageRender {
printf('%s: ',sprintf(_('Step %s of %s'),$page,$this->pagelast)); printf('%s: ',sprintf(_('Step %s of %s'),$page,$this->pagelast));
if ($page == 1) if ($page == 1)
echo _('Container and object class(es)'); echo _('Container and object classes');
else else
echo _('Specify attributes and values'); echo _('Specify attributes and values');

4
lam/templates/initsuff.php
View File

@ -3,7 +3,7 @@
$Id$ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2010 Roland Gruber Copyright (C) 2003 - 2012 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -176,7 +176,7 @@ include 'main_header.php';
echo '<div class="userlist-bright smallPaddingContent">'; echo '<div class="userlist-bright smallPaddingContent">';
echo "<form action=\"initsuff.php\" method=\"post\">\n"; echo "<form action=\"initsuff.php\" method=\"post\">\n";
$container = new htmlTable(); $container = new htmlTable();
$container->addElement(new htmlOutputText(_("The following suffix(es) are missing in LDAP. LAM can create them for you.")), true); $container->addElement(new htmlOutputText(_("The following suffixes are missing in LDAP. LAM can create them for you.")), true);
$container->addElement(new htmlSpacer(null, '10px'), true); $container->addElement(new htmlSpacer(null, '10px'), true);
// print missing suffixes // print missing suffixes
for ($i = 0; $i < sizeof($new_suff); $i++) { for ($i = 0; $i < sizeof($new_suff); $i++) {

7
lam/templates/tests/schemaTest.php
View File

@ -3,7 +3,7 @@
$Id$ $Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2007 - 2010 Roland Gruber Copyright (C) 2007 - 2012 Roland Gruber
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -116,11 +116,14 @@ function checkSchemaForModule($name, $type) {
} }
// check if attributes are supported // check if attributes are supported
for ($a = 0; $a < sizeof($attrs); $a++) { for ($a = 0; $a < sizeof($attrs); $a++) {
if (strpos($attrs[$a], 'INFO.') === 0) {
continue;
}
if (!in_array_ignore_case($attrs[$a], $schemaAttrs)) { if (!in_array_ignore_case($attrs[$a], $schemaAttrs)) {
if (isset($aliases[$attrs[$a]]) && in_array_ignore_case($aliases[$attrs[$a]], $schemaAttrs)) { if (isset($aliases[$attrs[$a]]) && in_array_ignore_case($aliases[$attrs[$a]], $schemaAttrs)) {
continue; continue;
} }
return sprintf(_("The attribute %s is not supported for the object class(es) %s by your LDAP server."), $attrs[$a], implode(", ", $classes)); return sprintf(_("The attribute %s is not supported for the object class %s by your LDAP server."), $attrs[$a], implode("/", $classes));
} }
} }
return null; return null;