[K6.3] Since rebanding of Twitter into X : change to X instead Twitter

src/admin/language/en-GB/en-GB.com_kunena.install.ini

@@ -27,7 +27,7 @@ COM_KUNENA_SAMPLEDATA_CATEGORY2_DESC = "Have some feedback and input to share? \
 COM_KUNENA_SAMPLEDATA_CATEGORY2_HEADER = "This is the optional category header for the Suggestion Box."
 COM_KUNENA_SAMPLEDATA_CATEGORY2_TITLE = "Suggestion Box"
 COM_KUNENA_SAMPLEDATA_POST_WELCOME_SUBJECT = "Welcome to Kunena!"
-COM_KUNENA_SAMPLEDATA_POST_WELCOME_TEXT_CONTENT = "[size=150][b]Welcome to Kunena![/b][/size] \n\n Thank you for choosing Kunena for your community forum needs in Joomla. \n\n Kunena, translated from Swahili meaning \"to speak\", is built by a team of open source professionals with the goal of providing a top quality, tightly unified forum solution for Joomla. \n\n\n [size=150][b]Additional Kunena Resources[/b][/size] \n\n [b]Kunena Documentation:[/b] [url=https://www.kunena.org/docs/en]www.kunena.org/docs/en[/url] \n\n [b]Kunena Support Forum[/b]: [url=https://www.kunena.org/forum]www.kunena.org/forum[/url] \n\n [b]Kunena Downloads:[/b] [url=https://www.kunena.org/download]www.kunena.org/download[/url] \n\n [b]Kunena Blog:[/b] [url=https://www.kunena.org/blog]www.kunena.org/blog[/url] \n\n [b]Follow Kunena on Twitter:[/b] [url=https://www.kunena.org/twitter]www.kunena.org/twitter[/url]"
+COM_KUNENA_SAMPLEDATA_POST_WELCOME_TEXT_CONTENT = "[size=150][b]Welcome to Kunena![/b][/size] \n\n Thank you for choosing Kunena for your community forum needs in Joomla. \n\n Kunena, translated from Swahili meaning \"to speak\", is built by a team of open source professionals with the goal of providing a top quality, tightly unified forum solution for Joomla. \n\n\n [size=150][b]Additional Kunena Resources[/b][/size] \n\n [b]Kunena Documentation:[/b] [url=https://www.kunena.org/docs/en]www.kunena.org/docs/en[/url] \n\n [b]Kunena Support Forum[/b]: [url=https://www.kunena.org/forum]www.kunena.org/forum[/url] \n\n [b]Kunena Downloads:[/b] [url=https://www.kunena.org/download]www.kunena.org/download[/url] \n\n [b]Kunena Blog:[/b] [url=https://www.kunena.org/blog]www.kunena.org/blog[/url] \n\n [b]Follow Kunena on X:[/b] [url=https://www.kunena.org/twitter]www.kunena.org/twitter[/url]"
 COM_KUNENA_SAMPLEDATA_SECTION_DESC = "This is the main forum section. It serves as a container for categories for your topics."
 COM_KUNENA_SAMPLEDATA_SECTION_HEADER = "The section header is used to display additional information about the categories of topics that it contains."
 COM_KUNENA_SAMPLEDATA_SECTION_TITLE = "Main Forum"

src/admin/language/en-GB/en-GB.com_kunena.libraries.ini

@@ -52,9 +52,9 @@ COM_KUNENA_LIB_BBCODE_EBAY_LABEL_BUY_IT_NOW = "Buy It Now"
 COM_KUNENA_LIB_BBCODE_EBAY_LABEL_COMPLETED = "Completed"
 COM_KUNENA_LIB_BBCODE_EBAY_ERROR_WRONG_ITEM_ID = "The ebay item id given is invalid, no result has been sent"
 COM_KUNENA_LIB_BBCODE_EBAY_INVALID_APPID_KEY = "You haven't set a correct eBay AppID key in Kunena configuration settings, please clear cache before to retry"
-COM_KUNENA_LIB_BBCODE_TWITTER_COULD_NOT_GET_TOKEN = "Could not retrieve bearer token (consumer)"
-COM_KUNENA_LIB_BBCODE_TWITTER_INVALID_TWEET_ID = "The tweet ID given is invalid"
-COM_KUNENA_LIB_BBCODE_TWITTER_CONSUMMER_KEY_SECRET_INVALID = "Invalid consumer key/secret in configuration"
+COM_KUNENA_LIB_BBCODE_X_SOCIAL_COULD_NOT_GET_TOKEN = "Could not retrieve bearer token (consumer)"
+COM_KUNENA_LIB_BBCODE_X_SOCIAL_INVALID_TWEET_ID = "The tweet ID given is invalid"
+COM_KUNENA_LIB_BBCODE_X_SOCIAL_CONSUMMER_KEY_SECRET_INVALID = "Invalid consumer key/secret in configuration"
 COM_KUNENA_LIB_BBCODE_EBAY_ERROR_NO_EBAY_APP_ID = "No eBay APP ID and/or Cert ID defined in Kunena configuration"
 COM_KUNENA_GOOGLE_MAP_NO_KEY_UNABLE_TO_DISPLAY_MAP = "The google map can't be displayed, ask your administrator for more details"
 COM_KUNENA_LIB_BBCODE_MAP_ERROR_CITY_MISSING = "The map cannot be displayed, you haven't specified a location yet."
@@ -141,8 +141,8 @@ COM_KUNENA_SCEDITOR_COMMAND_INSERT_EBAY = "Insert ebay item"
 COM_KUNENA_SCEDITOR_COMMAND_INSERT_EBAY_ITEM_ID = "Ebay item id:"
 COM_KUNENA_SCEDITOR_COMMAND_INSERT_INSTAGRAM = "Insert an instagram item"
 COM_KUNENA_SCEDITOR_COMMAND_INSERT_INSTAGRAM_ID = "Instragram id:"
-COM_KUNENA_SCEDITOR_COMMAND_INSERT_TWITTER = "Insert a tweet"
-COM_KUNENA_SCEDITOR_COMMAND_INSERT_TWITTER_ID = "Tweet id:"
+COM_KUNENA_SCEDITOR_COMMAND_INSERT_X_SOCIAL = "Insert a tweet"
+COM_KUNENA_SCEDITOR_COMMAND_INSERT_X_SOCIAL_ID = "Tweet id:"
 COM_KUNENA_SCEDITOR_COMMAND_INSERT_MAP = "Insert a map"
 COM_KUNENA_SCEDITOR_COMMAND_INSERT_MAP_TYPE = "Type :"
 COM_KUNENA_SCEDITOR_COMMAND_INSERT_MAP_TYPE_HYBRID = "Hybrid"
@@ -484,8 +484,8 @@ COM_KUNENA_MYPROFILE_WECHAT = "Wechat"
 COM_KUNENA_MYPROFILE_WECHAT_DESC = "This is your Wechat account."
 COM_KUNENA_MYPROFILE_TELEGRAM = "Telegram"
 COM_KUNENA_MYPROFILE_TELEGRAM_DESC = "This is your Telegram username."
-COM_KUNENA_MYPROFILE_TWITTER = "Twitter"
-COM_KUNENA_MYPROFILE_TWITTER_DESC = "This is your Twitter username."
+COM_KUNENA_MYPROFILE_X_SOCIAL = "X"
+COM_KUNENA_MYPROFILE_X_SOCIAL_DESC = "This is your X (previously Twitter) username."
 COM_KUNENA_MYPROFILE_VK = "VK"
 COM_KUNENA_MYPROFILE_VK_DESC = "This is your VK username."
 COM_KUNENA_MYPROFILE_WHATSAPP = "WhatsApp"

src/admin/language/en-GB/en-GB.com_kunena.views.ini

@@ -526,10 +526,10 @@ COM_KUNENA_CONFIGURATION_EBAY_API_KEY_LABEL = "eBay AppID key"
 COM_KUNENA_CONFIGURATION_EBAY_API_KEY_DESC = "You need to enter the AppID given on your ebay developer account, you need to register on <a href='https://developer.ebay.com/' target='_new'>https://developer.ebay.com/</a> in order to get the AppID"
 COM_KUNENA_CONFIGURATION_EBAY_CERTID_KEY_LABEL = "eBay Cert ID (Client Secret)"
 COM_KUNENA_CONFIGURATION_EBAY_CERTID_KEY_DESC = "You need to enter the eBay Cert ID given on your ebay developer account"
-COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_KEY_LABEL = "The Twitter consumer key"
-COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_KEY_DESC = "The Twitter consumer key to connect to API"
-COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_SECRET_LABEL = "The Twitter consumer secret"
-COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_SECRET_DESC = "The Twitter consumer secret to connect to API"
+COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_KEY_LABEL = "The X consumer key"
+COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_KEY_DESC = "The X consumer key to connect to API"
+COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_SECRET_LABEL = "The X consumer secret"
+COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_SECRET_DESC = "The X consumer secret to connect to API"
 COM_KUNENA_ADMIN_CONFIG_MAX_LINKS = "Max Links in message"
 COM_KUNENA_ADMIN_CONFIG_MAX_LINKS_DESC = "Enter here the max links in a message to prevent spam"
 COM_KUNENA_CONFIGURATION_CAPTCHA_FOR_WHO_TITLE = "Display Captcha for :"
@@ -874,8 +874,8 @@ COM_KUNENA_TEMPLATE_DISPLAY_MAPS = "Show <strong>Maps</strong> button"
 COM_KUNENA_TEMPLATE_DISPLAY_MAPS_DESC = "Show <strong>Maps</strong> button on editor"
 COM_KUNENA_TEMPLATE_DISPLAY_EMOTICONS = "Show <strong>Emoticons</strong> button"
 COM_KUNENA_TEMPLATE_DISPLAY_EMOTICONS_DESC = "Show <strong>Emoticons</strong> button on editor"
-COM_KUNENA_TEMPLATE_DISPLAY_TWITTER = "Show <strong>Twitter</strong> button"
-COM_KUNENA_TEMPLATE_DISPLAY_TWITTER_DESC = "Show <strong>Twitter</strong> button on editor"
+COM_KUNENA_TEMPLATE_DISPLAY_X_SOCIAL = "Show <strong>X</strong> button"
+COM_KUNENA_TEMPLATE_DISPLAY_X_SOCIAL_DESC = "Show <strong>X</strong> button on editor"
 COM_KUNENA_TEMPLATE_DISPLAY_EBAY = "Show <strong>Ebay</strong> button"
 COM_KUNENA_TEMPLATE_DISPLAY_EBAY_DESC = "Show <strong>Ebay</strong> button on editor"
 COM_KUNENA_TEMPLATE_DISPLAY_LINK = "Show <strong>Link</strong> button"

src/admin/src/Model/ConfigModel.php

@@ -1081,13 +1081,13 @@ class ConfigModel extends AdminModel
     public $ebayApiKey = '';
 
     /**
-     * @var     string  Define twitter API consumer key
+     * @var     string  Define X API consumer key
      * @since   Kunena 4.0.0
      */
     public $twitterConsumerKey = '';
 
     /**
-     * @var     string  Define twitter API consumer secret
+     * @var     string  Define X API consumer secret
      * @since   Kunena 4.0.0
      */
     public $twitterConsumerSecret = '';

src/admin/tmpl/config/default.php

@@ -1667,24 +1667,24 @@ function_exists('php_ini_loaded_file') ? php_ini_loaded_file() : ''
                                                     <tr <?php if ($this->config->twitterConsumerKey != '') :
                                                         echo 'class="changed"';
                                                         endif; ?>>
-                                                        <td><?php echo Text::_('COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_KEY_LABEL') ?></td>
+                                                        <td><?php echo Text::_('COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_KEY_LABEL') ?></td>
                                                         <td>
                                                             <input type="text" class="form-control"
                                                                    name="cfg_twitterConsumerKey"
                                                                    value="<?php echo $this->escape($this->config->twitterConsumerKey) ?>"/>
                                                         </td>
-                                                        <td><?php echo Text::_('COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_KEY_DESC') ?></td>
+                                                        <td><?php echo Text::_('COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_KEY_DESC') ?></td>
                                                     </tr>
                                                     <tr <?php if ($this->config->twitterConsumerSecret != '') :
                                                         echo 'class="changed"';
                                                         endif; ?>>
-                                                        <td><?php echo Text::_('COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_SECRET_LABEL') ?></td>
+                                                        <td><?php echo Text::_('COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_SECRET_LABEL') ?></td>
                                                         <td>
                                                             <input type="text" class="form-control"
                                                                    name="cfg_twitterConsumerSecret"
                                                                    value="<?php echo $this->escape($this->config->twitterConsumerSecret) ?>"/>
                                                         </td>
-                                                        <td><?php echo Text::_('COM_KUNENA_CONFIGURATION_TWITTER_API_CONSUMER_SECRET_DESC') ?></td>
+                                                        <td><?php echo Text::_('COM_KUNENA_CONFIGURATION_X_SOCIAL_API_CONSUMER_SECRET_DESC') ?></td>
                                                     </tr>
                                                     <tr <?php if ($this->config->googleMapApiKey != '') :
                                                         echo 'class="changed"';

src/libraries/kunena/src/BBCode/KunenaBBCode.php

@@ -2880,13 +2880,13 @@ protected function getTweet(int $tweetid)
                 $this->token = json_decode($response->body)->access_token;
             } else {
                 $tweet        = new stdClass();
-                $tweet->error = Text::_('COM_KUNENA_LIB_BBCODE_TWITTER_COULD_NOT_GET_TOKEN');
+                $tweet->error = Text::_('COM_KUNENA_LIB_BBCODE_X_SOCIAL_COULD_NOT_GET_TOKEN');
 
                 return $tweet;
             }
         } elseif (empty($consumer_key) || empty($consumer_secret)) {
             $tweet        = new stdClass();
-            $tweet->error = Text::_('COM_KUNENA_LIB_BBCODE_TWITTER_CONSUMMER_KEY_SECRET_INVALID');
+            $tweet->error = Text::_('COM_KUNENA_LIB_BBCODE_X_SOCIAL_CONSUMMER_KEY_SECRET_INVALID');
 
             return $tweet;
         }
@@ -2985,7 +2985,7 @@ protected function getTweet(int $tweetid)
                 return $tweet_data;
             } else {
                 $tweet        = new stdClass();
-                $tweet->error = Text::_('COM_KUNENA_LIB_BBCODE_TWITTER_INVALID_TWEET_ID');
+                $tweet->error = Text::_('COM_KUNENA_LIB_BBCODE_X_SOCIAL_INVALID_TWEET_ID');
 
                 return $tweet;
             }

src/libraries/kunena/src/Config/KunenaConfig.php

@@ -1316,13 +1316,13 @@ class KunenaConfig extends CMSObject
     public $ebayCertId = '';
 
     /**
-     * @var     string  Define twitter API consumer key
+     * @var     string  Define X API consumer key
      * @since   Kunena 4.0.0
      */
     public $twitterConsumerKey = '';
 
     /**
-     * @var     string  Define twitter API consumer secret
+     * @var     string  Define X API consumer secret
      * @since   Kunena 4.0.0
      */
     public $twitterConsumerSecret = '';

src/libraries/kunena/src/Tables/KunenaUsers.php

@@ -265,7 +265,7 @@ class KunenaUsers extends KunenaTable
     public $skype = null;
 
     /**
-     * TWITTER ID
+     * X (previously Twitter) ID
      *
      * @var     string
      * @since   Kunena

src/libraries/kunena/src/User/KunenaUser.php

@@ -2205,7 +2205,7 @@ public function socialButtonsTemplate(string $name, $gray = false)
     public function socialButtons()
     {
         return [
-            'twitter'          => ['url' => 'https://twitter.com/##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_TWITTER'), 'nourl' => '0'],
+            'twitter'          => ['url' => 'https://twitter.com/##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_X_SOCIAL'), 'nourl' => '0'],
             'facebook'         => ['url' => 'https://www.facebook.com/##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_FACEBOOK'), 'nourl' => '0'],
             'myspace'          => ['url' => 'https://www.myspace.com/##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_MYSPACE'), 'nourl' => '0'],
             'linkedin'         => ['url' => 'https://www.linkedin.com/in/##VALUE##', 'title' => Text::_('COM_KUNENA_MYPROFILE_LINKEDIN'), 'nourl' => '0'],

src/site/language/en-GB/en-GB.com_kunena.ini

@@ -554,13 +554,13 @@ COM_KUNENA_THANK_YOU_RECEIVED = "Thank you received"
 
 ; JROOT/components/com_kunena/site/template/aurelia/layouts/bbcode/twitter/default.php
 
-COM_KUNENA_WIDGET_TWITTER_RETWEETS = "Retweets"
-COM_KUNENA_WIDGET_TWITTER_FAVORITES = "favorites"
-COM_KUNENA_WIDGET_TWITTER_REPLY = "Reply"
-COM_KUNENA_WIDGET_TWITTER_RETWEET = "Retweet"
-COM_KUNENA_WIDGET_TWITTER_FAVORITE = "Favorites"
-COM_KUNENA_WIDGET_TWITTER_TIME_POSTED_TITLE = "Time posted"
-COM_KUNENA_WIDGET_TWITTER_VERIFIED_ACCOUNT_TITLE = "Verified Account"
+COM_KUNENA_WIDGET_X_SOCIAL_RETWEETS = "Retweets"
+COM_KUNENA_WIDGET_X_SOCIAL_FAVORITES = "favorites"
+COM_KUNENA_WIDGET_X_SOCIAL_REPLY = "Reply"
+COM_KUNENA_WIDGET_X_SOCIAL_RETWEET = "Retweet"
+COM_KUNENA_WIDGET_X_SOCIAL_FAVORITE = "Favorites"
+COM_KUNENA_WIDGET_X_SOCIAL_TIME_POSTED_TITLE = "Time posted"
+COM_KUNENA_WIDGET_X_SOCIAL_VERIFIED_ACCOUNT_TITLE = "Verified Account"
 
 ; Strings for ranks moved there
 

src/site/language/en-GB/en-GB.com_kunena.templates.ini

@@ -477,7 +477,7 @@ COM_KUNENA_MYPROFILE_PRIVATE_MESSAGING = "Private Messaging"
 COM_KUNENA_MYPROFILE_SKYPE_DESC = "This is your Skype nickname."
 COM_KUNENA_MYPROFILE_SUMMARY = "Summary"
 COM_KUNENA_MYPROFILE_TRASH = "Trash"
-COM_KUNENA_MYPROFILE_TWITTER_DESC = "This is your Twitter username."
+COM_KUNENA_MYPROFILE_X_SOCIAL_DESC = "This is your X username."
 COM_KUNENA_MYPROFILE_YIM_DESC = "This is your Yahoo! Instant Messenger nickname."
 COM_KUNENA_MYPROFILE_INSTAGRAM_DESC = "This is your Instagram account."
 COM_KUNENA_MYPROFILE_QQSOCIAL_DESC = "This is your QQ username."
@@ -682,8 +682,8 @@ COM_KUNENA_TEMPLATE_DISPLAY_MAPS = "Show <strong>Maps</strong> button"
 COM_KUNENA_TEMPLATE_DISPLAY_MAPS_DESC = "Show <strong>Maps</strong> button on editor"
 COM_KUNENA_TEMPLATE_DISPLAY_EMOTICONS = "Show <strong>Emoticons</strong> button"
 COM_KUNENA_TEMPLATE_DISPLAY_EMOTICONS_DESC = "Show <strong>Emoticons</strong> button on editor"
-COM_KUNENA_TEMPLATE_DISPLAY_TWITTER = "Show <strong>Twitter</strong> button"
-COM_KUNENA_TEMPLATE_DISPLAY_TWITTER_DESC = "Show <strong>Twitter</strong> button on editor"
+COM_KUNENA_TEMPLATE_DISPLAY_X_SOCIAL = "Show <strong>X</strong> button"
+COM_KUNENA_TEMPLATE_DISPLAY_X_SOCIAL_DESC = "Show <strong>X</strong> button on editor"
 COM_KUNENA_TEMPLATE_DISPLAY_EBAY = "Show <strong>Ebay</strong> button"
 COM_KUNENA_TEMPLATE_DISPLAY_EBAY_DESC = "Show <strong>Ebay</strong> button on editor"
 COM_KUNENA_TEMPLATE_DISPLAY_LINK = "Show <strong>Link</strong> button"
@@ -777,7 +777,7 @@ COM_KUNENA_TEMPLATE_TOGGLER_COLOR_DESC = "Enter the color of the section toggler
 ; JSsocial
 
 COM_KUNENA_SOCIAL_EMAIL_LABEL = "E-mail"
-COM_KUNENA_SOCIAL_TWITTER_LABEL = "Tweet"
+COM_KUNENA_SOCIAL_X_SOCIAL_LABEL = "Tweet"
 COM_KUNENA_SOCIAL_FACEBOOK_LABEL = "Facebook"
 COM_KUNENA_SOCIAL_LINKEDIN_LABEL = "LinkedIn"
 COM_KUNENA_SOCIAL_PINTEREST_LABEL = "Pinterest"

src/site/template/aurelia/config/config.xml

@@ -282,8 +282,8 @@
             <option value="0">COM_KUNENA_NO</option>
             <option value="1">COM_KUNENA_YES</option>
         </field>
-        <field name="Twitter" type="list" default="1" label="COM_KUNENA_TEMPLATE_DISPLAY_TWITTER"
-               description="COM_KUNENA_TEMPLATE_DISPLAY_TWITTER_DESC">
+        <field name="Twitter" type="list" default="1" label="COM_KUNENA_TEMPLATE_DISPLAY_X_SOCIAL"
+               description="COM_KUNENA_TEMPLATE_DISPLAY_X_SOCIAL_DESC">
             <option value="0">COM_KUNENA_NO</option>
             <option value="1">COM_KUNENA_YES</option>
         </field>