Skip to content

Commit 1de9e7a

Browse files
authored
Merge pull request #254 from dshanske/feb24refresh
Feb 24 Refresh
2 parents 92234e3 + e4f40be commit 1de9e7a

File tree

413 files changed

+1968
-376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

413 files changed

+1968
-376
lines changed

Gruntfile.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ module.exports = function (grunt) {
6464
files : { // Dictionary of files.
6565

6666
'static/css/indieweb.css': 'sass/main.scss', // 'destination': 'source'
67+
'static/css/indieweb-minimal.css': 'sass/min.scss', // 'destination': 'source'
6768
'static/css/indieweb-bw.css': 'sass/main-bw.scss',
6869
'static/css/indieweb-admin.css': 'sass/main-admin.scss'
6970
}

includes/class-hcard-author-widget.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public function __construct() {
1616
'HCard_Widget', // Base ID
1717
'Author Profile H-Card Widget', // Name
1818
array(
19-
'classname' => 'hcard_widget',
20-
'description' => __( 'A widget that allows you to display author profile marked up as an h-card', 'indieweb' ),
19+
'classname' => 'hcard_widget',
20+
'description' => __( 'A widget that allows you to display author profile marked up as an h-card', 'indieweb' ),
2121
'show_instance_in_rest' => true,
2222
)
2323
);

includes/class-hcard-user.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static function silos() {
5555
),
5656
'twitter' => array(
5757
'baseurl' => 'https://twitter.com/%s',
58-
'display' => __( 'Twitter username (without @)', 'indieweb' ),
58+
'display' => __( 'X/Twitter username (without @)', 'indieweb' ),
5959
),
6060
'facebook' => array(
6161
'baseurl' => 'https://www.facebook.com/%s',
@@ -73,6 +73,14 @@ public static function silos() {
7373
'baseurl' => 'https://www.flickr.com/people/%s',
7474
'display' => __( 'Flickr username', 'indieweb' ),
7575
),
76+
'bluesky' => array(
77+
'baseurl' => 'https://bsky.app/profile/%s',
78+
'display' => __( 'Bluesky Username', 'indieweb' ),
79+
),
80+
'reddit' => array(
81+
'baseurl' => 'https:/reddit.com/user/%s',
82+
'display' => __( 'Reddit Username', 'indieweb' ),
83+
),
7684
'mastodon' => array(
7785
'baseurl' => '%s',
7886
'display' => __( 'Mastodon Server (URL)', 'indieweb' ),
@@ -254,9 +262,13 @@ public static function clean_url( $string ) {
254262
if ( ! filter_var( $url, FILTER_VALIDATE_URL ) ) {
255263
return false;
256264
}
265+
$host = wp_parse_url( $url, PHP_URL_HOST );
266+
if ( ! $host ) {
267+
return false;
268+
}
257269
// Rewrite these to https as needed
258270
$secure = apply_filters( 'iwc_rewrite_secure', array( 'facebook.com', 'twitter.com', 'github.com' ) );
259-
if ( in_array( preg_replace( '/^www\./', '', wp_parse_url( $url, PHP_URL_HOST ) ), $secure, true ) ) {
271+
if ( in_array( preg_replace( '/^www\./', '', $host ), $secure, true ) ) {
260272
$url = preg_replace( '/^http:/i', 'https:', $url );
261273
}
262274
$url = esc_url_raw( $url );

includes/class-relme-domain-icon-map.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class Rel_Me_Domain_Icon_Map {
3030
'primal.net' => 'nostr',
3131
'habla.news' => 'nostr',
3232
'nostr.band' => 'nostr',
33-
'bsky.app' => 'bsky',
34-
'bsky.social' => 'bsky'
33+
'bsky.app' => 'bluesky',
34+
'bsky.social' => 'bluesky',
3535

3636
);
3737

includes/class-relme-widget.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public function __construct() {
1313
'RelMe_Widget',
1414
__( 'Show My Profiles on Other Sites', 'indieweb' ),
1515
array(
16-
'description' => __( 'Adds automatic rel-me URLs based on default author profile information. Rel=me links are links to your presence on other websites and visually appear like many social link widgets', 'indieweb' ),
16+
'description' => __( 'Adds automatic rel-me URLs based on default author profile information. Rel=me links are links to your presence on other websites and visually appear like many social link widgets', 'indieweb' ),
1717
'show_instance_in_rest' => true,
1818
)
1919
);

includes/simple-icons.php

Lines changed: 332 additions & 57 deletions
Large diffs are not rendered by default.

indieweb.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Description: Interested in connecting your WordPress site to the IndieWeb?
66
* Author: IndieWebCamp WordPress Outreach Club
77
* Author URI: https://indieweb.org/WordPress_Outreach_Club
8-
* Version: 4.0.2
8+
* Version: 4.0.3
99
* License: MIT
1010
* License URI: http://opensource.org/licenses/MIT
1111
* Text Domain: indieweb

languages/wordpress-indieweb.pot

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# Copyright (C) 2023 IndieWebCamp WordPress Outreach Club
1+
# Copyright (C) 2024 IndieWebCamp WordPress Outreach Club
22
# This file is distributed under the MIT.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: IndieWeb 4.0.2\n"
5+
"Project-Id-Version: IndieWeb 4.0.3\n"
66
"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wordpress-indieweb\n"
77
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
88
"Language-Team: LANGUAGE <LL@li.org>\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: 2023-11-24T15:11:27+00:00\n"
12+
"POT-Creation-Date: 2024-02-25T10:51:51+00:00\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"X-Generator: WP-CLI 2.9.0\n"
1515
"X-Domain: indieweb\n"
@@ -126,7 +126,7 @@ msgid "Github username"
126126
msgstr ""
127127

128128
#: includes/class-hcard-user.php:58
129-
msgid "Twitter username (without @)"
129+
msgid "X/Twitter username (without @)"
130130
msgstr ""
131131

132132
#: includes/class-hcard-user.php:62
@@ -146,107 +146,115 @@ msgid "Flickr username"
146146
msgstr ""
147147

148148
#: includes/class-hcard-user.php:78
149+
msgid "Bluesky Username"
150+
msgstr ""
151+
152+
#: includes/class-hcard-user.php:82
153+
msgid "Reddit Username"
154+
msgstr ""
155+
156+
#: includes/class-hcard-user.php:86
149157
msgid "Mastodon Server (URL)"
150158
msgstr ""
151159

152-
#: includes/class-hcard-user.php:100
160+
#: includes/class-hcard-user.php:108
153161
msgid "Telephone"
154162
msgstr ""
155163

156-
#: includes/class-hcard-user.php:101
164+
#: includes/class-hcard-user.php:109
157165
msgid "PGP Key (URL)"
158166
msgstr ""
159167

160-
#: includes/class-hcard-user.php:108
168+
#: includes/class-hcard-user.php:116
161169
msgid "Street Address"
162170
msgstr ""
163171

164-
#: includes/class-hcard-user.php:109
172+
#: includes/class-hcard-user.php:117
165173
msgid "Street Number and Name"
166174
msgstr ""
167175

168-
#: includes/class-hcard-user.php:112
176+
#: includes/class-hcard-user.php:120
169177
msgid "Extended Address"
170178
msgstr ""
171179

172-
#: includes/class-hcard-user.php:113
180+
#: includes/class-hcard-user.php:121
173181
msgid "Apartment/Suite/Room Name/Number if any"
174182
msgstr ""
175183

176-
#: includes/class-hcard-user.php:116
184+
#: includes/class-hcard-user.php:124
177185
msgid "Locality"
178186
msgstr ""
179187

180-
#: includes/class-hcard-user.php:117
188+
#: includes/class-hcard-user.php:125
181189
msgid "City/State/Village"
182190
msgstr ""
183191

184-
#: includes/class-hcard-user.php:120
192+
#: includes/class-hcard-user.php:128
185193
msgid "Region"
186194
msgstr ""
187195

188-
#: includes/class-hcard-user.php:121
196+
#: includes/class-hcard-user.php:129
189197
msgid "State/County/Province"
190198
msgstr ""
191199

192-
#: includes/class-hcard-user.php:124
200+
#: includes/class-hcard-user.php:132
193201
msgid "Postal Code"
194202
msgstr ""
195203

196-
#: includes/class-hcard-user.php:125
204+
#: includes/class-hcard-user.php:133
197205
msgid "Postal Code, such as Zip Code"
198206
msgstr ""
199207

200-
#: includes/class-hcard-user.php:128
201-
#: includes/class-hcard-user.php:129
208+
#: includes/class-hcard-user.php:136
209+
#: includes/class-hcard-user.php:137
202210
msgid "Country Name"
203211
msgstr ""
204212

205-
#: includes/class-hcard-user.php:138
213+
#: includes/class-hcard-user.php:146
206214
msgid "Job Title"
207215
msgstr ""
208216

209-
#: includes/class-hcard-user.php:139
217+
#: includes/class-hcard-user.php:147
210218
msgid "Title or Role"
211219
msgstr ""
212220

213-
#: includes/class-hcard-user.php:142
221+
#: includes/class-hcard-user.php:150
214222
msgid "Organization"
215223
msgstr ""
216224

217-
#: includes/class-hcard-user.php:143
225+
#: includes/class-hcard-user.php:151
218226
msgid "Affiliated Organization"
219227
msgstr ""
220228

221-
#: includes/class-hcard-user.php:146
229+
#: includes/class-hcard-user.php:154
222230
msgid "Honorific Prefix"
223231
msgstr ""
224232

225-
#: includes/class-hcard-user.php:147
233+
#: includes/class-hcard-user.php:155
226234
msgid "e.g. Mrs., Mr. Dr."
227235
msgstr ""
228236

229-
#: includes/class-hcard-user.php:154
237+
#: includes/class-hcard-user.php:162
230238
msgid "Address"
231239
msgstr ""
232240

233-
#: includes/class-hcard-user.php:155
241+
#: includes/class-hcard-user.php:163
234242
msgid "Fill in all fields you wish displayed."
235243
msgstr ""
236244

237-
#: includes/class-hcard-user.php:162
245+
#: includes/class-hcard-user.php:170
238246
msgid "Additional Profile Information"
239247
msgstr ""
240248

241-
#: includes/class-hcard-user.php:163
249+
#: includes/class-hcard-user.php:171
242250
msgid "Fill in all fields you are wish displayed."
243251
msgstr ""
244252

245-
#: includes/class-hcard-user.php:168
253+
#: includes/class-hcard-user.php:176
246254
msgid "Other Sites"
247255
msgstr ""
248256

249-
#: includes/class-hcard-user.php:168
257+
#: includes/class-hcard-user.php:176
250258
msgid "Other profiles without their own field in your user profile (One URL per line)"
251259
msgstr ""
252260

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"grunt-contrib-copy": "^1.0.0",
1717
"grunt-contrib-sass": "^2.0.0",
1818
"grunt-wp-readme-to-markdown": "~2.1.0",
19-
"simple-icons": "^9.21"
19+
"simple-icons": "^11.6.0"
2020
},
2121
"license": "MIT",
2222
"bugs": {

phpcs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<exclude-pattern>*/includes/class-connekt-plugin-installer.php</exclude-pattern>
1010
<exclude-pattern>*/vendor/*</exclude-pattern>
1111
<rule ref="PHPCompatibility"/>
12-
<config name="testVersion" value="5.6-"/>
12+
<config name="testVersion" value="7.2-"/>
1313
<rule ref="WordPress-Core" />
1414
<rule ref="WordPress.Files.FileName">
1515
<properties>

0 commit comments

Comments
 (0)