diff options
author | Phil Davis <phil.davis@inf.org> | 2017-02-06 21:23:13 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2017-02-06 21:23:13 +0545 |
commit | f8a1be5601179398cb8a0ee80cff2fdd93c709d6 (patch) | |
tree | 158584117a9749d623870817e316d54d2a6855c4 /src/usr/local | |
parent | c728ede6d0a39425716baeef698726108b39469c (diff) | |
download | pfsense-f8a1be5601179398cb8a0ee80cff2fdd93c709d6.zip pfsense-f8a1be5601179398cb8a0ee80cff2fdd93c709d6.tar.gz |
user/local/www inc file gettext improvements
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/guiconfig.inc | 2 | ||||
-rw-r--r-- | src/usr/local/www/head.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 5ae0861..6218658 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -385,7 +385,7 @@ function get_std_save_message($retval) { $to_return = gettext("The changes have been applied successfully."); } else { // non-zero means there was some problem - $to_return = gettext("There was a problem applying the changes. See the <a href=\"status_logs.php\">System Logs</a>."); + $to_return = sprintf(gettext('There was a problem applying the changes. See the %1$sSystem Logs%2$s.'), '<a href=\"status_logs.php\">', '</a>'); } foreach ($filter_pages as $fp) { if (stristr($_SERVER['SCRIPT_FILENAME'], $fp)) { diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index d69e512..6452e74 100644 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -638,11 +638,11 @@ if (('' != ($link = get_shortcut_log_link($shortcut_section, false))) && (isAllo /* if upgrade in progress, alert user */ if (is_subsystem_dirty('packagelock') || (file_exists('/conf/needs_package_sync') && platform_booting())) { if (file_exists('/conf/needs_package_sync') && platform_booting()) { - $warning_text = sprintf(gettext("<p>%s is booting, then packages will be reinstalled in the background.</p><p>Do not make changes in the GUI until this is complete.</p>"), $g['product_name']); + $warning_text = sprintf(gettext('%1$s%3$s is booting, then packages will be reinstalled in the background.%2$s%1$sDo not make changes in the GUI until this is complete.%2$s'), '<p>', '</p>', $g['product_name']); } else { $pgtitle = array(gettext("System"), gettext("Package Manager")); - $warning_text = gettext("<p>Packages are currently being reinstalled in the background.</p><p>Do not make changes in the GUI until this is complete.</p>"); - $warning_text .= sprintf(gettext('<p>If the above message is still displayed after a couple of hours, use the \'Clear Package Lock\' button on the <a href="diag_backup.php" title="%1$s > %2$s">%1$s > %2$s</a> page and reinstall packages manually.</p>'), gettext('Diagnostics'), htmlspecialchars(gettext('Backup & Restore'))); + $warning_text = sprintf(gettext('%1$sPackages are currently being reinstalled in the background.%2$s%1$sDo not make changes in the GUI until this is complete.%2$s'), '<p>', '</p>'); + $warning_text .= sprintf(gettext('%1$sIf the above message is still displayed after a couple of hours, use the \'Clear Package Lock\' button on the %3$s page and reinstall packages manually.%2$s'), '<p>', '</p>', sprintf('<a href="diag_backup.php" title="%1$s > %2$s">%1$s > %2$s</a>', gettext('Diagnostics'), htmlspecialchars(gettext('Backup & Restore')))); } print_info_box($warning_text); |