From 430a8912eba683e2c7750c9fb1725d03edacaf24 Mon Sep 17 00:00:00 2001
From: arunsahijpal <arunsahijpal111@gmail.com>
Date: Tue, 31 Dec 2024 14:21:46 +0530
Subject: [PATCH 1/4] Issue #3495211: Corrected Drupal.t() function.
---
sveltejs/src/Project/ActionButton.svelte | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sveltejs/src/Project/ActionButton.svelte b/sveltejs/src/Project/ActionButton.svelte
index c9899c2a3..9c726d711 100644
--- a/sveltejs/src/Project/ActionButton.svelte
+++ b/sveltejs/src/Project/ActionButton.svelte
@@ -39,15 +39,15 @@
{#if PACKAGE_MANAGER.available && PACKAGE_MANAGER.errors.length === 0}
{#if ($queueList[$activeTab] && $queueList[$activeTab].some((item) => item.id === project.id)) || false}
<ProjectButtonBase click={() => handleDequeueClick(project.id)}>
- {Drupal.t('Deselect')}<span class="visually-hidden"
- >{project.title}</span
- >
+ {Drupal.t('Deselect <span class="visually-hidden">@title</span>', {
+ '@title': project.title,
+ })}
</ProjectButtonBase>
{:else}
<ProjectButtonBase click={() => handleAddToQueueClick(project)}>
- {Drupal.t('Select')}<span class="visually-hidden"
- >{project.title}</span
- >
+ {Drupal.t('Select <span class="visually-hidden">@title</span>', {
+ '@title': project.title,
+ })}
</ProjectButtonBase>
{/if}
{:else if project.commands}
@@ -62,7 +62,7 @@
>
{Drupal.t('View Commands')}
<span class="visually-hidden"
- >{Drupal.t(' for ')} {project.title}</span
+ >{Drupal.t(' for @title', { '@title': project.title })}</span
>
</ProjectButtonBase>
{/if}
--
GitLab
From 7220f044671ed481f93a3007a07a5da77858a848 Mon Sep 17 00:00:00 2001
From: arunsahijpal <arunsahijpal111@gmail.com>
Date: Thu, 2 Jan 2025 23:50:27 +0530
Subject: [PATCH 2/4] Issue #3495211: Corrected Drupal.t()
---
sveltejs/src/Project/ActionButton.svelte | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sveltejs/src/Project/ActionButton.svelte b/sveltejs/src/Project/ActionButton.svelte
index 9c726d711..31b81f9d9 100644
--- a/sveltejs/src/Project/ActionButton.svelte
+++ b/sveltejs/src/Project/ActionButton.svelte
@@ -60,10 +60,9 @@
aria-haspopup="dialog"
click={() => openPopup(getCommandsPopupMessage(project), project)}
>
- {Drupal.t('View Commands')}
- <span class="visually-hidden"
- >{Drupal.t(' for @title', { '@title': project.title })}</span
- >
+ {Drupal.t('View Commands <span class="visually-hidden">for @title</span>', {
+ '@title': project.title,
+ })}
</ProjectButtonBase>
{/if}
{/if}
--
GitLab
From a0ea6de45ca51a41f1996ad8d3036f2856226a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net>
Date: Thu, 2 Jan 2025 13:49:32 -0500
Subject: [PATCH 3/4] Run prettier
---
sveltejs/public/build/bundle.js.map | Bin 269334 -> 269384 bytes
sveltejs/src/Project/ActionButton.svelte | 9 ++++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map
index 46ec3872d6c0fe2319f99b80c837adb9d11eb66e..af48f0b403d9f4d7928d7d2d5c55e6b78ecb942c 100644
GIT binary patch
delta 242
zcmbQXL*T>?frc%N2hL1?`H_)_MF9w=A2`G4#1WGRVgq@J@=T(W>*ujepL>c?ZTd5L
zCcf#xa~XxEpFYVbKizi=Bj5DX2~3>r^=BEk*PmqyUB#5`Jl*jiv%~ZYTFeH_o{lBk
zJu8?mGmAK<=xDn*I%>P<xH>vI0tr`hm+1yI%>GOshSM8sm}POQaGZW%7qh_hgiXvW
z(?8TP%dvPmhWSlz_{c0e{Q?uS-1LGk%<9t}+?f-$KdxmqWo9yQo^B|`tTnBI*_1Wh
U(b&a*y8U!!sqHfwnd@c&08A`T%K!iX
delta 181
zcmX@HLtxqtfrc%N2hL2taE8%odiN>D;`Zfd8MiM#%M`zgS=-5fdgDhX&FKcqm}RGF
zGix$?I_7P!u3)~*EbQp4qwV78sO_TT>gebQB%Cd$pQ&SZnzojid;0V`W>o=f(j_dO
zjzM127p!77p5CyGiFNw&FU(5Q3*4C#wu{y=n=&(1I!`}1joE0r0vEIJ^b2y#Qmo;Q
T6)yhM3#T(nZ9mn>TsI2<tD-*&
diff --git a/sveltejs/src/Project/ActionButton.svelte b/sveltejs/src/Project/ActionButton.svelte
index 31b81f9d9..12c38ccc8 100644
--- a/sveltejs/src/Project/ActionButton.svelte
+++ b/sveltejs/src/Project/ActionButton.svelte
@@ -60,9 +60,12 @@
aria-haspopup="dialog"
click={() => openPopup(getCommandsPopupMessage(project), project)}
>
- {Drupal.t('View Commands <span class="visually-hidden">for @title</span>', {
- '@title': project.title,
- })}
+ {Drupal.t(
+ 'View Commands <span class="visually-hidden">for @title</span>',
+ {
+ '@title': project.title,
+ },
+ )}
</ProjectButtonBase>
{/if}
{/if}
--
GitLab
From 3fb7e9b6c89bb89c48f61d6b7e010cd1dafb180f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=C3=A9na=20Proxima?= <adam@phenaproxima.net>
Date: Thu, 2 Jan 2025 14:29:42 -0500
Subject: [PATCH 4/4] Fix escaping bug to make tests pass
---
sveltejs/public/build/bundle.js | Bin 289610 -> 291380 bytes
sveltejs/public/build/bundle.js.map | Bin 269384 -> 271052 bytes
sveltejs/src/Project/ActionButton.svelte | 20 +++++++++++++-------
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js
index 8ea9786fb1bce81cd98d64e9c8e87ffa1ed439db..cda2e56b0957c1596eae475c701f2374343d68c8 100644
GIT binary patch
delta 1576
zcmd5*PiWIn944>bX4}m*tbaCTCBp1dSJHO1!?g?@D30PPV*?Q#HKu73Nz$66jUpa~
zhaq^_c*r}tlb|3d3O&lM9t0VR=*59o86qN{W?o*`4XGlY_D(PF_x-;2ec$ip)jRsd
zXZmT1b{maK5pMc3BZYZ(R5Hz4Hj%I_i?h;PRj(w*lgVVl#*D@pjaT7ZfB1Qd{@y#s
z*h^4&!(e7iRaxLG%q=fI!%L`YhN;&Dv#PVQQM9|6DW=RTh8Wv}!bnq+4URzIsv0`6
z=i6=}g<PAr-67gV2ddc{t*$6=^+J$gC0j|y8ziR$Q#XQP)!D`wlh-Sv8E1G+kg7TZ
zw}(P-O>p-dad<_z)EnrR%M80m5lji85mL6V#kq-!sEV4&5;9J!mc#<Dif}bI;1+GW
z@Om~#gkr^iLH9YdCbnhkg434+KIcRr!jt)7f{<CF7hAbPTy-=oa<Zn0`pm-YIhzyb
z(ji40-n6dsH@UK2Rf$uP6C_zF6>KL4z68iDJnss@d!9hIqez2qw!?5G(F>V;&j68a
zr-|pNU6L2$41Adj!jpL~^k4JN*Zw?{5*zEFspY9dMJ57ytSV|ZcX~-0SFY-3ctK)I
zqR9)8jt1^TBg@eU)r>~KO00V_n@-0Vv_4Knnjg-B(=?bk-efL<w{9?zZ2njTU%S9W
z2KCj!AOa=u>;R6gXz~^G<t`OQ`96w9uS>x4Ip?ie%sn1Cwu7@H)kJIOpJ2(OCvH3*
z4@RL{jv5+rwwRdXTLUT*HnfzZ;(;AHPGxo8DmHkfE+YRn6>~cjn-2ktK5bEcwDl1T
zBX7xdxUEg0V=-sq4tovvqxA|Hgb&`wyBuD$H027wC-;53?x<N;)IFX}rIEi50?k+j
zEKt-WvXdEWK9azi2V{~sl`+)NL1DL#q;iNFKp7Jh(J2G?_G2_HfmaW<bN%;Rjv`+j
f-2UA%eh5DsK-jmITLR1fWqEnS0?iG}WqtbvR6zm7
delta 294
zcmdn;MDWx#!3~Cjo0kfH<!PR%)IL#(ar;CirU{xX##YA0(-r#|6}G$jFu4danOaQW
zm&>HReOoNkDi$VFlkG`KOdnZUO)aeq4W`fYVwRm=n!&Vk`n((_>FIu%Oy$!X;+R#Z
z*IP38OiN(mp8g?=nPs|m0<-w^-7L(4)9tdE@~5*UG6zmxe_5Hy)NFfD4pTNGquF+#
z9j7^&Ow6Zumors@O`Du|o_)GP6;sr7gBqYg_>6@qjfERMU7?z(7UHP0)l7MKbx#MX
YNS@A|$Q%N4RQujKrtN#{n9Dx{0BI*>k^lez
diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map
index af48f0b403d9f4d7928d7d2d5c55e6b78ecb942c..3a5c8538b8fffc22f8d06503e5948ecee0a5cb20 100644
GIT binary patch
delta 1321
zcmah|TWAzl80P%{ZnBAScjN9_yNz-4;spmy)fB=$n15zgyTrJOtENg(BTCjZy0aIJ
zCMk_XqlKneq50oL1tZ?5q2hX>R%rzjB8rfQyr^$t3fj`X^r4q?W^t29#CbRzX1@Qs
zoih(^ct`Jhd#(w6ctKqvySF`LruSPd?aQ)@Ki?Oc_Hg~MsO32i#c`e(7A;lpfiH@4
zY*^H&f$wwwj)<G0C_j<Qjfx$Yt6Ftaixb7QW};@zATqQlQB;c%MZ!@sR`SpjnCsY0
zw41+r2^Cy+1zd12!ku>@$XB|cB)9Sq{OE3sQq<HMh#IsQQOssi^SknNlk7HREzw%7
zo~XW{lQ6U<qNY4r+2GetU|v~`KKXj!8Ggv?ufbdnWx>hoEbyzv9Z)*Ub(>FZ*V!bT
zdI9sqR`zD4&)a=4hcg+uq+fuKFMJKN_`e(AEU}HKz&vza5;sqvhp%>k<CB81w61L-
z+LAYBS7Vo?V%YuYTB}afs^>*tU6N`mlIZ8U@4)5DnhHbHAeGisNO`+Ch2IX|as>Rd
z)SL{jq`A?8fE__}@`BUwk;-4n9jCy}J0D5cGSdfdlJ*RO(_ctcIEI9wiU@G`m>lZs
z2QQx(m%Bz2OZevrDE6xgjkha&o<YA;IoZYiCt(@8#%1NdWzfyv9sytRzPxp=Ds}|y
z*7)R83D|B)cUBJ+@#<&toR)7w7x(`FrBG||nIRc|(r<t-`J{vA7r`Og*prpn)KQ6a
zVeeLS9&UXE<!-xpl}%aNkU!af5|aJZd@SSYJ?IFkFVn7qnh6tC*XJgV!Psj^>U_5Y
z>q^tQY`1|rj2IvO1D0_0AkH6Hic2s`HQaR&$HXdbI)p!grRO}ISRo*#pVzuj6oped
zH6{4tZmg6axv?9!xx(S_Qj<QlroN4{_Z9|t^`EkXHNVQv?*0WX-uNZnD^?Vr9WYoR
zR`?A|*ODet(o}bj<PvG;mTqjA&gy#yOrKHas(}utRN0!hq=qw6BQvRCy+dOr*vuNg
zpF>Z{<~Bq9^{Ggq#&W*ZgD2n%lkW}S3J#T`j~`cJ(Ai9Fkr<~KgSnBzcvgrw@9o7}
r#~xi?jASnc`IlZ?k89c@yzm<g@!x&8m`{grHh1>no!p|MSjGPXbbON=
delta 482
zcmZ|LO(?^09LMp#|L<ltVJk_ykdv6?VV+KY|NSQpGe%rEcsxv7n1g5!D4{rT_#C9<
zB2p6dr#v2%f1c*x;<Q{`6c;y&f0Po}@8{j?@Vz{<p6^*>yCiD}FOvmb8dVx{#@d6}
z(x{BWc-3hBYl;q%3H=%s{oV^<y{1$(ctQK5r)IVMirO}l1G3_17NQxpn3SQ~Mx~uJ
zgAjoRwPjwqd!}v_M7YM>=ad~D(eLuY%7y~0M7WlQ@fhJd3gIxyhf>b~PGg*@F2>kM
z-0Q4G!pC-0FR=wD<9weKkVVt5jN2{F#_0riB$X(luK4HR!@vTU;Bu0W^wwA5Lg(6N
zo4(E_i(3fca0^$^jnOF<h$lEj2b2-{->MZ+lfj7NHz`X88^2RqND(5Wd}?3h&_Cqg
z-8Xs@=Uk&#_=;q_PjOr-bKzy1^O63*PGg%WRlFEKV7uy>=2apOUS_yT|K%+Ex!&)_
Q#scRcJjZ!zVwRuq0T{BV0RR91
diff --git a/sveltejs/src/Project/ActionButton.svelte b/sveltejs/src/Project/ActionButton.svelte
index 12c38ccc8..72ff57067 100644
--- a/sveltejs/src/Project/ActionButton.svelte
+++ b/sveltejs/src/Project/ActionButton.svelte
@@ -39,15 +39,21 @@
{#if PACKAGE_MANAGER.available && PACKAGE_MANAGER.errors.length === 0}
{#if ($queueList[$activeTab] && $queueList[$activeTab].some((item) => item.id === project.id)) || false}
<ProjectButtonBase click={() => handleDequeueClick(project.id)}>
- {Drupal.t('Deselect <span class="visually-hidden">@title</span>', {
- '@title': project.title,
- })}
+ {@html Drupal.t(
+ 'Deselect <span class="visually-hidden">@title</span>',
+ {
+ '@title': project.title,
+ },
+ )}
</ProjectButtonBase>
{:else}
<ProjectButtonBase click={() => handleAddToQueueClick(project)}>
- {Drupal.t('Select <span class="visually-hidden">@title</span>', {
- '@title': project.title,
- })}
+ {@html Drupal.t(
+ 'Select <span class="visually-hidden">@title</span>',
+ {
+ '@title': project.title,
+ },
+ )}
</ProjectButtonBase>
{/if}
{:else if project.commands}
@@ -60,7 +66,7 @@
aria-haspopup="dialog"
click={() => openPopup(getCommandsPopupMessage(project), project)}
>
- {Drupal.t(
+ {@html Drupal.t(
'View Commands <span class="visually-hidden">for @title</span>',
{
'@title': project.title,
--
GitLab