From: Radek Czajka Date: Wed, 20 Jan 2021 13:52:05 +0000 (+0100) Subject: Internationalize carousels and club progress bar. X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/d891cd280793404e5d44e0fe0a3d7e0c70564177?ds=sidebyside Internationalize carousels and club progress bar. --- diff --git a/src/club/locale/de/LC_MESSAGES/django.po b/src/club/locale/de/LC_MESSAGES/django.po index ae1bb3da9..b0d70e663 100644 --- a/src/club/locale/de/LC_MESSAGES/django.po +++ b/src/club/locale/de/LC_MESSAGES/django.po @@ -66,133 +66,133 @@ msgstr "" msgid "clubs" msgstr "" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "" +#: club/models.py:50 +msgid "payed at" +msgstr "" + #: club/models.py:51 +msgid "expires_at" +msgstr "" + +#: club/models.py:71 msgid "amount" msgstr "" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "" -#: club/models.py:56 -msgid "payed at" -msgstr "" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "" -#: club/models.py:58 -msgid "expires_at" -msgstr "" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -298,66 +298,99 @@ msgstr "" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "" -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "" + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." msgstr "" -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "" diff --git a/src/club/locale/en/LC_MESSAGES/django.po b/src/club/locale/en/LC_MESSAGES/django.po index ae1bb3da9..b0d70e663 100644 --- a/src/club/locale/en/LC_MESSAGES/django.po +++ b/src/club/locale/en/LC_MESSAGES/django.po @@ -66,133 +66,133 @@ msgstr "" msgid "clubs" msgstr "" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "" +#: club/models.py:50 +msgid "payed at" +msgstr "" + #: club/models.py:51 +msgid "expires_at" +msgstr "" + +#: club/models.py:71 msgid "amount" msgstr "" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "" -#: club/models.py:56 -msgid "payed at" -msgstr "" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "" -#: club/models.py:58 -msgid "expires_at" -msgstr "" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -298,66 +298,99 @@ msgstr "" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "" -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "" + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." msgstr "" -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "" diff --git a/src/club/locale/es/LC_MESSAGES/django.po b/src/club/locale/es/LC_MESSAGES/django.po index ae1bb3da9..b0d70e663 100644 --- a/src/club/locale/es/LC_MESSAGES/django.po +++ b/src/club/locale/es/LC_MESSAGES/django.po @@ -66,133 +66,133 @@ msgstr "" msgid "clubs" msgstr "" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "" +#: club/models.py:50 +msgid "payed at" +msgstr "" + #: club/models.py:51 +msgid "expires_at" +msgstr "" + +#: club/models.py:71 msgid "amount" msgstr "" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "" -#: club/models.py:56 -msgid "payed at" -msgstr "" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "" -#: club/models.py:58 -msgid "expires_at" -msgstr "" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -298,66 +298,99 @@ msgstr "" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "" -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "" + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." msgstr "" -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "" diff --git a/src/club/locale/fr/LC_MESSAGES/django.po b/src/club/locale/fr/LC_MESSAGES/django.po index b6540a7a8..74a58dc4a 100644 --- a/src/club/locale/fr/LC_MESSAGES/django.po +++ b/src/club/locale/fr/LC_MESSAGES/django.po @@ -66,133 +66,133 @@ msgstr "" msgid "clubs" msgstr "" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "" +#: club/models.py:50 +msgid "payed at" +msgstr "" + #: club/models.py:51 +msgid "expires_at" +msgstr "" + +#: club/models.py:71 msgid "amount" msgstr "" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "" -#: club/models.py:56 -msgid "payed at" -msgstr "" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "" -#: club/models.py:58 -msgid "expires_at" -msgstr "" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -298,66 +298,99 @@ msgstr "" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "" -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "" + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." msgstr "" -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "" diff --git a/src/club/locale/it/LC_MESSAGES/django.po b/src/club/locale/it/LC_MESSAGES/django.po index ae1bb3da9..b0d70e663 100644 --- a/src/club/locale/it/LC_MESSAGES/django.po +++ b/src/club/locale/it/LC_MESSAGES/django.po @@ -66,133 +66,133 @@ msgstr "" msgid "clubs" msgstr "" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "" +#: club/models.py:50 +msgid "payed at" +msgstr "" + #: club/models.py:51 +msgid "expires_at" +msgstr "" + +#: club/models.py:71 msgid "amount" msgstr "" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "" -#: club/models.py:56 -msgid "payed at" -msgstr "" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "" -#: club/models.py:58 -msgid "expires_at" -msgstr "" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -298,66 +298,99 @@ msgstr "" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "" -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "" + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +msgstr[1] "" + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." msgstr "" -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "" diff --git a/src/club/locale/lt/LC_MESSAGES/django.po b/src/club/locale/lt/LC_MESSAGES/django.po index 11618bbdb..e70c69412 100644 --- a/src/club/locale/lt/LC_MESSAGES/django.po +++ b/src/club/locale/lt/LC_MESSAGES/django.po @@ -68,133 +68,133 @@ msgstr "" msgid "clubs" msgstr "" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "" +#: club/models.py:50 +msgid "payed at" +msgstr "" + #: club/models.py:51 +msgid "expires_at" +msgstr "" + +#: club/models.py:71 msgid "amount" msgstr "" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "" -#: club/models.py:56 -msgid "payed at" -msgstr "" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "" -#: club/models.py:58 -msgid "expires_at" -msgstr "" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -300,66 +300,103 @@ msgstr "" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "" -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "" + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." msgstr "" -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "" diff --git a/src/club/locale/pl/LC_MESSAGES/django.mo b/src/club/locale/pl/LC_MESSAGES/django.mo index 9bce02c80..902a989b0 100644 Binary files a/src/club/locale/pl/LC_MESSAGES/django.mo and b/src/club/locale/pl/LC_MESSAGES/django.mo differ diff --git a/src/club/locale/pl/LC_MESSAGES/django.po b/src/club/locale/pl/LC_MESSAGES/django.po index 43a31fb81..e56693950 100644 --- a/src/club/locale/pl/LC_MESSAGES/django.po +++ b/src/club/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2020-11-26 12:47+0100\n" +"PO-Revision-Date: 2021-01-20 14:34+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: pl\n" @@ -68,103 +68,103 @@ msgstr "towarzystwo" msgid "clubs" msgstr "towarzystwa" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "klucz" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "email" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "członkostwo" +#: club/models.py:50 +msgid "payed at" +msgstr "opłacona" + #: club/models.py:51 +msgid "expires_at" +msgstr "wygasa" + +#: club/models.py:71 msgid "amount" msgstr "kwota" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "miesięcznie" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "rocznie" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "anulowany" -#: club/models.py:56 -msgid "payed at" -msgstr "opłacona" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "start" -#: club/models.py:58 -msgid "expires_at" -msgstr "wygasa" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "harmonogram" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "harmonogramy" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "użytkownik" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "utworzone" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "nazwisko" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "ustawiony ręcznie" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "notatki" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "aktualizacja" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "członkostwa" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "dni przed" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "temat" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "treść" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "email z przypomnieniem" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "emaile z przypomnieniem" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" @@ -173,7 +173,7 @@ msgstr[1] "%d dni przed wygaśnięciem" msgstr[2] "%d dni przed wygaśnięciem" msgstr[3] "%d dni przed wygaśnięciem" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" @@ -182,23 +182,23 @@ msgstr[1] "%d dni po wygaśnięciu" msgstr[2] "%d dni po wygaśnięciu" msgstr[3] "%d dni przed wygaśnięciem" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "zdjęcie" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "tekst" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "ambasador" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "ambasadorowie" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -304,49 +304,115 @@ msgstr "Uwalniaj książki razem z nami!" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "Wspieraj Wolne Lektury" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" "Dziękujemy za Twoje dotychczasowe zaangażowanie! Wesprzyj nas ponownie!" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "Dziękujemy, że chcesz razem z nami uwalniać książki!" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "Zobacz swoje dotychczasowe wsparcie." -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "Pomóż nam zdobyć 100 nowych Przyjaciół do końca semestru szkolnego." + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +"\n" +"Od początku tej kampanii stałą wpłatą wsparła nas już %(supporters)s czytelniczka lub czytelnik," +msgstr[1] "" +"\n" +"Od początku tej kampanii stałą wpłatą wsparli nas już %(supporters)s czytelnicy i czytelniczki," +msgstr[2] "" +"\n" +"Od początku tej kampanii stałą wpłatą wsparło nas już %(supporters)s czytelników i czytelniczek," +msgstr[3] "" +"\n" +"Od początku tej kampanii stałą wpłatą wsparło nas już %(supporters)s czytelników i czytelniczek," + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +"\n" +"brakuje %(missing_supporters)s." +msgstr[1] "" +"\n" +"brakuje %(missing_supporters)s." +msgstr[2] "" +"\n" +"brakuje %(missing_supporters)s." +msgstr[3] "" +"\n" +"brakuje %(missing_supporters)s." + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "Bezpieczne wpłaty" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "przelew" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "Wybierz rodzaj wsparcia" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "jednorazowo" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "Wybierz kwotę" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "inna kwota" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "Podaj adres e-mail" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "Chcę dostawać informacje o nowościach" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." @@ -355,19 +421,10 @@ msgstr "" "\" href=\"https://nowoczesnapolska.org.pl/prywatnosc/\">polityce " "prywatności." -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "Wpłać" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "Bezpieczne wpłaty" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "przelew" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "Dziękujemy" diff --git a/src/club/locale/ru/LC_MESSAGES/django.po b/src/club/locale/ru/LC_MESSAGES/django.po index bc85ffa59..eaf7afdd4 100644 --- a/src/club/locale/ru/LC_MESSAGES/django.po +++ b/src/club/locale/ru/LC_MESSAGES/django.po @@ -68,133 +68,133 @@ msgstr "" msgid "clubs" msgstr "" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "" +#: club/models.py:50 +msgid "payed at" +msgstr "" + #: club/models.py:51 +msgid "expires_at" +msgstr "" + +#: club/models.py:71 msgid "amount" msgstr "" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "" -#: club/models.py:56 -msgid "payed at" -msgstr "" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "" -#: club/models.py:58 -msgid "expires_at" -msgstr "" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -300,66 +300,103 @@ msgstr "" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "" -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "" + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." msgstr "" -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "" diff --git a/src/club/locale/uk/LC_MESSAGES/django.po b/src/club/locale/uk/LC_MESSAGES/django.po index 4bb56cb1b..cc5c64687 100644 --- a/src/club/locale/uk/LC_MESSAGES/django.po +++ b/src/club/locale/uk/LC_MESSAGES/django.po @@ -69,133 +69,133 @@ msgstr "" msgid "clubs" msgstr "" -#: club/models.py:48 +#: club/models.py:47 msgid "key" msgstr "" -#: club/models.py:49 +#: club/models.py:48 msgid "email" msgstr "" -#: club/models.py:50 club/models.py:141 +#: club/models.py:49 club/models.py:155 msgid "membership" msgstr "" +#: club/models.py:50 +msgid "payed at" +msgstr "" + #: club/models.py:51 +msgid "expires_at" +msgstr "" + +#: club/models.py:71 msgid "amount" msgstr "" -#: club/models.py:52 club/templates/club/membership_form.html:185 +#: club/models.py:72 club/templates/club/payment_form.html:21 msgid "monthly" msgstr "" -#: club/models.py:53 +#: club/models.py:73 msgid "yearly" msgstr "" -#: club/models.py:55 +#: club/models.py:75 msgid "cancelled" msgstr "" -#: club/models.py:56 -msgid "payed at" -msgstr "" - -#: club/models.py:57 +#: club/models.py:76 msgid "started at" msgstr "" -#: club/models.py:58 -msgid "expires_at" -msgstr "" - -#: club/models.py:62 +#: club/models.py:79 msgid "schedule" msgstr "" -#: club/models.py:63 +#: club/models.py:80 msgid "schedules" msgstr "" -#: club/models.py:133 +#: club/models.py:147 msgid "user" msgstr "" -#: club/models.py:134 +#: club/models.py:148 msgid "created at" msgstr "" -#: club/models.py:135 club/models.py:196 +#: club/models.py:149 club/models.py:210 msgid "name" msgstr "" -#: club/models.py:136 +#: club/models.py:150 msgid "manual" msgstr "" -#: club/models.py:137 +#: club/models.py:151 msgid "notes" msgstr "" -#: club/models.py:138 +#: club/models.py:152 msgid "updated at" msgstr "" -#: club/models.py:142 +#: club/models.py:156 msgid "memberships" msgstr "" -#: club/models.py:179 +#: club/models.py:193 msgid "days before" msgstr "" -#: club/models.py:180 +#: club/models.py:194 msgid "subject" msgstr "" -#: club/models.py:181 club/payu/models.py:140 +#: club/models.py:195 club/payu/models.py:140 msgid "body" msgstr "" -#: club/models.py:184 +#: club/models.py:198 msgid "reminder email" msgstr "" -#: club/models.py:185 +#: club/models.py:199 msgid "reminder emails" msgstr "" -#: club/models.py:190 +#: club/models.py:204 #, python-format msgid "a day before expiration" msgid_plural "%d days before expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:192 +#: club/models.py:206 #, python-format msgid "a day after expiration" msgid_plural "%d days after expiration" msgstr[0] "" msgstr[1] "" -#: club/models.py:197 +#: club/models.py:211 msgid "photo" msgstr "" -#: club/models.py:198 +#: club/models.py:212 msgid "text" msgstr "" -#: club/models.py:201 +#: club/models.py:215 msgid "ambassador" msgstr "" -#: club/models.py:202 +#: club/models.py:216 msgid "ambassadors" msgstr "" -#: club/models.py:233 club/templates/club/index.html:7 +#: club/models.py:247 club/templates/club/index.html:7 #: club/templates/club/index.html:13 club/templates/club/thanks.html:6 #: club/templates/payu/rec_payment.html:5 msgid "Towarzystwo Przyjaciół Wolnych Lektur" @@ -301,66 +301,103 @@ msgstr "" msgid "„Wolne Lektury należy wspierać, bo są” - Filip Springer" msgstr "" -#: club/templates/club/membership_form.html:144 +#: club/templates/club/membership_form.html:14 msgid "Support Wolne Lektury" msgstr "" -#: club/templates/club/membership_form.html:148 +#: club/templates/club/membership_form.html:18 msgid "Thank you for your support! Support us again!" msgstr "" -#: club/templates/club/membership_form.html:151 +#: club/templates/club/membership_form.html:21 msgid "Thank you for wanting to free the books with us!" msgstr "" -#: club/templates/club/membership_form.html:156 +#: club/templates/club/membership_form.html:26 msgid "See your past support." msgstr "" -#: club/templates/club/membership_form.html:179 +#: club/templates/club/membership_form.html:40 +msgid "Help us get 100 new Friends by the end of the school semester." +msgstr "" + +#: club/templates/club/membership_form.html:41 +#, python-format +msgid "" +"\n" +"\t So far %(supporters)s reader has " +"already supported us with a regular donation,\n" +"\t " +msgid_plural "" +"\n" +"\t So far %(supporters)s readers have " +"already supported us with a regular donation,\n" +"\t " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: club/templates/club/membership_form.html:46 +#, python-format +msgid "" +"\n" +"\t %(missing_supporters)s is missing.\n" +" " +msgid_plural "" +"\n" +" %(missing_supporters)s are " +"missing.\n" +"\t " +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: club/templates/club/payment/payu-re.html:4 +#: club/templates/club/payment/payu.html:4 +msgid "Safe payments" +msgstr "" + +#: club/templates/club/payment/payu.html:10 +msgid "transfer" +msgstr "" + +#: club/templates/club/payment_form.html:15 msgid "Choose your type of support" msgstr "" -#: club/templates/club/membership_form.html:184 +#: club/templates/club/payment_form.html:20 msgid "one-time" msgstr "" -#: club/templates/club/membership_form.html:188 +#: club/templates/club/payment_form.html:24 msgid "Choose the amount" msgstr "" -#: club/templates/club/membership_form.html:196 -#: club/templates/club/membership_form.html:209 +#: club/templates/club/payment_form.html:32 +#: club/templates/club/payment_form.html:45 msgid "different amount" msgstr "" -#: club/templates/club/membership_form.html:215 +#: club/templates/club/payment_form.html:51 msgid "Provide an e-mail address" msgstr "" -#: club/templates/club/membership_form.html:222 +#: club/templates/club/payment_form.html:58 msgid "I'd like to receive informations about new publications." msgstr "" -#: club/templates/club/membership_form.html:226 +#: club/templates/club/payment_form.html:62 msgid "" "You can unsubscribe at any point. More in the privacy policy." msgstr "" -#: club/templates/club/membership_form.html:228 +#: club/templates/club/payment_form.html:64 msgid "Donate" msgstr "" -#: club/templates/club/payment/payu-re.html:4 -#: club/templates/club/payment/payu.html:4 -msgid "Safe payments" -msgstr "" - -#: club/templates/club/payment/payu.html:10 -msgid "transfer" -msgstr "" - #: club/templates/club/thanks.html:14 msgid "Thank you" msgstr "" diff --git a/src/club/templates/club/membership_form.html b/src/club/templates/club/membership_form.html index fe85c1c88..04a3e109b 100644 --- a/src/club/templates/club/membership_form.html +++ b/src/club/templates/club/membership_form.html @@ -34,10 +34,22 @@ {% chunk 'club_form_top' %} - {% club_monthly_since '2020-12-01' as cc %} - {% club_monthly_missing_since '2020-12-01' 100 as cm %} -

Pomóż nam zdobyć 100 nowych Przyjaciół do końca roku. W grudniu stałą wpłatą wsparło nas już {{ cc }} czytelników i czytelniczek, brakuje {{ cm }}.

-
 {{ cc }}{{ cm }} 
+ {% club_monthly_since '2020-12-01' as supporters %} + {% club_monthly_missing_since '2020-12-01' 100 as missing_supporters %} +

+ {% blocktrans %}Help us get 100 new Friends by the end of the school semester.{% endblocktrans %} + {% blocktrans count supporters=supporters %} + So far {{ supporters }} reader has already supported us with a regular donation, + {% plural %} + So far {{ supporters }} readers have already supported us with a regular donation, + {% endblocktrans %} + {% blocktrans count missing_supporters=missing_supporters %} + {{ missing_supporters }} is missing. + {% plural %} + {{ missing_supporters }} are missing. + {% endblocktrans %} +

+
 {{ supporters }}{{ missing_supporters }} 
{% include "club/payment_form.html" %} diff --git a/src/social/admin.py b/src/social/admin.py index 6e5bf3ab5..91ebcdba0 100644 --- a/src/social/admin.py +++ b/src/social/admin.py @@ -72,6 +72,7 @@ class CarouselItemInline(OrderableAdmin, admin.TabularInline): class CarouselAdmin(admin.ModelAdmin): + list_display = ['placement', 'priority', 'language'] inlines = [CarouselItemInline] diff --git a/src/social/locale/de/LC_MESSAGES/django.po b/src/social/locale/de/LC_MESSAGES/django.po index 365800e5e..b5986dc15 100644 --- a/src/social/locale/de/LC_MESSAGES/django.po +++ b/src/social/locale/de/LC_MESSAGES/django.po @@ -53,7 +53,7 @@ msgstr "" msgid "created at" msgstr "" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "" @@ -161,7 +161,7 @@ msgstr "" msgid "group" msgstr "" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "" @@ -170,30 +170,38 @@ msgid "banners" msgstr "" #: social/models.py:126 -msgid "slug" +msgid "placement" msgstr "" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "" + +#: social/models.py:130 +msgid "language" +msgstr "" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "" diff --git a/src/social/locale/en/LC_MESSAGES/django.po b/src/social/locale/en/LC_MESSAGES/django.po index bb85ba638..89d9594eb 100644 --- a/src/social/locale/en/LC_MESSAGES/django.po +++ b/src/social/locale/en/LC_MESSAGES/django.po @@ -52,7 +52,7 @@ msgstr "" msgid "created at" msgstr "" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "" @@ -160,7 +160,7 @@ msgstr "" msgid "group" msgstr "" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "" @@ -169,30 +169,38 @@ msgid "banners" msgstr "" #: social/models.py:126 -msgid "slug" +msgid "placement" msgstr "" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "" + +#: social/models.py:130 +msgid "language" +msgstr "" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "" diff --git a/src/social/locale/es/LC_MESSAGES/django.po b/src/social/locale/es/LC_MESSAGES/django.po index 365800e5e..b5986dc15 100644 --- a/src/social/locale/es/LC_MESSAGES/django.po +++ b/src/social/locale/es/LC_MESSAGES/django.po @@ -53,7 +53,7 @@ msgstr "" msgid "created at" msgstr "" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "" @@ -161,7 +161,7 @@ msgstr "" msgid "group" msgstr "" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "" @@ -170,30 +170,38 @@ msgid "banners" msgstr "" #: social/models.py:126 -msgid "slug" +msgid "placement" msgstr "" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "" + +#: social/models.py:130 +msgid "language" +msgstr "" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "" diff --git a/src/social/locale/fr/LC_MESSAGES/django.po b/src/social/locale/fr/LC_MESSAGES/django.po index ec609287b..fc19ce0bc 100644 --- a/src/social/locale/fr/LC_MESSAGES/django.po +++ b/src/social/locale/fr/LC_MESSAGES/django.po @@ -53,7 +53,7 @@ msgstr "" msgid "created at" msgstr "" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "" @@ -161,7 +161,7 @@ msgstr "" msgid "group" msgstr "" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "" @@ -170,30 +170,38 @@ msgid "banners" msgstr "" #: social/models.py:126 -msgid "slug" +msgid "placement" msgstr "" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "" + +#: social/models.py:130 +msgid "language" +msgstr "" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "" diff --git a/src/social/locale/it/LC_MESSAGES/django.po b/src/social/locale/it/LC_MESSAGES/django.po index 365800e5e..b5986dc15 100644 --- a/src/social/locale/it/LC_MESSAGES/django.po +++ b/src/social/locale/it/LC_MESSAGES/django.po @@ -53,7 +53,7 @@ msgstr "" msgid "created at" msgstr "" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "" @@ -161,7 +161,7 @@ msgstr "" msgid "group" msgstr "" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "" @@ -170,30 +170,38 @@ msgid "banners" msgstr "" #: social/models.py:126 -msgid "slug" +msgid "placement" msgstr "" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "" + +#: social/models.py:130 +msgid "language" +msgstr "" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "" diff --git a/src/social/locale/lt/LC_MESSAGES/django.po b/src/social/locale/lt/LC_MESSAGES/django.po index ec853fe58..12ea6ce7c 100644 --- a/src/social/locale/lt/LC_MESSAGES/django.po +++ b/src/social/locale/lt/LC_MESSAGES/django.po @@ -54,7 +54,7 @@ msgstr "" msgid "created at" msgstr "" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "" @@ -162,7 +162,7 @@ msgstr "" msgid "group" msgstr "" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "" @@ -171,30 +171,38 @@ msgid "banners" msgstr "" #: social/models.py:126 -msgid "slug" +msgid "placement" msgstr "" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "" + +#: social/models.py:130 +msgid "language" +msgstr "" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "" diff --git a/src/social/locale/pl/LC_MESSAGES/django.mo b/src/social/locale/pl/LC_MESSAGES/django.mo index e0abbc65c..aac859476 100644 Binary files a/src/social/locale/pl/LC_MESSAGES/django.mo and b/src/social/locale/pl/LC_MESSAGES/django.mo differ diff --git a/src/social/locale/pl/LC_MESSAGES/django.po b/src/social/locale/pl/LC_MESSAGES/django.po index 8071d7025..4890b9e8f 100644 --- a/src/social/locale/pl/LC_MESSAGES/django.po +++ b/src/social/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2019-08-06 23:24+0200\n" +"PO-Revision-Date: 2021-01-20 14:49+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: \n" "Language: pl\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 2.0.6\n" +"X-Generator: Poedit 2.3\n" #: social/admin.py:28 msgid "Content" @@ -54,7 +54,7 @@ msgstr "nazwa" msgid "created at" msgstr "utworzone" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "grupa bannerów" @@ -162,7 +162,7 @@ msgstr "adres licencji obrazu tła" msgid "group" msgstr "grupa" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "banner" @@ -171,30 +171,38 @@ msgid "banners" msgstr "bannery" #: social/models.py:126 -msgid "slug" -msgstr "slug" +msgid "placement" +msgstr "miejsce" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "priorytet" + +#: social/models.py:130 +msgid "language" +msgstr "język" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "karuzela" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "karuzele" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "kolejność" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "element karuzeli" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "elementy karuzeli" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "Proszę wskazać banner albo grupę bannerów." @@ -220,6 +228,9 @@ msgstr "" msgid "Remove from my shelf" msgstr "Usuń z mojej półki" +#~ msgid "slug" +#~ msgstr "slug" + #~ msgid "Adjust size to image, ignore the text" #~ msgstr "Dostosuj wielkość do obrazu tła, zignoruj tekst." diff --git a/src/social/locale/ru/LC_MESSAGES/django.po b/src/social/locale/ru/LC_MESSAGES/django.po index 44fb04dd2..0eaafbd4c 100644 --- a/src/social/locale/ru/LC_MESSAGES/django.po +++ b/src/social/locale/ru/LC_MESSAGES/django.po @@ -54,7 +54,7 @@ msgstr "" msgid "created at" msgstr "" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "" @@ -162,7 +162,7 @@ msgstr "" msgid "group" msgstr "" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "" @@ -171,30 +171,38 @@ msgid "banners" msgstr "" #: social/models.py:126 -msgid "slug" +msgid "placement" msgstr "" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "" + +#: social/models.py:130 +msgid "language" +msgstr "" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "" diff --git a/src/social/locale/uk/LC_MESSAGES/django.po b/src/social/locale/uk/LC_MESSAGES/django.po index 44fb04dd2..0eaafbd4c 100644 --- a/src/social/locale/uk/LC_MESSAGES/django.po +++ b/src/social/locale/uk/LC_MESSAGES/django.po @@ -54,7 +54,7 @@ msgstr "" msgid "created at" msgstr "" -#: social/models.py:20 social/models.py:140 +#: social/models.py:20 social/models.py:152 msgid "banner group" msgstr "" @@ -162,7 +162,7 @@ msgstr "" msgid "group" msgstr "" -#: social/models.py:72 social/models.py:139 +#: social/models.py:72 social/models.py:151 msgid "banner" msgstr "" @@ -171,30 +171,38 @@ msgid "banners" msgstr "" #: social/models.py:126 -msgid "slug" +msgid "placement" msgstr "" -#: social/models.py:130 social/models.py:138 +#: social/models.py:129 +msgid "priority" +msgstr "" + +#: social/models.py:130 +msgid "language" +msgstr "" + +#: social/models.py:134 social/models.py:150 msgid "carousel" msgstr "" -#: social/models.py:131 +#: social/models.py:135 msgid "carousels" msgstr "" -#: social/models.py:137 +#: social/models.py:149 msgid "order" msgstr "" -#: social/models.py:145 +#: social/models.py:157 msgid "carousel item" msgstr "" -#: social/models.py:146 +#: social/models.py:158 msgid "carousel items" msgstr "" -#: social/models.py:153 social/models.py:155 +#: social/models.py:165 social/models.py:167 msgid "Either banner or banner group is required." msgstr "" diff --git a/src/social/migrations/0012_auto_20210120_1444.py b/src/social/migrations/0012_auto_20210120_1444.py new file mode 100644 index 000000000..2f8182758 --- /dev/null +++ b/src/social/migrations/0012_auto_20210120_1444.py @@ -0,0 +1,32 @@ +# Generated by Django 2.2.16 on 2021-01-20 13:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('social', '0011_auto_20190807_1056'), + ] + + operations = [ + migrations.AlterModelOptions( + name='carousel', + options={'verbose_name': 'carousel', 'verbose_name_plural': 'carousels'}, + ), + migrations.AddField( + model_name='carousel', + name='language', + field=models.CharField(blank=True, choices=[('de', 'Deutsch'), ('en', 'English'), ('es', 'español'), ('fr', 'français'), ('it', 'italiano'), ('lt', 'lietuvių'), ('pl', 'polski'), ('ru', 'русский'), ('uk', 'українська')], default='', max_length=2, verbose_name='language'), + ), + migrations.AddField( + model_name='carousel', + name='priority', + field=models.SmallIntegerField(default=0, verbose_name='priority'), + ), + migrations.AlterField( + model_name='carousel', + name='slug', + field=models.SlugField(choices=[('main', 'main')], verbose_name='placement'), + ), + ] diff --git a/src/social/migrations/0013_auto_20210120_1445.py b/src/social/migrations/0013_auto_20210120_1445.py new file mode 100644 index 000000000..20e657f38 --- /dev/null +++ b/src/social/migrations/0013_auto_20210120_1445.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.16 on 2021-01-20 13:45 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('social', '0012_auto_20210120_1444'), + ] + + operations = [ + migrations.RenameField( + model_name='carousel', + old_name='slug', + new_name='placement', + ), + ] diff --git a/src/social/models.py b/src/social/models.py index 37cfecd24..4c8cd7430 100644 --- a/src/social/models.py +++ b/src/social/models.py @@ -6,7 +6,7 @@ from django.db import models from django.conf import settings from django.core.exceptions import ValidationError from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, get_language from catalogue.models import Book from wolnelektury.utils import cached_render, clear_cached_renders @@ -123,15 +123,27 @@ class Cite(models.Model): class Carousel(models.Model): - slug = models.SlugField(_('slug'), unique=True) + placement = models.SlugField(_('placement'), choices=[ + ('main', 'main'), + ]) + priority = models.SmallIntegerField(_('priority'), default=0) + language = models.CharField(_('language'), max_length=2, blank=True, default='', choices=settings.LANGUAGES) class Meta: - ordering = ('slug',) +# ordering = ('placement', '-priority') verbose_name = _('carousel') verbose_name_plural = _('carousels') def __str__(self): - return self.slug + return self.placement + + @classmethod + def get(cls, placement): + carousel = cls.objects.filter(models.Q(language='') | models.Q(language=get_language()), placement=placement).order_by('-priority', '?').first() + if carousel is None: + carousel = cls.objects.create(placement=placement) + return carousel + class CarouselItem(models.Model): order = models.PositiveSmallIntegerField(_('order'), unique=True) diff --git a/src/social/templates/social/carousel.html b/src/social/templates/social/carousel.html index c86d94daa..a76a435cb 100644 --- a/src/social/templates/social/carousel.html +++ b/src/social/templates/social/carousel.html @@ -1,6 +1,6 @@ {% spaceless %} -
diff --git a/src/social/templatetags/social_tags.py b/src/social/templatetags/social_tags.py index 596c36d30..434277a17 100644 --- a/src/social/templatetags/social_tags.py +++ b/src/social/templatetags/social_tags.py @@ -44,13 +44,8 @@ def book_shelf_tags(context, book_id): @register.inclusion_tag('social/carousel.html', takes_context=True) -def carousel(context, slug): - # TODO: cache - try: - carousel = Carousel.objects.get(slug=slug) - except Carousel.DoesNotExist: - # TODO: add sanity check for install. - carousel = Carousel.objects.create(slug=slug) +def carousel(context, placement): + carousel = Carousel.get(placement) banners = [ item.get_banner() for item in carousel.carouselitem_set.all().select_related('banner')