From d39b6928582ba4a22c562685fac6cdac3ffc16e2 Mon Sep 17 00:00:00 2001 From: Ronald Krist Date: Thu, 31 Oct 2024 13:23:47 +0100 Subject: [PATCH 1/4] translations update --- oarepo_requests/resolvers/ui.py | 27 +- .../translations/_only_for_translations.py | 1 + .../translations/cs/LC_MESSAGES/messages.mo | Bin 13398 -> 13709 bytes .../translations/cs/LC_MESSAGES/messages.po | 24 ++ .../translations/en/LC_MESSAGES/messages.mo | Bin 1021 -> 1021 bytes .../translations/en/LC_MESSAGES/messages.po | 50 ++++ oarepo_requests/translations/messages.mo | Bin 395 -> 395 bytes oarepo_requests/translations/messages.pot | 254 ++++++++++-------- .../messages/cs/LC_MESSAGES/translations.json | 2 +- setup.cfg | 2 +- tests/conftest.py | 8 +- .../test_requests/test_ui_serialialization.py | 71 ++++- 12 files changed, 300 insertions(+), 139 deletions(-) diff --git a/oarepo_requests/resolvers/ui.py b/oarepo_requests/resolvers/ui.py index b3365c23..58cca317 100644 --- a/oarepo_requests/resolvers/ui.py +++ b/oarepo_requests/resolvers/ui.py @@ -4,6 +4,7 @@ current_groups_service, current_users_service, ) +from oarepo_runtime.i18n import gettext as _ from ..proxies import current_oarepo_requests from ..utils import get_matching_service_for_refdict @@ -105,13 +106,7 @@ def _search_one(self, identity, reference, *args, **kwargs): return None def _resolve(self, record, reference): - if record.data["name"] is None: - if "id" in record.data: - label = record.data["id"] - else: - label = fallback_label_result(reference) - else: - label = record.data["name"] + label = record.data["name"] ret = { "reference": reference, "type": "group", @@ -144,13 +139,19 @@ def _search_one(self, identity, reference, *args, **kwargs): return None def _resolve(self, record, reference): - if record.data["username"] is None: # username undefined? - if "email" in record.data: - label = record.data["email"] - else: - label = fallback_label_result(reference) - else: + + if record.data["id"] == "system": + label = _("System user") + elif ( + "profile" in record.data + and "full_name" in record.data["profile"] + and record.data["profile"]["full_name"] + ): # username undefined? + label = record.data["profile"]["full_name"] + elif "username" in record.data and record.data["username"]: label = record.data["username"] + else: + label = fallback_label_result(reference) ret = { "reference": reference, "type": "user", diff --git a/oarepo_requests/translations/_only_for_translations.py b/oarepo_requests/translations/_only_for_translations.py index 3ddbfd36..a8b581ba 100644 --- a/oarepo_requests/translations/_only_for_translations.py +++ b/oarepo_requests/translations/_only_for_translations.py @@ -30,3 +30,4 @@ _("Submit event") _("No requests to show") _("api.requests") +_("api.applicable-requests") diff --git a/oarepo_requests/translations/cs/LC_MESSAGES/messages.mo b/oarepo_requests/translations/cs/LC_MESSAGES/messages.mo index 871acf8fca5ab573505598856aec289af76190ce..a32d8aad63ba4f1124b0b60a3e3d2056fc0c6184 100644 GIT binary patch delta 2774 zcmYM#4NR3)9LMo<0p(4R7f}q6CsD4DprWSuGPR+TP|$SDQ9%IvCBRTYZ1K&lZFGIp;jjIp=@==bX#s z>ese}`qJa}8Ga7(HpQZ8JNYWCAb`iU>nBcZY;!hoQNk; z{eDGF7|(24Knfpen1f@O-%N2Hl%odP;P{+lHIAU&hgx|XYQQ~6Or`^w!@Pz3nveKU zCceN-yojUlPh5%`OqnakZ00v>Dd>f*s1C2-1U!tn7{T%QJ1W4TtML}*;2K8N zq4c9NaR3+Laa3RfsD;GvP-i0*wV)hSAo-{O<{(3wiVy|eI1dt>*@Rm8cE^`d1MNYw zYxZL+eu$bdkCQePOK>K7@lia0+Pd#h<6cE=^&QlL@1qtNnoIsVC{*EU97Nsca`N*y zcB58s4|UyK+0lUGQP*u4`f(OE;W6Bd<2X=raW^V}(@4zb3Ti=jkN`vG0R?4XDEZYy z$*40i(s3+mPbZ*KH^Xr;Dg*1B=eARCcAoD-WpW>C!b48|D0aFye3+>FUzQs^#Vb$& zc$|7IK1F>8>X7}69vnagwAPCDv+*bD+fae8;%+L?ji~WzaT+$^K0Ja2IF~zJ5TamH zD8<)NdwCw!@gGdW*gRv3F$Hxv=c5jxjoRbA$PF|5QHSg(l2mibX}^jZ=Py)%_nf+} zOh_G)Dd>e!eDPyxr02F|0&LLIK@PJJmVa4%{+KQgp= z5jD?ysDRI*7JSo9{$nT%(7@Q{Z`5JQA$;BALVOHo<3`->)Gs;pEH-ix?S8Ds6R3&D z7e*&2b}V%)!+4%oqB6KXL}4+7AZmp@n1J6nFI>hV>Vv2+jJ!vp9ZQj$W;S3s22dI6 zMXmIEtiVB3>K9Fp{&)4FGSY!tF!Y)8U_7%-r=b#ccy{7Ed8{8;9cqOvEHk zCf_AyB+4k?MIFcG&=FTx=oJX}jC#YByt<_+VAosCO}0P0 zJnMRFhR5fttMPiCud|E%_SR;*DbN%y7`rOQH8Z?@TsS^;Wn+Wwt@Z@0)<{=tgQq@R zl<#&8U*ivY>TIj2-qY#{bl!F6clNjw!Y{cmxxy6%F>z_@{E@CeO~Be>HTwLX;F&kW z%ZiS;GBtbTXnkWaa>{Bx+glU#1nj!--Qw%9qk}DhV5IBp0lOj6ZJq6nbX7I-Zg==x HNxSPmM@3fP delta 2515 zcmYM!3rv<(9LMqhD|Zs*A}V=-yl^qO#6@K!i7APgwbV?~i9-sqg216Gx5o+=Y7h$4 zEZx9mwQ8t)y4b4atj26JakVm9jvAX&3bF4tC%bWA zci}SZLDpuMa0>I=h5NmRc~23LRus7&6SK>n4=6*MS-Rj56F0!fM;LUlame*XxSnQu@lA4R1$azZfh zWL!->4_TA7;;pzJ@51+7{W_*mAD>A6(<#g+Uo}{X)9@7P@LfQyd>pfsU@9uG8q`X* zq0T@HYDN2ynCvxF07p<4>I5>UeTiD|pz~*sf(E#VWY0$MX^dc2P4pb*;9e}ilQ<7Y zQCpPFNz=fEs1>e6EvOwk@IzdM%Sf-T=>c4hN{a&a$|>j?twu#!fx1Q;u>p5uBi_VE z@u?|hMfd}1;zSOR7BC0@J2R+pN>CG&qPFlp=UUX(ZA3EUSzWMTJ5ej%>mKNF^`q|h z&rqowKu!3)s}Eym!0b0v0N!*n&YSH*1#rOC597nskE71o1g_R5-Ty2Kil_tCu?Nqg zkBa=ol;B==p$0sRcVHiO;}B+G6L(VfU?F~m+PYBguKE>VG!|nPmSLJlVLJsKwjR_9 z`cZ+LMIEMLWN|j?+7o962TDf;nCI$6sOL*vy#kf7YE)()cRqt!@NV={D7;F6tk}oM zqHPe%@o&_FrL%&E>Omw1^N_{aA%GCpaV!BdkZze*Qh|Rp;8*37JN}nLz*lFbw=*N#kd;R;VZ6w z)z$OU$$tqyw5RjZ!2#5S#cZSoUhZ6j5!5SDnX191_yTf@?KEnS&%56*U?%l&t`e^h z%SZKFj$9n8#WHO1C@3{&P%HZdmHP18gDHLh=ThH_%0Mq}!G71C$B%i`D^X{p3-82Z zs0>~~ZQ)JS3oC}GqHqfGYA|m$1wB}dTH(E@>#+tyvCg$`MXhuPYVX>x4trgDTo&hq z`V3S+wa$a63D2T3@gwTFtH>GhYyl@|Ck++2N)O;8n9bc;f-mD(wPP4w#1OoK%GfpB zjuW|)P52VlV|XqH5VxTMejjzVPGK|-W0>y$AFg2pl>vpXy^KV*(c+v%s6DJkvTx0< z{U~y5Y|zz1@`IVn#2DIhQ7d1BR#H_}UBA_l(opT6j+!3Pc_a3x&JW__{D0y;5BU8F z%_07#N$mmu#^j+8|Ieu_#sud1i<12aKQt{h(AkhN*}p&i*MPrt&R-$^%Bjx45 diff --git a/oarepo_requests/translations/messages.pot b/oarepo_requests/translations/messages.pot index 379fe16f..c261c5d5 100644 --- a/oarepo_requests/translations/messages.pot +++ b/oarepo_requests/translations/messages.pot @@ -8,378 +8,405 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-10-23 22:00+0200\n" +"POT-Creation-Date: 2024-10-31 12:46+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.16.0\n" +"Generated-By: Babel 2.15.0\n" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:125 +#: /home/ron/prace/oarepo-requests/oarepo_requests/invenio_patches.py:125 msgid "Submitted" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:126 +#: /home/ron/prace/oarepo-requests/oarepo_requests/invenio_patches.py:126 msgid "Expired" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:127 +#: /home/ron/prace/oarepo-requests/oarepo_requests/invenio_patches.py:127 msgid "Accepted" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:128 +#: /home/ron/prace/oarepo-requests/oarepo_requests/invenio_patches.py:128 msgid "Declined" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:129 +#: /home/ron/prace/oarepo-requests/oarepo_requests/invenio_patches.py:129 msgid "Cancelled" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:131 +#: /home/ron/prace/oarepo-requests/oarepo_requests/invenio_patches.py:131 msgid "Request status" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/invenio_patches.py:137 +#: /home/ron/prace/oarepo-requests/oarepo_requests/invenio_patches.py:137 msgid "Type" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/services/ui_schema.py:110 +#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/delete_published_record.py:9 +msgid "Permanently delete" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/delete_published_record.py:20 +msgid "Keep the record" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/generic.py:65 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:21 +msgid "Submit" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/generic.py:70 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:17 +msgid "Decline" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/generic.py:75 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:15 +msgid "Accept" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/publish_draft.py:36 +msgid "Publish" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/publish_draft.py:58 +msgid "Return for correction" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:143 +msgid "System user" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/services/ui_schema.py:112 msgid "status" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:3 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:3 msgid "Create Request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:4 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:4 msgid "Open dialog for request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:5 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:5 msgid "My Requests" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:6 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:6 msgid "Requests to Approve" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:7 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:7 msgid "Are you sure?" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:8 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:8 msgid "Cancel" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:9 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:9 msgid "OK" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:10 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:10 msgid "Create request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:11 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:11 msgid "Submit request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:12 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:12 msgid "Delete request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:13 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:13 msgid "Delete" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:14 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:14 msgid "Accept request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:15 -msgid "Accept" -msgstr "" - -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:16 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:16 msgid "Decline request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:17 -msgid "Decline" -msgstr "" - -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:18 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:18 msgid "Create and submit request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:19 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:19 msgid "Create and submit" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:20 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:20 msgid "Error sending request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:21 -msgid "Submit" -msgstr "" - -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:22 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:22 msgid "Save drafted request" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:23 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:23 msgid "Save" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:24 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:24 msgid "Create" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:25 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:25 msgid "Creator" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:26 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:26 msgid "Receiver" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:27 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:27 msgid "Request type" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:28 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:28 msgid "Created" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:29 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:29 msgid "Timeline" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:30 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:30 msgid "Submit event" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:31 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:31 msgid "No requests to show" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:32 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:32 msgid "api.requests" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:12 +#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:33 +msgid "api.applicable-requests" +msgstr "" + +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:12 msgid "Delete draft" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:24 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:24 msgid "Request deletion of draft" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:33 -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:38 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:33 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:38 msgid "Request draft deletion" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:36 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:36 msgid "Draft deletion requested" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:43 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:43 msgid "Click to permanently delete the draft." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:46 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:46 msgid "Request permission to delete the draft." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:50 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:50 msgid "" "Permission to delete draft requested. You will be notified about the " "decision by email." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:55 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:55 msgid "" "You have been asked to approve the request to permanently delete the draft. " "You can approve or reject the request." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:59 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:59 msgid "Permission to delete draft (including files) requested. " msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_draft.py:62 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_draft.py:62 msgid "Submit request to get permission to delete the draft." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:15 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:16 msgid "Delete record" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:27 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:29 msgid "Request deletion of published record" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:36 -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:41 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:38 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:43 msgid "Request record deletion" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:39 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:41 msgid "Record deletion requested" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:46 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:48 msgid "Click to permanently delete the record." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:49 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:51 msgid "Request permission to delete the record." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:53 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:55 msgid "" "Permission to delete record requested. You will be notified about the " "decision by email." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:58 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:60 msgid "" "You have been asked to approve the request to permanently delete the record." " You can approve or reject the request." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:62 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:64 msgid "Permission to delete record (including files) requested. " msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/delete_published_record.py:65 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/delete_published_record.py:67 msgid "Submit request to get permission to delete the record." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:19 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:19 msgid "Edit record" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:39 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:39 msgid "Request re-opening of published record" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:65 -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:70 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:65 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:70 msgid "Request edit access" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:68 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:68 msgid "Edit access requested" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:75 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:75 msgid "Click to start editing the metadata of the record." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:78 -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:95 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:78 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:95 msgid "" "Request edit access to the record. You will be notified about the decision " "by email." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:85 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:85 msgid "" "Edit access requested. You will be notified about the decision by email." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:90 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:90 msgid "You have been requested to grant edit access to the record." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/edit_record.py:93 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/edit_record.py:93 msgid "Edit access requested." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:20 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:20 msgid "New Version" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:40 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:40 msgid "Request requesting creation of new version of a published record." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:65 -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:70 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:65 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:70 msgid "Request new version access" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:68 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:68 msgid "New version access requested" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:75 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:75 msgid "Click to start creating a new version of the record." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:78 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:78 msgid "" "Request permission to update record (including files). You will be notified " "about the decision by email." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:85 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:85 msgid "" "Permission to update record (including files) requested. You will be " "notified about the decision by email." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:90 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:90 msgid "" "You have been asked to approve the request to update the record. You can " "approve or reject the request." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:94 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:94 msgid "Permission to update record (including files) requested. " msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/new_version.py:97 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/new_version.py:97 msgid "Submit request to get edit access to the record." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:24 -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:83 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:25 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:85 msgid "Publish draft" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:41 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:42 msgid "Resource version" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:42 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:43 msgid "Write down the version (first, second…)." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:56 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:58 msgid "Request publishing of a draft" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:85 -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:90 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:87 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:92 msgid "Submit for review" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:88 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:90 msgid "Submitted for review" msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:95 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:97 msgid "" "Click to immediately publish the draft. The draft will be a subject to " "embargo as requested in the side panel. Note: The action is irreversible." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:102 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:104 msgid "" "By submitting the draft for review you are requesting the publication of the" " draft. The draft will become locked and no further changes will be possible" @@ -387,33 +414,33 @@ msgid "" "decision by email." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:110 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:112 msgid "" "The draft has been submitted for review. It is now locked and no further " "changes are possible. You will be notified about the decision by email." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:116 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:118 msgid "" "The draft has been submitted for review. You can now accept or decline the " "request." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:120 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:122 msgid "The draft has been submitted for review." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:123 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:125 msgid "" "Submit for review. After submitting the draft for review, it will be locked " "and no further modifications will be possible." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/types/publish_draft.py:127 +#: /home/ron/prace/oarepo-requests/oarepo_requests/types/publish_draft.py:129 msgid "Request not yet submitted." msgstr "" -#: /home/dusanst/Projects/oarepo-requests/oarepo_requests/ui/templates/semantic-ui/oarepo_requests_ui/RequestDetail.jinja:3 +#: /home/ron/prace/oarepo-requests/oarepo_requests/ui/templates/semantic-ui/oarepo_requests_ui/RequestDetail.jinja:3 msgid "Request" msgstr "" @@ -429,13 +456,13 @@ msgstr "" msgid "Comment" msgstr "" -msgid "Form fields could not be fetched." +msgid "Request details" msgstr "" -msgid "Close" +msgid "Form fields could not be fetched." msgstr "" -msgid "Request details" +msgid "Close" msgstr "" msgid "Status" @@ -458,9 +485,6 @@ msgid "" "be possible to undo it." msgstr "" -msgid "Are you sure you wish to" -msgstr "" - msgid "Proceed" msgstr "" diff --git a/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/cs/LC_MESSAGES/translations.json b/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/cs/LC_MESSAGES/translations.json index dccc1373..76da48ab 100644 --- a/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/cs/LC_MESSAGES/translations.json +++ b/oarepo_requests/ui/theme/assets/semantic-ui/translations/oarepo_requests_ui/messages/cs/LC_MESSAGES/translations.json @@ -1 +1 @@ -{"status":"Stav","Create Request":"Vytvořit žádost","Open dialog for request":"Otevřít dialogové okno pro žádost","My Requests":"Moje žádosti","Requests to Approve":"Žádosti ke schválení","Are you sure?":"Jste si jistí?","Cancel":"Zrušit","OK":"OK","Create request":"Vytvořit žádost","Submit request":"Odeslat žádost","Delete request":"Smazat žádost","Delete":"Smazat","Accept request":"Přijmout žádost","Accept":"Přijmout","Decline request":"Zamítnout žádost","Decline":"Zamítnout","Create and submit request":"Vytvořit a odeslat žádost","Create and submit":"Vytvořit a odeslat","Error sending request":"Chyba při odesílání žádosti","Submit":"Odeslat","Save drafted request":"Uložit koncept žádosti","Save":"Uložit","Create":"Vytvořit","Creator":"Tvůrce","Receiver":"Příjemce","Request type":"Typ žádosti","Created":"Vytvořeno","Timeline":"Časová osa","Submit event":"Odeslat událost","No requests to show":"Žádné žádosti k zobrazení","api.requests":"API pro žádosti záznamu","Request deletion of published record":"Žádost o smazání zveřejněného záznamu","Request re-opening of published record":"Žádost o znovuotevření zveřejněného záznamu","Request publishing of a draft":"Žádost o kontrolu a zveřejnění konceptu","No status":"Beze stavu","Cannot send request. Please try again later.":"Nemohu poslat žádost. Prosím, zkuste později.","Cancel request":"Zrušit žádost","Submitted":"Odeslána","Expired":"Expirována","Accepted":"Přijata","Declined":"Zamítnuta","Cancelled":"Zrušena","Status":"Stav","Type":"Typ","Loading request types":"Načítám typy žádostí","Error loading request types":"Chyba při načítání typů žádostí","No new requests to create":"Nejsou dostupné žádné žádosti","Requests":"Žádosti","Error loading requests":"Chyba při načítání žádostí","Loading requests":"Načítám žádosti","Delete record":"Smazat záznam","Edit record":"Upravit záznam","Publish draft":"Publikovat","Close":"Zavřít","Request":"Žádost","Pending":"Schvalována","request":"žádost","Error while submitting comment.":"Chyba při odesílání komentáře.","Add comment":"Přidat komentář","optional":"nepovinné","Your comment here...":"Váš komentář...","Comment was not created successfully.":"Komentář nebyl úspěšně vytvořen.","Comment":"Komentář","Error while submitting the comment":"Chyba při odesílání komentáře","Back to requests":"Zpět na žádosti","Record":"Záznam","preview":"náhled","to top":"na začátek stránky","Loading timeline...":"Načítám časovou osu...","Error while fetching timeline events":"Chyba při načítání událostí časové osy","commented":"komnetoval","icon":"ikona","this request":"tato žádost","Comment must be at least 1 character long.":"Komentář musí být alespoň 1 znak dlouhý.","Invalid format.":"Neplatný formát.","Request status":"Stav žádosti","Request record deletion":"Zažádat smazání záznamu","Record deletion requested":"Zažádáno smazání záznamu","Click to permanently delete the record.":"Klikněte pro trvalé smazání záznamu.","Request permission to delete the record.":"Zažádat o povolení smazat záznam.","Permission to delete record requested. You will be notified about the decision by email.":"Zažádáno o povolení k smazání záznamu. O rozhodnutí budete informováni e-mailem.","You have been asked to approve the request to permanently delete the record. You can approve or reject the request.":"Byl jste požádán o schválení žádosti o trvalé smazání záznamu. Můžete žádost schválit nebo zamítnout.","Permission to delete record (including files) requested. ":"Zažádáno o povolení ke smazání záznamu (včetně souborů).","Submit request to get permission to delete the record.":"Odeslat žádost o povolení ke smazání záznamu.","Request edit access":"Žádost o úpravu záznamu","Edit access requested":"Zažádáno o úpravu záznamu","Click to start editing the metadata of the record.":"Klikněte pro začátek úprav metadat záznamu.","Request edit access to the record. You will be notified about the decision by email.":"Zažádat o úpravu záznamu. O rozhodnutí budete informováni e-mailem.","Edit access requested. You will be notified about the decision by email.":"Zažádáno o úpravu záznamu. O rozhodnutí budete informováni e-mailem.","You have been requested to grant edit access to the record.":"Byl jste požádán o udělení práva na upravení záznamu.","Edit access requested.":"Zažádáno o úpravu záznamu.","New Version":"Nová verze","Request requesting creation of new version of a published record.":"Žádost o vytvoření nové verze zveřejněného záznamu.","Request new version access":"Zažádat o vytvoření nové verzi","New version access requested":"Zažádáno o vytvoření nové verze","Click to start creating a new version of the record.":"Kliněte pro začátek vytváření nové verze záznamu.","Request permission to update record (including files). You will be notified about the decision by email.":"Zažádat o povolení aktualizace záznamu (včetně souborů). O rozhodnutí budete informováni e-mailem.","Permission to update record (including files) requested. You will be notified about the decision by email.":"Zažádáno o povolení aktualizace záznamu (včetně souborů). O rozhodnutí budete informováni e-mailem.","You have been asked to approve the request to update the record. You can approve or reject the request.":"Byl jste požádán o schválení žádosti o aktualizaci záznamu. Můžete žádost schválit nebo zamítnout.","Permission to update record (including files) requested. ":"Zažádáno o povolení aktualizace záznamu (včetně souborů).","Submit request to get edit access to the record.":"Odeslat žádost o povolení aktualizace záznamu (včetně souborů).","Resource version":"Verze záznamu","Write down the version (first, second…).":"Napište verzi (první, druhá…).","Submit for review":"Odeslat ke kontrole","Submitted for review":"Odesláno ke kontrole","Click to immediately publish the draft. The draft will be a subject to embargo as requested in the side panel. Note: The action is irreversible.":"Klikněte pro okamžité zveřejnění konceptu. Bylo-li zvoleno, záznam může podléhat embargu. Upozornění: Tuto akci není možno vzít zpět.","By submitting the draft for review you are requesting the publication of the draft. The draft will become locked and no further changes will be possible until the request is accepted or declined. You will be notified about the decision by email.":"Odesláním konceptu ke kontrole žádáte o zveřejnění konceptu. Koncept bude uzamčen a další změny nebudou možné, dokud nebude žádost přijata nebo zamítnuta. O rozhodnutí budete informováni e-mailem.","The draft has been submitted for review. It is now locked and no further changes are possible. You will be notified about the decision by email.":"Koncept byl odeslán ke kontrole. Nyní je uzamčen a další změny nejsou možné. O rozhodnutí budete informováni e-mailem.","The draft has been submitted for review. You can now accept or decline the request.":"Koncept Vám byl odeslán ke kontrole. Žádost můžete přijmout nebo zamítnout.","The draft has been submitted for review.":"Koncept byl odeslán ke kontrole.","Submit for review. After submitting the draft for review, it will be locked and no further modifications will be possible.":"Odeslat ke kontrole. Po odeslání konceptu ke kontrole bude záznam uzamčen a další změny nebudou možné.","Request not yet submitted.":"Žádost zatím nebyla odeslána.","Delete draft":"Smazat koncept","Request draft deletion":"Zažádat o smazání konceptu","Draft deletion requested":"Zažádáno o smazání konceptu","Click to permanently delete the draft.":"Klikněte pro trvalé smazání konceptu.","Request permission to delete the draft.":"Zažádat o povolení ke smazání konceptu.","Permission to delete draft requested. You will be notified about the decision by email.":"Zažádáno o povolení ke smazání konceptu. O rozhodnutí budete informováni emailem.","You have been asked to approve the request to permanently delete the draft. You can approve or reject the request.":"Byli jste požádáni o schválení žádosti o trvalé smazání konceptu. Můžete žádost schválit nebo odmítnout.","Permission to delete draft (including files) requested. ":"Zažádáno o povolení ke smazání konceptu (včetně souborů).","Submit request to get permission to delete the draft.":"Odeslat žádost o povolení ke smazání konceptu.","Request not created successfully. Please try again in a moment.":"Žádost nebyla úspěšně vytvořena. Zkuste to prosím za chvíli znovu.","Form fields could not be fetched.":"Formulářová pole nebyla načtena.","Request details":"Podrobnosti žádosti","Topic":"Téma","Request topic":"Téma žádosti","Are you sure you want to proceed? Once the action is completed, it will not be possible to undo it.":"Jste si jisti, že chcete pokračovat? Po dokončení akce ji nebude možné vrátit zpět.","Are you sure you wish to":"Jste si jisti, že chcete","Proceed":"Pokračovat","Are you sure you wish to proceed? After this request is accepted, it will not be possible to reverse the action.":"Jste si jisti, že chcete pokračovat? Po přijetí této žádosti nebude možné akci zvrátit.","The request could not be created due to validation errors. Please correct the errors and try again.":"Žádost nemohla být vytvořena kvůli validačním chybám. Prosím opravte chyby a zkuste to znovu.","The action could not be executed. Please try again in a moment.":"Akce nebyla úspěšně provedena. Zkuste to prosím za chvíli znovu.","Record has validation errors. Redirecting to form...":"Záznam obsahuje validační chyby. Přesměrování na formulář...","Comment was not submitted successfully.":"Komentář nebyl úspěšně odeslán.","Leave comment":"Zanechat komentář","Request deletion of draft":"Zažádat o smazání konceptu","It is highly recommended to provide an explanation for the rejection of the request. Note that it is always possible to provide explanation later on the request timeline.":"Důrazně doporučujeme poskytnout vysvětlení zamítnutí žádosti. Všimněte si, že je vždy možné poskytnout vysvětlení později v rámci časové osy žádosti.","Record preview":"Náhled záznamu","This action is irreversible. Are you sure you wish to accept this request?":"Tato akce je nevratná. Opravdu si přejete tuto žádost přijmout?","requestCreated":"{{creatorLabel}} vytvořil(a) tuto žádost","requestSubmitted":"{{creatorLabel}} odeslal(a) tuto žádost","requestCancelled":"{{creatorLabel}} zrušil(a) tuto žádost","requestAccepted":"{{creatorLabel}} přijal(a) tuto žádost","requestDeclined":"{{creatorLabel}} odmítl(a) tuto žádost","Request expired.":"Žádost vypršela","requestDeleted":"{{creatorLabel}} smazal(a) tuto žádost","requestCommented":"{{creatorLabel}} komentoval(a)"} \ No newline at end of file +{"status":"Stav","Create Request":"Vytvořit žádost","Open dialog for request":"Otevřít dialogové okno pro žádost","My Requests":"Moje žádosti","Requests to Approve":"Žádosti ke schválení","Are you sure?":"Jste si jistí?","Cancel":"Zrušit","OK":"OK","Create request":"Vytvořit žádost","Submit request":"Odeslat žádost","Delete request":"Smazat žádost","Delete":"Smazat","Accept request":"Přijmout žádost","Accept":"Přijmout","Decline request":"Zamítnout žádost","Decline":"Zamítnout","Create and submit request":"Vytvořit a odeslat žádost","Create and submit":"Vytvořit a odeslat","Error sending request":"Chyba při odesílání žádosti","Submit":"Odeslat","Save drafted request":"Uložit koncept žádosti","Save":"Uložit","Create":"Vytvořit","Creator":"Tvůrce","Receiver":"Příjemce","Request type":"Typ žádosti","Created":"Vytvořeno","Timeline":"Časová osa","Submit event":"Odeslat událost","No requests to show":"Žádné žádosti k zobrazení","api.requests":"API pro žádosti záznamu","Request deletion of published record":"Žádost o smazání zveřejněného záznamu","Request re-opening of published record":"Žádost o znovuotevření zveřejněného záznamu","Request publishing of a draft":"Žádost o kontrolu a zveřejnění konceptu","No status":"Beze stavu","Cannot send request. Please try again later.":"Nemohu poslat žádost. Prosím, zkuste později.","Cancel request":"Zrušit žádost","Submitted":"Odeslána","Expired":"Expirována","Accepted":"Přijata","Declined":"Zamítnuta","Cancelled":"Zrušena","Status":"Stav","Type":"Typ","Loading request types":"Načítám typy žádostí","Error loading request types":"Chyba při načítání typů žádostí","No new requests to create":"Nejsou dostupné žádné žádosti","Requests":"Žádosti","Error loading requests":"Chyba při načítání žádostí","Loading requests":"Načítám žádosti","Delete record":"Smazat záznam","Edit record":"Upravit záznam","Publish draft":"Publikovat","Close":"Zavřít","Request":"Žádost","Pending":"Schvalována","request":"žádost","Error while submitting comment.":"Chyba při odesílání komentáře.","Add comment":"Přidat komentář","optional":"nepovinné","Your comment here...":"Váš komentář...","Comment was not created successfully.":"Komentář nebyl úspěšně vytvořen.","Comment":"Komentář","Error while submitting the comment":"Chyba při odesílání komentáře","Back to requests":"Zpět na žádosti","Record":"Záznam","preview":"náhled","to top":"na začátek stránky","Loading timeline...":"Načítám časovou osu...","Error while fetching timeline events":"Chyba při načítání událostí časové osy","commented":"komnetoval","icon":"ikona","this request":"tato žádost","Comment must be at least 1 character long.":"Komentář musí být alespoň 1 znak dlouhý.","Invalid format.":"Neplatný formát.","Request status":"Stav žádosti","Request record deletion":"Zažádat smazání záznamu","Record deletion requested":"Zažádáno smazání záznamu","Click to permanently delete the record.":"Klikněte pro trvalé smazání záznamu.","Request permission to delete the record.":"Zažádat o povolení smazat záznam.","Permission to delete record requested. You will be notified about the decision by email.":"Zažádáno o povolení k smazání záznamu. O rozhodnutí budete informováni e-mailem.","You have been asked to approve the request to permanently delete the record. You can approve or reject the request.":"Byl jste požádán o schválení žádosti o trvalé smazání záznamu. Můžete žádost schválit nebo zamítnout.","Permission to delete record (including files) requested. ":"Zažádáno o povolení ke smazání záznamu (včetně souborů).","Submit request to get permission to delete the record.":"Odeslat žádost o povolení ke smazání záznamu.","Request edit access":"Žádost o úpravu záznamu","Edit access requested":"Zažádáno o úpravu záznamu","Click to start editing the metadata of the record.":"Klikněte pro začátek úprav metadat záznamu.","Request edit access to the record. You will be notified about the decision by email.":"Zažádat o úpravu záznamu. O rozhodnutí budete informováni e-mailem.","Edit access requested. You will be notified about the decision by email.":"Zažádáno o úpravu záznamu. O rozhodnutí budete informováni e-mailem.","You have been requested to grant edit access to the record.":"Byl jste požádán o udělení práva na upravení záznamu.","Edit access requested.":"Zažádáno o úpravu záznamu.","New Version":"Nová verze","Request requesting creation of new version of a published record.":"Žádost o vytvoření nové verze zveřejněného záznamu.","Request new version access":"Zažádat o vytvoření nové verzi","New version access requested":"Zažádáno o vytvoření nové verze","Click to start creating a new version of the record.":"Kliněte pro začátek vytváření nové verze záznamu.","Request permission to update record (including files). You will be notified about the decision by email.":"Zažádat o povolení aktualizace záznamu (včetně souborů). O rozhodnutí budete informováni e-mailem.","Permission to update record (including files) requested. You will be notified about the decision by email.":"Zažádáno o povolení aktualizace záznamu (včetně souborů). O rozhodnutí budete informováni e-mailem.","You have been asked to approve the request to update the record. You can approve or reject the request.":"Byl jste požádán o schválení žádosti o aktualizaci záznamu. Můžete žádost schválit nebo zamítnout.","Permission to update record (including files) requested. ":"Zažádáno o povolení aktualizace záznamu (včetně souborů).","Submit request to get edit access to the record.":"Odeslat žádost o povolení aktualizace záznamu (včetně souborů).","Resource version":"Verze záznamu","Write down the version (first, second…).":"Napište verzi (první, druhá…).","Submit for review":"Odeslat ke kontrole","Submitted for review":"Odesláno ke kontrole","Click to immediately publish the draft. The draft will be a subject to embargo as requested in the side panel. Note: The action is irreversible.":"Klikněte pro okamžité zveřejnění konceptu. Bylo-li zvoleno, záznam může podléhat embargu. Upozornění: Tuto akci není možno vzít zpět.","By submitting the draft for review you are requesting the publication of the draft. The draft will become locked and no further changes will be possible until the request is accepted or declined. You will be notified about the decision by email.":"Odesláním konceptu ke kontrole žádáte o zveřejnění konceptu. Koncept bude uzamčen a další změny nebudou možné, dokud nebude žádost přijata nebo zamítnuta. O rozhodnutí budete informováni e-mailem.","The draft has been submitted for review. It is now locked and no further changes are possible. You will be notified about the decision by email.":"Koncept byl odeslán ke kontrole. Nyní je uzamčen a další změny nejsou možné. O rozhodnutí budete informováni e-mailem.","The draft has been submitted for review. You can now accept or decline the request.":"Koncept Vám byl odeslán ke kontrole. Žádost můžete přijmout nebo zamítnout.","The draft has been submitted for review.":"Koncept byl odeslán ke kontrole.","Submit for review. After submitting the draft for review, it will be locked and no further modifications will be possible.":"Odeslat ke kontrole. Po odeslání konceptu ke kontrole bude záznam uzamčen a další změny nebudou možné.","Request not yet submitted.":"Žádost zatím nebyla odeslána.","Delete draft":"Smazat koncept","Request draft deletion":"Zažádat o smazání konceptu","Draft deletion requested":"Zažádáno o smazání konceptu","Click to permanently delete the draft.":"Klikněte pro trvalé smazání konceptu.","Request permission to delete the draft.":"Zažádat o povolení ke smazání konceptu.","Permission to delete draft requested. You will be notified about the decision by email.":"Zažádáno o povolení ke smazání konceptu. O rozhodnutí budete informováni emailem.","You have been asked to approve the request to permanently delete the draft. You can approve or reject the request.":"Byli jste požádáni o schválení žádosti o trvalé smazání konceptu. Můžete žádost schválit nebo odmítnout.","Permission to delete draft (including files) requested. ":"Zažádáno o povolení ke smazání konceptu (včetně souborů).","Submit request to get permission to delete the draft.":"Odeslat žádost o povolení ke smazání konceptu.","Request not created successfully. Please try again in a moment.":"Žádost nebyla úspěšně vytvořena. Zkuste to prosím za chvíli znovu.","Form fields could not be fetched.":"Formulářová pole nebyla načtena.","Request details":"Podrobnosti žádosti","Topic":"Téma","Request topic":"Téma žádosti","Are you sure you want to proceed? Once the action is completed, it will not be possible to undo it.":"Jste si jisti, že chcete pokračovat? Po dokončení akce ji nebude možné vrátit zpět.","Are you sure you wish to":"Jste si jisti, že chcete","Proceed":"Pokračovat","Are you sure you wish to proceed? After this request is accepted, it will not be possible to reverse the action.":"Jste si jisti, že chcete pokračovat? Po přijetí této žádosti nebude možné akci zvrátit.","The request could not be created due to validation errors. Please correct the errors and try again.":"Žádost nemohla být vytvořena kvůli validačním chybám. Prosím opravte chyby a zkuste to znovu.","The action could not be executed. Please try again in a moment.":"Akce nebyla úspěšně provedena. Zkuste to prosím za chvíli znovu.","Record has validation errors. Redirecting to form...":"Záznam obsahuje validační chyby. Přesměrování na formulář...","Comment was not submitted successfully.":"Komentář nebyl úspěšně odeslán.","Leave comment":"Zanechat komentář","Request deletion of draft":"Zažádat o smazání konceptu","It is highly recommended to provide an explanation for the rejection of the request. Note that it is always possible to provide explanation later on the request timeline.":"Důrazně doporučujeme poskytnout vysvětlení zamítnutí žádosti. Všimněte si, že je vždy možné poskytnout vysvětlení později v rámci časové osy žádosti.","Record preview":"Náhled záznamu","This action is irreversible. Are you sure you wish to accept this request?":"Tato akce je nevratná. Opravdu si přejete tuto žádost přijmout?","requestCreated":"{{creatorLabel}} vytvořil(a) tuto žádost","requestSubmitted":"{{creatorLabel}} odeslal(a) tuto žádost","requestCancelled":"{{creatorLabel}} zrušil(a) tuto žádost","requestAccepted":"{{creatorLabel}} přijal(a) tuto žádost","requestDeclined":"{{creatorLabel}} odmítl(a) tuto žádost","Request expired.":"Žádost vypršela","requestDeleted":"{{creatorLabel}} smazal(a) tuto žádost","requestCommented":"{{creatorLabel}} komentoval(a)","Permanently delete":"Trvale smazat","Keep the record":"Ponechat záznam","Publish":"Publikovat","Return for correction":"Vrátit k opravě","api.applicable-requests":"API pro vytváření žádostí","System user":"Systémový uživatel"} \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index e097e852..83dc45f2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = oarepo-requests -version = 2.2.8 +version = 2.2.9 description = authors = Ronald Krist readme = README.md diff --git a/tests/conftest.py b/tests/conftest.py index 2736c62e..8da0fc44 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -422,7 +422,7 @@ def _result(topic_id, request_id): return { # 'created': '2024-01-26T10:06:17.945916', "created_by": { - "label": "user1@example.org", + "label": "id: 1", "links": {"self": "https://127.0.0.1:5000/api/users/1"}, "reference": {"user": "1"}, "type": "user", @@ -521,6 +521,7 @@ def users(app, db, UserFixture): user2 = UserFixture( email="user2@example.org", password="beetlesmasher", + username="beetlesmasher", active=True, confirmed=True, ) @@ -529,6 +530,11 @@ def users(app, db, UserFixture): user3 = UserFixture( email="user3@example.org", password="beetlesmasher", + username="beetlesmasherXXL", + user_profile={ + "full_name": "Maxipes Fik", + "affiliations": "CERN", + }, active=True, confirmed=True, ) diff --git a/tests/test_requests/test_ui_serialialization.py b/tests/test_requests/test_ui_serialialization.py index 2facced8..f3362876 100644 --- a/tests/test_requests/test_ui_serialialization.py +++ b/tests/test_requests/test_ui_serialialization.py @@ -9,7 +9,7 @@ from .utils import is_valid_subdict, link_api2testclient -def test_publish( +def test_user_serialization( users, urls, publish_request_data_function, @@ -18,19 +18,34 @@ def test_publish( logged_client, search_clear, ): - creator = users[0] - creator_client = logged_client(creator) + client_fallback_label = logged_client(users[0]) + client_username_label = logged_client(users[1]) + client_fullname_label = logged_client(users[2]) + + draft1 = create_draft_via_resource(client_fallback_label) + draft2 = create_draft_via_resource(client_username_label) + draft3 = create_draft_via_resource(client_fullname_label) - draft1 = create_draft_via_resource(creator_client) draft_id = draft1.json["id"] ThesisRecord.index.refresh() ThesisDraft.index.refresh() - resp_request_create = creator_client.post( + resp_request_create = client_fallback_label.post( urls["BASE_URL_REQUESTS"], json=publish_request_data_function(draft1.json["id"]), headers={"Accept": "application/vnd.inveniordm.v1+json"}, ) + resp_request_create_username = client_username_label.post( + urls["BASE_URL_REQUESTS"], + json=publish_request_data_function(draft2.json["id"]), + headers={"Accept": "application/vnd.inveniordm.v1+json"}, + ) + resp_request_create_fullname = client_fullname_label.post( + urls["BASE_URL_REQUESTS"], + json=publish_request_data_function(draft3.json["id"]), + headers={"Accept": "application/vnd.inveniordm.v1+json"}, + ) + pprint(resp_request_create.json) assert resp_request_create.json["stateful_name"] == "Submit for review" assert resp_request_create.json["stateful_description"] == ( @@ -38,7 +53,7 @@ def test_publish( "it will be locked and no further modifications will be possible." ) - resp_request_submit = creator_client.post( + resp_request_submit = client_fallback_label.post( link_api2testclient(resp_request_create.json["links"]["actions"]["submit"]), headers={"Accept": "application/vnd.inveniordm.v1+json"}, ) @@ -49,8 +64,8 @@ def test_publish( == "The draft has been submitted for review. It is now locked and no further changes are possible. You will be notified about the decision by email." ) - record = creator_client.get(f"{urls['BASE_URL']}{draft_id}/draft").json - ui_record = creator_client.get( + record = client_fallback_label.get(f"{urls['BASE_URL']}{draft_id}/draft").json + ui_record = client_fallback_label.get( f"{urls['BASE_URL']}{draft_id}/draft?expand=true", headers={"Accept": "application/vnd.inveniordm.v1+json"}, ).json @@ -61,6 +76,46 @@ def test_publish( assert "dictionary_item_removed" not in diff assert "dictionary_item_changed" not in diff + creator_serialization = { + "label": "id: 1", + "links": {"self": "https://127.0.0.1:5000/api/users/1"}, + "reference": {"user": "1"}, + "type": "user", + } + + creator_serialization_username = { + "label": "beetlesmasher", + "links": {"self": "https://127.0.0.1:5000/api/users/2"}, + "reference": {"user": "2"}, + "type": "user", + } + + creator_serialization_fullname = { + "label": "Maxipes Fik", + "links": {"self": "https://127.0.0.1:5000/api/users/3"}, + "reference": {"user": "3"}, + "type": "user", + } + + ui_record_username = client_username_label.get( + f"{urls['BASE_URL']}{draft2.json['id']}/draft?expand=true", + headers={"Accept": "application/vnd.inveniordm.v1+json"}, + ).json + ui_record_fullname = client_fullname_label.get( + f"{urls['BASE_URL']}{draft3.json['id']}/draft?expand=true", + headers={"Accept": "application/vnd.inveniordm.v1+json"}, + ).json + + assert ui_record["expanded"]["requests"][0]["created_by"] == creator_serialization + assert ( + ui_record_username["expanded"]["requests"][0]["created_by"] + == creator_serialization_username + ) + assert ( + ui_record_fullname["expanded"]["requests"][0]["created_by"] + == creator_serialization_fullname + ) + def test_resolver_fallback( app, From 59d73e2db86eef8d3feb1b78b85d49a0f2acfe85 Mon Sep 17 00:00:00 2001 From: Ronald Krist Date: Thu, 31 Oct 2024 13:26:19 +0100 Subject: [PATCH 2/4] deleted comment --- oarepo_requests/resolvers/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oarepo_requests/resolvers/ui.py b/oarepo_requests/resolvers/ui.py index 58cca317..8346f12d 100644 --- a/oarepo_requests/resolvers/ui.py +++ b/oarepo_requests/resolvers/ui.py @@ -146,7 +146,7 @@ def _resolve(self, record, reference): "profile" in record.data and "full_name" in record.data["profile"] and record.data["profile"]["full_name"] - ): # username undefined? + ): label = record.data["profile"]["full_name"] elif "username" in record.data and record.data["username"]: label = record.data["username"] From 458144bd3d188d65420234a16950c5c49f1125a3 Mon Sep 17 00:00:00 2001 From: Ronald Krist Date: Thu, 31 Oct 2024 13:27:39 +0100 Subject: [PATCH 3/4] deleted nonexistent msgs from en translations --- .../translations/en/LC_MESSAGES/messages.po | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/oarepo_requests/translations/en/LC_MESSAGES/messages.po b/oarepo_requests/translations/en/LC_MESSAGES/messages.po index 8b233da9..4f3c3c25 100644 --- a/oarepo_requests/translations/en/LC_MESSAGES/messages.po +++ b/oarepo_requests/translations/en/LC_MESSAGES/messages.po @@ -605,32 +605,6 @@ msgstr "" msgid "Return for correction" msgstr "" -#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:24 -#, python-format -msgid "id: %(id)s" -msgstr "" - -#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:114 -msgid "name" -msgstr "" - -#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:117 -msgid "group" -msgstr "" - -#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:153 -msgid "username" -msgstr "" - -#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:156 -msgid "user" -msgstr "" - -#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:185 -#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:243 -msgid "metadatatitle" -msgstr "" - #: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:143 msgid "System user" msgstr "" From b44b72c148634f9edccd30a2e8991801847a04d7 Mon Sep 17 00:00:00 2001 From: Ronald Krist Date: Thu, 31 Oct 2024 13:33:20 +0100 Subject: [PATCH 4/4] timeline test fix --- tests/test_requests/test_timeline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_requests/test_timeline.py b/tests/test_requests/test_timeline.py index 9694678c..9be13a67 100644 --- a/tests/test_requests/test_timeline.py +++ b/tests/test_requests/test_timeline.py @@ -58,7 +58,7 @@ def test_timeline( "created_by": { "reference": {"user": "1"}, "type": "user", - "label": "user1@example.org", + "label": "id: 1", "links": {"self": "https://127.0.0.1:5000/api/users/1"}, }, "permissions": {},