Skip to content

[I18n] Fix issues and add improvements to JavaScript internationalization #2034

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
Crabcyborg merged 5 commits into from
Oct 18, 2024
Merged

[I18n] Fix issues and add improvements to JavaScript internationalization #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01b1d6c
Add missing space before name placeholder
pedro-mendonca Oct 8, 2024
621f613
Fix number on comment to translators.
pedro-mendonca Oct 8, 2024
a356e22
Set scripts translations to translate JavaScript files
pedro-mendonca Oct 8, 2024
063d09b
Use standard sprintf for variables in JavaScript
pedro-mendonca Oct 8, 2024
f07b387
Add missing textdomain
pedro-mendonca Oct 8, 2024
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
1 change: 1 addition & 0 deletions classes/controllers/FrmAddonsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public static function enqueue_assets() {
wp_register_script( self::SCRIPT_HANDLE, $plugin_url . '/js/addons-page.js', $js_dependencies, $version, true );
wp_localize_script( self::SCRIPT_HANDLE, 'frmAddonsVars', self::get_js_variables() );
wp_enqueue_script( self::SCRIPT_HANDLE );
wp_set_script_translations( self::SCRIPT_HANDLE, 'formidable' );

FrmAppHelper::dequeue_extra_global_scripts();
}
Expand Down
2 changes: 2 additions & 0 deletions classes/controllers/FrmAppController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,9 @@ public static function admin_js() {
wp_enqueue_style( 'widgets' );
self::maybe_deregister_popper2();
wp_enqueue_script( 'formidable_admin' );
wp_set_script_translations( 'formidable_admin', 'formidable' );
wp_enqueue_script( 'formidable_embed' );
wp_set_script_translations( 'formidable_embed', 'formidable' );
FrmAppHelper::localize_script( 'admin' );

wp_enqueue_style( 'formidable-animations' );
Expand Down
2 changes: 1 addition & 1 deletion classes/models/FrmReviews.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private function review() {

$title = sprintf(
/* translators: %s: User name, %2$d: number of entries */
esc_html__( 'Congratulations%1$s! You have collected %2$d form submissions.', 'formidable' ),
esc_html__( 'Congratulations %1$s! You have collected %2$d form submissions.', 'formidable' ),
esc_html( $name ),
absint( $entries )
);
Expand Down
9 changes: 4 additions & 5 deletions js/admin/applications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
return;
}

const __ = wp.i18n.__;
const { __, sprintf } = wp.i18n;
const { tag, div, span, a, svg, img } = frmDom;
const { maybeCreateModal, footerButton } = frmDom.modal;
const { newSearchInput } = frmDom.search;
Expand Down Expand Up @@ -210,7 +210,7 @@

function getAllItemsCategory() {
/* translators: %d: Number of application templates. */
return __( 'All Items (%d)', 'formidable' ).replace( '%d', state.templates.length );
return sprintf( __( 'All Items (%d)', 'formidable' ), state.templates.length );
}

function handleCategorySelect( category ) {
Expand Down Expand Up @@ -374,7 +374,7 @@
});
control.setAttribute( 'role', 'button' );
/* translators: %s: Application Template Name */
const ariaDescription = __( '%s Template' ).replace( '%s', data.name );
const ariaDescription = sprintf( __( '%s Template', 'formidable' ), data.name );
control.setAttribute( 'aria-description', ariaDescription );
control.addEventListener(
'click',
Expand Down Expand Up @@ -419,8 +419,7 @@
children: [
span(
/* translators: %s: The required license type (ie. Plus, Business, or Elite) */
__( 'Access to this application requires the %s plan.', 'formidable' )
.replace( '%s', data.requires )
sprintf( __( 'Access to this application requires the %s plan.', 'formidable' ), data.requires )
),
a({
text: getUpgradeNowText(),
Expand Down
16 changes: 8 additions & 8 deletions js/admin/embed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
return;
}

const __ = wp.i18n.__;
const { __, sprintf } = wp.i18n;
const { div, tag, svg } = frmDom;
const { maybeCreateModal, footerButton } = frmDom.modal;

Expand Down Expand Up @@ -74,7 +74,7 @@

function openEmbedModal() {
/* translators: %s type: ie form, view. */
const title = __( 'Embed %s', 'formidable' ).replace( '%s', getTypeDescription() );
const title = sprintf( __( 'Embed %s', 'formidable' ), getTypeDescription() );

modal = maybeCreateModal(
'frm_embed_modal',
Expand Down Expand Up @@ -129,13 +129,13 @@
const typeDescription = getTypeDescription();

/* translators: %s type: ie form, view. */
const existingPageDescription = __( 'Embed your %s into an existing page.', 'formidable' ).replace( '%s', typeDescription );
const existingPageDescription = sprintf( __( 'Embed your %s into an existing page.', 'formidable' ), typeDescription );

/* translators: %s type: ie form, view. */
const newPageDescription = __( 'Put your %s on a newly created page.', 'formidable' ).replace( '%s', typeDescription );
const newPageDescription = sprintf( __( 'Put your %s on a newly created page.', 'formidable' ), typeDescription );

/* translators: %s type: ie form, view. */
const insertManuallyDescription = __( 'Use shortcodes or PHP code to put the %s anywhere.', 'formidable' ).replace( '%s', typeDescription );
const insertManuallyDescription = sprintf( __( 'Use shortcodes or PHP code to put the %s anywhere.', 'formidable' ), typeDescription );

const options = [
{
Expand Down Expand Up @@ -178,7 +178,7 @@
const typeDescription = getTypeDescription();

/* translators: %s: type (ie. view, form). */
const titleText = __( 'Select the page you want to embed your %s into.', 'formidable' ).replace( '%s', typeDescription );
const titleText = sprintf( __( 'Select the page you want to embed your %s into.', 'formidable' ), typeDescription );

const title = getLabel( titleText );
title.setAttribute( 'for', 'frm_page_dropdown' );
Expand All @@ -189,7 +189,7 @@
doneButton = modal.querySelector( '.frm_modal_footer .button-primary' );
doneButton.classList.remove( 'dismiss' );
/* translators: %s: type (ie. view, form). */
doneButton.textContent = __( 'Insert %s', 'formidable' ).replace( '%s', typeDescription );
doneButton.textContent = sprintf( __( 'Insert %s', 'formidable' ), typeDescription );
doneButton.addEventListener( 'click', redirectToExistingPageWithInjectedShortcode );

const dropdownWrapper = div();
Expand Down Expand Up @@ -448,7 +448,7 @@
icon.setAttribute( 'tabindex', 0 );
icon.setAttribute( 'role', 'button' );
/* translators: %s: Example type (ie. WordPress shortcode, API Form script) */
icon.setAttribute( 'aria-label', __( 'Copy %s', 'formidable' ).replace( '%s', label ) );
icon.setAttribute( 'aria-label', sprintf( __( 'Copy %s', 'formidable' ), label ) );
icon.addEventListener(
'click',
() => copyExampleToClipboard( icon.parentNode.querySelector( '.frm_embed_example' ) )
Expand Down
8 changes: 4 additions & 4 deletions js/admin/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
return;
}

const { __ } = wp.i18n;
const { __, sprintf } = wp.i18n;
const state = {
showingSampleForm: document.getElementById( 'frm_active_style_form' ).classList.contains( 'frm_hidden' ), // boolean
unsavedChanges: false, // boolean
Expand Down Expand Up @@ -152,7 +152,8 @@
card => card.classList.add( 'frm_hidden' )
);
const hiddenCount = wrapper.querySelectorAll( '.frm-style-card.frm_hidden' ).length;
showAllAnchor.textContent = __( 'Show all (%d)', 'formidable' ).replace( '%d', hiddenCount );
/* translators: %d: The number of hidden items to show. */
showAllAnchor.textContent = sprintf( __( 'Show all (%d)', 'formidable' ), hiddenCount );
}
);
}
Expand Down Expand Up @@ -425,8 +426,7 @@
children: [
span(
/* translators: %s: The required license type (ie. Plus, Business, or Elite) */
__( 'Access to this style requires the %s plan.', 'formidable' )
.replace( '%s', card.dataset.requires )
sprintf( __( 'Access to this style requires the %s plan.', 'formidable' ), card.dataset.requires )
),
a({
text: getUpgradeNowText(),
Expand Down
9 changes: 5 additions & 4 deletions js/formidable_admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ function frmAdminBuildJS() {
if ( isFieldGroup( draggable ) ) {
const newTextFieldClone = document.getElementById( 'frm-insert-fields' ).querySelector( '.frm_ttext' ).cloneNode( true );
newTextFieldClone.querySelector( 'use' ).setAttributeNS( 'http://www.w3.org/1999/xlink', 'href', '#frm_field_group_layout_icon' );
newTextFieldClone.querySelector( 'span' ).textContent = __( 'Field Group' );
newTextFieldClone.querySelector( 'span' ).textContent = __( 'Field Group', 'formidable' );
Comment thread
Crabcyborg marked this conversation as resolved.
newTextFieldClone.classList.add( 'frm_field_box' );
newTextFieldClone.classList.add( 'ui-sortable-helper' );
return newTextFieldClone;
Expand Down Expand Up @@ -3640,7 +3640,7 @@ function frmAdminBuildJS() {

function confirmFieldsDeleteMessage( numberOfFields ) {
/* translators: %1$s: Number of fields that are selected to be deleted. */
return __( 'Are you sure you want to delete these %1$s selected field(s)?', 'formidable' ).replace( '%1$s', numberOfFields );
return sprintf( __( 'Are you sure you want to delete these %1$s selected field(s)?', 'formidable' ), numberOfFields );
}

function clickDeleteField() {
Expand Down Expand Up @@ -6110,7 +6110,8 @@ function frmAdminBuildJS() {
);

if ( conflicts.length ) {
infoModal( __( 'Duplicate option value "%s" detected', 'formidable' ).replace( '%s', purifyHtml( targetInput.value ) ) );
/* translators: %s: The detected option value. */
infoModal( sprintf( __( 'Duplicate option value "%s" detected', 'formidable' ), purifyHtml( targetInput.value ) ) );
}
}

Expand Down Expand Up @@ -6851,7 +6852,7 @@ function frmAdminBuildJS() {
h2.style.borderBottom = 'none';

/* translators: %s: Form Setting section name (ie Form Permissions, Form Scheduling). */
h2.textContent = __( '%s are not installed', 'formidable' ).replace( '%s', title );
h2.textContent = sprintf( __( '%s are not installed', 'formidable' ), title );

container.classList.add( 'frmcenter' );

Expand Down
2 changes: 1 addition & 1 deletion stripe/helpers/FrmTransLiteListHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public function get_views() {

if ( $counts[ $status ] || 'published' === $status ) {
$links[ $status ] = '<a href="' . esc_url( '?page=formidable-payments&trans_type=' . $status ) . '" ' . $class . '>'
// translators: %1$s: Transaction type (Payments or Subscriptions), %2$s: Span start tag, %3$s: Count, %3$s: Span close tag.
// translators: %1$s: Transaction type (Payments or Subscriptions), %2$s: Span start tag, %3$s: Count, %4$s: Span close tag.
. sprintf( esc_html__( '%1$s %2$s(%3$s)%4$s', 'formidable' ), esc_html( $name ), '<span class="count">', number_format_i18n( $counts[ $status ] ), '</span>' )
. '</a>';
}
Expand Down