Skip to content

Commit c22cb9c

Browse files
lloclloc
authored
Merge pull request #335 from lloc/refactoring-version-2-8
esc_html__ instead of __
2 parents b3f5099 + 92797d2 commit c22cb9c

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎includes/MslsAdmin.php

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,10 @@ public function __call( $method, $args ) {
115115
);
116116

117117
if ( isset( $checkboxes[ $method ] ) ) {
118-
echo ( new Group() )->add( new Checkbox( $method, $this->options->$method ) )->add(
119-
new Label(
120-
$method,
121-
$checkboxes[ $method ]
122-
)
123-
)->render();
118+
echo ( new Group() )
119+
->add( new Checkbox( $method, $this->options->$method ) )
120+
->add( new Label( $method, $checkboxes[ $method ] ) )
121+
->render();
124122
} else {
125123
$value = ! empty( $this->options->$method ) ? $this->options->$method : '';
126124
echo ( new Text( $method, $value ) )->render();
@@ -145,7 +143,7 @@ public function has_problems(): bool {
145143
} elseif ( 1 == count( $this->options->get_available_languages() ) ) {
146144
/* translators: %1$s: URL to a page at WordPress.orgs */
147145
$format = __(
148-
'TNo language files are currently installed. Learn how to install various languages in WordPress by <a href="%1$s">reading more here</a>.',
146+
'No language files are currently installed. Learn how to install various languages in WordPress by <a href="%1$s">reading more here</a>.',
149147
'multisite-language-switcher'
150148
);
151149
$message = sprintf(
@@ -261,18 +259,18 @@ public function language_section(): int {
261259
*/
262260
public function main_section(): int {
263261
$map = array(
264-
'display' => __( 'Display', 'multisite-language-switcher' ),
265-
'admin_display' => __( 'Admin Display', 'multisite-language-switcher' ),
266-
'sort_by_description' => __( 'Sort languages', 'multisite-language-switcher' ),
267-
'output_current_blog' => __( 'Current language link', 'multisite-language-switcher' ),
268-
'only_with_translation' => __( 'Translation links', 'multisite-language-switcher' ),
269-
'description' => __( 'Description', 'multisite-language-switcher' ),
270-
'before_output' => __( 'Text/HTML before the list', 'multisite-language-switcher' ),
271-
'after_output' => __( 'Text/HTML after the list', 'multisite-language-switcher' ),
272-
'before_item' => __( 'Text/HTML before each item', 'multisite-language-switcher' ),
273-
'after_item' => __( 'Text/HTML after each item', 'multisite-language-switcher' ),
274-
'content_filter' => __( 'Available translations hint', 'multisite-language-switcher' ),
275-
'content_priority' => __( 'Hint priority', 'multisite-language-switcher' ),
262+
'display' => esc_html__( 'Display', 'multisite-language-switcher' ),
263+
'admin_display' => esc_html__( 'Admin Display', 'multisite-language-switcher' ),
264+
'sort_by_description' => esc_html__( 'Sort languages', 'multisite-language-switcher' ),
265+
'output_current_blog' => esc_html__( 'Current language link', 'multisite-language-switcher' ),
266+
'only_with_translation' => esc_html__( 'Translation links', 'multisite-language-switcher' ),
267+
'description' => esc_html__( 'Description', 'multisite-language-switcher' ),
268+
'before_output' => esc_html__( 'Text/HTML before the list', 'multisite-language-switcher' ),
269+
'after_output' => esc_html__( 'Text/HTML after the list', 'multisite-language-switcher' ),
270+
'before_item' => esc_html__( 'Text/HTML before each item', 'multisite-language-switcher' ),
271+
'after_item' => esc_html__( 'Text/HTML after each item', 'multisite-language-switcher' ),
272+
'content_filter' => esc_html__( 'Available translations hint', 'multisite-language-switcher' ),
273+
'content_priority' => esc_html__( 'Hint priority', 'multisite-language-switcher' ),
276274
);
277275

278276
return $this->add_settings_fields( $map, 'main_section' );
@@ -287,11 +285,11 @@ public function main_section(): int {
287285
*/
288286
public function advanced_section(): int {
289287
$map = array(
290-
'activate_autocomplete' => __( 'Autocomplete', 'multisite-language-switcher' ),
291-
'image_url' => __( 'Custom URL for flag-images', 'multisite-language-switcher' ),
292-
'reference_user' => __( 'Reference user', 'multisite-language-switcher' ),
293-
'exclude_current_blog' => __( 'Exclude blog', 'multisite-language-switcher' ),
294-
'activate_content_import' => __( 'Content import', 'multisite-language-switcher' ),
288+
'activate_autocomplete' => esc_html__( 'Autocomplete', 'multisite-language-switcher' ),
289+
'image_url' => esc_html__( 'Custom URL for flag-images', 'multisite-language-switcher' ),
290+
'reference_user' => esc_html__( 'Reference user', 'multisite-language-switcher' ),
291+
'exclude_current_blog' => esc_html__( 'Exclude blog', 'multisite-language-switcher' ),
292+
'activate_content_import' => esc_html__( 'Content import', 'multisite-language-switcher' ),
295293
);
296294

297295
return $this->add_settings_fields( $map, 'advanced_section' );

‎includes/MslsAdminIcon.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -231,24 +231,24 @@ public function get_icon(): string {
231231

232232
switch ( $this->icon_type ) {
233233
case self::TYPE_FLAG:
234-
$icon = sprintf(
234+
$class = ( new IconSvg() )->get( $this->language );
235+
$icon = sprintf(
235236
'<span class="flag-icon %s">%s</span>',
236-
( new IconSvg() )->get( $this->language ),
237-
$this->language
237+
esc_attr( $class ),
238+
esc_html( $this->language )
238239
);
239240
break;
240241
case self::TYPE_LABEL:
242+
$text = ( new IconLabel() )->get( $this->language );
241243
$icon = sprintf(
242244
'<span class="language-badge %s">%s</span>',
243-
$this->language,
244-
( new IconLabel() )->get( $this->language )
245+
esc_attr( $this->language ),
246+
esc_html( $text )
245247
);
246248
break;
247249
default:
248-
$icon = sprintf(
249-
'<span class="dashicons %s"></span>',
250-
empty( $this->href ) ? 'dashicons-plus' : 'dashicons-edit'
251-
);
250+
$class = empty( $this->href ) ? 'dashicons-plus' : 'dashicons-edit';
251+
$icon = sprintf( '<span class="dashicons %s"></span>', esc_attr( $class ) );
252252
}
253253

254254
return $icon;

‎tests/phpunit/TestMslsAdmin.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,15 +368,17 @@ function test_language_section(): void {
368368
function test_main_section(): void {
369369
$obj = $this->get_sut();
370370

371-
Functions\when( 'add_settings_field' )->returnArg();
371+
Functions\expect( 'add_settings_field' )->times( 12 )->andReturnFirstArg();
372+
Functions\expect( 'esc_html__' )->times( 12 )->andReturnFirstArg();
372373

373374
$this->assertEquals( 12, $obj->main_section() );
374375
}
375376

376377
function test_advanced_section(): void {
377378
$obj = $this->get_sut();
378379

379-
Functions\when( 'add_settings_field' )->returnArg();
380+
Functions\expect( 'add_settings_field' )->times( 5 )->andReturnFirstArg();
381+
Functions\expect( 'esc_html__' )->times( 5 )->andReturnFirstArg();
380382

381383
$this->assertEquals( 5, $obj->advanced_section() );
382384
}

0 commit comments

Comments
 (0)