From 2d2940314561273f9363c91bf5ec7034f24ec692 Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Sun, 11 Jun 2023 14:45:03 -0400 Subject: [PATCH 01/10] Remove string referencing tipping posts, add missing localized string comments, and export strings for translation --- damus/Views/CarouselView.swift | 2 +- damus/Views/EventView.swift | 2 +- damus/Views/Events/ZapEvent.swift | 4 ++-- .../Localized Contents/en-US.xliff | 21 +++++++++++------- .../damus/en-US.lproj/Localizable.strings | Bin 89514 -> 89700 bytes 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/damus/Views/CarouselView.swift b/damus/Views/CarouselView.swift index 3c95c452..42f1110f 100644 --- a/damus/Views/CarouselView.swift +++ b/damus/Views/CarouselView.swift @@ -21,7 +21,7 @@ let carousel_items = [ CarouselItem(image: Image("undercover"), text: Text("\(Text("Private", comment: "Heading indicating that this application keeps personally identifiable information private. A sentence describing what is done to keep data private comes after this heading.").bold()). Creating an account doesn't require a phone number, email or name. Get started right away with zero friction.", comment: "Explanation of what is done to keep personally identifiable information private. There is a heading that precedes this explanation which is a variable to this string.")), CarouselItem(image: Image("bitcoin-p2p"), - text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.")) + text: Text("\(Text("Earn Money", comment: "Heading indicating that this application allows users to earn money.").bold()). Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet.", comment: "Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string.")) ] struct CarouselView: View { diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift index 68cddb83..1d4d9045 100644 --- a/damus/Views/EventView.swift +++ b/damus/Views/EventView.swift @@ -40,7 +40,7 @@ struct EventView: View { if let zap = damus.zaps.zaps[event.id] { ZapEvent(damus: damus, zap: zap, is_top_zap: options.contains(.top_zap)) } else { - Text("Invalid Zap") + Text("Invalid Zap", comment: "Text indicating that a zap event is malformed and could not be displayed.") EmptyView() } } else { diff --git a/damus/Views/Events/ZapEvent.swift b/damus/Views/Events/ZapEvent.swift index 2fe29b2d..cb39a635 100644 --- a/damus/Views/Events/ZapEvent.swift +++ b/damus/Views/Events/ZapEvent.swift @@ -18,11 +18,11 @@ struct ZapEvent: View { Image("zap.fill") .foregroundColor(.orange) - Text("\(format_msats(zap.amount))", comment: "Text indicating the zap amount. i.e. number of satoshis that were tipped to a user") + Text(verbatim: format_msats(zap.amount)) .font(.headline) if is_top_zap { - Text("Top Zap") + Text("Top Zap", comment: "Text indicating that this zap is the one with the highest amount of sats.") .font(.caption) .foregroundColor(.gray) .padding([.top], 2) diff --git a/damus/en-US.xcloc/Localized Contents/en-US.xliff b/damus/en-US.xcloc/Localized Contents/en-US.xliff index 63d1a138..7d6c40c5 100644 --- a/damus/en-US.xcloc/Localized Contents/en-US.xliff +++ b/damus/en-US.xcloc/Localized Contents/en-US.xliff @@ -73,9 +73,9 @@ Sentence composed of 2 variables to describe how many people are following a use %@. End-to-End encrypted private messaging. Keep Big Tech out of your DMs Explanation of what is done to keep private data encrypted. There is a heading that precedes this explanation which is a variable to this string. - - %@. Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet. - %@. Tip your friend's notes and stack sats with Bitcoin⚡️, the native currency of the internet. + + %@. Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet. + %@. Tip your friends and stack sats with Bitcoin⚡️, the native currency of the internet. Explanation of what can be done by users to earn money. There is a heading that precedes this explanation which is a variable to this string. @@ -651,6 +651,11 @@ Sentence composed of 2 variables to describe how many people are following a use Invalid Tip Address Title of alerting as invalid tip address. + + Invalid Zap + Invalid Zap + Text indicating that a zap event is malformed and could not be displayed. + Invalid key Invalid key @@ -1395,6 +1400,11 @@ Button text to indicate that the zap type is a private zap. Thread Navigation bar title for note thread. + + Top Zap + Top Zap + Text indicating that this zap is the one with the highest amount of sats. + Translate DMs Translate DMs @@ -1802,11 +1812,6 @@ YOU WILL NO LONGER BE ABLE TO LOG INTO DAMUS USING THIS ACCOUNT KEY. %@ and %@ zapped your profile Notification that 2 users zapped the current user's profile - - ⚡️ %@ - ⚡️ %@ - Text indicating the zap amount. i.e. number of satoshis that were tipped to a user - diff --git a/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings b/damus/en-US.xcloc/Source Contents/damus/en-US.lproj/Localizable.strings index df66dccbe57304842d8a8f51d1736d70233500ab..d16e4855e126fdb6c04c88670d9b121c533a7fce 100644 GIT binary patch delta 262 zcmZ3roAt>a)(uT+lP9R{0^**@Crm5hBStJh9V$4l_3QvmIzb{6JgOl;d61jIHZdpxS++o|#DF3`+16coyP6K; GDgywbuu2L5 delta 205 zcmaE|hjrC%)(uT+%<2rqlM}neC-9%44`l^P_hKbN(7P$4CO#YML-M^%Va13!c>No>5cr1q6P{KS`7LOTntJK3)T4l XDKMxqH~`rS47NawDrOB-#l-*sGYB Date: Mon, 19 Jun 2023 07:30:18 +0000 Subject: [PATCH 02/10] Translate Localizable.strings in ja 100% translated source file: 'Localizable.strings' on 'ja'. --- damus/ja.lproj/Localizable.strings | Bin 83404 -> 84130 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/ja.lproj/Localizable.strings b/damus/ja.lproj/Localizable.strings index c489ac47d6bff761a856bae7301e8b112e0e7a24..848807d9a3cc6f05e4afcfaa5beb10c93989139b 100644 GIT binary patch delta 1487 zcmZ`(ZERCj7(QpCxAm^;TH3XRuImS50VHy_p)5Fz6JlI&(;=B331rodl?vT#C)!~! z5kmYRbK9f22niZB3&AXz+-boWnZ{^giyA{BzsRQ1WM~}IKPpY>7mqH-FTzSA z<+DE4g&9)-)g~v#$~R)#e8`~T2vw}csWJh6(=jb$b468A#%LZZVrNMsbK3zeQf+e= zu><&0JetP~8Oo`$l`E95YW^|vHhf;Umbb|dHSo%__0|Unu=U@K!L4Q`dhnc4*ZMW> zft0OPqKDUT9lUVSql_Q18s#yGiwG)a$3-*Mg5%;*ZHD zH2r8%u8w!uVZC!V+Q!_<`%~Mzc@1T5cENyq(gHr4x7ZWxDb2(f*%xEos->8pv*V3} z%kkS~v+rq=P7>Nj2m0yhrF~4>M`*Pdbtmn3=cu{tkwqOff9A3amR&*Pd1+MoN%|A> zFRi*g!JeZN`iK?L)$(WiSv%W7=vLAX(HhdJ91%v(RbaZK+)bzR5)IH_Lg8URLVo3O=gO ze(Eh7?-u0gW=?;g*&0kw30wNL(e-O%t@^L}t)3Lq-Z?jOUgjbZVs>k+1na{`clkEl zLHu=W0~5)+os`*2`~QCstozD|*5eu~&-l3={Tr?Fh?_f7wQl~G0Egs|qt#rLn|xf% zdzxzX@xKejw+8sv0uJ49w%mNj2dJtpx_dv3Yl2pB?Nk2GeHT^Pk!NG}hgBc1;ZKUV j_MuaLzMflYAnHEN|e=XBJ+3hxdKXd*0{yp7Wl`G4;~0 zdi12Wn{<(0(uX}TfSW4o*w4WPM0>yhiG=Mp<2{`bS5=ccU|Fb7wc3J-eXMX;_-xN$4y~`=iB$@b<-R-WfXJH2Ron&$AVZ#m(xDx7+lOI{!5e={nkSO zr_0?CkYXO#Mc2yH8yFG`RiSPDIF5!IQfy=o)_l(eH%2b!nr)XlszuVPKTxhR=Z+EZ%YZCnJqO-XDT2a7pC*^$;|%$`LvB&qu`5K@I{M&r=Q(Q z*2o1sHbi@Q?E42V#5Ylq_xT)c=5ezzCuM8;?KKym!O3Z+vXXp2jzW#nwC?q}fFw)=0>q6z@|vCq?4`fqzrFoW*_J!tqfIOPY1)5F;yl_!E9uJRR!6nV4dtmcC)xm i$uM%sj3bMJGvYLD+DI|+GJ|cTntcwk9jjv2i{uY;dqc7S From 95148e9c9cb69b79e0a9759d21e9a2bc587502e3 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 08:04:14 +0000 Subject: [PATCH 03/10] Translate Localizable.strings in cs 100% translated source file: 'Localizable.strings' on 'cs'. --- damus/cs.lproj/Localizable.strings | Bin 90962 -> 91186 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/cs.lproj/Localizable.strings b/damus/cs.lproj/Localizable.strings index bd6b1dca6c6508b4cb38fd8835922373e65973f7..cde6adbccdc5844f0b21b90f49bed112393d55eb 100644 GIT binary patch delta 408 zcmca~jCIoq)(tl5lfBgE$vz1q?+D`9LxgD3ZtUa(cE7qpZCG zLn2tRgdvjgAwvp^hD4ykN}y~3P+Kk#Co{YS@|?g1Bm?=G40)47HRKs9HISgq)?L|O#D$q)h6Y{`x^5nH{ zl7cBDGI6rtR7uXiKpkN7HwRAjpFO=HiBW0tf@fUv5c6R+ zLwF?&89);hfVSmLew!nno&hvF9V}K1c2gqQW2Hd*K`zV(x(gIiAdeR_=mFVU4EhXQ z3`z_kKsk_qz^(xD6&P%RSc$<8XnGdVkChCGjERh(-~rn|S*UZ delta 337 zcmY+9ze>YU6vn?$3Q{OS9kMuFgf>MaRaX^4r>>563pLnCnuOe&h?BU9qZf2=@(ucD z5MLlTJNOPAdXG+!7vUNT5dq|?QIDynV>zndgy;AtKd0!)rX_bdvfg5M|%9|>)nqnH{@pI=v468A?6>!e>opIZY6Cy zv&fVM$+BW*MhM&xE9`-0V9poe(h?beb3{ppVFdOuKnr_zO@S@~<^pGoP3?qK3xAH5 BOdJ3J From 53262afa010d229a22d63d00a85c8cd94fc1126e Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 08:39:13 +0000 Subject: [PATCH 04/10] Translate Localizable.strings in nl 100% translated source file: 'Localizable.strings' on 'nl'. --- damus/nl.lproj/Localizable.strings | Bin 91498 -> 91700 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/nl.lproj/Localizable.strings b/damus/nl.lproj/Localizable.strings index 0f55141e858aa3c7e99dca4198a7945c621c80be..e5299f98626657cf908212b374b26e9468d43a6d 100644 GIT binary patch delta 245 zcmaELign8w)(uJ;n+-G`&DQZaes6j|0NAg^FD_cUqdR0f5~2Oo-V z7MQLwXYzy3I+OQRv)NXGq=803EGc2g0BTeKT9OB*%Yot`F$FLQlF0yyq=QuzGn7o0 uw~^P>1Bz-f=reFJC^3Wpb%IO-TMFbWFxUbyR2*daj!`C2w*;1mENj6Vo Date: Mon, 19 Jun 2023 10:19:29 +0000 Subject: [PATCH 05/10] Translate Localizable.strings in zh_CN 100% translated source file: 'Localizable.strings' on 'zh_CN'. --- damus/zh-CN.lproj/Localizable.strings | Bin 80836 -> 81006 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/zh-CN.lproj/Localizable.strings b/damus/zh-CN.lproj/Localizable.strings index 603e797c78cf073bd4a971af45d18c4d1d055712..1b9919e5133f44d983032b7aab66d31e3193c0aa 100644 GIT binary patch delta 278 zcmX@|o#ovRmJL^wCO=YIG`T}rhNU+0bnxbN$`cZ&+o>~hO+Ij4!90;cfuV{ak)Z%c zr!tfQaUMenke$g;3?y@bGC2%s4EYR2Kz1ra3Q#N&s3K+Z#wc0A6tJoSpo&C>N|5a2 z=Pj}lQDD=QfGTZ)Sc&05sz+*Y(yOVP4O%~RPIpje2jd)ATb3n36jYGill>86*H7f4m6S1(F2NVG3YaJ0WAsv>I8WM-2n{gH)eqx Luw8(k@s>6KI@3qQ delta 249 zcmaF&gXPF~mJL^wnAI7ICvRLQKKX&tG_8ed{Qr3VPx1?C2&``@n;$G+s@}^O$MZip z$-g(jzom>j{d90knMn19?#p3ced?1i>(6JXq- zJ$;SnAWUUQ0rT>KWFiok0(F4YC@^R-=reFJC^3K>ufU+n-~ePR PFxUbys+cuU6&C{lsTxFz From e68952fa0c862e4579bbca9f13f9bb29772e347a Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 10:20:07 +0000 Subject: [PATCH 06/10] Translate Localizable.strings in zh_CN 100% translated source file: 'Localizable.strings' on 'zh_CN'. --- damus/zh-CN.lproj/Localizable.strings | Bin 81006 -> 81010 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/zh-CN.lproj/Localizable.strings b/damus/zh-CN.lproj/Localizable.strings index 1b9919e5133f44d983032b7aab66d31e3193c0aa..391883b51ed88f284e3e0e619251cfab04e175a7 100644 GIT binary patch delta 23 fcmaF&gXPl?mJMafEDP26|23B>Z!c43{2>7VjQ Date: Mon, 19 Jun 2023 10:21:08 +0000 Subject: [PATCH 07/10] Translate Localizable.strings in zh_TW 100% translated source file: 'Localizable.strings' on 'zh_TW'. --- damus/zh-TW.lproj/Localizable.strings | Bin 80750 -> 80924 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/zh-TW.lproj/Localizable.strings b/damus/zh-TW.lproj/Localizable.strings index 5f93abbf69fff5960ae0bbad1e92d11858b00b75..81a4b9038f5c9b5b412d7899944939ef086ece85 100644 GIT binary patch delta 248 zcmaF&jb+XcmJL^wCO=X-#8Ml1I(YLs<(kCFc_mzv7hG4EEU<@V^0e(D%9#ws3ig4>OC@^F)=rN=+=uMUv6E7=fNMtBs$Y&^K$N-8L17%BqERdK2 zLpe}Y5fFpKG8qbhFqI(%%*zLoi9lQm)B#eXz@WvT&%ni?#IR6}|DOVbDuV-%t-xRl M#HeD{Kvi4}0663@LI3~& From afcbaea331cf542e3fa1568085d362c48209ba72 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 10:21:11 +0000 Subject: [PATCH 08/10] Translate Localizable.strings in zh_HK 100% translated source file: 'Localizable.strings' on 'zh_HK'. --- damus/zh-HK.lproj/Localizable.strings | Bin 80784 -> 80958 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/zh-HK.lproj/Localizable.strings b/damus/zh-HK.lproj/Localizable.strings index 52e75e371fe0abac385c74be8c433988691bcacd..89f73a663fbafa06c1fdf54d6e188f74ae9fa271 100644 GIT binary patch delta 256 zcmbR6on_w-mJL^wCO=X-#8Ml1I(YLs<*LNVb*WsF=Ui8qykRrT8H#}HRE89wSRz9nm`C8B`5 z0tO|Z4qG5rVo)sfNDWSEo;vx%6P3+&t!p|bH>7d^?NpJ6*i{8quK+enfuV#U189;0 z(B{0!yb0pG89?!Luvjre$z)p-c^y5VtQLbl0~gTj5TLpOARpaMhV&b=z;@oVSK9uE Ik8zha05^L`Pyhe` delta 216 zcmdn@gJr^ZmJL^wnAI7IC-<)tpZq{+8y9!_>EMmwv_^t3#wSQ&k$f-ragUyD5Jpi4g8E!lN~%+*r0EZeldjJ3c From 491d4c4d255f02766edc335a3fc92840cfdccb6d Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 07:49:38 +0000 Subject: [PATCH 09/10] Translate Localizable.strings in sv_SE 100% translated source file: 'Localizable.strings' on 'sv_SE'. --- damus/sv-SE.lproj/Localizable.strings | Bin 90980 -> 91122 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/sv-SE.lproj/Localizable.strings b/damus/sv-SE.lproj/Localizable.strings index 6706049ef37de901b6ffb1ff11b0425be995e99f..a88fe7445b30aaab3594d2b3099ec58780ee998e 100644 GIT binary patch delta 290 zcmaEIjP=uT)(uALlO5DIO+TW;C?uZGkj#+5pukYfkjPL1CKVV87@khH){vasq9MRv z43sMa%H=SW0_77oPuBRGGkHOm%H#)8T$87q6H(3tYEodx1uIEo$Y&@5vQrsSfMSUZ zd0;wua-zGWUsWLcwtyn@N~Q>59!ECz+mjZv1$TA6dVzYh+>m?SO`mkIl1D3c48F$iS!bM6VE&GR&D(RWl0QJ*`yXM`~fj- zK0-SyKOi`}7nYr!oj338?DZ#gI;OT&J82_Q;lWZ(`}!|tto@s(J} z-PdP+y`NVT Date: Tue, 20 Jun 2023 07:50:51 +0000 Subject: [PATCH 10/10] Translate Localizable.strings in sv_SE 100% translated source file: 'Localizable.strings' on 'sv_SE'. --- damus/sv-SE.lproj/Localizable.strings | Bin 91122 -> 91134 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/damus/sv-SE.lproj/Localizable.strings b/damus/sv-SE.lproj/Localizable.strings index a88fe7445b30aaab3594d2b3099ec58780ee998e..e379f19bb0f4f738652d18269cfadb8d7021770a 100644 GIT binary patch delta 27 jcmex#ob}&v)&&}q9n?iwa~V<@Qkr=+w)1K*KD7n_m?jBd delta 35 rcmex&ob}Uj)&&~8i3}wS#SDoI3Je7dPbWvKOEw#6Y&X(iJYx+2<`WB`