Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:plausible/wordpress into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan0sz committed Jul 29, 2024
2 parents 6f1f1b0 + 03a1640 commit c638e64
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion languages/plausible-analytics.pot
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ msgid "Please check that your proxy is functioning correctly. If you encounter a
msgstr ""

#: src/Admin/Module.php:213
msgid "Plausible's proxy couldn't be enabled, because the WordPress API is inaccessable. This might be due to a conflicting setting in a (security) plugin or server firewall. Make sure you whitelist requests to the Proxy's endpoint: <code>%1$s</code>. <a href=\"%2$s\" target=\"_blank\">Contact support</a> if you need help locating the issue."
msgid "Plausible's proxy couldn't be enabled, because the WordPress API is inaccessible. This might be due to a conflicting setting in a (security) plugin or server firewall. Make sure you whitelist requests to the Proxy's endpoint: <code>%1$s</code>. <a href=\"%2$s\" target=\"_blank\">Contact support</a> if you need help locating the issue."
msgstr ""

#: src/Admin/Provisioning.php:73
Expand Down
2 changes: 1 addition & 1 deletion mu-plugin/plausible-proxy-speed-module.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class PlausibleProxySpeed {
private $is_proxy_request = false;

/**
* Currenct request URI.
* Current request URI.
*
* @var string
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Admin/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public function maybe_enable_proxy( $settings, $old_settings ) {
sprintf(
wp_kses(
__(
'Plausible\'s proxy couldn\'t be enabled, because the WordPress API is inaccessable. This might be due to a conflicting setting in a (security) plugin or server firewall. Make sure you whitelist requests to the Proxy\'s endpoint: <code>%1$s</code>. <a href="%2$s" target="_blank">Contact support</a> if you need help locating the issue.',
'Plausible\'s proxy couldn\'t be enabled, because the WordPress API is inaccessible. This might be due to a conflicting setting in a (security) plugin or server firewall. Make sure you whitelist requests to the Proxy\'s endpoint: <code>%1$s</code>. <a href="%2$s" target="_blank">Contact support</a> if you need help locating the issue.',
'plausible-analytics'
),
'post'
Expand Down Expand Up @@ -241,7 +241,7 @@ private function is_ssl() {
}

/**
* Runs a quick internal call to the WordPress API to make sure it's accessable.
* Runs a quick internal call to the WordPress API to make sure it's accessible.
*
* @since 1.3.0
* @return bool
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {
},
extend: {
colors: {
yellow: colors.amber, // We started usign `yellow` in v2 but it was renamed to `amber` in v3 https://tailwindcss.com/docs/upgrade-guide#removed-color-aliases
yellow: colors.amber, // We started using `yellow` in v2 but it was renamed to `amber` in v3 https://tailwindcss.com/docs/upgrade-guide#removed-color-aliases
gray: colors.slate,
'gray-950': 'rgb(13, 18, 30)',
'gray-850': 'rgb(26, 32, 44)',
Expand Down

0 comments on commit c638e64

Please sign in to comment.