Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
efe5a084
Commit
efe5a084
authored
10 years ago
by
Jared Hancock
Browse files
Options
Downloads
Patches
Plain Diff
i18n: Translate titles on email template management
Also fix redactor translation for SCP
parent
b6162fd3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/ajax.config.php
+6
-2
6 additions, 2 deletions
include/ajax.config.php
include/staff/tpl.inc.php
+5
-5
5 additions, 5 deletions
include/staff/tpl.inc.php
include/staff/user-view.inc.php
+1
-1
1 addition, 1 deletion
include/staff/user-view.inc.php
with
12 additions
and
8 deletions
include/ajax.config.php
+
6
−
2
View file @
efe5a084
...
@@ -20,7 +20,10 @@ class ConfigAjaxAPI extends AjaxController {
...
@@ -20,7 +20,10 @@ class ConfigAjaxAPI extends AjaxController {
//config info UI might need.
//config info UI might need.
function
scp
()
{
function
scp
()
{
global
$cfg
,
$thisstaff
;
global
$cfg
;
$lang
=
Internationalization
::
getCurrentLanguage
();
list
(
$sl
,
$locale
)
=
explode
(
'_'
,
$lang
);
$config
=
array
(
$config
=
array
(
'lock_time'
=>
(
$cfg
->
getLockTime
()
*
3600
),
'lock_time'
=>
(
$cfg
->
getLockTime
()
*
3600
),
...
@@ -28,7 +31,8 @@ class ConfigAjaxAPI extends AjaxController {
...
@@ -28,7 +31,8 @@ class ConfigAjaxAPI extends AjaxController {
'html_thread'
=>
(
bool
)
$cfg
->
isHtmlThreadEnabled
(),
'html_thread'
=>
(
bool
)
$cfg
->
isHtmlThreadEnabled
(),
'date_format'
=>
(
$cfg
->
getDateFormat
()),
'date_format'
=>
(
$cfg
->
getDateFormat
()),
'allow_attachments'
=>
(
bool
)
$cfg
->
allowAttachments
(),
'allow_attachments'
=>
(
bool
)
$cfg
->
allowAttachments
(),
'lang'
=>
$thisstaff
->
getLanguage
(),
'lang'
=>
$lang
,
'short_lang'
=>
$sl
,
);
);
return
$this
->
json_encode
(
$config
);
return
$this
->
json_encode
(
$config
);
}
}
...
...
This diff is collapsed.
Click to expand it.
include/staff/tpl.inc.php
+
5
−
5
View file @
efe5a084
...
@@ -59,12 +59,12 @@ $tpl=$msgtemplates[$selected];
...
@@ -59,12 +59,12 @@ $tpl=$msgtemplates[$selected];
echo
"</optgroup>"
;
echo
"</optgroup>"
;
$current_group
=
$nfo
[
'group'
];
?>
$current_group
=
$nfo
[
'group'
];
?>
<optgroup
label=
"
<?php
echo
isset
(
$_groups
[
$current_group
])
<optgroup
label=
"
<?php
echo
isset
(
$_groups
[
$current_group
])
?
$_groups
[
$current_group
]
:
$current_group
;
?>
"
>
?
__
(
$_groups
[
$current_group
]
)
:
$current_group
;
?>
"
>
<?php
}
<?php
}
$sel
=
(
$selected
==
$cn
)
?
'selected="selected"'
:
''
;
$sel
=
(
$selected
==
$cn
)
?
'selected="selected"'
:
''
;
echo
sprintf
(
'<option value="%s" %s>%s</option>'
,
echo
sprintf
(
'<option value="%s" %s>%s</option>'
,
isset
(
$impl
[
$cn
])
?
$impl
[
$cn
]
->
getId
()
:
$cn
,
isset
(
$impl
[
$cn
])
?
$impl
[
$cn
]
->
getId
()
:
$cn
,
$sel
,
$nfo
[
'name'
]);
$sel
,
__
(
$nfo
[
'name'
])
)
;
}
}
if
(
$current_group
)
if
(
$current_group
)
echo
"</optgroup>"
;
echo
"</optgroup>"
;
...
@@ -86,10 +86,10 @@ $tpl=$msgtemplates[$selected];
...
@@ -86,10 +86,10 @@ $tpl=$msgtemplates[$selected];
<div
style=
"border:1px solid #ccc;background:#f0f0f0;padding:5px 10px;
<div
style=
"border:1px solid #ccc;background:#f0f0f0;padding:5px 10px;
margin:10px 0;"
>
margin:10px 0;"
>
<h3
style=
"font-size:12pt;margin:0"
>
<?php
echo
$desc
[
'name'
];
?>
<h3
style=
"font-size:12pt;margin:0"
>
<?php
echo
__
(
$desc
[
'name'
]
)
;
?>
<i
class=
"help-tip icon-question-sign"
<i
class=
"help-tip icon-question-sign"
data-content=
"
<?php
echo
Format
::
htmlchars
(
$desc
[
'desc'
]);
?>
"
data-content=
"
<?php
echo
Format
::
htmlchars
(
__
(
$desc
[
'desc'
])
)
;
?>
"
data-title=
"
<?php
echo
Format
::
htmlchars
(
$desc
[
'name'
]);
?>
"
></i>
data-title=
"
<?php
echo
Format
::
htmlchars
(
__
(
$desc
[
'name'
])
)
;
?>
"
></i>
<a
style=
"font-size:10pt"
class=
"tip pull-right"
href=
"#ticket_variables.txt"
>
<a
style=
"font-size:10pt"
class=
"tip pull-right"
href=
"#ticket_variables.txt"
>
<i
class=
"icon-tags"
></i>
<i
class=
"icon-tags"
></i>
<?php
echo
__
(
'Supported Variables'
);
?>
</a>
<?php
echo
__
(
'Supported Variables'
);
?>
</a>
...
...
This diff is collapsed.
Click to expand it.
include/staff/user-view.inc.php
+
1
−
1
View file @
efe5a084
...
@@ -14,7 +14,7 @@ $org = $user->getOrganization();
...
@@ -14,7 +14,7 @@ $org = $user->getOrganization();
</td>
</td>
<td
width=
"50%"
class=
"right_align has_bottom_border"
>
<td
width=
"50%"
class=
"right_align has_bottom_border"
>
<span
class=
"action-button"
data-dropdown=
"#action-dropdown-more"
>
<span
class=
"action-button"
data-dropdown=
"#action-dropdown-more"
>
<span
><i
class=
"icon-cog"
></i>
More
</span>
<span
><i
class=
"icon-cog"
></i>
<?php
echo
__
(
'More'
);
?>
</span>
<i
class=
"icon-caret-down"
></i>
<i
class=
"icon-caret-down"
></i>
</span>
</span>
<a
id=
"user-delete"
class=
"action-button user-action"
<a
id=
"user-delete"
class=
"action-button user-action"
...
...
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