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
68ded1b4
Commit
68ded1b4
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix language
parent
3e2c0d26
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/langs/en_US/main.lang
+1
-0
1 addition, 0 deletions
htdocs/langs/en_US/main.lang
htdocs/main.inc.php
+3
-3
3 additions, 3 deletions
htdocs/main.inc.php
with
4 additions
and
3 deletions
htdocs/langs/en_US/main.lang
+
1
−
0
View file @
68ded1b4
...
...
@@ -793,6 +793,7 @@ Select2NotFound=No result found
Select2Enter=Enter
Select2MoreCharacter=or more character
Select2MoreCharacters=or more characters
Select2MoreCharactersMore=<br /><br /><strong>Search syntax:</strong><br /><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br /><kbd><strong>*</strong></kbd><kbd> Any character</kbd> (a*b)<br /><kbd><strong>^</strong></kbd><kbd> Start with</kbd> (^ab)<br /><kbd><strong>$</strong></kbd><kbd> End with</kbd> (ab$)<br />
Select2LoadingMoreResults=Loading more results...
Select2SearchInProgress=Search in progress...
SearchIntoThirdparties=Thirdparties
...
...
This diff is collapsed.
Click to expand it.
htdocs/main.inc.php
+
3
−
3
View file @
68ded1b4
...
...
@@ -1243,7 +1243,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{
$tmpplugin
=
empty
(
$conf
->
global
->
MAIN_USE_JQUERY_MULTISELECT
)
?
constant
(
'REQUIRE_JQUERY_MULTISELECT'
)
:
$conf
->
global
->
MAIN_USE_JQUERY_MULTISELECT
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/includes/jquery/plugins/'
.
$tmpplugin
.
'/'
.
$tmpplugin
.
'.min.js'
.
(
$ext
?
'?'
.
$ext
:
''
)
.
'"></script>'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/core/js/select2_locale.js.php
'
.
(
$ext
?
'
?
'
.
$ext
:
''
)
.
'"></script>'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/core/js/select2_locale.js.php
?lang='
.
$langs
->
defaultlang
.
(
$ext
?
'
&
'
.
$ext
:
''
)
.
'"></script>'
.
"
\n
"
;
}
// jQuery jMobile
if
(
!
$disablejmobile
&&
(
!
empty
(
$conf
->
global
->
MAIN_USE_JQUERY_JMOBILE
)
||
defined
(
'REQUIRE_JQUERY_JMOBILE'
)
||
(
!
empty
(
$conf
->
dol_use_jmobile
)
&&
$conf
->
dol_use_jmobile
>
0
)))
...
...
@@ -1307,10 +1307,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
// Global js function
print
'<!-- Includes JS of Dolibarr -->'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/core/js/lib_head.js.php
?version='
.
urlencode
(
DOL_VERSION
)
.
(
$ext
?
'
&
'
.
$ext
:
''
)
.
'"></script>'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/core/js/lib_head.js.php
'
.
(
$ext
?
'
?
'
.
$ext
:
''
)
.
'"></script>'
.
"
\n
"
;
// Add datepicker default options
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/core/js/datepicker.js.php
?lang='
.
$langs
->
defaultlang
.
(
$ext
?
'
&
'
.
$ext
:
''
)
.
'"></script>'
.
"
\n
"
;
print
'<script type="text/javascript" src="'
.
DOL_URL_ROOT
.
'/core/js/datepicker.js.php
'
.
(
$ext
?
'
?
'
.
$ext
:
''
)
.
'"></script>'
.
"
\n
"
;
// JS forced by modules (relative url starting with /)
if
(
!
empty
(
$conf
->
modules_parts
[
'js'
]))
// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
...
...
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