Skip to content
Snippets Groups Projects
Commit e822ff2c authored by Juanjo Menent's avatar Juanjo Menent
Browse files

Trad: fristname and lastname improved treatment for US and ES

parent ee784452
No related branches found
No related tags found
No related merge requests found
...@@ -240,7 +240,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit ...@@ -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 ...@@ -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>';
......
...@@ -285,7 +285,7 @@ NumberOfModelFilesFound=Number of ODT templates files found in those directories ...@@ -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)
......
...@@ -50,7 +50,7 @@ CivilityCode=Civility code ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment