Merge pull request #80 from oarepo/krist/be-497-user-reference-not-tr…

…anslated-in-requests-ui-serialization

translations update

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"]
+        ):
+            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",

oarepo_requests/translations/_only_for_translations.py

@@ -30,3 +30,4 @@
 _("Submit event")
 _("No requests to show")
 _("api.requests")
+_("api.applicable-requests")

oarepo_requests/translations/cs/LC_MESSAGES/messages.po

@@ -624,3 +624,27 @@ msgstr "{{creatorLabel}} smazal(a) tuto žádost"
 
 msgid "requestCommented"
 msgstr "{{creatorLabel}} komentoval(a)"
+
+#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/delete_published_record.py:9
+msgid "Permanently delete"
+msgstr "Trvale smazat"
+
+#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/delete_published_record.py:20
+msgid "Keep the record"
+msgstr "Ponechat záznam"
+
+#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/publish_draft.py:36
+msgid "Publish"
+msgstr "Publikovat"
+
+#: /home/ron/prace/oarepo-requests/oarepo_requests/actions/publish_draft.py:58
+msgid "Return for correction"
+msgstr "Vrátit k opravě"
+
+#: /home/ron/prace/oarepo-requests/oarepo_requests/translations/_only_for_translations.py:33
+msgid "api.applicable-requests"
+msgstr "API pro vytváření žádostí"
+
+#: /home/ron/prace/oarepo-requests/oarepo_requests/resolvers/ui.py:143
+msgid "System user"
+msgstr "Systémový uživatel"

oarepo_requests/translations/en/LC_MESSAGES/messages.po

@@ -589,5 +589,29 @@ msgstr "{{creatorLabel}} deleted this request"
 msgid "requestCommented"
 msgstr "{{creatorLabel}} commented"
 
+#: /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/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/translations/_only_for_translations.py:33
+msgid "api.applicable-requests"
+msgstr ""
+
 #~ msgid "No status"
 #~ msgstr ""