Skip to content

Commit

Permalink
Merge pull request #143 from akirk/fix-typos
Browse files Browse the repository at this point in the history 
Fix some typos on the Welcome Screen
  • Loading branch information
@akirk
akirk authored Jun 6, 2024
2 parents 8dc6256 + 1b9478b commit 2397ace
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 18 deletions.
Binary file modified assets/screenshot-1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/screenshot-2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/screenshot-3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion bin/release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@ git push origin $ENABLE_MASTODON_APPS_VERSION
echo -n '❯ svn ci -m "enable-mastodon-apps '$ENABLE_MASTODON_APPS_VERSION'" && svn cp https://plugins.svn.wordpress.org/enable-mastodon-apps/trunk https://plugins.svn.wordpress.org/enable-mastodon-apps/tags/'$ENABLE_MASTODON_APPS_VERSION' -m "Release '$ENABLE_MASTODON_APPS_VERSION'"'
read
svn ci -m "enable-mastodon-apps $ENABLE_MASTODON_APPS_VERSION" && svn cp https://plugins.svn.wordpress.org/enable-mastodon-apps/trunk https://plugins.svn.wordpress.org/enable-mastodon-apps/tags/$ENABLE_MASTODON_APPS_VERSION -m "Release $ENABLE_MASTODON_APPS_VERSION"
echo -n '❯ gh release create $ENABLE_MASTODON_APPS_VERSION --generate-notes'
echo -n '❯ gh release create '$ENABLE_MASTODON_APPS_VERSION' --generate-notes'
read
gh release create $ENABLE_MASTODON_APPS_VERSION --generate-notes
5 changes: 3 additions & 2 deletions includes/class-mastodon-oauth.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,11 @@ public function handle_oauth( $return_value = false ) {

public function get_token() {
$request = Request::createFromGlobals();
if ( ! $this->server->verifyResourceRequest( $request ) ) {
$response = new Response();
if ( ! $this->server->verifyResourceRequest( $request, $response ) ) {
return null;
}
return $this->server->getAccessTokenData( $request );
return $this->server->getAccessTokenData( $request, $response );
}

public function authenticate( $user_id ) {
Expand Down
32 changes: 17 additions & 15 deletions templates/welcome.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<div class="box">
<h2><?php esc_html_e( 'Welcome', 'enable-mastodon-apps' ); ?></h2>
<p>
<?php esc_html_e( 'This plugin enables you to access your WordPress with Mastodon clients.', 'enable-mastodon-apps' ); ?>
<span><?php esc_html_e( 'This plugin enables you to access your WordPress with Mastodon clients.', 'enable-mastodon-apps' ); ?></span>
<span>
<?php
echo wp_kses(
sprintf(
Expand All @@ -29,16 +30,17 @@
)
);
?>
<?php esc_html_e( 'Make sure you scroll down to the "Browse third-party apps" section for more choice.', 'enable-mastodon-apps' ); ?>
</span>
<span><?php esc_html_e( 'Make sure you scroll down to the "Browse third-party apps" section for more choice.', 'enable-mastodon-apps' ); ?></span>
</p>
<p>
<?php esc_html_e( 'When you first start a Mastodon app, it will ask you for your instance URL:', 'enable-mastodon-apps' ); ?>
</p>
<input type="text" class="regular-text copyable" id="enable-mastodon-apps-instance" value="<?php echo esc_attr( $args['instance_url'] ); ?>" readonly="readonly">
<p>
<?php esc_html_e( 'The Mastodon app will then redirect you to the login page of your own WordPress site.', 'enable-mastodon-apps' ); ?>
<?php esc_html_e( 'Double-check the URL of the login form so that you don\'t enter your details on another site.', 'enable-mastodon-apps' ); ?>
<?php esc_html_e( 'You\'ll need to log in there and then authorize the app.', 'enable-mastodon-apps' ); ?>
<span><?php esc_html_e( 'The Mastodon app will then redirect you to the login page of your own WordPress site.', 'enable-mastodon-apps' ); ?></span>
<span><?php esc_html_e( 'Double-check the URL of the login form so that you don\'t enter your details on another site.', 'enable-mastodon-apps' ); ?></span>
<span><?php esc_html_e( 'You\'ll need to log in there and then authorize the app.', 'enable-mastodon-apps' ); ?></span>
</p>
<p>
<?php esc_html_e( 'Depending on the plugins you use (see below), you\'ll then see posts in the timeline and can start interacting with them.', 'enable-mastodon-apps' ); ?>
Expand All @@ -65,13 +67,13 @@
<div class="box plugin-recommendations">
<h2><?php esc_html_e( 'Recommended Plugins', 'enable-mastodon-apps' ); ?></h2>
<p>
<?php esc_html_e( 'The Enable Mastodon Apps plugin works well on its own: it allows you to publish posts and show your all blog posts in the apps\' timelines.', 'enable-mastodon-apps' ); ?>
<?php esc_html_e( 'This can already be very useful on a blog where multiple people interact.', 'enable-mastodon-apps' ); ?>
<span><?php esc_html_e( 'The Enable Mastodon Apps plugin works well on its own: it allows you to publish posts and show your all blog posts in the apps\' timelines.', 'enable-mastodon-apps' ); ?></span>
<span><?php esc_html_e( 'This can already be very useful on a blog where multiple people interact.', 'enable-mastodon-apps' ); ?></span>
</p>

<p>
<?php esc_html_e( 'That said, it was designed so that it can be meaningfully extended by other plugins.', 'enable-mastodon-apps' ); ?>
<?php esc_html_e( 'In particular this is the case for the following plugins:', 'enable-mastodon-apps' ); ?>
<span><?php esc_html_e( 'That said, it was designed so that it can be meaningfully extended by other plugins.', 'enable-mastodon-apps' ); ?></span>
<span><?php esc_html_e( 'In particular this is the case for the following plugins:', 'enable-mastodon-apps' ); ?></span>
</p>
</div>
<div class="enable-mastodon-apps-settings-accordion">
Expand All @@ -88,13 +90,13 @@
</h4>
<div id="enable-mastodon-apps-settings-accordion-block-activitypub-plugin" class="enable-mastodon-apps-settings-accordion-panel plugin-card-activitypub" hidden="hidden">
<p>
<?php \esc_html_e( 'The Activitypub plugin allows you interact with the Fediverse, for example Mastodon.', 'enable-mastodon-apps' ); ?>
<?php \esc_html_e( 'With this plugin installed, for example, you can search for Mastodon users and view their posts.', 'enable-mastodon-apps' ); ?>
<span><?php \esc_html_e( 'The Activitypub plugin allows you interact with the Fediverse, for example Mastodon.', 'enable-mastodon-apps' ); ?></span>
<span><?php \esc_html_e( 'With this plugin installed, for example, you can search for Mastodon users and view their posts.', 'enable-mastodon-apps' ); ?></span>
</p>
<?php if ( defined( 'ACTIVITYPUB_PLUGIN_VERSION' ) ) : ?>
<p><strong><?php \esc_html_e( 'The Activitypub plugin is installed.', 'enable-mastodon-apps' ); ?></strong></p>
<?php else : ?>
<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=activitypub&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the Friends Plugin', 'enable-mastodon-apps' ); ?></a></p>
<p><a href="<?php echo \esc_url_raw( \admin_url( 'plugin-install.php?tab=plugin-information&plugin=activitypub&TB_iframe=true' ) ); ?>" class="thickbox open-plugin-details-modal button install-now" target="_blank"><?php \esc_html_e( 'Install the Activitypub Plugin', 'enable-mastodon-apps' ); ?></a></p>
<?php endif; ?>
</div>

Expand All @@ -111,9 +113,9 @@
</h4>
<div id="enable-mastodon-apps-settings-accordion-block-friends-plugin" class="enable-mastodon-apps-settings-accordion-panel plugin-card-friends" hidden="hidden">
<p>
<?php \esc_html_e( 'The Friends plugin allows you to follow others from within your own WordPress.', 'enable-mastodon-apps' ); ?>
<?php \esc_html_e( 'This will give you a feed of your friends\' posts which will also be displayed in the Enable Mastodon Apps plugin.', 'enable-mastodon-apps' ); ?>
<?php \esc_html_e( 'Combined with ActivityPub plugin you can also follow and interact with people over the ActivityPub protocol, for example on Mastodon.', 'enable-mastodon-apps' ); ?>
<span><?php \esc_html_e( 'The Friends plugin allows you to follow others from within your own WordPress.', 'enable-mastodon-apps' ); ?></span>
<span><?php \esc_html_e( 'This will give you a feed of your friends\' posts which will also be displayed in the Enable Mastodon Apps plugin.', 'enable-mastodon-apps' ); ?></span>
<span><?php \esc_html_e( 'Combined with ActivityPub plugin you can also follow and interact with people over the ActivityPub protocol, for example on Mastodon.', 'enable-mastodon-apps' ); ?></span>
</p>
<?php if ( defined( 'FRIENDS_VERSION' ) ) : ?>
<p><strong><?php \esc_html_e( 'The Friends plugin is installed.', 'enable-mastodon-apps' ); ?></strong></p>
Expand Down

0 comments on commit 2397ace

Please sign in to comment.