Skip to content

Commit 0c3ed21

Browse files
jaapmarcusjaapmarcus
authored
Merge pull request hestiacp#1128 from hestiacp/refactor/ui-i18n-fixes
Refactor/ui i18n fixes
2 parents b65ac4a + ad9a801 commit 0c3ed21

File tree

11 files changed

+12
-11
lines changed

11 files changed

+12
-11
lines changed

‎web/restart/service/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
if ($return_var != 0) {
2424
$error = implode('<br>', $output);
25-
if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('restart'),$v_service);
25+
if (empty($error)) $error = __('Restart "%s" failed',$v_service);
2626
$_SESSION['error_msg'] = $error;
2727
}
2828
unset($output);

‎web/start/service/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
if ($return_var != 0) {
2424
$error = implode('<br>', $output);
25-
if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('start'),$v_service);;
25+
if (empty($error)) $error = __('Start "%s" failed',$v_service);;
2626
$_SESSION['error_srv'] = $error;
2727
}
2828
unset($output);

‎web/stop/service/index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
if ($return_var != 0) {
2525
$error = implode('<br>', $output);
2626
if (empty($error)) {
27-
$error = __('SERVICE_ACTION_FAILED', __('stop'), $v_service);
27+
$error = __('Stop "%s" failed', $v_service);
2828
}
2929

3030
$_SESSION['error_srv'] = $error;

‎web/templates/admin/add_db.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<tr>
7070
<td class="vst-text input-label">
7171
<?php
72-
print __('User');
72+
print __('Username');
7373
// if (is_it_mysql_or_mariadb()=='mysql')
7474
echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".__('maximum characters length, including prefix', 32).")</small></em>";
7575
?>

‎web/templates/admin/add_web.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
</tr>
234234
<tr>
235235
<td class="vst-text input-label">
236-
<?php print( __('Folder'));?> <span class="optional">(<?php print __('optional');?>)</span>
236+
<?php print( __('Directory'));?> <span class="optional">(<?php print __('optional');?>)</span>
237237
</td>
238238
</tr>
239239
<tr>

‎web/templates/admin/edit_db.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
</tr>
6868
<tr>
6969
<td class="vst-text input-label">
70-
<?php print __('User');?>
70+
71+
<?php print __('Username');?>
7172
<?php echo "&nbsp;&nbsp;&nbsp;&nbsp;<em><small>(".__('maximum characters length, including prefix', 32).")</small></em>"; ?>
7273
</td>
7374
</tr>

‎web/templates/admin/edit_web.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
</tr>
282282
<tr>
283283
<td class="vst-text input-label">
284-
<?php print( __('Folder'));?> <span class="optional">(<?php print __('optional');?>)</span>
284+
<?php print( __('Directory'));?> <span class="optional">(<?php print __('optional');?>)</span>
285285
</td>
286286
</tr>
287287
<tr>

‎web/templates/admin/list_backup_detail.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<div class="l-unit-toolbar__col l-unit-toolbar__col--right noselect">
7676
<div class="actions-panel clearfix">
7777
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
78-
<a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="Restore">
78+
<a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?php print __('Restore');?>">
7979
<i class="fas fa-undo status-icon green status-icon dim"></i>
8080
</a>
8181
</div>

‎web/templates/admin/list_db.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<li entity="sort-date" sort_as_int="1"><span class="name active"><?=__('Date')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
3535
<li entity="sort-name"><span class="name"><?=__('Database')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
3636
<li entity="sort-disk" sort_as_int="1"><span class="name"><?=__('Disk')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
37-
<li entity="sort-user"><span class="name"><?=__('User')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
37+
<li entity="sort-user"><span class="name"><?=__('Username')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
3838
<li entity="sort-server"><span class="name"><?=__('Host')?> <i class="fas fa-sort-amount-down"></i></span><span class="up"><i class="fas fa-sort-amount-up"></i></span></li>
3939
</ul>
4040
<div class="l-sort-toolbar clearfix">

‎web/templates/user/edit_web.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@
294294
</tr>
295295
<tr>
296296
<td class="vst-text input-label">
297-
<?php print( __('Folder'));?> <span class="optional">(<?php print __('optional');?>)</span>
297+
<?php print( __('Directory'));?> <span class="optional">(<?php print __('optional');?>)</span>
298298
</td>
299299
</tr>
300300
<tr>

0 commit comments

Comments
 (0)