Skip to content

Commit cbc9b94

Browse files
Merge pull request #2567 from Automattic/trunk
Alpha release Oct 17
2 parents 958e082 + 0fe8f8b commit cbc9b94

File tree

14 files changed

+355
-255
lines changed

14 files changed

+355
-255
lines changed

.github/workflows/main.yml

Lines changed: 100 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,105 @@
1-
on: pull_request_review
2-
name: Label approved pull requests
1+
on:
2+
pull_request_review:
3+
types: [submitted]
4+
name: Label pull requests on review
35
jobs:
46
labelWhenApproved:
57
name: Label when approved
68
runs-on: ubuntu-latest
9+
permissions:
10+
contents: read
11+
pull-requests: write
712
steps:
8-
- name: Label when approved
9-
uses: abinoda/label-when-approved-action@master
10-
env:
11-
APPROVALS: '1'
12-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13-
ADD_LABEL: '[Status] Approved'
14-
# Needs to be URL-encoded, see https://github.com/abinoda/label-when-approved-action/pull/3#discussion_r321882620
15-
REMOVE_LABEL: '%5BStatus%5D%20Needs%20Review'
13+
- name: Check if review is approved
14+
id: check_approval
15+
run: |
16+
if [ "${{ github.event.review.state }}" = "approved" ]; then
17+
echo "approved=true" >> $GITHUB_OUTPUT
18+
else
19+
echo "approved=false" >> $GITHUB_OUTPUT
20+
fi
21+
22+
- name: Add approved label
23+
if: steps.check_approval.outputs.approved == 'true'
24+
uses: actions/github-script@v7
25+
with:
26+
script: |
27+
const { owner, repo, number } = context.issue;
28+
29+
// Add the approved label
30+
await github.rest.issues.addLabels({
31+
owner,
32+
repo,
33+
issue_number: number,
34+
labels: ['[Status] Approved']
35+
});
36+
37+
// Remove the needs review label if it exists
38+
try {
39+
await github.rest.issues.removeLabel({
40+
owner,
41+
repo,
42+
issue_number: number,
43+
name: '[Status] Needs Review'
44+
});
45+
} catch (error) {
46+
// Label might not exist, which is fine
47+
console.log('Label "[Status] Needs Review" not found or already removed');
48+
}
49+
50+
// Remove the needs changes or feedback label if it exists
51+
try {
52+
await github.rest.issues.removeLabel({
53+
owner,
54+
repo,
55+
issue_number: number,
56+
name: '[Status] Needs Changes or Feedback'
57+
});
58+
} catch (error) {
59+
// Label might not exist, which is fine
60+
console.log('Label "[Status] Needs Changes or Feedback" not found or already removed');
61+
}
62+
63+
labelWhenChangesRequested:
64+
name: Label when changes requested
65+
runs-on: ubuntu-latest
66+
permissions:
67+
contents: read
68+
pull-requests: write
69+
steps:
70+
- name: Check if review requests changes
71+
id: check_changes_requested
72+
run: |
73+
if [ "${{ github.event.review.state }}" = "changes_requested" ]; then
74+
echo "changes_requested=true" >> $GITHUB_OUTPUT
75+
else
76+
echo "changes_requested=false" >> $GITHUB_OUTPUT
77+
fi
78+
79+
- name: Add changes requested label
80+
if: steps.check_changes_requested.outputs.changes_requested == 'true'
81+
uses: actions/github-script@v7
82+
with:
83+
script: |
84+
const { owner, repo, number } = context.issue;
85+
86+
// Add the changes requested label
87+
await github.rest.issues.addLabels({
88+
owner,
89+
repo,
90+
issue_number: number,
91+
labels: ['[Status] Needs Changes or Feedback']
92+
});
93+
94+
// Remove the approved label if it exists
95+
try {
96+
await github.rest.issues.removeLabel({
97+
owner,
98+
repo,
99+
issue_number: number,
100+
name: '[Status] Approved'
101+
});
102+
} catch (error) {
103+
// Label might not exist, which is fine
104+
console.log('Label "[Status] Approved" not found or already removed');
105+
}

composer.lock

Lines changed: 18 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

newspack-theme/classes/class-newspack-svg-icons.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,9 @@ public static function get_social_icons_map() {
282282
'oldbytes.space',
283283
'pawoo.net',
284284
),
285+
'nextdoor' => array(
286+
'nextdoor.com',
287+
),
285288
'phone' => array(
286289
'tel:',
287290
),
@@ -494,6 +497,12 @@ public static function get_social_icons_map() {
494497
</g>
495498
</svg>
496499
',
500+
501+
'nextdoor' => '
502+
<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
503+
<path d="M8.07664 5.53693V3H4.82086V7.64405L1 10.1163L2.73222 12.9556L4.82086 11.6035V21H19.1791V11.6035L21.2678 12.9556L23 10.1163L11.9991 3L8.07664 5.53693Z" />
504+
</svg>',
505+
497506
'patreon' => '
498507
<svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
499508
<g>

newspack-theme/languages/de_DE.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Newspack 1.0.0-alpha.24\n"
44
"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/newspack-theme\n"
5-
"POT-Creation-Date: 2025-09-08T14:34:56+00:00\n"
5+
"POT-Creation-Date: 2025-10-17T15:10:06+00:00\n"
66
"PO-Revision-Date: 2025-03-12 09:09-0700\n"
77
"Last-Translator: \n"
88
"Language-Team: \n"

newspack-theme/languages/es_ES.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Newspack\n"
44
"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/newspack-theme\n"
5-
"POT-Creation-Date: 2025-09-08T14:34:56+00:00\n"
5+
"POT-Creation-Date: 2025-10-17T15:10:06+00:00\n"
66
"PO-Revision-Date: 2025-03-14 10:01-0700\n"
77
"Last-Translator: \n"
88
"Language-Team: \n"

newspack-theme/languages/fr_BE.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Newspack 1.0.0-alpha.33\n"
44
"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/newspack-theme\n"
5-
"POT-Creation-Date: 2025-09-08T14:34:56+00:00\n"
5+
"POT-Creation-Date: 2025-10-17T15:10:06+00:00\n"
66
"PO-Revision-Date: 2025-03-12 09:11-0700\n"
77
"Last-Translator: \n"
88
"Language-Team: \n"

newspack-theme/languages/newspack-theme.pot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# This file is distributed under the GNU General Public License v2 or later.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: Newspack 2.13.0\n"
5+
"Project-Id-Version: Newspack 2.14.3\n"
66
"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/newspack-theme\n"
77
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
88
"Language-Team: LANGUAGE <[email protected]>\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"POT-Creation-Date: 2025-09-08T14:34:56+00:00\n"
12+
"POT-Creation-Date: 2025-10-17T15:10:06+00:00\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"X-Generator: WP-CLI 2.12.0\n"
1515
"X-Domain: newspack-theme\n"

newspack-theme/languages/pl_PL.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Newspack 1.0.0-alpha.33\n"
44
"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/newspack-theme\n"
5-
"POT-Creation-Date: 2025-09-08T14:34:56+00:00\n"
5+
"POT-Creation-Date: 2025-10-17T15:10:06+00:00\n"
66
"PO-Revision-Date: 2025-03-12 09:12-0700\n"
77
"Last-Translator: \n"
88
"Language-Team: \n"

newspack-theme/languages/pt_BR.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Newspack\n"
44
"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/newspack-theme\n"
5-
"POT-Creation-Date: 2025-09-08T14:34:56+00:00\n"
5+
"POT-Creation-Date: 2025-10-17T15:10:06+00:00\n"
66
"PO-Revision-Date: 2025-03-14 10:02-0700\n"
77
"Last-Translator: Luiz Eduardo Oliveira Fonseca <[email protected]>\n"
88
"Language-Team: Português do Brasil\n"

newspack-theme/languages/pt_PT.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Newspack 1.0.0-alpha.33\n"
44
"Report-Msgid-Bugs-To: https://wordpress.org/support/theme/newspack-theme\n"
5-
"POT-Creation-Date: 2025-09-08T14:34:56+00:00\n"
5+
"POT-Creation-Date: 2025-10-17T15:10:06+00:00\n"
66
"PO-Revision-Date: 2025-03-12 09:13-0700\n"
77
"Last-Translator: \n"
88
"Language-Team: \n"

0 commit comments

Comments
 (0)