lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trad: fristname and lastname improved treatment for US and ES

Browse Source
This commit is contained in:
Juanjo Menent 2010-12-30 23:42:33 +00:00
parent ee784452f0
commit e822ff2c29
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/ihm.php
View File

@ -240,7 +240,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit
// Firstname/Name // Firstname/Name
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
$array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Name"),1=>$langs->trans("Name").' '.$langs->trans("Firstname")); $array=array(0=>$langs->trans("Firstname").' '.$langs->trans("Lastname"),1=>$langs->trans("Lastname").' '.$langs->trans("Firstname"));
print $html->selectarray('MAIN_FIRSTNAME_NAME_POSITION',$array,(isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0)); print $html->selectarray('MAIN_FIRSTNAME_NAME_POSITION',$array,(isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?$conf->global->MAIN_FIRSTNAME_NAME_POSITION:0));
print '</td>'; print '</td>';
print '<td width="20">&nbsp;</td>'; print '<td width="20">&nbsp;</td>';
@ -440,8 +440,8 @@ else // Show
// Firstname / Name position // Firstname / Name position
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>'; print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("FirstnameNamePosition").'</td><td>';
if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Name"); } if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { print $langs->trans("Firstname").' '.$langs->trans("Lastname"); }
else { print $langs->trans("Name").' '.$langs->trans("Firstname"); } else { print $langs->trans("Lastname").' '.$langs->trans("Firstname"); }
print '</td>'; print '</td>';
print '<td width="20">&nbsp;</td>'; print '<td width="20">&nbsp;</td>';
print '</tr>'; print '</tr>';

2
htdocs/langs/en_US/admin.lang
View File

@ -285,7 +285,7 @@ NumberOfModelFilesFound=Number of ODT templates files found in those directories
ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
FollowingSubstitutionKeysCanBeUsed=By adding such tags into template, you will get a substitution with personalized value when generating document: FollowingSubstitutionKeysCanBeUsed=By adding such tags into template, you will get a substitution with personalized value when generating document:
FullListOnOnlineDocumentation=Full list of all available tags can be found on user documentation of module on wiki http://wiki.dolibarr.org FullListOnOnlineDocumentation=Full list of all available tags can be found on user documentation of module on wiki http://wiki.dolibarr.org
FirstnameNamePosition=Position of firstname/name FirstnameNamePosition=Position of Name/Lastname
DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values: DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)

2
htdocs/langs/en_US/companies.lang
View File

@ -50,7 +50,7 @@ CivilityCode=Civility code
RegisteredOffice=Registered office RegisteredOffice=Registered office
Name=Name Name=Name
Lastname=Lastname Lastname=Lastname
Firstname=Firstname Firstname=Name
PostOrFunction=Post/Function PostOrFunction=Post/Function
UserTitle=Title UserTitle=Title
Surname=Surname/Pseudo Surname=Surname/Pseudo