From a86da9a59adac3ce6b564872719cd8ebaba32e47 Mon Sep 17 00:00:00 2001 From: moldcraft Date: Wed, 8 Feb 2017 10:14:02 +0200 Subject: [PATCH] fixes https://github.com/ThemeFuse/Unyson/issues/2381 --- framework/core/components/backend.php | 23 +++++++++++++++-------- framework/static/js/fw.js | 2 +- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/framework/core/components/backend.php b/framework/core/components/backend.php index 467c9c62..0c7e9f1b 100644 --- a/framework/core/components/backend.php +++ b/framework/core/components/backend.php @@ -347,14 +347,21 @@ private function register_static() { 'FW_URI' => fw_get_framework_directory_uri(), 'SITE_URI' => site_url(), 'LOADER_URI' => apply_filters( 'fw_loader_image', fw_get_framework_directory_uri() . '/static/img/logo.svg' ), - 'l10n' => array( - 'done' => __( 'Done', 'fw' ), - 'ah_sorry' => __( 'Ah, Sorry', 'fw' ), - 'save' => __( 'Save', 'fw' ), - 'reset' => __( 'Reset', 'fw' ), - 'apply' => __( 'Apply', 'fw' ), - 'cancel' => __( 'Cancel', 'fw' ), - 'ok' => __( 'Ok', 'fw' ) + 'l10n' => array_merge( + $l10n = array( + 'modal_save_btn' => __( 'Save', 'fw' ), + 'done' => __( 'Done', 'fw' ), + 'ah_sorry' => __( 'Ah, Sorry', 'fw' ), + 'reset' => __( 'Reset', 'fw' ), + 'apply' => __( 'Apply', 'fw' ), + 'cancel' => __( 'Cancel', 'fw' ), + 'ok' => __( 'Ok', 'fw' ) + ), + /** + * fixes https://github.com/ThemeFuse/Unyson/issues/2381 + * @since 2.6.14 + */ + apply_filters('fw_js_l10n', $l10n) ), 'options_modal' => array( /** @since 2.6.13 */ diff --git a/framework/static/js/fw.js b/framework/static/js/fw.js index 1597fe6c..47aef62d 100644 --- a/framework/static/js/fw.js +++ b/framework/static/js/fw.js @@ -1217,7 +1217,7 @@ fw.getValuesFromServer = function (data) { buttons = [ { style: 'primary', - text: settings.saveText || _fw_localized.l10n.save, + text: settings.saveText || _fw_localized.l10n.modal_save_btn, priority: 40, click: function () { if (settings.shouldSaveWithoutClose) {