Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
e822ff2c
Commit
e822ff2c
authored
14 years ago
by
Juanjo Menent
Browse files
Options
Downloads
Patches
Plain Diff
Trad: fristname and lastname improved treatment for US and ES
parent
ee784452
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/admin/ihm.php
+3
-3
3 additions, 3 deletions
htdocs/admin/ihm.php
htdocs/langs/en_US/admin.lang
+1
-1
1 addition, 1 deletion
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/companies.lang
+1
-1
1 addition, 1 deletion
htdocs/langs/en_US/companies.lang
with
5 additions
and
5 deletions
htdocs/admin/ihm.php
+
3
−
3
View file @
e822ff2c
...
@@ -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
(
"
N
ame"
),
1
=>
$langs
->
trans
(
"
N
ame"
)
.
' '
.
$langs
->
trans
(
"Firstname"
));
$array
=
array
(
0
=>
$langs
->
trans
(
"Firstname"
)
.
' '
.
$langs
->
trans
(
"
Lastn
ame"
),
1
=>
$langs
->
trans
(
"
Lastn
ame"
)
.
' '
.
$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"> </td>'
;
print
'<td width="20"> </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
(
"
N
ame"
);
}
if
(
empty
(
$conf
->
global
->
MAIN_FIRSTNAME_NAME_POSITION
))
{
print
$langs
->
trans
(
"Firstname"
)
.
' '
.
$langs
->
trans
(
"
Lastn
ame"
);
}
else
{
print
$langs
->
trans
(
"
N
ame"
)
.
' '
.
$langs
->
trans
(
"Firstname"
);
}
else
{
print
$langs
->
trans
(
"
Lastn
ame"
)
.
' '
.
$langs
->
trans
(
"Firstname"
);
}
print
'</td>'
;
print
'</td>'
;
print
'<td width="20"> </td>'
;
print
'<td width="20"> </td>'
;
print
'</tr>'
;
print
'</tr>'
;
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/admin.lang
+
1
−
1
View file @
e822ff2c
...
@@ -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/Last
name
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)
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/companies.lang
+
1
−
1
View file @
e822ff2c
...
@@ -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=
Firstn
ame
Firstname=
N
ame
PostOrFunction=Post/Function
PostOrFunction=Post/Function
UserTitle=Title
UserTitle=Title
Surname=Surname/Pseudo
Surname=Surname/Pseudo
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment