Skip to content

Commit

Permalink
Merge branch 'release/B23.negadon'
Browse files Browse the repository at this point in the history
  • Loading branch information
Camwyn committed Dec 14, 2023
2 parents 8e644c0 + 8e1270c commit 3be81d6
Show file tree
Hide file tree
Showing 10 changed files with 229 additions and 109 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
node_modules
.phpstorm*
.vscode
bun.lockb

# Tests - local config files
codeception.yml
Expand Down
63 changes: 32 additions & 31 deletions lang/tribe-common.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# This file is distributed under the GPLv2 or later.
msgid ""
msgstr ""
"Project-Id-Version: Tribe Common 5.1.16\n"
"Project-Id-Version: Tribe Common 5.1.17\n"
"Report-Msgid-Bugs-To: https://evnt.is/191x\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2023-12-11T06:29:35-08:00\n"
"PO-Revision-Date: 2023-12-11 14:29\n"
"POT-Creation-Date: 2023-12-13T10:35:43-08:00\n"
"PO-Revision-Date: 2023-12-13 18:35\n"
"X-Generator: WP-CLI 2.7.1\n"
"X-Domain: tribe-common\n"

Expand Down Expand Up @@ -1385,20 +1385,21 @@ msgstr ""
msgid "There are a few %s to resolve and prevent 404 errors."
msgstr ""

#: src/Tribe/Ajax/Dropdown.php:38
#: src/Tribe/Ajax/Dropdown.php:41
msgid "Cannot look for Terms without a taxonomy"
msgstr ""

#: src/Tribe/Ajax/Dropdown.php:270
#: src/Tribe/Ajax/Dropdown.php:279
msgid "Missing data source for this dropdown"
msgstr ""

#: src/Tribe/Ajax/Dropdown.php:283
#: src/Tribe/Ajax/Dropdown.php:301
msgid "Empty data set for this dropdown"
msgstr ""

#: src/Tribe/Ajax/Dropdown.php:336
msgid "The \"%s\" source is invalid and cannot be reached on \"%s\" instance."
#. Translators: %1$s is the name of the source, %2$s is the class name
#: src/Tribe/Ajax/Dropdown.php:353
msgid "The \"%1$s\" source is invalid and cannot be reached on \"%2$s\" instance."
msgstr ""

#: src/Tribe/App_Shop.php:50
Expand Down Expand Up @@ -3106,89 +3107,89 @@ msgstr ""
msgid "Null logger (will log nothing)"
msgstr ""

#: src/Tribe/Main.php:401
#: src/Tribe/Main.php:396
msgid ": activate to sort column ascending"
msgstr ""

#: src/Tribe/Main.php:402
#: src/Tribe/Main.php:397
msgid ": activate to sort column descending"
msgstr ""

#: src/Tribe/Main.php:404
#: src/Tribe/Main.php:399
msgid "Show _MENU_ entries"
msgstr ""

#: src/Tribe/Main.php:405
#: src/Tribe/Main.php:400
msgid "No data available in table"
msgstr ""

#: src/Tribe/Main.php:406
#: src/Tribe/Main.php:401
msgid "Showing _START_ to _END_ of _TOTAL_ entries"
msgstr ""

#: src/Tribe/Main.php:407
#: src/Tribe/Main.php:402
msgid "Showing 0 to 0 of 0 entries"
msgstr ""

#: src/Tribe/Main.php:408
#: src/Tribe/Main.php:403
msgid "(filtered from _MAX_ total entries)"
msgstr ""

#: src/Tribe/Main.php:409
#: src/Tribe/Main.php:404
msgid "No matching records found"
msgstr ""

#: src/Tribe/Main.php:410
#: src/Tribe/Main.php:405
msgid "Search:"
msgstr ""

#: src/Tribe/Main.php:411
#: src/Tribe/Main.php:406
msgid "All items on this page were selected. "
msgstr ""

#: src/Tribe/Main.php:412
#: src/Tribe/Main.php:407
msgid "Select all pages"
msgstr ""

#: src/Tribe/Main.php:413
#: src/Tribe/Main.php:408
msgid "Clear Selection."
msgstr ""

#: src/Tribe/Main.php:415
#: src/Tribe/Main.php:410
msgid "All"
msgstr ""

#: src/Tribe/Main.php:416
#: src/Tribe/Main.php:433
#: src/Tribe/Main.php:411
#: src/Tribe/Main.php:428
msgid "Next"
msgstr ""

#: src/Tribe/Main.php:417
#: src/Tribe/Main.php:412
msgid "Previous"
msgstr ""

#: src/Tribe/Main.php:422
#: src/Tribe/Main.php:417
msgid ": Selected %d rows"
msgstr ""

#: src/Tribe/Main.php:423
#: src/Tribe/Main.php:418
msgid ": Selected 1 row"
msgstr ""

#: src/Tribe/Main.php:434
#: src/Tribe/Main.php:429
msgid "Prev"
msgstr ""

#: src/Tribe/Main.php:435
#: src/Tribe/Main.php:437
#: src/Tribe/Main.php:430
#: src/Tribe/Main.php:432
msgid "Today"
msgstr ""

#: src/Tribe/Main.php:436
#: src/Tribe/Main.php:431
msgid "Done"
msgstr ""

#: src/Tribe/Main.php:438
#: src/Tribe/Main.php:433
msgid "Clear"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tribe-common",
"version": "5.1.16",
"version": "5.1.17",
"repository": "[email protected]:the-events-calendar/tribe-common.git",
"_resourcepath": "src/resources",
"_domainPath": "lang",
Expand Down
22 changes: 13 additions & 9 deletions phpcs.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
<?xml version="1.0"?>
<ruleset name="Tribe Common Coding Standards">
<rule ref="TribalScents"></rule>
<rule ref="WordPress-VIP-Go"></rule>
<ruleset name="The Events Calendar Coding Standards">
<rule ref="TEC"/>
<rule ref="WordPress-VIP-Go"/>
<rule ref="WordPress-Extra""/>
<rule ref="WordPress-Core""/>
<rule ref="WordPress-Docs">
<exclude-pattern>*/tests/*</exclude-pattern>
</rule>
<rule ref="WordPress">
<exclude name="WordPress.Files.FileName"/>
</rule>
<rule ref="WordPress-Extra"></rule>
<rule ref="WordPress-Docs"></rule>
<rule ref="WordPress-Core"></rule>

<rule ref="Generic">
<exclude name="Generic.Arrays.DisallowShortArraySyntax"/>
<exclude name="WordPress.DB.DirectDatabaseQuery"/>
<exclude name="WordPress.PHP.YodaConditions.NotYoda"/>
</rule>

<exclude-pattern>*/tests/_support/_generated/*</exclude-pattern>
<exclude-pattern>*/vendor/*</exclude-pattern>
</ruleset>
5 changes: 5 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
== Changelog ==

= [5.1.17] 2023-12-14 =

* Fix - Adding a param safe list to validate input for Select2 usage on AJAX requests. [BTRIA-2148]
* Language - 0 new strings added, 24 updated, 2 fuzzied, and 0 obsoleted

= [5.1.16] 2023-12-13 =

* Tweak - Include Wallet Plus on Add-Ons Page. [ET-1932]
Expand Down
Loading

0 comments on commit 3be81d6

Please sign in to comment.