Skip to content

fix(i18n): embed French JS strings with json_encode #8556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheWitness merged 1 commit into from
Nov 1, 2026
Merged

fix(i18n): embed French JS strings with json_encode #8556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aggregate_graphs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1496,10 +1496,10 @@ function changeTotalsType() {
$('#toggle_items').click(function() {
if ($('#toggle_items').is(":contains('<?php print __('Show'); ?>')")) {
$('#local_graph_template_graph_id').next('table').css('display', '');
$('#toggle_items').text('<?php print __('Hide Item Details'); ?>');
$('#toggle_items').text(<?php print json_encode(__('Hide Item Details')); ?>);
} else {
$('#local_graph_template_graph_id').next('table').css('display', 'none');
$('#toggle_items').text('<?php print __('Show Item Details'); ?>');
$('#toggle_items').text(<?php print json_encode(__('Show Item Details')); ?>);
}
});

Expand Down
2 changes: 1 addition & 1 deletion automation_templates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,7 +1450,7 @@ function template_edit() : void {
applySkin();

$('#cdialog').dialog({
title: '<?php print __('Delete Item from Device Rule'); ?>',
title: <?php print json_encode(__('Delete Item from Device Rule')); ?>,
close: function () { $('.delete').blur(); $('.selectable').removeClass('selected'); },
minHeight: 80,
minWidth: 500
Expand Down
2 changes: 1 addition & 1 deletion cdef.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ function cdef_edit() : void {
});

$('#cdialog').dialog({
title: '<?php print __('Delete CDEF Item'); ?>',
title: <?php print json_encode(__('Delete CDEF Item')); ?>,
minHeight: 80,
minWidth: 500
});
Expand Down
1 change: 1 addition & 0 deletions changelog.d/8555.issue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
French apostrophe in JS-embedded gettext ends the string and skips the page script
2 changes: 1 addition & 1 deletion data_source_profiles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ function profile_edit() : void {
});

$('#cdialog').dialog({
title: '<?php print __('Delete Data Source Profile Item'); ?>',
title: <?php print json_encode(__('Delete Data Source Profile Item')); ?>,
close: function () { $('.delete').blur(); $('.selectable').removeClass('selected'); },
minHeight: 80,
minWidth: 500
Expand Down
2 changes: 1 addition & 1 deletion host.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ function changeHostForm() {
applySkin();

$('#cdialog').dialog({
title: '<?php print __('Delete Item from Device Template'); ?>',
title: <?php print json_encode(__('Delete Item from Device Template')); ?>,
close: function () { $('.delete').blur(); $('.selectable').removeClass('selected'); },
minHeight: 80,
minWidth: 500
Expand Down
2 changes: 1 addition & 1 deletion host_templates.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ function template_edit() : void {
<script type='text/javascript'>
function deleteFinalize(options, data) {
$('#cdialog').dialog({
title: '<?php print __('Delete Item from Device Template'); ?>',
title: <?php print json_encode(__('Delete Item from Device Template')); ?>,
close: function() {
$('.delete').blur();
$('.selectable').removeClass('selected');
Expand Down
2 changes: 1 addition & 1 deletion lib/api_scheduler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ function api_scheduler_javascript() : void {

$('#month').multiselect({
selectedList: 7,
noneSelectedText: '<?php print __('Select the month(s) of the year'); ?>',
noneSelectedText: <?php print json_encode(__('Select the month(s) of the year')); ?>,
header: false,
height: 82,
groupColumns: true,
Expand Down
2 changes: 1 addition & 1 deletion lib/package.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function check_get_author_info() : mixed {
} else {
?>
<script type='text/javascript'>
var mixedReasonTitle = '<?php print __('Key Generation Required to Use Tool'); ?>';
var mixedReasonTitle = <?php print json_encode(__('Key Generation Required to Use Tool')); ?>;
var mixedOnPage = '<?php print __esc('Packaging Key Information Not Found'); ?>';

sessionMessage = {
Expand Down
2 changes: 1 addition & 1 deletion package_import.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function check_tmp_dir() : mixed {
} else {
?>
<script type='text/javascript'>
var mixedReasonTitle = '<?php print __('Key Generation Required to Use Tool'); ?>';
var mixedReasonTitle = <?php print json_encode(__('Key Generation Required to Use Tool')); ?>;
var mixedOnPage = '<?php print __esc('Packaging Key Information Not Found'); ?>';

sessionMessage = {
Expand Down
Loading