From 2b0d1c6ca715a1adb86e4b19f68341c1af3414ac Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Thu, 14 Jan 2021 22:34:14 +0200 Subject: [PATCH] Fix str format --- locale/en/LC_MESSAGES/django.po | 7 ++----- locale/fi/LC_MESSAGES/django.mo | Bin 16104 -> 16189 bytes locale/fi/LC_MESSAGES/django.po | 7 +++---- webapp/models.py | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 07c88ba..c25f80f 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-14 22:24+0200\n" +"POT-Creation-Date: 2021-01-14 22:32+0200\n" "PO-Revision-Date: 2017-11-02 23:09+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -1138,13 +1138,10 @@ msgstr "" #: webapp/models.py:61 webapp/models.py:80 webapp/models.py:119 #: webapp/models.py:152 webapp/models.py:198 -#| msgid "Delete" msgid "Deleted: " msgstr "Deleted: " #: webapp/models.py:62 -#, fuzzy -#| msgid "Feed: {}" msgid "{}Feed: {}" msgstr "" @@ -1177,7 +1174,7 @@ msgid "Signup forms" msgstr "" #: webapp/models.py:120 -msgid "#{} {delete_str}{}" +msgid "#{} {}{}" msgstr "" #: webapp/models.py:138 diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index 1539e6795f9fceb8ba6df619e809563b9f25652e..6c55aba8238eee8a4a68542b8c0510da52985378 100644 GIT binary patch delta 4026 zcmXZe4Q!Xi9l-IcrBF&s%O6@$DpcA+fl4XJM6@kq1Lr`48K`8Lqikh%$eVyLyYg(1 zV8d4TQov;prjQ6muaj@O1c_(L?HO?W##eI5C?!^g41mFQJ;qMX5LAOp||2BYoO zv3@I(oG=3oqzRqqn`pl!==cemsYh`b{uo`rfx+b82S;hR246-8_$_*PPGKcpMN?SG z74i8k=z9%#1AZ~qA4JY?ScwMQ9_w4t3HM_a9znP2Ttb1H6}r$B^yY+^^1kS`8iY<* zif+j;wBN{BAA_cJ0(!{4fS!e~Mi=8%u5*HJNy0($`Ssu%|!E0!QZ=eC3jb1(P}@L)-5~$8SOxumH{EL&z>CVI2hreiAv5VJ|w+Ni;LB z$NG76;EU)UW|8;Du>!~9FVM{V9i8|RxH8zmt(+8{fo{e9=vi1gocudb8x3E= zc3gmeMFYEYM7pwOG-b=s0l$l$fe!TjZRn?Z2b#GPI2uo(_x*p!kYNOso_H5_XEuoq z^UxGFqXRBOCtQVgT!+_S2Rgwfbfw#HSXKzn;W6s3j!gS^j7l@`1Uk-MG=ndofgQ(O zOg^H}i^9Lq0DS7o@}k#9tI&aNMpHO7w%>^qmgaHJbVV7;CXc76PS;u(dXyTz(0=d|Bm(C8`Fhk(3IbR9=a-Y z{HZvf`NLfl9N++w#qa_e`FYI8|KJ4d%}H~h1}wm7ScbE3D6T-ZIc!8?2uEW31$4r^ znsmJW*q3@4=6e5YD7cb|=;8WYtj|WiC1Ec1!L?Y3KR^fk85+<|^!e^sKOF1FFo*Wv zqg(t(bo{rY|G>mZ{C?V@5MA*=}7RhF(H5 z`8xVxdmo)Ar#7{qmi!meP)vgZSH=gUv5fk7bcM6f3BDZb^U?kb(Nr(PQTPP*!;|PO z`g8Oh><$23V9vO7%QEB0zyE+37aOLd*JJ_uDP4@NSgi~oDoI&^K0{ZFAotO?#fv)U!^l;sSrhZ;*e-Qn# zX+ZK*M_1e&U4mw0 zB|71EVtqaO#p^)N)&X?BLq7NZcTzC*XV3uNMF+Tu?(L`O7UWM#BOe)^g#P|d$ALH( z4QLgbu>`$tk3~130dB=|+=2dkFr1{o!3-aukq+TIT!xde3LDYAT#sI}=g@)Q#Qt~| zGuVYr(CfDJuoa;hyB^1274iuP_r~_N+v5H2pus)aj-Jx}=-&Mjo!~WeW$)ok{1E42 z9Vc-FZbdV80)6jQG&5(T|3u%N4e7m-aPgic3mbTBknTv}pOH uvX<7+(mJiF>FXBvt*Ba7GNh$-R^yV!2bQl`*chMBUa`D+QPZOC+W!HrI+mFL delta 3940 zcmXZe3v`!b9Ki8sZPjLLt7$8x?O!R|T5EM$icF%zgvuPH%W^N59i)?M{ZHvAbh;1< z?YKLWgy~S^e#>#|!ZDl*2jPS{Mabp*?R`4c=Y5{{x%{5r^E~gidETD6>79jHcLn~m z@$X3fJ<>6Ru^Ay$7FZj?q^=?C!gDbfM-+vSjbox`VkYH@H~^<$2V4~Em!kddz|Po& zhv9n63n3jg#Rl)7b8bf)euMeAFTT$#PU;JyDJLnM!`K%$UZgMFZJ~PVjfE&+D0#dm>2*m1rPi(1}h% z`;SM*pN?i~2KK>O=mPHQN&bD&L`6GnMhAEjJv`51Kiq|;usv7A_eY@pO0hRq#PaFL zc?}cMfE#0Z9y;MlEW5Qhj1YLQ5bcM&Dg4JD(7-mJD|;!v-x2Fu(SUZNs2Gd%S3e>V?& zi^Em;bJqK_k6lnyOC_^I8B4zL$pS?A$Nhf*~41JL>!^oPsIXuu8V-d~9ZJR5DlFqW61 z?V8ZctVieDjJe+b)kNWE47KT`bq5U%aX4*_nq< zxFEi7LR0@Z=6e6v@!$X((Y<{G-GWch$bXAw9-I8U?~2{1FGmA95zWl0=xv%9osI@L z1N-7t=q*@@p1P$-f=v#uvAt6Woig>?s_N8}K~rz)3tBXP_Bdh7PzI{Y|Jj z`ZC&oJNm=ub2LML;sDI9O%^(|_SEF(@-!+uL<_My-iof|A@tO)L-%YWy7E_|+mLG< ezO8LJt)MV7BiuQyuy00anO|5`+_J80R`LHZL4Mo- diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 91b3f11..1936793 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-14 22:24+0200\n" +"POT-Creation-Date: 2021-01-14 22:32+0200\n" "PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -1130,7 +1130,7 @@ msgstr "Uutiset" msgid "Deleted: " msgstr "Poistettu: " -#, fuzzy +#: webapp/models.py:62 #| msgid "Feed: {}" msgid "{}Feed: {}" msgstr "{}Uutinen: {}" @@ -1140,7 +1140,6 @@ msgid "Event" msgstr "Tapahtuma" #: webapp/models.py:81 -#, fuzzy #| msgid "Event: {}" msgid "{}Event: {}" msgstr "{}Tapahtuma: {}" @@ -1166,7 +1165,7 @@ msgid "Signup forms" msgstr "Ilmoittautumislomakkeet" #: webapp/models.py:120 -msgid "#{} {delete_str}{}" +msgid "#{} {}{}" msgstr "" #: webapp/models.py:138 diff --git a/webapp/models.py b/webapp/models.py index 7e67c17..e856e23 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -117,7 +117,7 @@ class SignupForm(models.Model): def __str__(self): delete_str = _("Deleted: ") if self.deleted else "" - return _('#{} {delete_str}{}').format(self.id, delete_str, self.title) + return _('#{} {}{}').format(self.id, delete_str, self.title) @property def signups(self):