Merge pull request #13 from iMattPro/fixes

Fixes
phpbb-extensions · Jan 4, 2024 · 387d4e4 · 387d4e4
2 parents 4b86af0 + 20c5f6e
commit 387d4e4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/adm/style/event/acp_main_notice_after.html b/adm/style/event/acp_main_notice_after.html
@@ -1,5 +1,6 @@
 {% if S_WPN_COMPATIBILITY_NOTICE %}
 	<div class="errorbox">
+		<h3>{{ lang('ACP_WEBPUSH_REMOVE_WARNING') }}</h3>
 		<p>{{ lang('ACP_WEBPUSH_REMOVE_NOTICE') }}</p>
 	</div>
 {% endif %}
diff --git a/event/listener.php b/event/listener.php
@@ -88,6 +88,6 @@ public function load_language()
 	 */
 	public function compatibility_notice()
 	{
-		$this->template->assign_var('S_WPN_COMPATIBILITY_NOTICE', phpbb_version_compare(PHPBB_VERSION, '4.0.0-a1', '>='));
+		$this->template->assign_var('S_WPN_COMPATIBILITY_NOTICE', phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='));
 	}
 }
diff --git a/ext.php b/ext.php
@@ -40,7 +40,7 @@ public function is_enableable()
 	protected function check_phpbb_version()
 	{
 		if (phpbb_version_compare(PHPBB_VERSION, '3.3.12-dev', '<') ||
-			phpbb_version_compare(PHPBB_VERSION, '4.0.0-a1', '>='))
+			phpbb_version_compare(PHPBB_VERSION, '4.0.0-dev', '>='))
 		{
 			$this->errors[] = 'PHPBB_VERSION_ERROR';
 		}

diff --git a/language/en/info_acp_webpushnotifications.php b/language/en/info_acp_webpushnotifications.php
@@ -39,7 +39,8 @@
 
 $lang = array_merge($lang, [
 	'ACP_WEBPUSH_SETTINGS'				=> 'Web Push settings',
-	'ACP_WEBPUSH_REMOVE_NOTICE'			=> 'Web Push Notifications are now built-in to phpBB.<br>The extension “phpBB Browser Push Notifications” is no longer needed and should be uninstalled.<br>All settings and user preferences associated with the extension will be migrated into phpBB‘s built-in push notifications when you uninstall the extension.',
+	'ACP_WEBPUSH_REMOVE_WARNING'		=> 'Web Push Notifications are now built-in to phpBB',
+	'ACP_WEBPUSH_REMOVE_NOTICE'			=> 'The extension “phpBB Browser Push Notifications” is no longer needed and should be uninstalled.<br>All settings and user preferences associated with the extension will be migrated into phpBB‘s built-in push notifications when you uninstall the extension.',
 	'LOG_CONFIG_WEBPUSH'				=> '<strong>Altered Web Push settings</strong>',
 	'LOG_WEBPUSH_MESSAGE_FAIL'			=> '<strong>Web Push message could not be sent:</strong> %s',
 	'LOG_WEBPUSH_SUBSCRIPTION_REMOVED'	=> '<strong>Removed Web Push subscription:</strong>» %s',