Skip to content

fix: resolve NonSingularStringLiteral errors #302

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

Open
masteradhoc wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −9
Open

fix: resolve NonSingularStringLiteral errors #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/Admin/Settings/API.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ private function show_wizard() {
$i = 0;
?>
<?php foreach ( $this->slides as $id => $title ): ?>
<div id="<?php esc_attr_e( $id, 'plausible-analytics' ); ?>_slide" class="plausible-analytics-group bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 sm:rounded-md sm:overflow-hidden bg-white dark:bg-gray-800
<div id="<?php echo esc_attr( $id ); ?>_slide" class="plausible-analytics-group bg-white dark:bg-gray-800 shadow-md rounded px-8 py-6 sm:rounded-md sm:overflow-hidden bg-white dark:bg-gray-800
space-y-6 invisible target:opacity-100 target:visible transition-opacity absolute md:min-w-full sm:max-w-full">
<header class="relative">
<label class="text-lg leading-6 font-medium text-gray-900 dark:text-gray-100"
Expand Down Expand Up @@ -246,7 +246,7 @@ private function show_wizard() {
$disabled = true;
}
} ?>
<a href="#<?php esc_attr_e( $slide_ids[ $i ], 'plausible-analytics' ); ?>_slide"
<a href="#<?php echo esc_attr( $slide_ids[ $i ] ); ?>_slide"
class="plausible-analytics-wizard-next-step no-underline gap-x-2 inline-flex relative inset-0
rounded-md <?php echo $disabled ? 'bg-gray-200 pointer-events-none' : 'bg-indigo-600'; ?> px-3.5 py-2.5 text-sm
font-semibold text-white shadow-sm hover:bg-indigo-700 hover:text-white focus-visible:outline
Expand Down Expand Up @@ -290,7 +290,7 @@ class="hover:cursor-pointer no-underline gap-x-2 rounded-md bg-indigo-600 px-3.5
?>
<?php foreach ( $this->slides as $id => $title ): ?>
<!-- Upcoming step -->
<li id="step-<?php esc_attr_e( $id, 'plausible-analytics' ); ?>"
<li id="step-<?php echo esc_attr( $id ); ?>"
class="plausible-analytics-wizard-step flex hidden items-start mb-6">
<div
class="flex-shrink-0 h-5 w-5 relative flex items-center justify-center">
Expand All @@ -305,9 +305,9 @@ class="flex-shrink-0 h-5 w-5 relative flex items-center justify-center">
?>
</li>
<!-- Active Step -->
<li id="active-step-<?php esc_attr_e( $id, 'plausible-analytics' ); ?>"
<li id="active-step-<?php echo esc_attr( $id ); ?>"
class="plausible-analytics-wizard-active-step flex hidden items-start mb-6"
data-completed-steps="<?php esc_attr_e( implode( ',', $completed_steps ), 'plausible-analytics' ); ?>">
data-completed-steps="<?php echo esc_attr( implode( ',', $completed_steps ) ); ?>">
<!-- Hidden -->
<span
class="flex-shrink-0 h-5 w-5 relative flex items-center justify-center">
Expand All @@ -325,7 +325,7 @@ class="relative block w-2 h-2 bg-indigo-600 dark:bg-indigo-500 rounded-full"></s
?>
</li>
<!-- Completed Step -->
<li id="completed-step-<?php esc_attr_e( $id, 'plausible-analytics' ); ?>"
<li id="completed-step-<?php echo esc_attr( $id ); ?>"
class="plausible-analytics-wizard-completed-step flex hidden items-start mb-6">
<span
class="flex-shrink-0 relative h-5 w-5 flex items-center justify-center">
Expand Down Expand Up @@ -743,15 +743,15 @@ public function render_button_field( array $field ) {
<button
class="plausible-analytics-button mt-4 border-0 hover:cursor-pointer inline-flex items-center justify-center !gap-x-2 rounded-md bg-indigo-600 px-3.5 py-2.5 text-sm font-semibold
text-white shadow-sm hover:bg-indigo-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 disabled:bg-gray-400 dark:disabled:bg-gray-800 ease-in-out transition-all"
id="<?php esc_attr_e( $field['slug'], 'plausible-analytics' ); ?>"
id="<?php echo esc_attr( $field['slug'] ); ?>"
type="submit" <?php echo $disabled ? 'disabled' : ''; ?>>
<svg class="animate-spin -ml-1 mr-3 h-5 w-5 text-white hidden" xmlns="http://www.w3.org/2000/svg"
fill="none" viewBox="0 0 24 24">
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
<path class="opacity-75" fill="currentColor"
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
<?php esc_html_e( $field['label'], 'plausible-analytics' ); ?>
<?php echo esc_html( $field['label'] ); ?>
</button>
<?php
return ob_get_clean();
Expand Down
2 changes: 1 addition & 1 deletion src/InitOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public function maybe_track_logged_in_users( $options = [] ) {
return $options; // @codeCoverageIgnore
}

$logged_in = _x( 'no', __( 'Value when user is not logged in.', 'plausible-analytics' ), 'plausible-analytics' );
$logged_in = _x( 'no', 'Value when user is not logged in.', 'plausible-analytics' );

if ( is_user_logged_in() ) {
$user = wp_get_current_user();
Expand Down
Loading