From a97f1ac784ef8b7e99326e9db499b9a599ac3dc7 Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Mon, 11 Mar 2024 16:21:43 +0700
Subject: [PATCH] Some improvements for Acronym mod (#1425)

* Some improvements for Acronym mod

* Update CHANGELOG.md

* Update BBCode.php
---
 CHANGELOG.md                                | 4 ++--
 library/language/source/main.php            | 4 ++--
 src/Legacy/BBCode.php                       | 4 ++--
 styles/templates/default/posting_editor.tpl | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83fc02e9a..3c8700e28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 
 - Release 2.4.2 🐯 ([belomaxorka](https://github.com/belomaxorka))
 - Added demo mode 📺 [\#1399](https://github.com/torrentpier/torrentpier/pull/1399) ([belomaxorka](https://github.com/belomaxorka))
-- Added BBCode Acronym tag [\#1419](https://github.com/torrentpier/torrentpier/pull/1419) ([belomaxorka](https://github.com/belomaxorka))
+- Added BBCode Acronym tag [\#1419](https://github.com/torrentpier/torrentpier/pull/1419), [\#1425](https://github.com/torrentpier/torrentpier/pull/1425) ([belomaxorka](https://github.com/belomaxorka))
 - Added showing poll status in `topic_watch.php` [\#1413](https://github.com/torrentpier/torrentpier/pull/1413) ([belomaxorka](https://github.com/belomaxorka))
 - Added ability to view post_text of topic [\#1401](https://github.com/torrentpier/torrentpier/pull/1401) ([belomaxorka](https://github.com/belomaxorka))
 - Added support for rutracker font BBCode tag [\#1397](https://github.com/torrentpier/torrentpier/pull/1397) ([belomaxorka](https://github.com/belomaxorka))
@@ -23,7 +23,7 @@
 - Hide quote button if topic locked [\#1416](https://github.com/torrentpier/torrentpier/pull/1416) ([belomaxorka](https://github.com/belomaxorka))
 - Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382), [\#1383](https://github.com/torrentpier/torrentpier/pull/1383), [\#1391](https://github.com/torrentpier/torrentpier/pull/1391), [\#1398](https://github.com/torrentpier/torrentpier/pull/1398), [\#1405](https://github.com/torrentpier/torrentpier/pull/1405), [\#1406](https://github.com/torrentpier/torrentpier/pull/1406), [\#1408](https://github.com/torrentpier/torrentpier/pull/1408), [\#1409](https://github.com/torrentpier/torrentpier/pull/1409), [\#1410](https://github.com/torrentpier/torrentpier/pull/1410), [\#1411](https://github.com/torrentpier/torrentpier/pull/1411), [\#1418](https://github.com/torrentpier/torrentpier/pull/1418), [\#1422](https://github.com/torrentpier/torrentpier/pull/1422) ([belomaxorka](https://github.com/belomaxorka))
 - Some bugfixes [\#1380](https://github.com/torrentpier/torrentpier/pull/1380) ([belomaxorka](https://github.com/belomaxorka))
-- Updated deps [\#1414](https://github.com/torrentpier/torrentpier/pull/1414), [\#1415](https://github.com/torrentpier/torrentpier/pull/1415), [\#1421](https://github.com/torrentpier/torrentpier/pull/1421) ([belomaxorka](https://github.com/belomaxorka))
+- Updated deps [\#1414](https://github.com/torrentpier/torrentpier/pull/1414), [\#1415](https://github.com/torrentpier/torrentpier/pull/1415), [\#1421](https://github.com/torrentpier/torrentpier/pull/1421), [\#1424](https://github.com/torrentpier/torrentpier/pull/1424) ([belomaxorka](https://github.com/belomaxorka))
 - New Crowdin updates [\#1384](https://github.com/torrentpier/torrentpier/pull/1384), [\#1389](https://github.com/torrentpier/torrentpier/pull/1389), [\#1392](https://github.com/torrentpier/torrentpier/pull/1392), [\#1402](https://github.com/torrentpier/torrentpier/pull/1402), [\#1403](https://github.com/torrentpier/torrentpier/pull/1403), [\#1412](https://github.com/torrentpier/torrentpier/pull/1412), [\#1420](https://github.com/torrentpier/torrentpier/pull/1420) ([Exileum](https://github.com/Exileum))
 
 ## [v2.4.1](https://github.com/torrentpier/torrentpier/tree/v2.4.1) (2024-02-04)
diff --git a/library/language/source/main.php b/library/language/source/main.php
index d9a461602..d2e230887 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -1547,8 +1547,8 @@ $lang['CODE_TITLE'] = 'Code display: [code]code[/code] (Ctrl+K)';
 $lang['LIST'] = 'List';
 $lang['LIST_TITLE'] = 'List: [list]text[/list] (Ctrl+l)';
 $lang['LIST_ITEM'] = 'Ordered list: [list=]text[/list] (Ctrl+O)';
-$lang['ACR'] = 'Acronym';
-$lang['ACR_TITLE'] = 'Acronym: [acronym=Full text]Short text[/acronym]';
+$lang['ACRONYM'] = 'Acronym';
+$lang['ACRONYM_TITLE'] = 'Acronym: [acronym=Full text]Short text[/acronym]';
 $lang['QUOTE_SEL'] = 'Quote selected';
 $lang['JAVASCRIPT_ON'] = 'Heads necessary to send messages to enable JavaScript';
 
diff --git a/src/Legacy/BBCode.php b/src/Legacy/BBCode.php
index 353346297..3461a22fd 100644
--- a/src/Legacy/BBCode.php
+++ b/src/Legacy/BBCode.php
@@ -82,8 +82,7 @@ class BBCode
         $this->preg = [
             '#\[quote="(.+?)"\]#isu' => $tpl['quote_username_open'],
             '#\[spoiler="(.+?)"\]#isu' => $tpl['spoiler_title_open'],
-            '#\[acronym="([\w\- \']+)"\](.*?)\[/acronym\]#isu' => '<span class="post-acronym" title="$1">$2</span>',
-            '#\[acronym=([\w\- \']+)\](.*?)\[/acronym\]#isu' => '<span class="post-acronym" title="$1">$2</span>',
+            '#\[acronym="(.+?)"\]#isu' => '<span class="post-acronym" title="$1">',
             '#\[list=(a|A|i|I|1)\]#isu' => '<ul type="$1">',
             '#\[\*=(\d+)\]#isu' => '<li value="$1">',
             '#\[pre\](.*?)\[/pre\]#isu' => '<pre class="post-pre">$1</pre>',
@@ -105,6 +104,7 @@ class BBCode
             '[/quote]' => $tpl['quote_close'],
             '[spoiler]' => $tpl['spoiler_open'],
             '[/spoiler]' => $tpl['spoiler_close'],
+            '[/acronym]' => '</span>',
             '[list]' => '<ul>',
             '[*]' => '<li>',
             '[/list]' => '</ul>',
diff --git a/styles/templates/default/posting_editor.tpl b/styles/templates/default/posting_editor.tpl
index 7a879eb23..4c6b9ea88 100644
--- a/styles/templates/default/posting_editor.tpl
+++ b/styles/templates/default/posting_editor.tpl
@@ -74,6 +74,7 @@ ajax.callback.posts = function(data) {
 	<input type="button" value="&para;" name="codeBR" title="{L_NEW_LINE}" />
 	<input type="button" value="&#8667;" name="codeIndent" title="{L_INDENT_TAG}" />&nbsp;
 	<input type="button" value="{L_SPOILER}" name="codeSpoiler" title="{L_SPOILER}" />
+    <input type="button" value="{L_ACRONYM}" name="codeAcronym" title="{L_ACRONYM_TITLE}" />
     <input type="button" value="box" name="codeBox" title="{L_BOX_TAG}" />
 </span>
 
@@ -94,7 +95,6 @@ ajax.callback.posts = function(data) {
 	<input type="button" value="{L_URL}" name="codeUrl" title="{L_URL_TITLE}" style="text-decoration: underline;" />&nbsp;
 	<input type="button" value="{L_CODE}" name="codeCode" title="{L_CODE_TITLE}" />
 	<input type="button" value="{L_LIST}" name="codeList" title="{L_LIST_TITLE}" />
-	<input type="button" value="{L_ACR}" name="codeAcronym" title="{L_ACR_TITLE}" />
 	<input type="button" value="1." name="codeOpt" title="{L_LIST_ITEM}" />&nbsp;
 	<input type="button" value="{L_QUOTE_SEL}" name="quoteselected" title="{L_QUOTE_SELECTED}" onclick="bbcode.onclickQuoteSel();" />
 </div>
@@ -195,7 +195,6 @@ function checkForm(form) {
 
     bbcode.addTag("codeCode", "code", null, "K", ctrl);
     bbcode.addTag("codeList", "list", null, "L", ctrl);
-    bbcode.addTag("codeAcronym", "acronym", null, "", ctrl);
     bbcode.addTag("codeOpt", "*", "", "0", ctrl);
 </script>
 
@@ -207,6 +206,7 @@ function checkForm(form) {
     bbcode.addTag("codeSpoiler", "spoiler", null, "", ctrl);
     bbcode.addTag("codeSup", "sup", null, "", ctrl);
     bbcode.addTag("codeSub", "sub", null, "", ctrl);
+    bbcode.addTag("codeAcronym", "acronym", null, "", ctrl);
     bbcode.addTag("codeBox", "box", null, "", ctrl);
     bbcode.addTag("codeIndent", "indent", null, "", ctrl);