Skip to content

Commit

Permalink
fixes #2381
Browse files Browse the repository at this point in the history
  • Loading branch information
moldcraft committed Feb 8, 2017
1 parent 9f474f4 commit a86da9a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
23 changes: 15 additions & 8 deletions framework/core/components/backend.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion framework/static/js/fw.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit a86da9a

Please sign in to comment.