Skip to content

Commit 7e78c7d

Browse files
authored
load donate banner from donate.python.org (#19120)
* load donate banner from donate.python.org This is no-op until we go live with the fundraiser. can be previewd using `?banner_preview=true` * translationst
1 parent fb44376 commit 7e78c7d

File tree

4 files changed

+59
-53
lines changed

4 files changed

+59
-53
lines changed

tests/unit/test_csp.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ def test_includeme():
269269
"https://analytics.python.org",
270270
"*.fastly-insights.com",
271271
"*.ethicalads.io",
272+
"https://donate.python.org",
272273
"'sha256-U3hKDidudIaxBDEzwGJApJgPEf2mWk6cfMWghrAa6i0='",
273274
"https://cdn.jsdelivr.net/npm/mathjax@3.2.2/",
274275
"'sha256-1CldwzdEg2k1wTmf7s5RWVd7NMXI/7nxxjJM2C4DqII='",
@@ -278,6 +279,7 @@ def test_includeme():
278279
"'self'",
279280
"fonts.googleapis.com",
280281
"*.ethicalads.io",
282+
"donate.python.org",
281283
"'sha256-2YHqZokjiizkHi1Zt+6ar0XJ0OeEy/egBnlm+MDMtrM='",
282284
"'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='",
283285
"'sha256-JLEjeN9e5dGsz5475WyRaoA4eQOdNPxDIeUhclnJDCE='",

warehouse/csp.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ def _script_src_settings(config) -> list:
125125
"https://analytics.python.org",
126126
"*.fastly-insights.com",
127127
"*.ethicalads.io",
128+
"https://donate.python.org",
128129
# Hash for v1.4.0 of ethicalads.min.js
129130
"'sha256-U3hKDidudIaxBDEzwGJApJgPEf2mWk6cfMWghrAa6i0='",
130131
"https://cdn.jsdelivr.net/npm/mathjax@3.2.2/",
@@ -174,6 +175,7 @@ def includeme(config):
174175
SELF,
175176
"fonts.googleapis.com",
176177
"*.ethicalads.io",
178+
"donate.python.org",
177179
# Hashes for inline styles generated by v1.4.0 of ethicalads.min.js
178180
"'sha256-2YHqZokjiizkHi1Zt+6ar0XJ0OeEy/egBnlm+MDMtrM='",
179181
"'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='",

warehouse/locale/messages.pot

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,14 +1020,14 @@ msgstr ""
10201020

10211021
#: warehouse/templates/404.html:30 warehouse/templates/500.html:18
10221022
#: warehouse/templates/accounts/two-factor.html:35
1023-
#: warehouse/templates/base.html:343 warehouse/templates/base.html:349
1024-
#: warehouse/templates/base.html:355 warehouse/templates/base.html:361
1025-
#: warehouse/templates/base.html:377 warehouse/templates/base.html:383
1026-
#: warehouse/templates/base.html:408 warehouse/templates/base.html:414
1027-
#: warehouse/templates/base.html:423 warehouse/templates/base.html:436
1028-
#: warehouse/templates/base.html:445 warehouse/templates/base.html:451
1029-
#: warehouse/templates/base.html:457 warehouse/templates/base.html:470
1030-
#: warehouse/templates/base.html:487
1023+
#: warehouse/templates/base.html:345 warehouse/templates/base.html:351
1024+
#: warehouse/templates/base.html:357 warehouse/templates/base.html:363
1025+
#: warehouse/templates/base.html:379 warehouse/templates/base.html:385
1026+
#: warehouse/templates/base.html:410 warehouse/templates/base.html:416
1027+
#: warehouse/templates/base.html:425 warehouse/templates/base.html:438
1028+
#: warehouse/templates/base.html:447 warehouse/templates/base.html:453
1029+
#: warehouse/templates/base.html:459 warehouse/templates/base.html:472
1030+
#: warehouse/templates/base.html:489
10311031
#: warehouse/templates/includes/accounts/profile-callout.html:17
10321032
#: warehouse/templates/includes/file-details.html:129
10331033
#: warehouse/templates/index.html:98 warehouse/templates/index.html:105
@@ -1181,7 +1181,7 @@ msgid "Main navigation"
11811181
msgstr ""
11821182

11831183
#: warehouse/templates/base.html:33 warehouse/templates/base.html:68
1184-
#: warehouse/templates/base.html:338
1184+
#: warehouse/templates/base.html:340
11851185
#: warehouse/templates/includes/current-user-indicator.html:77
11861186
#: warehouse/templates/pages/help.html:209
11871187
#: warehouse/templates/pages/sitemap.html:19
@@ -1257,16 +1257,16 @@ msgstr ""
12571257
msgid "RSS: 40 newest packages"
12581258
msgstr ""
12591259

1260-
#: warehouse/templates/base.html:209
1260+
#: warehouse/templates/base.html:211
12611261
msgid "Skip to main content"
12621262
msgstr ""
12631263

1264-
#: warehouse/templates/base.html:213
1264+
#: warehouse/templates/base.html:215
12651265
msgid "Switch to mobile version"
12661266
msgstr ""
12671267

1268-
#: warehouse/templates/base.html:220 warehouse/templates/base.html:229
1269-
#: warehouse/templates/base.html:239
1268+
#: warehouse/templates/base.html:222 warehouse/templates/base.html:231
1269+
#: warehouse/templates/base.html:241
12701270
#: warehouse/templates/includes/flash-messages.html:41
12711271
#: warehouse/templates/includes/session-notifications.html:19
12721272
#: warehouse/templates/manage/account.html:845
@@ -1283,177 +1283,177 @@ msgstr ""
12831283
msgid "Warning"
12841284
msgstr ""
12851285

1286-
#: warehouse/templates/base.html:222
1286+
#: warehouse/templates/base.html:224
12871287
msgid "You are using an unsupported browser, upgrade to a newer version."
12881288
msgstr ""
12891289

1290-
#: warehouse/templates/base.html:231
1290+
#: warehouse/templates/base.html:233
12911291
msgid ""
12921292
"You are using TestPyPI – a separate instance of the Python Package Index "
12931293
"that allows you to try distribution tools and processes without affecting"
12941294
" the real index."
12951295
msgstr ""
12961296

1297-
#: warehouse/templates/base.html:241
1297+
#: warehouse/templates/base.html:243
12981298
msgid ""
12991299
"Some features may not work without JavaScript. Please try enabling it if "
13001300
"you encounter problems."
13011301
msgstr ""
13021302

1303-
#: warehouse/templates/base.html:276 warehouse/templates/base.html:308
1303+
#: warehouse/templates/base.html:278 warehouse/templates/base.html:310
13041304
#: warehouse/templates/error-base-with-search.html:8
13051305
#: warehouse/templates/index.html:29
13061306
msgid "Search PyPI"
13071307
msgstr ""
13081308

1309-
#: warehouse/templates/base.html:281 warehouse/templates/index.html:35
1309+
#: warehouse/templates/base.html:283 warehouse/templates/index.html:35
13101310
msgid "Type '/' to search projects"
13111311
msgstr ""
13121312

1313-
#: warehouse/templates/base.html:292 warehouse/templates/base.html:321
1313+
#: warehouse/templates/base.html:294 warehouse/templates/base.html:323
13141314
#: warehouse/templates/error-base-with-search.html:19
13151315
#: warehouse/templates/index.html:44
13161316
msgid "Search"
13171317
msgstr ""
13181318

1319-
#: warehouse/templates/base.html:313
1319+
#: warehouse/templates/base.html:315
13201320
#: warehouse/templates/error-base-with-search.html:13
13211321
msgid "Search projects"
13221322
msgstr ""
13231323

1324-
#: warehouse/templates/base.html:339
1324+
#: warehouse/templates/base.html:341
13251325
msgid "Help navigation"
13261326
msgstr ""
13271327

1328-
#: warehouse/templates/base.html:345
1328+
#: warehouse/templates/base.html:347
13291329
msgid "Installing packages"
13301330
msgstr ""
13311331

1332-
#: warehouse/templates/base.html:351
1332+
#: warehouse/templates/base.html:353
13331333
msgid "Uploading packages"
13341334
msgstr ""
13351335

1336-
#: warehouse/templates/base.html:357
1336+
#: warehouse/templates/base.html:359
13371337
msgid "User guide"
13381338
msgstr ""
13391339

1340-
#: warehouse/templates/base.html:363
1340+
#: warehouse/templates/base.html:365
13411341
msgid "Project name retention"
13421342
msgstr ""
13431343

1344-
#: warehouse/templates/base.html:366
1344+
#: warehouse/templates/base.html:368
13451345
msgid "FAQs"
13461346
msgstr ""
13471347

1348-
#: warehouse/templates/base.html:372 warehouse/templates/pages/sitemap.html:34
1348+
#: warehouse/templates/base.html:374 warehouse/templates/pages/sitemap.html:34
13491349
msgid "About PyPI"
13501350
msgstr ""
13511351

1352-
#: warehouse/templates/base.html:373
1352+
#: warehouse/templates/base.html:375
13531353
msgid "About PyPI navigation"
13541354
msgstr ""
13551355

1356-
#: warehouse/templates/base.html:379
1356+
#: warehouse/templates/base.html:381
13571357
msgid "PyPI Blog"
13581358
msgstr ""
13591359

1360-
#: warehouse/templates/base.html:385
1360+
#: warehouse/templates/base.html:387
13611361
msgid "Infrastructure dashboard"
13621362
msgstr ""
13631363

1364-
#: warehouse/templates/base.html:388 warehouse/templates/pages/sitemap.html:40
1364+
#: warehouse/templates/base.html:390 warehouse/templates/pages/sitemap.html:40
13651365
#: warehouse/templates/pages/stats.html:4
13661366
msgid "Statistics"
13671367
msgstr ""
13681368

1369-
#: warehouse/templates/base.html:391
1369+
#: warehouse/templates/base.html:393
13701370
msgid "Logos & trademarks"
13711371
msgstr ""
13721372

1373-
#: warehouse/templates/base.html:394
1373+
#: warehouse/templates/base.html:396
13741374
msgid "Our sponsors"
13751375
msgstr ""
13761376

1377-
#: warehouse/templates/base.html:400
1377+
#: warehouse/templates/base.html:402
13781378
msgid "Contributing to PyPI"
13791379
msgstr ""
13801380

1381-
#: warehouse/templates/base.html:401
1381+
#: warehouse/templates/base.html:403
13821382
msgid "How to contribute navigation"
13831383
msgstr ""
13841384

1385-
#: warehouse/templates/base.html:404
1385+
#: warehouse/templates/base.html:406
13861386
msgid "Bugs and feedback"
13871387
msgstr ""
13881388

1389-
#: warehouse/templates/base.html:410
1389+
#: warehouse/templates/base.html:412
13901390
msgid "Contribute on GitHub"
13911391
msgstr ""
13921392

1393-
#: warehouse/templates/base.html:416
1393+
#: warehouse/templates/base.html:418
13941394
msgid "Translate PyPI"
13951395
msgstr ""
13961396

1397-
#: warehouse/templates/base.html:419
1397+
#: warehouse/templates/base.html:421
13981398
msgid "Sponsor PyPI"
13991399
msgstr ""
14001400

1401-
#: warehouse/templates/base.html:425
1401+
#: warehouse/templates/base.html:427
14021402
msgid "Development credits"
14031403
msgstr ""
14041404

1405-
#: warehouse/templates/base.html:431 warehouse/templates/pages/sitemap.html:10
1405+
#: warehouse/templates/base.html:433 warehouse/templates/pages/sitemap.html:10
14061406
msgid "Using PyPI"
14071407
msgstr ""
14081408

1409-
#: warehouse/templates/base.html:432
1409+
#: warehouse/templates/base.html:434
14101410
msgid "Using PyPI navigation"
14111411
msgstr ""
14121412

1413-
#: warehouse/templates/base.html:438
1413+
#: warehouse/templates/base.html:440
14141414
#: warehouse/templates/manage/organization/activate_subscription.html:21
14151415
msgid "Terms of Service"
14161416
msgstr ""
14171417

1418-
#: warehouse/templates/base.html:441
1418+
#: warehouse/templates/base.html:443
14191419
msgid "Report security issue"
14201420
msgstr ""
14211421

1422-
#: warehouse/templates/base.html:447
1422+
#: warehouse/templates/base.html:449
14231423
msgid "Code of conduct"
14241424
msgstr ""
14251425

1426-
#: warehouse/templates/base.html:453
1426+
#: warehouse/templates/base.html:455
14271427
msgid "Privacy Notice"
14281428
msgstr ""
14291429

1430-
#: warehouse/templates/base.html:459
1430+
#: warehouse/templates/base.html:461
14311431
msgid "Acceptable Use Policy"
14321432
msgstr ""
14331433

1434-
#: warehouse/templates/base.html:469
1434+
#: warehouse/templates/base.html:471
14351435
msgid "Status:"
14361436
msgstr ""
14371437

1438-
#: warehouse/templates/base.html:473
1438+
#: warehouse/templates/base.html:475
14391439
msgid "all systems operational"
14401440
msgstr ""
14411441

1442-
#: warehouse/templates/base.html:477
1442+
#: warehouse/templates/base.html:479
14431443
msgid ""
14441444
"Developed and maintained by the Python community, for the Python "
14451445
"community."
14461446
msgstr ""
14471447

1448-
#: warehouse/templates/base.html:479
1448+
#: warehouse/templates/base.html:481
14491449
msgid "Donate today!"
14501450
msgstr ""
14511451

1452-
#: warehouse/templates/base.html:491 warehouse/templates/pages/sitemap.html:4
1452+
#: warehouse/templates/base.html:493 warehouse/templates/pages/sitemap.html:4
14531453
msgid "Site map"
14541454
msgstr ""
14551455

1456-
#: warehouse/templates/base.html:498
1456+
#: warehouse/templates/base.html:500
14571457
msgid "Switch to desktop version"
14581458
msgstr ""
14591459

warehouse/templates/base.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@
200200
integrity="sha256-U3hKDidudIaxBDEzwGJApJgPEf2mWk6cfMWghrAa6i0= sha384-UcmsCqcNRSLW/dV3Lo1oCi2/VaurXbib6p4HyUEOeIa/4OpsrnucrugAefzVZJfI sha512-q4t1L4xEjGV2R4hzqCa41P8jrgFUS8xTb8rdNv4FGvw7FpydVj/kkxBJHOiaoxHa8olCcx1Slk9K+3sNbsM4ug=="
201201
crossorigin="anonymous"></script>
202202
{% if devPyPI %}<script src="{{ request.registry.settings.get("livereload.url") }}/livereload.js"></script>{% endif %}
203+
<script async
204+
src="https://donate.python.org/fundraiser-banner/fundraiser-banner.js"></script>
203205
</head>
204206
<body data-controller="viewport-toggle"
205207
data-allowed-domains="{{ request.hashed_domains }}"

0 commit comments

Comments
 (0)