Merge pull request #4339 from Codeinwp/fix/translations

Strings Review
Codeinwp · Dec 18, 2024 · e4c9da9 · e4c9da9
2 parents 2d25f30 + a964e9a
commit e4c9da9
Show file tree

Hide file tree

Showing 12 changed files with 204 additions and 184 deletions.
diff --git a/assets/apps/customizer-controls/src/controls.js b/assets/apps/customizer-controls/src/controls.js
@@ -1,6 +1,7 @@
 /* global CustomEvent, NeveReactCustomize, MutationObserver */
 import './public-path.js';
 import { render } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
 
 import { init as initDynamicFields } from './dynamic-fields/index';
 import { ToggleControl } from './toggle/Control';
@@ -297,8 +298,10 @@ const checkHasElementorTemplates = () => {
 					'neve-custom-elementor-shop-template',
 					{
 						type: 'warning',
-						message:
+						message: __(
 							'Some of the settings might not work as expected because you are using a custom shop template made in Elementor.',
+							'neve'
+						),
 					}
 				)
 			);
@@ -312,8 +315,10 @@ const checkHasElementorTemplates = () => {
 					'neve-custom-elementor-product-template',
 					{
 						type: 'warning',
-						message:
+						message: __(
 							'Some of the settings might not work as expected because you are using a custom product template made in Elementor.',
+							'neve'
+						),
 					}
 				)
 			);

diff --git a/assets/apps/customizer-controls/src/customizer-search/SearchResults.tsx b/assets/apps/customizer-controls/src/customizer-search/SearchResults.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Control } from './SearchComponent';
 import classnames from 'classnames';
+import { __ } from '@wordpress/i18n';
 
 /**
  * Type SearchComponentProps
@@ -84,7 +85,9 @@ const SearchResults: React.FC<SearchResultsProps> = ({
 			{query !== '' && (
 				<ul id="customizer-search-results">
 					{matchResults.map((control) => {
-						if ('' === control.label) return '';
+						if ('' === control.label) {
+							return '';
+						}
 
 						let breadcrumbs = control.panelName;
 						if (breadcrumbs === null) {
@@ -118,8 +121,10 @@ const SearchResults: React.FC<SearchResultsProps> = ({
 								>
 									{getHighlightedText(label, query)}
 									<span className="screen-reader-text">
-										Press return or enter to open this
-										section
+										{__(
+											'Press return or enter to open this section',
+											'neve'
+										)}
 									</span>
 								</h3>
 								<span className="search-setting-path">

diff --git a/assets/apps/customizer-controls/src/typography-font-pair/FontPairSelector.tsx b/assets/apps/customizer-controls/src/typography-font-pair/FontPairSelector.tsx
@@ -188,13 +188,13 @@ const FontPairSelector: React.FC<Props> = ({
 										className="neve-font-preview"
 										style={headingStyle}
 									>
-										The big brown fox
+										{__('The big brown fox', 'neve')}
 									</span>
 									<span
 										className="neve-font-preview"
 										style={bodyStyle}
 									>
-										Jumps over the lazy dog
+										{__('Jumps over the lazy dog', 'neve')}
 									</span>
 								</button>
 							</Tooltip>

diff --git a/assets/apps/dashboard/src/Components/Content/Changelog.js b/assets/apps/dashboard/src/Components/Content/Changelog.js
@@ -21,7 +21,7 @@ const Changelog = () => {
 							setShowForPro(false);
 						}}
 					>
-						Neve
+						{__('Neve', 'neve')}
 					</a>
 					<a
 						href="#show-for-pro"
@@ -30,7 +30,7 @@ const Changelog = () => {
 							setShowForPro(true);
 						}}
 					>
-						Neve Pro
+						{__('Neve Pro', 'neve')}
 					</a>
 				</div>
 			)}

diff --git a/assets/apps/dashboard/src/Components/FeatureRow.js b/assets/apps/dashboard/src/Components/FeatureRow.js
@@ -97,11 +97,12 @@ const FeatureRow = ({ item }) => {
 												),
 												{
 													external_link: (
-														<ExternalLink
+														<a
 															href={docsLink}
+															target="external noreferrer noopener"
 														>
 															#dumptext
-														</ExternalLink>
+														</a>
 													),
 												}
 											)}

diff --git a/assets/apps/dashboard/src/Components/Notification.js b/assets/apps/dashboard/src/Components/Notification.js
@@ -143,9 +143,14 @@ const Notification = ({ data, slug }) => {
 	const wrappedButtonContent = !canInstallPlugins ? (
 		<Tooltip
 			text={sprintf(
-				// translators: %s: Plugin and theme names.
+				// translators: %s: the plugin and theme to update (label: 'Neve and Neve Pro').
 				__('Ask your admin to update %s on your site', 'neve'),
-				'Neve and Neve Pro'
+				sprintf(
+					// translators: %1$s: theme name (Neve), %2$s: plugin name (Neve Pro).
+					__('%1$s and %2$s', 'neve'),
+					__('Neve', 'neve'),
+					__('Neve Pro', 'neve')
+				)
 			)}
 			position="top center"
 			style={{
@@ -173,7 +178,7 @@ const Notification = ({ data, slug }) => {
 						<Dashicon icon="no" />
 						{errorMessage ||
 							__(
-								'An error occured. Please reload the page and try again.',
+								'An error occurred. Please reload the page and try again.',
 								'neve'
 							)}
 					</p>

diff --git a/header-footer-grid/Core/Builder/Abstract_Builder.php b/header-footer-grid/Core/Builder/Abstract_Builder.php
@@ -167,10 +167,7 @@ abstract class Abstract_Builder implements Builder {
 	 * @access  protected
 	 * @var array $devices
 	 */
-	protected $devices = [
-		'desktop' => 'Desktop',
-		'mobile'  => 'Mobile',
-	];
+	protected $devices = [];
 
 	/**
 	 * Default colors for rows.
@@ -243,6 +240,11 @@ public function __construct() {
 
 		add_filter( 'hfg_header_row_classes', [ $this, 'add_header_row_utility_classes' ], 10, 2 );
 		add_filter( 'hfg_page_header_row_classes', [ $this, 'add_header_row_utility_classes' ], 10, 2 );
+
+		$this->devices = [
+			'desktop' => __( 'Desktop', 'neve' ),
+			'mobile'  => __( 'Mobile', 'neve' ),
+		];
 	}
 
 	/**

diff --git a/header-footer-grid/Core/Builder/Header.php b/header-footer-grid/Core/Builder/Header.php
@@ -498,37 +498,37 @@ protected function get_rows() {
 	private function get_header_presets() {
 		$presets = [
 			[
-				'label' => 'Classic',
+				'label' => __( 'Classic', 'neve' ),
 				'image' => NEVE_ASSETS_URL . 'img/header-presets/Classic.jpg',
 				'setup' => '{"hfg_header_layout_v2":"{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"primary-menu\"},{\"id\":\"header_search_responsive\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"nav-icon\"},{\"id\":\"header_search_responsive\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"}]}}"}',
 			],
 			[
-				'label' => 'Inverted',
-				'image' => NEVE_ASSETS_URL . 'img/header-presets/Inverted.jpg',
+				'label' => __( 'Inverted', 'neve' ),
+				'image' => NEVE_ASSETS_URL . 'img/header-presets/Inverted.jpg', 
 				'setup' => '{"hfg_header_layout_v2":"{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"primary-menu\"},{\"id\":\"header_search_responsive\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"logo\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"nav-icon\"},{\"id\":\"header_search_responsive\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"logo\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"}]}}","logo_component_align":{"mobile":"right","tablet":"right","desktop":"right"}}',
 			],
 			[
-				'label' => 'Centered',
+				'label' => __( 'Centered', 'neve' ),
 				'image' => NEVE_ASSETS_URL . 'img/header-presets/Centered.jpg',
 				'setup' => '{"hfg_header_layout_v2":"{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[],\"c-left\":[],\"center\":[{\"id\":\"logo\"}],\"c-right\":[],\"right\":[]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[{\"id\":\"primary-menu\"}],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[],\"c-left\":[],\"center\":[{\"id\":\"logo\"}],\"c-right\":[],\"right\":[]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[{\"id\":\"nav-icon\"}],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"}]}}","logo_component_align":{"mobile":"center","tablet":"center","desktop":"center"}}',
 			],
 			[
-				'label' => 'Spaced',
+				'label' => __( 'Spaced', 'neve' ),
 				'image' => NEVE_ASSETS_URL . 'img/header-presets/Spaced.jpg',
 				'setup' => '{"hfg_header_layout_v2":"{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"header_search_responsive\"}],\"c-left\":[],\"center\":[{\"id\":\"logo\"}],\"c-right\":[],\"right\":[{\"id\":\"nav-icon\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"header_search_responsive\"}],\"c-left\":[],\"center\":[{\"id\":\"logo\"}],\"c-right\":[],\"right\":[{\"id\":\"nav-icon\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"}]}}","logo_component_align":{"mobile":"center","tablet":"center","desktop":"center"}}',
 			],
 			[
-				'label' => 'Collapsed',
+				'label' => __( 'Collapsed', 'neve' ),
 				'image' => NEVE_ASSETS_URL . 'img/header-presets/ClassicCollapsed.jpg',
 				'setup' => '{"hfg_header_layout_v2":"{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"header_search_responsive\"},{\"id\":\"nav-icon\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"header_search_responsive\"},{\"id\":\"nav-icon\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"}]}}"}',
 			],
 			[
-				'label' => 'Search Field',
+				'label' => __( 'Search Field', 'neve' ),
 				'image' => NEVE_ASSETS_URL . 'img/header-presets/SearchField.jpg',
 				'setup' => '{"hfg_header_layout_v2":"{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"},{\"id\":\"primary-menu\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"header_search\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"},{\"id\":\"nav-icon\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"header_search_responsive\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"}]}}"}',
 			],
 			[
-				'label' => 'Button Item',
+				'label' => __( 'Button Item', 'neve' ),
 				'image' => NEVE_ASSETS_URL . 'img/header-presets/ButtonItem.jpg',
 				'setup' => '{"hfg_header_layout_v2":"{\"desktop\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"primary-menu\"},{\"id\":\"button_base\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]}},\"mobile\":{\"top\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"main\":{\"left\":[{\"id\":\"logo\"}],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[{\"id\":\"nav-icon\"}]},\"bottom\":{\"left\":[],\"c-left\":[],\"center\":[],\"c-right\":[],\"right\":[]},\"sidebar\":[{\"id\":\"primary-menu\"},{\"id\":\"button_base\"}]}}"}',
 			],

diff --git a/header-footer-grid/Core/Components/MenuIcon.php b/header-footer-grid/Core/Components/MenuIcon.php
@@ -544,13 +544,13 @@ public function add_settings() {
 				'default'               => 'default',
 				'options'               => [
 					'options' => [
-						'default' => 'Default',
-						'arrow'   => 'Arrow',
-						'donner'  => 'Donner',
-						'dots'    => 'Dots',
-						'minus'   => 'Minus',
-						'vortex'  => 'Vortex',
-						'squeeze' => 'Squeeze',
+						'default' => __( 'Default', 'neve' ),
+						'arrow'   => __( 'Arrow', 'neve' ),
+						'donner'  => __( 'Donner', 'neve' ),
+						'dots'    => __( 'Dots', 'neve' ),
+						'minus'   => __( 'Minus', 'neve' ),
+						'vortex'  => __( 'Vortex', 'neve' ),
+						'squeeze' => __( 'Squeeze', 'neve' ),
 					],
 					'default' => 'default',
 				],

diff --git a/header-footer-grid/templates/components/component-footer-sidebar.php b/header-footer-grid/templates/components/component-footer-sidebar.php
@@ -30,7 +30,6 @@
 						/* translators: %s - customizer link */
 						__( 'Replace this widget content by going to %s and add widgets into this widget area.', 'neve' ), //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 						sprintf(
-							/* translators: %1$s - link %2$s - name %3$s - label */
 							'<a href="%1$s"><strong>%2$s  %3$s</strong></a>',
 							esc_url( admin_url( 'customize.php?autofocus[section]=sidebar-widgets-footer-' . $_id ) ),
 							/* translators: %1$s - &rarr; symbol %2$s - &rarr; symbol %3$s - &rarr; symbol */